diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 0a05541b2e..8c08ac9c20 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "jetbrains.resharper.globaltools": {
-      "version": "2021.2.2",
+      "version": "2021.3.0",
       "commands": [
         "jb"
       ]
@@ -21,7 +21,7 @@
       ]
     },
     "dotnet-reportgenerator-globaltool": {
-      "version": "4.8.12",
+      "version": "5.0.0",
       "commands": [
         "reportgenerator"
       ]
diff --git a/Build.ps1 b/Build.ps1
index a4b930d26c..b02e4bb7bb 100644
--- a/Build.ps1
+++ b/Build.ps1
@@ -8,7 +8,8 @@ function CheckLastExitCode {
 
 function RunInspectCode {
     $outputPath = [System.IO.Path]::Combine([System.IO.Path]::GetTempPath(), 'jetbrains-inspectcode-results.xml')
-    dotnet jb inspectcode JsonApiDotNetCore.sln --no-build --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
+    # passing --build instead of --no-build as workaround for https://youtrack.jetbrains.com/issue/RSRP-487054
+    dotnet jb inspectcode JsonApiDotNetCore.sln --build --output="$outputPath" --profile=WarningSeverities.DotSettings --properties:Configuration=Release --severity=WARNING --verbosity=WARN -dsl=GlobalAll -dsl=GlobalPerProduct -dsl=SolutionPersonal -dsl=ProjectPersonal
     CheckLastExitCode
 
     [xml]$xml = Get-Content "$outputPath"
@@ -84,22 +85,18 @@ function CreateNuGetPackage {
     }
 
     if ([string]::IsNullOrWhitespace($versionSuffix)) {
-        dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts
-        dotnet pack .\src\JsonApiDotNetCore.OpenApi -c Release -o .\artifacts
-        dotnet pack .\src\JsonApiDotNetCore.OpenApi.Client -c Release -o .\artifacts
+        dotnet pack --no-restore --no-build --configuration Release --output .\artifacts
     }
     else {
-        dotnet pack .\src\JsonApiDotNetCore -c Release -o .\artifacts --version-suffix=$versionSuffix
-        dotnet pack .\src\JsonApiDotNetCore.OpenApi -c Release -o .\artifacts --version-suffix=$versionSuffix
-        dotnet pack .\src\JsonApiDotNetCore.OpenApi.Client -c Release -o .\artifacts --version-suffix=$versionSuffix
+        dotnet pack --no-restore --no-build --configuration Release --output .\artifacts --version-suffix=$versionSuffix
     }
 
     CheckLastExitCode
 }
 
 # In a PR the base branch needs to be fetched in order for regitlint to work.
-function FetchBaseBranchIfNotMaster(){
-    if ($env:APPVEYOR_PULL_REQUEST_NUMBER -And $env:APPVEYOR_REPO_BRANCH -ne "master"){
+function FetchBaseBranchIfNotMaster() {
+    if ($env:APPVEYOR_PULL_REQUEST_NUMBER -And $env:APPVEYOR_REPO_BRANCH -ne "master") {
         git fetch -q origin ${env:APPVEYOR_REPO_BRANCH}:${env:APPVEYOR_REPO_BRANCH}
     }
 }
diff --git a/Directory.Build.props b/Directory.Build.props
index 43158313fe..2fd1da959a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,19 +1,24 @@
 <Project>
   <PropertyGroup>
-    <NetCoreAppVersion>net5.0</NetCoreAppVersion>
-    <AspNetCoreVersion>5.0.*</AspNetCoreVersion>
-    <EFCoreVersion>5.0.*</EFCoreVersion>
-    <NpgsqlPostgreSQLVersion>5.0.*</NpgsqlPostgreSQLVersion>
+    <TargetFrameworkName>net6.0</TargetFrameworkName>
+    <AspNetVersion>6.0.*</AspNetVersion>
+    <EFCoreVersion>6.0.*</EFCoreVersion>
+    <EFCorePostgresVersion>6.0.*</EFCorePostgresVersion>
+    <MicrosoftCodeAnalysisVersion>4.*</MicrosoftCodeAnalysisVersion>
+    <HumanizerVersion>2.*</HumanizerVersion>
     <SwashbuckleVersion>6.2.*</SwashbuckleVersion>
     <JsonApiDotNetCoreVersionPrefix>5.0.0</JsonApiDotNetCoreVersionPrefix>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)CodingGuidelines.ruleset</CodeAnalysisRuleSet>
     <WarningLevel>9999</WarningLevel>
     <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <IsPackable>false</IsPackable>
+    <WarnOnPackingNonPackableProject>false</WarnOnPackingNonPackableProject>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
-    <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.7.0" PrivateAssets="All" />
+    <PackageReference Include="CSharpGuidelinesAnalyzer" Version="3.7.1" PrivateAssets="All" />
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)CSharpGuidelinesAnalyzer.config" Visible="False" />
   </ItemGroup>
 
@@ -25,11 +30,8 @@
 
   <!-- Test Project Dependencies -->
   <PropertyGroup>
-    <BogusVersion>33.1.1</BogusVersion>
     <CoverletVersion>3.1.0</CoverletVersion>
-    <FluentAssertionsVersion>6.2.0</FluentAssertionsVersion>
     <MoqVersion>4.16.1</MoqVersion>
-    <XUnitVersion>2.4.*</XUnitVersion>
     <TestSdkVersion>17.0.0</TestSdkVersion>
   </PropertyGroup>
 </Project>
diff --git a/JsonApiDotNetCore.sln b/JsonApiDotNetCore.sln
index 311a1a586c..e4b74f93aa 100644
--- a/JsonApiDotNetCore.sln
+++ b/JsonApiDotNetCore.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28606.126
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31919.166
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}"
 EndProject
@@ -44,15 +44,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiDbContextTests", "test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestBuildingBlocks", "test\TestBuildingBlocks\TestBuildingBlocks.csproj", "{210FD61E-FF5D-4CEE-8E0D-C739ECCCBA21}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiDotNetCore.OpenApi", "src\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj", "{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore.SourceGenerators", "src\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj", "{952C0FDE-AFC8-455C-986F-6CC882ED8953}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenApiTests", "test\OpenApiTests\OpenApiTests.csproj", "{B693DE14-BB28-496F-AB39-B4E674ABCA80}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGeneratorDebugger", "test\SourceGeneratorDebugger\SourceGeneratorDebugger.csproj", "{87D066F9-3540-4AC7-A748-134900969EE5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiDotNetCore.OpenApi.Client", "src\JsonApiDotNetCore.OpenApi.Client\JsonApiDotNetCore.OpenApi.Client.csproj", "{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGeneratorTests", "test\SourceGeneratorTests\SourceGeneratorTests.csproj", "{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JsonApiDotNetCoreExampleClient", "src\Examples\JsonApiDotNetCoreExampleClient\JsonApiDotNetCoreExampleClient.csproj", "{7FC5DFA3-6F66-4FD8-820D-81E93856F252}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore.Annotations", "src\JsonApiDotNetCore.Annotations\JsonApiDotNetCore.Annotations.csproj", "{83FF097C-C8C6-477B-9FAB-DF99B84978B5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenApiClientTests", "test\OpenApiClientTests\OpenApiClientTests.csproj", "{77F98215-3085-422E-B99D-4C404C2114CF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore.OpenApi", "src\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj", "{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApiTests", "test\OpenApiTests\OpenApiTests.csproj", "{B693DE14-BB28-496F-AB39-B4E674ABCA80}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCore.OpenApi.Client", "src\JsonApiDotNetCore.OpenApi.Client\JsonApiDotNetCore.OpenApi.Client.csproj", "{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JsonApiDotNetCoreExampleClient", "src\Examples\JsonApiDotNetCoreExampleClient\JsonApiDotNetCoreExampleClient.csproj", "{7FC5DFA3-6F66-4FD8-820D-81E93856F252}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenApiClientTests", "test\OpenApiClientTests\OpenApiClientTests.csproj", "{77F98215-3085-422E-B99D-4C404C2114CF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -64,6 +72,18 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Debug|x64.Build.0 = Debug|Any CPU
+		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Debug|x86.Build.0 = Debug|Any CPU
+		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x64.ActiveCfg = Release|Any CPU
+		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x64.Build.0 = Release|Any CPU
+		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x86.ActiveCfg = Release|Any CPU
+		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x86.Build.0 = Release|Any CPU
 		{CAF331F8-9255-4D72-A1A8-A54141E99F1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{CAF331F8-9255-4D72-A1A8-A54141E99F1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CAF331F8-9255-4D72-A1A8-A54141E99F1E}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -172,18 +192,6 @@ Global
 		{21D27239-138D-4604-8E49-DCBE41BCE4C8}.Release|x64.Build.0 = Release|Any CPU
 		{21D27239-138D-4604-8E49-DCBE41BCE4C8}.Release|x86.ActiveCfg = Release|Any CPU
 		{21D27239-138D-4604-8E49-DCBE41BCE4C8}.Release|x86.Build.0 = Release|Any CPU
-		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Debug|x64.Build.0 = Debug|Any CPU
-		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Debug|x86.Build.0 = Debug|Any CPU
-		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x64.ActiveCfg = Release|Any CPU
-		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x64.Build.0 = Release|Any CPU
-		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x86.ActiveCfg = Release|Any CPU
-		{067FFD7A-C66B-473D-8471-37F5C95DF61C}.Release|x86.Build.0 = Release|Any CPU
 		{6CAFDDBE-00AB-4784-801B-AB419C3C3A26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6CAFDDBE-00AB-4784-801B-AB419C3C3A26}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6CAFDDBE-00AB-4784-801B-AB419C3C3A26}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -220,6 +228,54 @@ Global
 		{210FD61E-FF5D-4CEE-8E0D-C739ECCCBA21}.Release|x64.Build.0 = Release|Any CPU
 		{210FD61E-FF5D-4CEE-8E0D-C739ECCCBA21}.Release|x86.ActiveCfg = Release|Any CPU
 		{210FD61E-FF5D-4CEE-8E0D-C739ECCCBA21}.Release|x86.Build.0 = Release|Any CPU
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Debug|x64.Build.0 = Debug|Any CPU
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Debug|x86.Build.0 = Debug|Any CPU
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Release|Any CPU.Build.0 = Release|Any CPU
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Release|x64.ActiveCfg = Release|Any CPU
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Release|x64.Build.0 = Release|Any CPU
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Release|x86.ActiveCfg = Release|Any CPU
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953}.Release|x86.Build.0 = Release|Any CPU
+		{87D066F9-3540-4AC7-A748-134900969EE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{87D066F9-3540-4AC7-A748-134900969EE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{87D066F9-3540-4AC7-A748-134900969EE5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{87D066F9-3540-4AC7-A748-134900969EE5}.Debug|x64.Build.0 = Debug|Any CPU
+		{87D066F9-3540-4AC7-A748-134900969EE5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{87D066F9-3540-4AC7-A748-134900969EE5}.Debug|x86.Build.0 = Debug|Any CPU
+		{87D066F9-3540-4AC7-A748-134900969EE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{87D066F9-3540-4AC7-A748-134900969EE5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{87D066F9-3540-4AC7-A748-134900969EE5}.Release|x64.ActiveCfg = Release|Any CPU
+		{87D066F9-3540-4AC7-A748-134900969EE5}.Release|x64.Build.0 = Release|Any CPU
+		{87D066F9-3540-4AC7-A748-134900969EE5}.Release|x86.ActiveCfg = Release|Any CPU
+		{87D066F9-3540-4AC7-A748-134900969EE5}.Release|x86.Build.0 = Release|Any CPU
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Debug|x64.Build.0 = Debug|Any CPU
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Debug|x86.Build.0 = Debug|Any CPU
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Release|x64.ActiveCfg = Release|Any CPU
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Release|x64.Build.0 = Release|Any CPU
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Release|x86.ActiveCfg = Release|Any CPU
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9}.Release|x86.Build.0 = Release|Any CPU
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5}.Debug|x64.Build.0 = Debug|Any CPU
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5}.Debug|x86.Build.0 = Debug|Any CPU
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5}.Release|x64.ActiveCfg = Release|Any CPU
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5}.Release|x64.Build.0 = Release|Any CPU
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5}.Release|x86.ActiveCfg = Release|Any CPU
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5}.Release|x86.Build.0 = Release|Any CPU
 		{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{71287D6F-6C3B-44B4-9FCA-E78FE3F02289}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -298,6 +354,10 @@ Global
 		{6CAFDDBE-00AB-4784-801B-AB419C3C3A26} = {026FBC6C-AF76-4568-9B87-EC73457899FD}
 		{EC3202C6-1D4C-4B14-A599-B9D3F27FE3BA} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
 		{210FD61E-FF5D-4CEE-8E0D-C739ECCCBA21} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
+		{952C0FDE-AFC8-455C-986F-6CC882ED8953} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
+		{87D066F9-3540-4AC7-A748-134900969EE5} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
+		{0E0B5C51-F7E2-4F40-A4E4-DED0E9731DC9} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
+		{83FF097C-C8C6-477B-9FAB-DF99B84978B5} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
 		{71287D6F-6C3B-44B4-9FCA-E78FE3F02289} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
 		{B693DE14-BB28-496F-AB39-B4E674ABCA80} = {24B15015-62E5-42E1-9BA0-ECE6BE7AA15F}
 		{5ADAA902-5A75-4ECB-B4B4-03291D63CE9C} = {7A2B7ADD-ECB5-4D00-AA6A-D45BD11C97CF}
diff --git a/JsonApiDotNetCore.sln.DotSettings b/JsonApiDotNetCore.sln.DotSettings
index 595cae92d8..6ae5a3a918 100644
--- a/JsonApiDotNetCore.sln.DotSettings
+++ b/JsonApiDotNetCore.sln.DotSettings
@@ -14,6 +14,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$, $NAME$);</s:String>
 	<s:Int64 x:Key="/Default/CodeEditing/NullCheckPatterns/PatternTypeNamesToPriority/=JetBrains_002EReSharper_002EFeature_002EServices_002ECSharp_002ENullChecking_002EThrowExpressionNullCheckPattern/@EntryIndexedValue">3000</s:Int64>
 	<s:Int64 x:Key="/Default/CodeEditing/NullCheckPatterns/PatternTypeNamesToPriority/=JetBrains_002EReSharper_002EFeature_002EServices_002ECSharp_002ENullChecking_002ETraceAssertPattern/@EntryIndexedValue">50</s:Int64>
 	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/PropagateAnnotations/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeInspection/ExcludedFiles/FileMasksToSkip/=swagger_002Ejson/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/IdentifierHighlightingEnabled/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeInspection/Highlighting/IncludeWarningsInSwea/@EntryValue">True</s:Boolean>
@@ -27,6 +28,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$, $NAME$);</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMissingParentheses/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeNamespaceBody/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeStaticMemberQualifier/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeThisQualifier/@EntryIndexedValue">SUGGESTION</s:String>
@@ -56,6 +58,8 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$, $NAME$);</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LocalizableElement/@EntryIndexedValue">DO_NOT_SHOW</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=LoopCanBePartlyConvertedToQuery/@EntryIndexedValue">HINT</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MemberCanBeInternal/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeIntoLogicalPattern/@EntryIndexedValue">WARNING</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=MergeNestedPropertyPatterns/@EntryIndexedValue">WARNING</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/=PatternAlwaysMatches/@EntryIndexedValue">SUGGESTION</s:String>
@@ -71,6 +75,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$, $NAME$);</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantQueryOrderByAscendingKeyword/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantToStringCallForValueType/@EntryIndexedValue">SUGGESTION</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RemoveConstructorInvocation/@EntryIndexedValue">SUGGESTION</s:String>
+	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SimplifyStringInterpolation/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SpecifyStringComparison/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringEndsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=StringStartsWithIsCultureSpecific/@EntryIndexedValue">WARNING</s:String>
@@ -83,7 +88,7 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$, $NAME$);</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseEmptyTypesField/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=UseEventArgsEmptyField/@EntryIndexedValue">WARNING</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</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" /&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;EmbraceInRegion&gt;False&lt;/EmbraceInRegion&gt;&lt;RegionName&gt;&lt;/RegionName&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;/Profile&gt;</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" /&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;/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>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>
@@ -91,10 +96,12 @@ JsonApiDotNetCore.ArgumentGuard.NotNull($EXPR$, $NAME$);</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/PARENTHESES_GROUP_NON_OBVIOUS_OPERATIONS/@EntryValue">Conditional</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_BINARY_EXPRESSIONS_CHAIN/@EntryValue">False</s:Boolean>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_STATEMENT_CONDITIONS/@EntryValue">False</s:Boolean>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AFTER_MULTILINE_STATEMENTS/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_INVOCABLE/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_AROUND_SINGLE_LINE_LOCAL_METHOD/@EntryValue">1</s:Int64>
 	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/BLANK_LINES_BEFORE_MULTILINE_STATEMENTS/@EntryValue">1</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_BRACES_INSIDE_STATEMENT_CONDITIONS/@EntryValue">False</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FIXED_STMT/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOR_STMT/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_NESTED_FOREACH_STMT/@EntryValue">True</s:Boolean>
diff --git a/README.md b/README.md
index e9670ff393..71e5f523e5 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ See [our documentation](https://www.jsonapi.net/) for detailed usage.
 ```c#
 #nullable enable
 
+[Resource]
 public class Article : Identifiable<int>
 {
     [Attr]
@@ -52,36 +53,18 @@ public class Article : Identifiable<int>
 }
 ```
 
-### Controllers
+### Middleware
 
 ```c#
-public class ArticlesController : JsonApiController<Article, int>
-{
-    public ArticlesController(IJsonApiOptions options, IResourceGraph resourceGraph,
-        ILoggerFactory loggerFactory, IResourceService<Article, int> resourceService)
-        : base(options, resourceGraph, loggerFactory, resourceService)
-    {
-    }
-}
-```
+// Program.cs
 
-### Middleware
+builder.Services.AddJsonApi<AppDbContext>();
 
-```c#
-public class Startup
-{
-    public IServiceProvider ConfigureServices(IServiceCollection services)
-    {
-        services.AddJsonApi<AppDbContext>();
-    }
-
-    public void Configure(IApplicationBuilder app)
-    {
-        app.UseRouting();
-        app.UseJsonApi();
-        app.UseEndpoints(endpoints => endpoints.MapControllers());
-    }
-}
+// ...
+
+app.UseRouting();
+app.UseJsonApi();
+app.MapControllers();
 ```
 
 ## Compatibility
@@ -89,16 +72,14 @@ public class Startup
 The following chart should help you pick the best version, based on your environment.
 See also our [versioning policy](./VERSIONING_POLICY.md).
 
-| JsonApiDotNetCore | .NET     | Entity Framework Core | Status                     |
-| ----------------- | -------- | --------------------- | -------------------------- |
-| 3.x               | Core 2.x | 2.x                   | Released                   |
-| 4.x               | Core 3.1 | 3.1                   | Released                   |
-|                   | Core 3.1 | 5                     |                            |
-|                   | 5        | 5                     |                            |
-|                   | 6        | 5                     |                            |
-| v5.x (pending)    | 5        | 5                     | On AppVeyor, to-be-dropped |
-|                   | 6        | 5                     | On AppVeyor, to-be-dropped |
-|                   | 6        | 6                     | Requires build from master |
+| JsonApiDotNetCore | Status      | .NET     | Entity Framework Core |
+| ----------------- | ----------- | -------- | --------------------- |
+| 3.x               | Stable      | Core 2.x | 2.x                   |
+| 4.x               | Stable      | Core 3.1 | 3.1                   |
+|                   |             | Core 3.1 | 5                     |
+|                   |             | 5        | 5                     |
+|                   |             | 6        | 5                     |
+| v5.x              | Pre-release | 6        | 6                     |
 
 ## Contributing
 
diff --git a/ROADMAP.md b/ROADMAP.md
index 49f499e79c..559e0bfe7d 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -24,13 +24,13 @@ The need for breaking changes has blocked several efforts in the v4.x release, s
 - [x] Nullable reference types [#1029](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1029)
 - [x] Improved paging links [#1010](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1010)
 - [x] Configuration validation [#170](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/170)
-- [ ] Support .NET 6 with EF Core 6 [#1109](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1109)
+- [x] Auto-generated controllers [#732](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/732) [#365](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/365)
+- [x] Support .NET 6 with EF Core 6 [#1109](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1109)
+- [x] Extract annotations into separate package [#730](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/730)
 
 Aside from the list above, we have interest in the following topics. It's too soon yet to decide whether they'll make it into v5.x or in a later major version.
 
-- Auto-generated controllers [#732](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/732) [#365](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/365)
 - Optimistic concurrency [#1004](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1004)
-- Extract annotations into separate package [#730](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/730)
 - OpenAPI (Swagger) [#1046](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/1046)
 - Fluent API [#776](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/776)
 - Resource inheritance [#844](https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/844)
diff --git a/benchmarks/Benchmarks.csproj b/benchmarks/Benchmarks.csproj
index 225c3a75d7..4bde435c15 100644
--- a/benchmarks/Benchmarks.csproj
+++ b/benchmarks/Benchmarks.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/benchmarks/Deserialization/DeserializationBenchmarkBase.cs b/benchmarks/Deserialization/DeserializationBenchmarkBase.cs
index b21d7c85e7..bbf746d1a8 100644
--- a/benchmarks/Deserialization/DeserializationBenchmarkBase.cs
+++ b/benchmarks/Deserialization/DeserializationBenchmarkBase.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.Design;
 using System.Text.Json;
 using JetBrains.Annotations;
@@ -11,114 +9,111 @@
 using JsonApiDotNetCore.Serialization.Request.Adapters;
 using Microsoft.Extensions.Logging.Abstractions;
 
-namespace Benchmarks.Deserialization
-{
-    public abstract class DeserializationBenchmarkBase
-    {
-        protected readonly JsonSerializerOptions SerializerReadOptions;
-        protected readonly DocumentAdapter DocumentAdapter;
+namespace Benchmarks.Deserialization;
 
-        protected DeserializationBenchmarkBase()
-        {
-            var options = new JsonApiOptions();
-            IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<IncomingResource, int>().Build();
-            options.SerializerOptions.Converters.Add(new ResourceObjectConverter(resourceGraph));
-            SerializerReadOptions = ((IJsonApiOptions)options).SerializerReadOptions;
+public abstract class DeserializationBenchmarkBase
+{
+    protected readonly JsonSerializerOptions SerializerReadOptions;
+    protected readonly DocumentAdapter DocumentAdapter;
 
-            var serviceContainer = new ServiceContainer();
-            var resourceFactory = new ResourceFactory(serviceContainer);
-            var resourceDefinitionAccessor = new ResourceDefinitionAccessor(resourceGraph, serviceContainer);
+    protected DeserializationBenchmarkBase()
+    {
+        var options = new JsonApiOptions();
+        IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<IncomingResource, int>().Build();
+        options.SerializerOptions.Converters.Add(new ResourceObjectConverter(resourceGraph));
+        SerializerReadOptions = ((IJsonApiOptions)options).SerializerReadOptions;
 
-            serviceContainer.AddService(typeof(IResourceDefinitionAccessor), resourceDefinitionAccessor);
+        var serviceContainer = new ServiceContainer();
+        var resourceFactory = new ResourceFactory(serviceContainer);
+        var resourceDefinitionAccessor = new ResourceDefinitionAccessor(resourceGraph, serviceContainer);
 
-            serviceContainer.AddService(typeof(IResourceDefinition<IncomingResource, int>),
-                new JsonApiResourceDefinition<IncomingResource, int>(resourceGraph));
+        serviceContainer.AddService(typeof(IResourceDefinitionAccessor), resourceDefinitionAccessor);
+        serviceContainer.AddService(typeof(IResourceDefinition<IncomingResource, int>), new JsonApiResourceDefinition<IncomingResource, int>(resourceGraph));
 
-            // ReSharper disable once VirtualMemberCallInConstructor
-            JsonApiRequest request = CreateJsonApiRequest(resourceGraph);
-            var targetedFields = new TargetedFields();
+        // ReSharper disable once VirtualMemberCallInConstructor
+        JsonApiRequest request = CreateJsonApiRequest(resourceGraph);
+        var targetedFields = new TargetedFields();
 
-            var resourceIdentifierObjectAdapter = new ResourceIdentifierObjectAdapter(resourceGraph, resourceFactory);
-            var relationshipDataAdapter = new RelationshipDataAdapter(resourceIdentifierObjectAdapter);
-            var resourceObjectAdapter = new ResourceObjectAdapter(resourceGraph, resourceFactory, options, relationshipDataAdapter);
-            var resourceDataAdapter = new ResourceDataAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
+        var resourceIdentifierObjectAdapter = new ResourceIdentifierObjectAdapter(resourceGraph, resourceFactory);
+        var relationshipDataAdapter = new RelationshipDataAdapter(resourceIdentifierObjectAdapter);
+        var resourceObjectAdapter = new ResourceObjectAdapter(resourceGraph, resourceFactory, options, relationshipDataAdapter);
+        var resourceDataAdapter = new ResourceDataAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
 
-            var atomicReferenceAdapter = new AtomicReferenceAdapter(resourceGraph, resourceFactory);
-            var atomicOperationResourceDataAdapter = new ResourceDataInOperationsRequestAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
+        var atomicReferenceAdapter = new AtomicReferenceAdapter(resourceGraph, resourceFactory);
+        var atomicOperationResourceDataAdapter = new ResourceDataInOperationsRequestAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
 
-            var atomicOperationObjectAdapter = new AtomicOperationObjectAdapter(options, atomicReferenceAdapter,
-                atomicOperationResourceDataAdapter, relationshipDataAdapter);
+        var atomicOperationObjectAdapter = new AtomicOperationObjectAdapter(options, atomicReferenceAdapter,
+            atomicOperationResourceDataAdapter, relationshipDataAdapter);
 
-            var resourceDocumentAdapter = new DocumentInResourceOrRelationshipRequestAdapter(options, resourceDataAdapter, relationshipDataAdapter);
-            var operationsDocumentAdapter = new DocumentInOperationsRequestAdapter(options, atomicOperationObjectAdapter);
+        var resourceDocumentAdapter = new DocumentInResourceOrRelationshipRequestAdapter(options, resourceDataAdapter, relationshipDataAdapter);
+        var operationsDocumentAdapter = new DocumentInOperationsRequestAdapter(options, atomicOperationObjectAdapter);
 
-            DocumentAdapter = new DocumentAdapter(request, targetedFields, resourceDocumentAdapter, operationsDocumentAdapter);
-        }
+        DocumentAdapter = new DocumentAdapter(request, targetedFields, resourceDocumentAdapter, operationsDocumentAdapter);
+    }
 
-        protected abstract JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph);
+    protected abstract JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph);
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        public sealed class IncomingResource : Identifiable<int>
-        {
-            [Attr]
-            public bool Attribute01 { get; set; }
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    public sealed class IncomingResource : Identifiable<int>
+    {
+        [Attr]
+        public bool Attribute01 { get; set; }
 
-            [Attr]
-            public char Attribute02 { get; set; }
+        [Attr]
+        public char Attribute02 { get; set; }
 
-            [Attr]
-            public ulong? Attribute03 { get; set; }
+        [Attr]
+        public ulong? Attribute03 { get; set; }
 
-            [Attr]
-            public decimal Attribute04 { get; set; }
+        [Attr]
+        public decimal Attribute04 { get; set; }
 
-            [Attr]
-            public float? Attribute05 { get; set; }
+        [Attr]
+        public float? Attribute05 { get; set; }
 
-            [Attr]
-            public string Attribute06 { get; set; } = null!;
+        [Attr]
+        public string Attribute06 { get; set; } = null!;
 
-            [Attr]
-            public DateTime? Attribute07 { get; set; }
+        [Attr]
+        public DateTime? Attribute07 { get; set; }
 
-            [Attr]
-            public DateTimeOffset? Attribute08 { get; set; }
+        [Attr]
+        public DateTimeOffset? Attribute08 { get; set; }
 
-            [Attr]
-            public TimeSpan? Attribute09 { get; set; }
+        [Attr]
+        public TimeSpan? Attribute09 { get; set; }
 
-            [Attr]
-            public DayOfWeek Attribute10 { get; set; }
+        [Attr]
+        public DayOfWeek Attribute10 { get; set; }
 
-            [HasOne]
-            public IncomingResource Single1 { get; set; } = null!;
+        [HasOne]
+        public IncomingResource Single1 { get; set; } = null!;
 
-            [HasOne]
-            public IncomingResource Single2 { get; set; } = null!;
+        [HasOne]
+        public IncomingResource Single2 { get; set; } = null!;
 
-            [HasOne]
-            public IncomingResource Single3 { get; set; } = null!;
+        [HasOne]
+        public IncomingResource Single3 { get; set; } = null!;
 
-            [HasOne]
-            public IncomingResource Single4 { get; set; } = null!;
+        [HasOne]
+        public IncomingResource Single4 { get; set; } = null!;
 
-            [HasOne]
-            public IncomingResource Single5 { get; set; } = null!;
+        [HasOne]
+        public IncomingResource Single5 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<IncomingResource> Multi1 { get; set; } = null!;
+        [HasMany]
+        public ISet<IncomingResource> Multi1 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<IncomingResource> Multi2 { get; set; } = null!;
+        [HasMany]
+        public ISet<IncomingResource> Multi2 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<IncomingResource> Multi3 { get; set; } = null!;
+        [HasMany]
+        public ISet<IncomingResource> Multi3 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<IncomingResource> Multi4 { get; set; } = null!;
+        [HasMany]
+        public ISet<IncomingResource> Multi4 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<IncomingResource> Multi5 { get; set; } = null!;
-        }
+        [HasMany]
+        public ISet<IncomingResource> Multi5 { get; set; } = null!;
     }
 }
diff --git a/benchmarks/Deserialization/OperationsDeserializationBenchmarks.cs b/benchmarks/Deserialization/OperationsDeserializationBenchmarks.cs
index 0181f4ccbc..d28684e27b 100644
--- a/benchmarks/Deserialization/OperationsDeserializationBenchmarks.cs
+++ b/benchmarks/Deserialization/OperationsDeserializationBenchmarks.cs
@@ -1,285 +1,283 @@
-using System;
 using System.Text.Json;
 using BenchmarkDotNet.Attributes;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace Benchmarks.Deserialization
+namespace Benchmarks.Deserialization;
+
+[MarkdownExporter]
+// ReSharper disable once ClassCanBeSealed.Global
+public class OperationsDeserializationBenchmarks : DeserializationBenchmarkBase
 {
-    [MarkdownExporter]
-    // ReSharper disable once ClassCanBeSealed.Global
-    public class OperationsDeserializationBenchmarks : DeserializationBenchmarkBase
+    private static readonly string RequestBody = JsonSerializer.Serialize(new
     {
-        private static readonly string RequestBody = JsonSerializer.Serialize(new
+        atomic__operations = new object[]
         {
-            atomic__operations = new object[]
+            new
             {
-                new
+                op = "add",
+                data = new
                 {
-                    op = "add",
-                    data = new
+                    type = "incomingResources",
+                    lid = "a-1",
+                    attributes = new
+                    {
+                        attribute01 = true,
+                        attribute02 = 'A',
+                        attribute03 = 100UL,
+                        attribute04 = 100.001m,
+                        attribute05 = 200.002f,
+                        attribute06 = "text",
+                        attribute07 = DateTime.MaxValue,
+                        attribute08 = DateTimeOffset.MaxValue,
+                        attribute09 = TimeSpan.MaxValue,
+                        attribute10 = DayOfWeek.Friday
+                    },
+                    relationships = new
                     {
-                        type = "incomingResources",
-                        lid = "a-1",
-                        attributes = new
+                        single1 = new
                         {
-                            attribute01 = true,
-                            attribute02 = 'A',
-                            attribute03 = 100UL,
-                            attribute04 = 100.001m,
-                            attribute05 = 200.002f,
-                            attribute06 = "text",
-                            attribute07 = DateTime.MaxValue,
-                            attribute08 = DateTimeOffset.MaxValue,
-                            attribute09 = TimeSpan.MaxValue,
-                            attribute10 = DayOfWeek.Friday
+                            data = new
+                            {
+                                type = "incomingResources",
+                                id = "101"
+                            }
                         },
-                        relationships = new
+                        single2 = new
                         {
-                            single1 = new
+                            data = new
                             {
-                                data = new
-                                {
-                                    type = "incomingResources",
-                                    id = "101"
-                                }
-                            },
-                            single2 = new
+                                type = "incomingResources",
+                                id = "102"
+                            }
+                        },
+                        single3 = new
+                        {
+                            data = new
                             {
-                                data = new
-                                {
-                                    type = "incomingResources",
-                                    id = "102"
-                                }
-                            },
-                            single3 = new
+                                type = "incomingResources",
+                                id = "103"
+                            }
+                        },
+                        single4 = new
+                        {
+                            data = new
                             {
-                                data = new
-                                {
-                                    type = "incomingResources",
-                                    id = "103"
-                                }
-                            },
-                            single4 = new
+                                type = "incomingResources",
+                                id = "104"
+                            }
+                        },
+                        single5 = new
+                        {
+                            data = new
                             {
-                                data = new
-                                {
-                                    type = "incomingResources",
-                                    id = "104"
-                                }
-                            },
-                            single5 = new
+                                type = "incomingResources",
+                                id = "105"
+                            }
+                        },
+                        multi1 = new
+                        {
+                            data = new[]
                             {
-                                data = new
+                                new
                                 {
                                     type = "incomingResources",
-                                    id = "105"
-                                }
-                            },
-                            multi1 = new
-                            {
-                                data = new[]
-                                {
-                                    new
-                                    {
-                                        type = "incomingResources",
-                                        id = "201"
-                                    }
+                                    id = "201"
                                 }
-                            },
-                            multi2 = new
+                            }
+                        },
+                        multi2 = new
+                        {
+                            data = new[]
                             {
-                                data = new[]
+                                new
                                 {
-                                    new
-                                    {
-                                        type = "incomingResources",
-                                        id = "202"
-                                    }
+                                    type = "incomingResources",
+                                    id = "202"
                                 }
-                            },
-                            multi3 = new
+                            }
+                        },
+                        multi3 = new
+                        {
+                            data = new[]
                             {
-                                data = new[]
+                                new
                                 {
-                                    new
-                                    {
-                                        type = "incomingResources",
-                                        id = "203"
-                                    }
+                                    type = "incomingResources",
+                                    id = "203"
                                 }
-                            },
-                            multi4 = new
+                            }
+                        },
+                        multi4 = new
+                        {
+                            data = new[]
                             {
-                                data = new[]
+                                new
                                 {
-                                    new
-                                    {
-                                        type = "incomingResources",
-                                        id = "204"
-                                    }
+                                    type = "incomingResources",
+                                    id = "204"
                                 }
-                            },
-                            multi5 = new
+                            }
+                        },
+                        multi5 = new
+                        {
+                            data = new[]
                             {
-                                data = new[]
+                                new
                                 {
-                                    new
-                                    {
-                                        type = "incomingResources",
-                                        id = "205"
-                                    }
+                                    type = "incomingResources",
+                                    id = "205"
                                 }
                             }
                         }
                     }
-                },
-                new
+                }
+            },
+            new
+            {
+                op = "update",
+                data = new
                 {
-                    op = "update",
-                    data = new
+                    type = "incomingResources",
+                    id = "1",
+                    attributes = new
+                    {
+                        attribute01 = true,
+                        attribute02 = 'A',
+                        attribute03 = 100UL,
+                        attribute04 = 100.001m,
+                        attribute05 = 200.002f,
+                        attribute06 = "text",
+                        attribute07 = DateTime.MaxValue,
+                        attribute08 = DateTimeOffset.MaxValue,
+                        attribute09 = TimeSpan.MaxValue,
+                        attribute10 = DayOfWeek.Friday
+                    },
+                    relationships = new
                     {
-                        type = "incomingResources",
-                        id = "1",
-                        attributes = new
+                        single1 = new
                         {
-                            attribute01 = true,
-                            attribute02 = 'A',
-                            attribute03 = 100UL,
-                            attribute04 = 100.001m,
-                            attribute05 = 200.002f,
-                            attribute06 = "text",
-                            attribute07 = DateTime.MaxValue,
-                            attribute08 = DateTimeOffset.MaxValue,
-                            attribute09 = TimeSpan.MaxValue,
-                            attribute10 = DayOfWeek.Friday
+                            data = new
+                            {
+                                type = "incomingResources",
+                                id = "101"
+                            }
                         },
-                        relationships = new
+                        single2 = new
                         {
-                            single1 = new
+                            data = new
                             {
-                                data = new
-                                {
-                                    type = "incomingResources",
-                                    id = "101"
-                                }
-                            },
-                            single2 = new
+                                type = "incomingResources",
+                                id = "102"
+                            }
+                        },
+                        single3 = new
+                        {
+                            data = new
                             {
-                                data = new
-                                {
-                                    type = "incomingResources",
-                                    id = "102"
-                                }
-                            },
-                            single3 = new
+                                type = "incomingResources",
+                                id = "103"
+                            }
+                        },
+                        single4 = new
+                        {
+                            data = new
                             {
-                                data = new
-                                {
-                                    type = "incomingResources",
-                                    id = "103"
-                                }
-                            },
-                            single4 = new
+                                type = "incomingResources",
+                                id = "104"
+                            }
+                        },
+                        single5 = new
+                        {
+                            data = new
                             {
-                                data = new
-                                {
-                                    type = "incomingResources",
-                                    id = "104"
-                                }
-                            },
-                            single5 = new
+                                type = "incomingResources",
+                                id = "105"
+                            }
+                        },
+                        multi1 = new
+                        {
+                            data = new[]
                             {
-                                data = new
+                                new
                                 {
                                     type = "incomingResources",
-                                    id = "105"
-                                }
-                            },
-                            multi1 = new
-                            {
-                                data = new[]
-                                {
-                                    new
-                                    {
-                                        type = "incomingResources",
-                                        id = "201"
-                                    }
+                                    id = "201"
                                 }
-                            },
-                            multi2 = new
+                            }
+                        },
+                        multi2 = new
+                        {
+                            data = new[]
                             {
-                                data = new[]
+                                new
                                 {
-                                    new
-                                    {
-                                        type = "incomingResources",
-                                        id = "202"
-                                    }
+                                    type = "incomingResources",
+                                    id = "202"
                                 }
-                            },
-                            multi3 = new
+                            }
+                        },
+                        multi3 = new
+                        {
+                            data = new[]
                             {
-                                data = new[]
+                                new
                                 {
-                                    new
-                                    {
-                                        type = "incomingResources",
-                                        id = "203"
-                                    }
+                                    type = "incomingResources",
+                                    id = "203"
                                 }
-                            },
-                            multi4 = new
+                            }
+                        },
+                        multi4 = new
+                        {
+                            data = new[]
                             {
-                                data = new[]
+                                new
                                 {
-                                    new
-                                    {
-                                        type = "incomingResources",
-                                        id = "204"
-                                    }
+                                    type = "incomingResources",
+                                    id = "204"
                                 }
-                            },
-                            multi5 = new
+                            }
+                        },
+                        multi5 = new
+                        {
+                            data = new[]
                             {
-                                data = new[]
+                                new
                                 {
-                                    new
-                                    {
-                                        type = "incomingResources",
-                                        id = "205"
-                                    }
+                                    type = "incomingResources",
+                                    id = "205"
                                 }
                             }
                         }
                     }
-                },
-                new
+                }
+            },
+            new
+            {
+                op = "remove",
+                @ref = new
                 {
-                    op = "remove",
-                    @ref = new
-                    {
-                        type = "incomingResources",
-                        lid = "a-1"
-                    }
+                    type = "incomingResources",
+                    lid = "a-1"
                 }
             }
-        }).Replace("atomic__operations", "atomic:operations");
-
-        [Benchmark]
-        public object? DeserializeOperationsRequest()
-        {
-            var document = JsonSerializer.Deserialize<Document>(RequestBody, SerializerReadOptions)!;
-            return DocumentAdapter.Convert(document);
         }
+    }).Replace("atomic__operations", "atomic:operations");
 
-        protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)
+    [Benchmark]
+    public object? DeserializeOperationsRequest()
+    {
+        var document = JsonSerializer.Deserialize<Document>(RequestBody, SerializerReadOptions)!;
+        return DocumentAdapter.Convert(document);
+    }
+
+    protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)
+    {
+        return new JsonApiRequest
         {
-            return new JsonApiRequest
-            {
-                Kind = EndpointKind.AtomicOperations
-            };
-        }
+            Kind = EndpointKind.AtomicOperations
+        };
     }
 }
diff --git a/benchmarks/Deserialization/ResourceDeserializationBenchmarks.cs b/benchmarks/Deserialization/ResourceDeserializationBenchmarks.cs
index e154306819..23a6205bf5 100644
--- a/benchmarks/Deserialization/ResourceDeserializationBenchmarks.cs
+++ b/benchmarks/Deserialization/ResourceDeserializationBenchmarks.cs
@@ -1,150 +1,148 @@
-using System;
 using System.Text.Json;
 using BenchmarkDotNet.Attributes;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace Benchmarks.Deserialization
+namespace Benchmarks.Deserialization;
+
+[MarkdownExporter]
+// ReSharper disable once ClassCanBeSealed.Global
+public class ResourceDeserializationBenchmarks : DeserializationBenchmarkBase
 {
-    [MarkdownExporter]
-    // ReSharper disable once ClassCanBeSealed.Global
-    public class ResourceDeserializationBenchmarks : DeserializationBenchmarkBase
+    private static readonly string RequestBody = JsonSerializer.Serialize(new
     {
-        private static readonly string RequestBody = JsonSerializer.Serialize(new
+        data = new
         {
-            data = new
+            type = "incomingResources",
+            attributes = new
+            {
+                attribute01 = true,
+                attribute02 = 'A',
+                attribute03 = 100UL,
+                attribute04 = 100.001m,
+                attribute05 = 200.002f,
+                attribute06 = "text",
+                attribute07 = DateTime.MaxValue,
+                attribute08 = DateTimeOffset.MaxValue,
+                attribute09 = TimeSpan.MaxValue,
+                attribute10 = DayOfWeek.Friday
+            },
+            relationships = new
             {
-                type = "incomingResources",
-                attributes = new
+                single1 = new
                 {
-                    attribute01 = true,
-                    attribute02 = 'A',
-                    attribute03 = 100UL,
-                    attribute04 = 100.001m,
-                    attribute05 = 200.002f,
-                    attribute06 = "text",
-                    attribute07 = DateTime.MaxValue,
-                    attribute08 = DateTimeOffset.MaxValue,
-                    attribute09 = TimeSpan.MaxValue,
-                    attribute10 = DayOfWeek.Friday
+                    data = new
+                    {
+                        type = "incomingResources",
+                        id = "101"
+                    }
                 },
-                relationships = new
+                single2 = new
                 {
-                    single1 = new
+                    data = new
                     {
-                        data = new
-                        {
-                            type = "incomingResources",
-                            id = "101"
-                        }
-                    },
-                    single2 = new
+                        type = "incomingResources",
+                        id = "102"
+                    }
+                },
+                single3 = new
+                {
+                    data = new
                     {
-                        data = new
-                        {
-                            type = "incomingResources",
-                            id = "102"
-                        }
-                    },
-                    single3 = new
+                        type = "incomingResources",
+                        id = "103"
+                    }
+                },
+                single4 = new
+                {
+                    data = new
                     {
-                        data = new
-                        {
-                            type = "incomingResources",
-                            id = "103"
-                        }
-                    },
-                    single4 = new
+                        type = "incomingResources",
+                        id = "104"
+                    }
+                },
+                single5 = new
+                {
+                    data = new
                     {
-                        data = new
-                        {
-                            type = "incomingResources",
-                            id = "104"
-                        }
-                    },
-                    single5 = new
+                        type = "incomingResources",
+                        id = "105"
+                    }
+                },
+                multi1 = new
+                {
+                    data = new[]
                     {
-                        data = new
+                        new
                         {
                             type = "incomingResources",
-                            id = "105"
+                            id = "201"
                         }
-                    },
-                    multi1 = new
-                    {
-                        data = new[]
-                        {
-                            new
-                            {
-                                type = "incomingResources",
-                                id = "201"
-                            }
-                        }
-                    },
-                    multi2 = new
+                    }
+                },
+                multi2 = new
+                {
+                    data = new[]
                     {
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "incomingResources",
-                                id = "202"
-                            }
+                            type = "incomingResources",
+                            id = "202"
                         }
-                    },
-                    multi3 = new
+                    }
+                },
+                multi3 = new
+                {
+                    data = new[]
                     {
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "incomingResources",
-                                id = "203"
-                            }
+                            type = "incomingResources",
+                            id = "203"
                         }
-                    },
-                    multi4 = new
+                    }
+                },
+                multi4 = new
+                {
+                    data = new[]
                     {
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "incomingResources",
-                                id = "204"
-                            }
+                            type = "incomingResources",
+                            id = "204"
                         }
-                    },
-                    multi5 = new
+                    }
+                },
+                multi5 = new
+                {
+                    data = new[]
                     {
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "incomingResources",
-                                id = "205"
-                            }
+                            type = "incomingResources",
+                            id = "205"
                         }
                     }
                 }
             }
-        });
-
-        [Benchmark]
-        public object? DeserializeResourceRequest()
-        {
-            var document = JsonSerializer.Deserialize<Document>(RequestBody, SerializerReadOptions)!;
-            return DocumentAdapter.Convert(document);
         }
+    });
 
-        protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)
+    [Benchmark]
+    public object? DeserializeResourceRequest()
+    {
+        var document = JsonSerializer.Deserialize<Document>(RequestBody, SerializerReadOptions)!;
+        return DocumentAdapter.Convert(document);
+    }
+
+    protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)
+    {
+        return new JsonApiRequest
         {
-            return new JsonApiRequest
-            {
-                Kind = EndpointKind.Primary,
-                PrimaryResourceType = resourceGraph.GetResourceType<IncomingResource>(),
-                WriteOperation = WriteOperationKind.CreateResource
-            };
-        }
+            Kind = EndpointKind.Primary,
+            PrimaryResourceType = resourceGraph.GetResourceType<IncomingResource>(),
+            WriteOperation = WriteOperationKind.CreateResource
+        };
     }
 }
diff --git a/benchmarks/Program.cs b/benchmarks/Program.cs
index 45406133dd..818b9ab5e5 100644
--- a/benchmarks/Program.cs
+++ b/benchmarks/Program.cs
@@ -3,22 +3,21 @@
 using Benchmarks.QueryString;
 using Benchmarks.Serialization;
 
-namespace Benchmarks
+namespace Benchmarks;
+
+internal static class Program
 {
-    internal static class Program
+    private static void Main(string[] args)
     {
-        private static void Main(string[] args)
+        var switcher = new BenchmarkSwitcher(new[]
         {
-            var switcher = new BenchmarkSwitcher(new[]
-            {
-                typeof(ResourceDeserializationBenchmarks),
-                typeof(OperationsDeserializationBenchmarks),
-                typeof(ResourceSerializationBenchmarks),
-                typeof(OperationsSerializationBenchmarks),
-                typeof(QueryStringParserBenchmarks)
-            });
+            typeof(ResourceDeserializationBenchmarks),
+            typeof(OperationsDeserializationBenchmarks),
+            typeof(ResourceSerializationBenchmarks),
+            typeof(OperationsSerializationBenchmarks),
+            typeof(QueryStringParserBenchmarks)
+        });
 
-            switcher.Run(args);
-        }
+        switcher.Run(args);
     }
 }
diff --git a/benchmarks/QueryString/QueryStringParserBenchmarks.cs b/benchmarks/QueryString/QueryStringParserBenchmarks.cs
index 42d34f8ce4..efa4f12659 100644
--- a/benchmarks/QueryString/QueryStringParserBenchmarks.cs
+++ b/benchmarks/QueryString/QueryStringParserBenchmarks.cs
@@ -1,4 +1,3 @@
-using System;
 using System.ComponentModel.Design;
 using BenchmarkDotNet.Attributes;
 using JsonApiDotNetCore;
@@ -11,94 +10,92 @@
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Logging.Abstractions;
 
-namespace Benchmarks.QueryString
+namespace Benchmarks.QueryString;
+
+// ReSharper disable once ClassCanBeSealed.Global
+[MarkdownExporter]
+[SimpleJob(3, 10, 20)]
+[MemoryDiagnoser]
+public class QueryStringParserBenchmarks
 {
-    // ReSharper disable once ClassCanBeSealed.Global
-    [MarkdownExporter]
-    [SimpleJob(3, 10, 20)]
-    [MemoryDiagnoser]
-    public class QueryStringParserBenchmarks
+    private readonly FakeRequestQueryStringAccessor _queryStringAccessor = new();
+    private readonly QueryStringReader _queryStringReader;
+
+    public QueryStringParserBenchmarks()
     {
-        private readonly FakeRequestQueryStringAccessor _queryStringAccessor = new();
-        private readonly QueryStringReader _queryStringReader;
+        IJsonApiOptions options = new JsonApiOptions
+        {
+            EnableLegacyFilterNotation = true
+        };
 
-        public QueryStringParserBenchmarks()
+        IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<QueryableResource, int>("alt-resource-name").Build();
+
+        var request = new JsonApiRequest
         {
-            IJsonApiOptions options = new JsonApiOptions
-            {
-                EnableLegacyFilterNotation = true
-            };
+            PrimaryResourceType = resourceGraph.GetResourceType(typeof(QueryableResource)),
+            IsCollection = true
+        };
 
-            IResourceGraph resourceGraph =
-                new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<QueryableResource, int>("alt-resource-name").Build();
+        var resourceFactory = new ResourceFactory(new ServiceContainer());
 
-            var request = new JsonApiRequest
-            {
-                PrimaryResourceType = resourceGraph.GetResourceType(typeof(QueryableResource)),
-                IsCollection = true
-            };
+        var includeReader = new IncludeQueryStringParameterReader(request, resourceGraph, options);
+        var filterReader = new FilterQueryStringParameterReader(request, resourceGraph, resourceFactory, options);
+        var sortReader = new SortQueryStringParameterReader(request, resourceGraph);
+        var sparseFieldSetReader = new SparseFieldSetQueryStringParameterReader(request, resourceGraph);
+        var paginationReader = new PaginationQueryStringParameterReader(request, resourceGraph, options);
 
-            var resourceFactory = new ResourceFactory(new ServiceContainer());
+        IQueryStringParameterReader[] readers = ArrayFactory.Create<IQueryStringParameterReader>(includeReader, filterReader, sortReader,
+            sparseFieldSetReader, paginationReader);
 
-            var includeReader = new IncludeQueryStringParameterReader(request, resourceGraph, options);
-            var filterReader = new FilterQueryStringParameterReader(request, resourceGraph, resourceFactory, options);
-            var sortReader = new SortQueryStringParameterReader(request, resourceGraph);
-            var sparseFieldSetReader = new SparseFieldSetQueryStringParameterReader(request, resourceGraph);
-            var paginationReader = new PaginationQueryStringParameterReader(request, resourceGraph, options);
+        _queryStringReader = new QueryStringReader(options, _queryStringAccessor, readers, NullLoggerFactory.Instance);
+    }
 
-            IQueryStringParameterReader[] readers = ArrayFactory.Create<IQueryStringParameterReader>(includeReader, filterReader, sortReader,
-                sparseFieldSetReader, paginationReader);
+    [Benchmark]
+    public void AscendingSort()
+    {
+        const string queryString = "?sort=alt-attr-name";
 
-            _queryStringReader = new QueryStringReader(options, _queryStringAccessor, readers, NullLoggerFactory.Instance);
-        }
+        _queryStringAccessor.SetQueryString(queryString);
+        _queryStringReader.ReadAll(null);
+    }
 
-        [Benchmark]
-        public void AscendingSort()
-        {
-            const string queryString = "?sort=alt-attr-name";
+    [Benchmark]
+    public void DescendingSort()
+    {
+        const string queryString = "?sort=-alt-attr-name";
 
-            _queryStringAccessor.SetQueryString(queryString);
-            _queryStringReader.ReadAll(null);
-        }
+        _queryStringAccessor.SetQueryString(queryString);
+        _queryStringReader.ReadAll(null);
+    }
 
-        [Benchmark]
-        public void DescendingSort()
+    [Benchmark]
+    public void ComplexQuery()
+    {
+        Run(100, () =>
         {
-            const string queryString = "?sort=-alt-attr-name";
+            const string queryString =
+                "?filter[alt-attr-name]=abc,eq:abc&sort=-alt-attr-name&include=child&page[size]=1&fields[alt-resource-name]=alt-attr-name";
 
             _queryStringAccessor.SetQueryString(queryString);
             _queryStringReader.ReadAll(null);
-        }
+        });
+    }
 
-        [Benchmark]
-        public void ComplexQuery()
+    private void Run(int iterations, Action action)
+    {
+        for (int index = 0; index < iterations; index++)
         {
-            Run(100, () =>
-            {
-                const string queryString =
-                    "?filter[alt-attr-name]=abc,eq:abc&sort=-alt-attr-name&include=child&page[size]=1&fields[alt-resource-name]=alt-attr-name";
-
-                _queryStringAccessor.SetQueryString(queryString);
-                _queryStringReader.ReadAll(null);
-            });
+            action();
         }
+    }
 
-        private void Run(int iterations, Action action)
-        {
-            for (int index = 0; index < iterations; index++)
-            {
-                action();
-            }
-        }
+    private sealed class FakeRequestQueryStringAccessor : IRequestQueryStringAccessor
+    {
+        public IQueryCollection Query { get; private set; } = new QueryCollection();
 
-        private sealed class FakeRequestQueryStringAccessor : IRequestQueryStringAccessor
+        public void SetQueryString(string queryString)
         {
-            public IQueryCollection Query { get; private set; } = new QueryCollection();
-
-            public void SetQueryString(string queryString)
-            {
-                Query = new QueryCollection(QueryHelpers.ParseQuery(queryString));
-            }
+            Query = new QueryCollection(QueryHelpers.ParseQuery(queryString));
         }
     }
 }
diff --git a/benchmarks/QueryString/QueryableResource.cs b/benchmarks/QueryString/QueryableResource.cs
index bcf0a5075a..7c26474ae4 100644
--- a/benchmarks/QueryString/QueryableResource.cs
+++ b/benchmarks/QueryString/QueryableResource.cs
@@ -2,15 +2,14 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace Benchmarks.QueryString
+namespace Benchmarks.QueryString;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class QueryableResource : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class QueryableResource : Identifiable<int>
-    {
-        [Attr(PublicName = "alt-attr-name")]
-        public string? Name { get; set; }
+    [Attr(PublicName = "alt-attr-name")]
+    public string? Name { get; set; }
 
-        [HasOne]
-        public QueryableResource? Child { get; set; }
-    }
+    [HasOne]
+    public QueryableResource? Child { get; set; }
 }
diff --git a/benchmarks/Serialization/OperationsSerializationBenchmarks.cs b/benchmarks/Serialization/OperationsSerializationBenchmarks.cs
index fef0d67a12..7076ca5cb8 100644
--- a/benchmarks/Serialization/OperationsSerializationBenchmarks.cs
+++ b/benchmarks/Serialization/OperationsSerializationBenchmarks.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Text.Json;
 using BenchmarkDotNet.Attributes;
 using JsonApiDotNetCore.Configuration;
@@ -8,130 +6,129 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace Benchmarks.Serialization
+namespace Benchmarks.Serialization;
+
+[MarkdownExporter]
+// ReSharper disable once ClassCanBeSealed.Global
+public class OperationsSerializationBenchmarks : SerializationBenchmarkBase
 {
-    [MarkdownExporter]
-    // ReSharper disable once ClassCanBeSealed.Global
-    public class OperationsSerializationBenchmarks : SerializationBenchmarkBase
-    {
-        private readonly IEnumerable<OperationContainer> _responseOperations;
+    private readonly IEnumerable<OperationContainer> _responseOperations;
 
-        public OperationsSerializationBenchmarks()
-        {
-            // ReSharper disable once VirtualMemberCallInConstructor
-            JsonApiRequest request = CreateJsonApiRequest(ResourceGraph);
+    public OperationsSerializationBenchmarks()
+    {
+        // ReSharper disable once VirtualMemberCallInConstructor
+        JsonApiRequest request = CreateJsonApiRequest(ResourceGraph);
 
-            _responseOperations = CreateResponseOperations(request);
-        }
+        _responseOperations = CreateResponseOperations(request);
+    }
 
-        private static IEnumerable<OperationContainer> CreateResponseOperations(IJsonApiRequest request)
+    private static IEnumerable<OperationContainer> CreateResponseOperations(IJsonApiRequest request)
+    {
+        var resource1 = new OutgoingResource
         {
-            var resource1 = new OutgoingResource
-            {
-                Id = 1,
-                Attribute01 = true,
-                Attribute02 = 'A',
-                Attribute03 = 100UL,
-                Attribute04 = 100.001m,
-                Attribute05 = 100.002f,
-                Attribute06 = "text1",
-                Attribute07 = new DateTime(2001, 1, 1),
-                Attribute08 = new DateTimeOffset(2001, 1, 1, 0, 0, 0, TimeSpan.FromHours(1)),
-                Attribute09 = new TimeSpan(1, 0, 0),
-                Attribute10 = DayOfWeek.Sunday
-            };
-
-            var resource2 = new OutgoingResource
-            {
-                Id = 2,
-                Attribute01 = false,
-                Attribute02 = 'B',
-                Attribute03 = 200UL,
-                Attribute04 = 200.001m,
-                Attribute05 = 200.002f,
-                Attribute06 = "text2",
-                Attribute07 = new DateTime(2002, 2, 2),
-                Attribute08 = new DateTimeOffset(2002, 2, 2, 0, 0, 0, TimeSpan.FromHours(2)),
-                Attribute09 = new TimeSpan(2, 0, 0),
-                Attribute10 = DayOfWeek.Monday
-            };
+            Id = 1,
+            Attribute01 = true,
+            Attribute02 = 'A',
+            Attribute03 = 100UL,
+            Attribute04 = 100.001m,
+            Attribute05 = 100.002f,
+            Attribute06 = "text1",
+            Attribute07 = new DateTime(2001, 1, 1),
+            Attribute08 = new DateTimeOffset(2001, 1, 1, 0, 0, 0, TimeSpan.FromHours(1)),
+            Attribute09 = new TimeSpan(1, 0, 0),
+            Attribute10 = DayOfWeek.Sunday
+        };
 
-            var resource3 = new OutgoingResource
-            {
-                Id = 3,
-                Attribute01 = true,
-                Attribute02 = 'C',
-                Attribute03 = 300UL,
-                Attribute04 = 300.001m,
-                Attribute05 = 300.002f,
-                Attribute06 = "text3",
-                Attribute07 = new DateTime(2003, 3, 3),
-                Attribute08 = new DateTimeOffset(2003, 3, 3, 0, 0, 0, TimeSpan.FromHours(3)),
-                Attribute09 = new TimeSpan(3, 0, 0),
-                Attribute10 = DayOfWeek.Tuesday
-            };
+        var resource2 = new OutgoingResource
+        {
+            Id = 2,
+            Attribute01 = false,
+            Attribute02 = 'B',
+            Attribute03 = 200UL,
+            Attribute04 = 200.001m,
+            Attribute05 = 200.002f,
+            Attribute06 = "text2",
+            Attribute07 = new DateTime(2002, 2, 2),
+            Attribute08 = new DateTimeOffset(2002, 2, 2, 0, 0, 0, TimeSpan.FromHours(2)),
+            Attribute09 = new TimeSpan(2, 0, 0),
+            Attribute10 = DayOfWeek.Monday
+        };
 
-            var resource4 = new OutgoingResource
-            {
-                Id = 4,
-                Attribute01 = false,
-                Attribute02 = 'D',
-                Attribute03 = 400UL,
-                Attribute04 = 400.001m,
-                Attribute05 = 400.002f,
-                Attribute06 = "text4",
-                Attribute07 = new DateTime(2004, 4, 4),
-                Attribute08 = new DateTimeOffset(2004, 4, 4, 0, 0, 0, TimeSpan.FromHours(4)),
-                Attribute09 = new TimeSpan(4, 0, 0),
-                Attribute10 = DayOfWeek.Wednesday
-            };
+        var resource3 = new OutgoingResource
+        {
+            Id = 3,
+            Attribute01 = true,
+            Attribute02 = 'C',
+            Attribute03 = 300UL,
+            Attribute04 = 300.001m,
+            Attribute05 = 300.002f,
+            Attribute06 = "text3",
+            Attribute07 = new DateTime(2003, 3, 3),
+            Attribute08 = new DateTimeOffset(2003, 3, 3, 0, 0, 0, TimeSpan.FromHours(3)),
+            Attribute09 = new TimeSpan(3, 0, 0),
+            Attribute10 = DayOfWeek.Tuesday
+        };
 
-            var resource5 = new OutgoingResource
-            {
-                Id = 5,
-                Attribute01 = true,
-                Attribute02 = 'E',
-                Attribute03 = 500UL,
-                Attribute04 = 500.001m,
-                Attribute05 = 500.002f,
-                Attribute06 = "text5",
-                Attribute07 = new DateTime(2005, 5, 5),
-                Attribute08 = new DateTimeOffset(2005, 5, 5, 0, 0, 0, TimeSpan.FromHours(5)),
-                Attribute09 = new TimeSpan(5, 0, 0),
-                Attribute10 = DayOfWeek.Thursday
-            };
+        var resource4 = new OutgoingResource
+        {
+            Id = 4,
+            Attribute01 = false,
+            Attribute02 = 'D',
+            Attribute03 = 400UL,
+            Attribute04 = 400.001m,
+            Attribute05 = 400.002f,
+            Attribute06 = "text4",
+            Attribute07 = new DateTime(2004, 4, 4),
+            Attribute08 = new DateTimeOffset(2004, 4, 4, 0, 0, 0, TimeSpan.FromHours(4)),
+            Attribute09 = new TimeSpan(4, 0, 0),
+            Attribute10 = DayOfWeek.Wednesday
+        };
 
-            var targetedFields = new TargetedFields();
+        var resource5 = new OutgoingResource
+        {
+            Id = 5,
+            Attribute01 = true,
+            Attribute02 = 'E',
+            Attribute03 = 500UL,
+            Attribute04 = 500.001m,
+            Attribute05 = 500.002f,
+            Attribute06 = "text5",
+            Attribute07 = new DateTime(2005, 5, 5),
+            Attribute08 = new DateTimeOffset(2005, 5, 5, 0, 0, 0, TimeSpan.FromHours(5)),
+            Attribute09 = new TimeSpan(5, 0, 0),
+            Attribute10 = DayOfWeek.Thursday
+        };
 
-            return new List<OperationContainer>
-            {
-                new(resource1, targetedFields, request),
-                new(resource2, targetedFields, request),
-                new(resource3, targetedFields, request),
-                new(resource4, targetedFields, request),
-                new(resource5, targetedFields, request)
-            };
-        }
+        var targetedFields = new TargetedFields();
 
-        [Benchmark]
-        public string SerializeOperationsResponse()
+        return new List<OperationContainer>
         {
-            Document responseDocument = ResponseModelAdapter.Convert(_responseOperations);
-            return JsonSerializer.Serialize(responseDocument, SerializerWriteOptions);
-        }
+            new(resource1, targetedFields, request),
+            new(resource2, targetedFields, request),
+            new(resource3, targetedFields, request),
+            new(resource4, targetedFields, request),
+            new(resource5, targetedFields, request)
+        };
+    }
 
-        protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)
-        {
-            return new JsonApiRequest
-            {
-                Kind = EndpointKind.AtomicOperations,
-                PrimaryResourceType = resourceGraph.GetResourceType<OutgoingResource>()
-            };
-        }
+    [Benchmark]
+    public string SerializeOperationsResponse()
+    {
+        Document responseDocument = ResponseModelAdapter.Convert(_responseOperations);
+        return JsonSerializer.Serialize(responseDocument, SerializerWriteOptions);
+    }
 
-        protected override IEvaluatedIncludeCache CreateEvaluatedIncludeCache(IResourceGraph resourceGraph)
+    protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)
+    {
+        return new JsonApiRequest
         {
-            return new EvaluatedIncludeCache();
-        }
+            Kind = EndpointKind.AtomicOperations,
+            PrimaryResourceType = resourceGraph.GetResourceType<OutgoingResource>()
+        };
+    }
+
+    protected override IEvaluatedIncludeCache CreateEvaluatedIncludeCache(IResourceGraph resourceGraph)
+    {
+        return new EvaluatedIncludeCache();
     }
 }
diff --git a/benchmarks/Serialization/ResourceSerializationBenchmarks.cs b/benchmarks/Serialization/ResourceSerializationBenchmarks.cs
index 3435265262..6b716a5401 100644
--- a/benchmarks/Serialization/ResourceSerializationBenchmarks.cs
+++ b/benchmarks/Serialization/ResourceSerializationBenchmarks.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Text.Json;
 using BenchmarkDotNet.Attributes;
@@ -11,133 +9,132 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace Benchmarks.Serialization
+namespace Benchmarks.Serialization;
+
+[MarkdownExporter]
+// ReSharper disable once ClassCanBeSealed.Global
+public class ResourceSerializationBenchmarks : SerializationBenchmarkBase
 {
-    [MarkdownExporter]
-    // ReSharper disable once ClassCanBeSealed.Global
-    public class ResourceSerializationBenchmarks : SerializationBenchmarkBase
+    private static readonly OutgoingResource ResponseResource = CreateResponseResource();
+
+    private static OutgoingResource CreateResponseResource()
     {
-        private static readonly OutgoingResource ResponseResource = CreateResponseResource();
+        var resource1 = new OutgoingResource
+        {
+            Id = 1,
+            Attribute01 = true,
+            Attribute02 = 'A',
+            Attribute03 = 100UL,
+            Attribute04 = 100.001m,
+            Attribute05 = 100.002f,
+            Attribute06 = "text1",
+            Attribute07 = new DateTime(2001, 1, 1),
+            Attribute08 = new DateTimeOffset(2001, 1, 1, 0, 0, 0, TimeSpan.FromHours(1)),
+            Attribute09 = new TimeSpan(1, 0, 0),
+            Attribute10 = DayOfWeek.Sunday
+        };
 
-        private static OutgoingResource CreateResponseResource()
+        var resource2 = new OutgoingResource
         {
-            var resource1 = new OutgoingResource
-            {
-                Id = 1,
-                Attribute01 = true,
-                Attribute02 = 'A',
-                Attribute03 = 100UL,
-                Attribute04 = 100.001m,
-                Attribute05 = 100.002f,
-                Attribute06 = "text1",
-                Attribute07 = new DateTime(2001, 1, 1),
-                Attribute08 = new DateTimeOffset(2001, 1, 1, 0, 0, 0, TimeSpan.FromHours(1)),
-                Attribute09 = new TimeSpan(1, 0, 0),
-                Attribute10 = DayOfWeek.Sunday
-            };
-
-            var resource2 = new OutgoingResource
-            {
-                Id = 2,
-                Attribute01 = false,
-                Attribute02 = 'B',
-                Attribute03 = 200UL,
-                Attribute04 = 200.001m,
-                Attribute05 = 200.002f,
-                Attribute06 = "text2",
-                Attribute07 = new DateTime(2002, 2, 2),
-                Attribute08 = new DateTimeOffset(2002, 2, 2, 0, 0, 0, TimeSpan.FromHours(2)),
-                Attribute09 = new TimeSpan(2, 0, 0),
-                Attribute10 = DayOfWeek.Monday
-            };
-
-            var resource3 = new OutgoingResource
-            {
-                Id = 3,
-                Attribute01 = true,
-                Attribute02 = 'C',
-                Attribute03 = 300UL,
-                Attribute04 = 300.001m,
-                Attribute05 = 300.002f,
-                Attribute06 = "text3",
-                Attribute07 = new DateTime(2003, 3, 3),
-                Attribute08 = new DateTimeOffset(2003, 3, 3, 0, 0, 0, TimeSpan.FromHours(3)),
-                Attribute09 = new TimeSpan(3, 0, 0),
-                Attribute10 = DayOfWeek.Tuesday
-            };
-
-            var resource4 = new OutgoingResource
-            {
-                Id = 4,
-                Attribute01 = false,
-                Attribute02 = 'D',
-                Attribute03 = 400UL,
-                Attribute04 = 400.001m,
-                Attribute05 = 400.002f,
-                Attribute06 = "text4",
-                Attribute07 = new DateTime(2004, 4, 4),
-                Attribute08 = new DateTimeOffset(2004, 4, 4, 0, 0, 0, TimeSpan.FromHours(4)),
-                Attribute09 = new TimeSpan(4, 0, 0),
-                Attribute10 = DayOfWeek.Wednesday
-            };
-
-            var resource5 = new OutgoingResource
-            {
-                Id = 5,
-                Attribute01 = true,
-                Attribute02 = 'E',
-                Attribute03 = 500UL,
-                Attribute04 = 500.001m,
-                Attribute05 = 500.002f,
-                Attribute06 = "text5",
-                Attribute07 = new DateTime(2005, 5, 5),
-                Attribute08 = new DateTimeOffset(2005, 5, 5, 0, 0, 0, TimeSpan.FromHours(5)),
-                Attribute09 = new TimeSpan(5, 0, 0),
-                Attribute10 = DayOfWeek.Thursday
-            };
-
-            resource1.Single2 = resource2;
-            resource2.Single3 = resource3;
-            resource3.Multi4 = resource4.AsHashSet();
-            resource4.Multi5 = resource5.AsHashSet();
-
-            return resource1;
-        }
-
-        [Benchmark]
-        public string SerializeResourceResponse()
+            Id = 2,
+            Attribute01 = false,
+            Attribute02 = 'B',
+            Attribute03 = 200UL,
+            Attribute04 = 200.001m,
+            Attribute05 = 200.002f,
+            Attribute06 = "text2",
+            Attribute07 = new DateTime(2002, 2, 2),
+            Attribute08 = new DateTimeOffset(2002, 2, 2, 0, 0, 0, TimeSpan.FromHours(2)),
+            Attribute09 = new TimeSpan(2, 0, 0),
+            Attribute10 = DayOfWeek.Monday
+        };
+
+        var resource3 = new OutgoingResource
         {
-            Document responseDocument = ResponseModelAdapter.Convert(ResponseResource);
-            return JsonSerializer.Serialize(responseDocument, SerializerWriteOptions);
-        }
+            Id = 3,
+            Attribute01 = true,
+            Attribute02 = 'C',
+            Attribute03 = 300UL,
+            Attribute04 = 300.001m,
+            Attribute05 = 300.002f,
+            Attribute06 = "text3",
+            Attribute07 = new DateTime(2003, 3, 3),
+            Attribute08 = new DateTimeOffset(2003, 3, 3, 0, 0, 0, TimeSpan.FromHours(3)),
+            Attribute09 = new TimeSpan(3, 0, 0),
+            Attribute10 = DayOfWeek.Tuesday
+        };
 
-        protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)
+        var resource4 = new OutgoingResource
         {
-            return new JsonApiRequest
-            {
-                Kind = EndpointKind.Primary,
-                PrimaryResourceType = resourceGraph.GetResourceType<OutgoingResource>()
-            };
-        }
-
-        protected override IEvaluatedIncludeCache CreateEvaluatedIncludeCache(IResourceGraph resourceGraph)
+            Id = 4,
+            Attribute01 = false,
+            Attribute02 = 'D',
+            Attribute03 = 400UL,
+            Attribute04 = 400.001m,
+            Attribute05 = 400.002f,
+            Attribute06 = "text4",
+            Attribute07 = new DateTime(2004, 4, 4),
+            Attribute08 = new DateTimeOffset(2004, 4, 4, 0, 0, 0, TimeSpan.FromHours(4)),
+            Attribute09 = new TimeSpan(4, 0, 0),
+            Attribute10 = DayOfWeek.Wednesday
+        };
+
+        var resource5 = new OutgoingResource
         {
-            ResourceType resourceAType = resourceGraph.GetResourceType<OutgoingResource>();
+            Id = 5,
+            Attribute01 = true,
+            Attribute02 = 'E',
+            Attribute03 = 500UL,
+            Attribute04 = 500.001m,
+            Attribute05 = 500.002f,
+            Attribute06 = "text5",
+            Attribute07 = new DateTime(2005, 5, 5),
+            Attribute08 = new DateTimeOffset(2005, 5, 5, 0, 0, 0, TimeSpan.FromHours(5)),
+            Attribute09 = new TimeSpan(5, 0, 0),
+            Attribute10 = DayOfWeek.Thursday
+        };
+
+        resource1.Single2 = resource2;
+        resource2.Single3 = resource3;
+        resource3.Multi4 = resource4.AsHashSet();
+        resource4.Multi5 = resource5.AsHashSet();
+
+        return resource1;
+    }
+
+    [Benchmark]
+    public string SerializeResourceResponse()
+    {
+        Document responseDocument = ResponseModelAdapter.Convert(ResponseResource);
+        return JsonSerializer.Serialize(responseDocument, SerializerWriteOptions);
+    }
+
+    protected override JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph)
+    {
+        return new JsonApiRequest
+        {
+            Kind = EndpointKind.Primary,
+            PrimaryResourceType = resourceGraph.GetResourceType<OutgoingResource>()
+        };
+    }
+
+    protected override IEvaluatedIncludeCache CreateEvaluatedIncludeCache(IResourceGraph resourceGraph)
+    {
+        ResourceType resourceAType = resourceGraph.GetResourceType<OutgoingResource>();
 
-            RelationshipAttribute single2 = resourceAType.GetRelationshipByPropertyName(nameof(OutgoingResource.Single2));
-            RelationshipAttribute single3 = resourceAType.GetRelationshipByPropertyName(nameof(OutgoingResource.Single3));
-            RelationshipAttribute multi4 = resourceAType.GetRelationshipByPropertyName(nameof(OutgoingResource.Multi4));
-            RelationshipAttribute multi5 = resourceAType.GetRelationshipByPropertyName(nameof(OutgoingResource.Multi5));
+        RelationshipAttribute single2 = resourceAType.GetRelationshipByPropertyName(nameof(OutgoingResource.Single2));
+        RelationshipAttribute single3 = resourceAType.GetRelationshipByPropertyName(nameof(OutgoingResource.Single3));
+        RelationshipAttribute multi4 = resourceAType.GetRelationshipByPropertyName(nameof(OutgoingResource.Multi4));
+        RelationshipAttribute multi5 = resourceAType.GetRelationshipByPropertyName(nameof(OutgoingResource.Multi5));
 
-            ImmutableArray<ResourceFieldAttribute> chain = ImmutableArray.Create<ResourceFieldAttribute>(single2, single3, multi4, multi5);
-            IEnumerable<ResourceFieldChainExpression> chains = new ResourceFieldChainExpression(chain).AsEnumerable();
+        ImmutableArray<ResourceFieldAttribute> chain = ImmutableArray.Create<ResourceFieldAttribute>(single2, single3, multi4, multi5);
+        IEnumerable<ResourceFieldChainExpression> chains = new ResourceFieldChainExpression(chain).AsEnumerable();
 
-            var converter = new IncludeChainConverter();
-            IncludeExpression include = converter.FromRelationshipChains(chains);
+        var converter = new IncludeChainConverter();
+        IncludeExpression include = converter.FromRelationshipChains(chains);
 
-            var cache = new EvaluatedIncludeCache();
-            cache.Set(include);
-            return cache;
-        }
+        var cache = new EvaluatedIncludeCache();
+        cache.Set(include);
+        return cache;
     }
 }
diff --git a/benchmarks/Serialization/SerializationBenchmarkBase.cs b/benchmarks/Serialization/SerializationBenchmarkBase.cs
index 84d28c22ab..befa5049e8 100644
--- a/benchmarks/Serialization/SerializationBenchmarkBase.cs
+++ b/benchmarks/Serialization/SerializationBenchmarkBase.cs
@@ -1,10 +1,6 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -19,249 +15,248 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging.Abstractions;
 
-namespace Benchmarks.Serialization
+namespace Benchmarks.Serialization;
+
+public abstract class SerializationBenchmarkBase
 {
-    public abstract class SerializationBenchmarkBase
-    {
-        protected readonly JsonSerializerOptions SerializerWriteOptions;
-        protected readonly IResponseModelAdapter ResponseModelAdapter;
-        protected readonly IResourceGraph ResourceGraph;
+    protected readonly JsonSerializerOptions SerializerWriteOptions;
+    protected readonly IResponseModelAdapter ResponseModelAdapter;
+    protected readonly IResourceGraph ResourceGraph;
 
-        protected SerializationBenchmarkBase()
+    protected SerializationBenchmarkBase()
+    {
+        var options = new JsonApiOptions
         {
-            var options = new JsonApiOptions
+            SerializerOptions =
             {
-                SerializerOptions =
+                Converters =
                 {
-                    Converters =
-                    {
-                        new JsonStringEnumConverter()
-                    }
+                    new JsonStringEnumConverter()
                 }
-            };
+            }
+        };
 
-            ResourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<OutgoingResource, int>().Build();
-            SerializerWriteOptions = ((IJsonApiOptions)options).SerializerWriteOptions;
+        ResourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<OutgoingResource, int>().Build();
+        SerializerWriteOptions = ((IJsonApiOptions)options).SerializerWriteOptions;
 
-            // ReSharper disable VirtualMemberCallInConstructor
-            JsonApiRequest request = CreateJsonApiRequest(ResourceGraph);
-            IEvaluatedIncludeCache evaluatedIncludeCache = CreateEvaluatedIncludeCache(ResourceGraph);
-            // ReSharper restore VirtualMemberCallInConstructor
+        // ReSharper disable VirtualMemberCallInConstructor
+        JsonApiRequest request = CreateJsonApiRequest(ResourceGraph);
+        IEvaluatedIncludeCache evaluatedIncludeCache = CreateEvaluatedIncludeCache(ResourceGraph);
+        // ReSharper restore VirtualMemberCallInConstructor
 
-            var linkBuilder = new FakeLinkBuilder();
-            var metaBuilder = new FakeMetaBuilder();
-            IQueryConstraintProvider[] constraintProviders = Array.Empty<IQueryConstraintProvider>();
-            var resourceDefinitionAccessor = new FakeResourceDefinitionAccessor();
-            var sparseFieldSetCache = new SparseFieldSetCache(constraintProviders, resourceDefinitionAccessor);
-            var requestQueryStringAccessor = new FakeRequestQueryStringAccessor();
+        var linkBuilder = new FakeLinkBuilder();
+        var metaBuilder = new FakeMetaBuilder();
+        IQueryConstraintProvider[] constraintProviders = Array.Empty<IQueryConstraintProvider>();
+        var resourceDefinitionAccessor = new FakeResourceDefinitionAccessor();
+        var sparseFieldSetCache = new SparseFieldSetCache(constraintProviders, resourceDefinitionAccessor);
+        var requestQueryStringAccessor = new FakeRequestQueryStringAccessor();
 
-            ResponseModelAdapter = new ResponseModelAdapter(request, options, linkBuilder, metaBuilder, resourceDefinitionAccessor, evaluatedIncludeCache,
-                sparseFieldSetCache, requestQueryStringAccessor);
-        }
+        ResponseModelAdapter = new ResponseModelAdapter(request, options, linkBuilder, metaBuilder, resourceDefinitionAccessor, evaluatedIncludeCache,
+            sparseFieldSetCache, requestQueryStringAccessor);
+    }
 
-        protected abstract JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph);
+    protected abstract JsonApiRequest CreateJsonApiRequest(IResourceGraph resourceGraph);
 
-        protected abstract IEvaluatedIncludeCache CreateEvaluatedIncludeCache(IResourceGraph resourceGraph);
+    protected abstract IEvaluatedIncludeCache CreateEvaluatedIncludeCache(IResourceGraph resourceGraph);
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        public sealed class OutgoingResource : Identifiable<int>
-        {
-            [Attr]
-            public bool Attribute01 { get; set; }
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    public sealed class OutgoingResource : Identifiable<int>
+    {
+        [Attr]
+        public bool Attribute01 { get; set; }
 
-            [Attr]
-            public char Attribute02 { get; set; }
+        [Attr]
+        public char Attribute02 { get; set; }
 
-            [Attr]
-            public ulong? Attribute03 { get; set; }
+        [Attr]
+        public ulong? Attribute03 { get; set; }
 
-            [Attr]
-            public decimal Attribute04 { get; set; }
+        [Attr]
+        public decimal Attribute04 { get; set; }
 
-            [Attr]
-            public float? Attribute05 { get; set; }
+        [Attr]
+        public float? Attribute05 { get; set; }
 
-            [Attr]
-            public string Attribute06 { get; set; } = null!;
+        [Attr]
+        public string Attribute06 { get; set; } = null!;
 
-            [Attr]
-            public DateTime? Attribute07 { get; set; }
+        [Attr]
+        public DateTime? Attribute07 { get; set; }
 
-            [Attr]
-            public DateTimeOffset? Attribute08 { get; set; }
+        [Attr]
+        public DateTimeOffset? Attribute08 { get; set; }
 
-            [Attr]
-            public TimeSpan? Attribute09 { get; set; }
+        [Attr]
+        public TimeSpan? Attribute09 { get; set; }
 
-            [Attr]
-            public DayOfWeek Attribute10 { get; set; }
+        [Attr]
+        public DayOfWeek Attribute10 { get; set; }
 
-            [HasOne]
-            public OutgoingResource Single1 { get; set; } = null!;
+        [HasOne]
+        public OutgoingResource Single1 { get; set; } = null!;
 
-            [HasOne]
-            public OutgoingResource Single2 { get; set; } = null!;
+        [HasOne]
+        public OutgoingResource Single2 { get; set; } = null!;
 
-            [HasOne]
-            public OutgoingResource Single3 { get; set; } = null!;
+        [HasOne]
+        public OutgoingResource Single3 { get; set; } = null!;
 
-            [HasOne]
-            public OutgoingResource Single4 { get; set; } = null!;
+        [HasOne]
+        public OutgoingResource Single4 { get; set; } = null!;
 
-            [HasOne]
-            public OutgoingResource Single5 { get; set; } = null!;
+        [HasOne]
+        public OutgoingResource Single5 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<OutgoingResource> Multi1 { get; set; } = null!;
+        [HasMany]
+        public ISet<OutgoingResource> Multi1 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<OutgoingResource> Multi2 { get; set; } = null!;
+        [HasMany]
+        public ISet<OutgoingResource> Multi2 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<OutgoingResource> Multi3 { get; set; } = null!;
+        [HasMany]
+        public ISet<OutgoingResource> Multi3 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<OutgoingResource> Multi4 { get; set; } = null!;
+        [HasMany]
+        public ISet<OutgoingResource> Multi4 { get; set; } = null!;
 
-            [HasMany]
-            public ISet<OutgoingResource> Multi5 { get; set; } = null!;
-        }
+        [HasMany]
+        public ISet<OutgoingResource> Multi5 { get; set; } = null!;
+    }
 
-        private sealed class FakeResourceDefinitionAccessor : IResourceDefinitionAccessor
+    private sealed class FakeResourceDefinitionAccessor : IResourceDefinitionAccessor
+    {
+        public IImmutableSet<IncludeElementExpression> OnApplyIncludes(ResourceType resourceType, IImmutableSet<IncludeElementExpression> existingIncludes)
         {
-            public IImmutableSet<IncludeElementExpression> OnApplyIncludes(ResourceType resourceType, IImmutableSet<IncludeElementExpression> existingIncludes)
-            {
-                return existingIncludes;
-            }
-
-            public FilterExpression? OnApplyFilter(ResourceType resourceType, FilterExpression? existingFilter)
-            {
-                return existingFilter;
-            }
+            return existingIncludes;
+        }
 
-            public SortExpression? OnApplySort(ResourceType resourceType, SortExpression? existingSort)
-            {
-                return existingSort;
-            }
+        public FilterExpression? OnApplyFilter(ResourceType resourceType, FilterExpression? existingFilter)
+        {
+            return existingFilter;
+        }
 
-            public PaginationExpression? OnApplyPagination(ResourceType resourceType, PaginationExpression? existingPagination)
-            {
-                return existingPagination;
-            }
+        public SortExpression? OnApplySort(ResourceType resourceType, SortExpression? existingSort)
+        {
+            return existingSort;
+        }
 
-            public SparseFieldSetExpression? OnApplySparseFieldSet(ResourceType resourceType, SparseFieldSetExpression? existingSparseFieldSet)
-            {
-                return existingSparseFieldSet;
-            }
+        public PaginationExpression? OnApplyPagination(ResourceType resourceType, PaginationExpression? existingPagination)
+        {
+            return existingPagination;
+        }
 
-            public object? GetQueryableHandlerForQueryStringParameter(Type resourceClrType, string parameterName)
-            {
-                return null;
-            }
+        public SparseFieldSetExpression? OnApplySparseFieldSet(ResourceType resourceType, SparseFieldSetExpression? existingSparseFieldSet)
+        {
+            return existingSparseFieldSet;
+        }
 
-            public IDictionary<string, object?>? GetMeta(ResourceType resourceType, IIdentifiable resourceInstance)
-            {
-                return null;
-            }
+        public object? GetQueryableHandlerForQueryStringParameter(Type resourceClrType, string parameterName)
+        {
+            return null;
+        }
 
-            public Task OnPrepareWriteAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable
-            {
-                return Task.CompletedTask;
-            }
+        public IDictionary<string, object?>? GetMeta(ResourceType resourceType, IIdentifiable resourceInstance)
+        {
+            return null;
+        }
 
-            public Task<IIdentifiable?> OnSetToOneRelationshipAsync<TResource>(TResource leftResource, HasOneAttribute hasOneRelationship,
-                IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable
-            {
-                return Task.FromResult(rightResourceId);
-            }
+        public Task OnPrepareWriteAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable
+        {
+            return Task.CompletedTask;
+        }
 
-            public Task OnSetToManyRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship,
-                ISet<IIdentifiable> rightResourceIds, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable
-            {
-                return Task.CompletedTask;
-            }
+        public Task<IIdentifiable?> OnSetToOneRelationshipAsync<TResource>(TResource leftResource, HasOneAttribute hasOneRelationship,
+            IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable
+        {
+            return Task.FromResult(rightResourceId);
+        }
 
-            public Task OnAddToRelationshipAsync<TResource, TId>(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable<TId>
-            {
-                return Task.CompletedTask;
-            }
+        public Task OnSetToManyRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            WriteOperationKind writeOperation, CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable
+        {
+            return Task.CompletedTask;
+        }
 
-            public Task OnRemoveFromRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship,
-                ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable
-            {
-                return Task.CompletedTask;
-            }
+        public Task OnAddToRelationshipAsync<TResource, TId>(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable<TId>
+        {
+            return Task.CompletedTask;
+        }
 
-            public Task OnWritingAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable
-            {
-                return Task.CompletedTask;
-            }
+        public Task OnRemoveFromRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable
+        {
+            return Task.CompletedTask;
+        }
 
-            public Task OnWriteSucceededAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable
-            {
-                return Task.CompletedTask;
-            }
+        public Task OnWritingAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable
+        {
+            return Task.CompletedTask;
+        }
 
-            public void OnDeserialize(IIdentifiable resource)
-            {
-            }
+        public Task OnWriteSucceededAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable
+        {
+            return Task.CompletedTask;
+        }
 
-            public void OnSerialize(IIdentifiable resource)
-            {
-            }
+        public void OnDeserialize(IIdentifiable resource)
+        {
         }
 
-        private sealed class FakeLinkBuilder : ILinkBuilder
+        public void OnSerialize(IIdentifiable resource)
         {
-            public TopLevelLinks GetTopLevelLinks()
-            {
-                return new TopLevelLinks
-                {
-                    Self = "TopLevel:Self"
-                };
-            }
+        }
+    }
 
-            public ResourceLinks GetResourceLinks(ResourceType resourceType, IIdentifiable resource)
+    private sealed class FakeLinkBuilder : ILinkBuilder
+    {
+        public TopLevelLinks GetTopLevelLinks()
+        {
+            return new TopLevelLinks
             {
-                return new ResourceLinks
-                {
-                    Self = "Resource:Self"
-                };
-            }
+                Self = "TopLevel:Self"
+            };
+        }
 
-            public RelationshipLinks GetRelationshipLinks(RelationshipAttribute relationship, IIdentifiable leftResource)
+        public ResourceLinks GetResourceLinks(ResourceType resourceType, IIdentifiable resource)
+        {
+            return new ResourceLinks
             {
-                return new RelationshipLinks
-                {
-                    Self = "Relationship:Self",
-                    Related = "Relationship:Related"
-                };
-            }
+                Self = "Resource:Self"
+            };
         }
 
-        private sealed class FakeMetaBuilder : IMetaBuilder
+        public RelationshipLinks GetRelationshipLinks(RelationshipAttribute relationship, IIdentifiable leftResource)
         {
-            public void Add(IReadOnlyDictionary<string, object?> values)
+            return new RelationshipLinks
             {
-            }
+                Self = "Relationship:Self",
+                Related = "Relationship:Related"
+            };
+        }
+    }
 
-            public IDictionary<string, object?>? Build()
-            {
-                return null;
-            }
+    private sealed class FakeMetaBuilder : IMetaBuilder
+    {
+        public void Add(IReadOnlyDictionary<string, object?> values)
+        {
         }
 
-        private sealed class FakeRequestQueryStringAccessor : IRequestQueryStringAccessor
+        public IDictionary<string, object?>? Build()
         {
-            public IQueryCollection Query { get; } = new QueryCollection(0);
+            return null;
         }
     }
+
+    private sealed class FakeRequestQueryStringAccessor : IRequestQueryStringAccessor
+    {
+        public IQueryCollection Query { get; } = new QueryCollection(0);
+    }
 }
diff --git a/codecov.yml b/codecov.yml
index 551e7d4c54..32a518442e 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -8,3 +8,6 @@ coverage:
     patch:
       default:
         informational: true
+
+github_checks:
+    annotations: false
diff --git a/docs/getting-started/step-by-step.md b/docs/getting-started/step-by-step.md
index 21daf04171..57090d2d09 100644
--- a/docs/getting-started/step-by-step.md
+++ b/docs/getting-started/step-by-step.md
@@ -3,22 +3,21 @@
 The most basic use case leverages Entity Framework Core.
 The shortest path to a running API looks like:
 
-- Create a new web app
+- Create a new API project
 - Install
 - Define models
 - Define the DbContext
-- Define controllers
-- Add Middleware and Services
+- Add services and middleware
 - Seed the database
-- Start the app
+- Start the API
 
 This page will walk you through the **simplest** use case. More detailed examples can be found in the detailed usage subsections.
 
-### Create A New Web App
+### Create a new API project
 
 ```
-mkdir MyApp
-cd MyApp
+mkdir MyApi
+cd MyApi
 dotnet new webapi
 ```
 
@@ -32,7 +31,7 @@ dotnet add package JsonApiDotNetCore
 Install-Package JsonApiDotNetCore
 ```
 
-### Define Models
+### Define models
 
 Define your domain models such that they implement `IIdentifiable<TId>`.
 The easiest way to do this is to inherit from `Identifiable<TId>`.
@@ -40,6 +39,7 @@ The easiest way to do this is to inherit from `Identifiable<TId>`.
 ```c#
 #nullable enable
 
+[Resource]
 public class Person : Identifiable<int>
 {
     [Attr]
@@ -47,7 +47,7 @@ public class Person : Identifiable<int>
 }
 ```
 
-### Define DbContext
+### Define the DbContext
 
 Nothing special here, just an ordinary `DbContext`.
 
@@ -63,62 +63,56 @@ public class AppDbContext : DbContext
 }
 ```
 
-### Define Controllers
+### Add services and middleware
 
-You need to create controllers that inherit from `JsonApiController<TResource, TId>`
-where `TResource` is the model that inherits from `Identifiable<TId>`.
+Finally, register the services and middleware by adding them to your Program.cs:
 
 ```c#
-public class PeopleController : JsonApiController<Person, int>
+WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+
+// Add the Entity Framework Core DbContext like you normally would.
+builder.Services.AddDbContext<AppDbContext>(options =>
 {
-    public PeopleController(IJsonApiOptions options, IResourceGraph resourceGraph,
-        ILoggerFactory loggerFactory, IResourceService<Person, int> resourceService)
-        : base(options, resourceGraph, loggerFactory, resourceService)
-    {
-    }
-}
-```
+    string connectionString = GetConnectionString();
 
-### Middleware and Services
+    // Use whatever provider you want, this is just an example.
+    options.UseNpgsql(connectionString);
+});
 
-Finally, add the services by adding the following to your Startup.ConfigureServices:
+// Add JsonApiDotNetCore services.
+builder.Services.AddJsonApi<AppDbContext>();
 
-```c#
-// This method gets called by the runtime. Use this method to add services to the container.
-public void ConfigureServices(IServiceCollection services)
-{
-    // Add the Entity Framework Core DbContext like you normally would
-    services.AddDbContext<AppDbContext>(options =>
-    {
-        // Use whatever provider you want, this is just an example
-        options.UseNpgsql(GetDbConnectionString());
-    });
+WebApplication app = builder.Build();
 
-    // Add JsonApiDotNetCore
-    services.AddJsonApi<AppDbContext>();
-}
-```
+// Configure the HTTP request pipeline.
 
-Add the middleware to the Startup.Configure method.
+app.UseRouting();
 
-```c#
-// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-public void Configure(IApplicationBuilder app)
-{
-    app.UseRouting();
-    app.UseJsonApi();
-    app.UseEndpoints(endpoints => endpoints.MapControllers());
-}
+// Add JsonApiDotNetCore middleware.
+app.UseJsonApi();
+
+app.MapControllers();
+
+app.Run();
 ```
 
-### Seeding the Database
+### Seed the database
 
-One way to seed the database is in your Configure method:
+One way to seed the database is from your Program.cs:
 
 ```c#
-public void Configure(IApplicationBuilder app, AppDbContext dbContext)
+await CreateDatabaseAsync(app.Services);
+
+app.Run();
+
+static async Task CreateDatabaseAsync(IServiceProvider serviceProvider)
 {
-    dbContext.Database.EnsureCreated();
+    await using AsyncServiceScope scope = serviceProvider.CreateAsyncScope();
+
+    var dbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+    await dbContext.Database.EnsureCreatedAsync();
 
     if (!dbContext.People.Any())
     {
@@ -127,16 +121,12 @@ public void Configure(IApplicationBuilder app, AppDbContext dbContext)
             Name = "John Doe"
         });
 
-        dbContext.SaveChanges();
+        await dbContext.SaveChangesAsync();
     }
-
-    app.UseRouting();
-    app.UseJsonApi();
-    app.UseEndpoints(endpoints => endpoints.MapControllers());
 }
 ```
 
-### Start the App
+### Start the API
 
 ```
 dotnet run
diff --git a/docs/usage/errors.md b/docs/usage/errors.md
index 3278526e6c..67ce6fde17 100644
--- a/docs/usage/errors.md
+++ b/docs/usage/errors.md
@@ -88,11 +88,6 @@ public class CustomExceptionHandler : ExceptionHandler
     }
 }
 
-public class Startup
-{
-    public void ConfigureServices(IServiceCollection services)
-    {
-        services.AddScoped<IExceptionHandler, CustomExceptionHandler>();
-    }
-}
+// Program.cs
+builder.Services.AddScoped<IExceptionHandler, CustomExceptionHandler>();
 ```
diff --git a/docs/usage/extensibility/controllers.md b/docs/usage/extensibility/controllers.md
index 1993f77841..0c71f45090 100644
--- a/docs/usage/extensibility/controllers.md
+++ b/docs/usage/extensibility/controllers.md
@@ -1,6 +1,99 @@
 # Controllers
 
-You need to create controllers that inherit from `JsonApiController<TResource, TId>`
+To expose API endpoints, ASP.NET controllers need to be defined.
+
+_since v5_
+
+Controllers are auto-generated (using [source generators](https://docs.microsoft.com/en-us/dotnet/csharp/roslyn-sdk/source-generators-overview)) when you add `[Resource]` on your model class:
+
+```c#
+[Resource] // Generates ArticlesController.g.cs
+public class Article : Identifiable<Guid>
+{
+    // ...
+}
+```
+
+## Resource Access Control
+
+It is often desirable to limit which endpoints are exposed on your controller.
+A subset can be specified too:
+
+```c#
+[Resource(GenerateControllerEndpoints =
+    JsonApiEndpoints.GetCollection | JsonApiEndpoints.GetSingle)]
+public class Article : Identifiable<Guid>
+{
+    // ...
+}
+```
+
+Instead of passing a set of endpoints, you can use `JsonApiEndpoints.Query` to generate all read-only endpoints or `JsonApiEndpoints.Command` for all write-only endpoints.
+
+When an endpoint is blocked, an HTTP 403 Forbidden response is returned.
+
+```http
+DELETE http://localhost:14140/articles/1 HTTP/1.1
+```
+
+```json
+{
+  "links": {
+    "self": "/articles"
+  },
+  "errors": [
+    {
+      "id": "dde7f219-2274-4473-97ef-baac3e7c1487",
+      "status": "403",
+      "title": "The requested endpoint is not accessible.",
+      "detail": "Endpoint '/articles/1' is not accessible for DELETE requests."
+    }
+  ]
+}
+```
+
+## Augmenting controllers
+
+Auto-generated controllers can easily be augmented because they are partial classes. For example:
+
+```c#
+[DisableRoutingConvention]
+[Route("some/custom/route")]
+[DisableQueryString(JsonApiQueryStringParameters.Include)]
+partial class ArticlesController
+{
+    [HttpPost]
+    public IActionResult Upload()
+    {
+        // ...
+    }
+}
+```
+
+If you need to inject extra dependencies, tell the IoC container with `[ActivatorUtilitiesConstructor]` to prefer your constructor:
+
+```c#
+partial class ArticlesController
+{
+    private IAuthenticationService _authService;
+
+    [ActivatorUtilitiesConstructor]
+    public ArticlesController(IAuthenticationService authService, IJsonApiOptions options,
+        IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<Article, Guid> resourceService)
+            : base(options, resourceGraph, loggerFactory, resourceService)
+    {
+        _authService = authService;
+    }
+}
+```
+
+In case you don't want to use auto-generated controllers and define them yourself (see below), remove
+`[Resource]` from your models or use `[Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]`.
+
+## Earlier versions
+
+In earlier versions of JsonApiDotNetCore, you needed to create controllers that inherit from `JsonApiController<TResource, TId>`. For example:
 
 ```c#
 public class ArticlesController : JsonApiController<Article, Guid>
@@ -15,7 +108,7 @@ public class ArticlesController : JsonApiController<Article, Guid>
 
 If you want to setup routes yourself, you can instead inherit from `BaseJsonApiController<TResource, TId>` and override its methods with your own `[HttpGet]`, `[HttpHead]`, `[HttpPost]`, `[HttpPatch]` and `[HttpDelete]` attributes added on them. Don't forget to add `[FromBody]` on parameters where needed.
 
-## Resource Access Control
+### Resource Access Control
 
 It is often desirable to limit which routes are exposed on your controller.
 
@@ -37,25 +130,3 @@ public class ReportsController : JsonApiController<Report, int>
 ```
 
 For more information about resource service injection, see [Replacing injected services](~/usage/extensibility/layer-overview.md#replacing-injected-services) and [Resource Services](~/usage/extensibility/services.md).
-
-When a route is blocked, an HTTP 403 Forbidden response is returned.
-
-```http
-DELETE http://localhost:14140/people/1 HTTP/1.1
-```
-
-```json
-{
-  "links": {
-    "self": "/api/v1/people"
-  },
-  "errors": [
-    {
-      "id": "dde7f219-2274-4473-97ef-baac3e7c1487",
-      "status": "403",
-      "title": "The requested endpoint is not accessible.",
-      "detail": "Endpoint '/people/1' is not accessible for DELETE requests."
-    }
-  ]
-}
-```
diff --git a/docs/usage/extensibility/layer-overview.md b/docs/usage/extensibility/layer-overview.md
index 8afd1b38bb..2fe99e2fbd 100644
--- a/docs/usage/extensibility/layer-overview.md
+++ b/docs/usage/extensibility/layer-overview.md
@@ -25,18 +25,15 @@ on your needs, you may want to replace other parts by deriving from the built-in
 
 **Note:** If you're using [auto-discovery](~/usage/resource-graph.md#auto-discovery), then resource services, repositories and resource definitions will be automatically registered for you.
 
-Replacing built-in services is done on a per-resource basis and can be done through dependency injection in your Startup.cs file.
+Replacing built-in services is done on a per-resource basis and can be done at startup.
 For convenience, extension methods are provided to register layers on all their implemented interfaces.
 
 ```c#
-// Startup.cs
-public void ConfigureServices(IServiceCollection services)
-{
-    services.AddResourceService<ProductService>();
-    services.AddResourceRepository<ProductRepository>();
-    services.AddResourceDefinition<ProductDefinition>();
-
-    services.AddScoped<IResourceFactory, CustomResourceFactory>();
-    services.AddScoped<IJsonApiSerializerFactory, CustomResponseSerializerFactory>();
-}
+// Program.cs
+builder.Services.AddResourceService<ProductService>();
+builder.Services.AddResourceRepository<ProductRepository>();
+builder.Services.AddResourceDefinition<ProductDefinition>();
+
+builder.Services.AddScoped<IResourceFactory, CustomResourceFactory>();
+builder.Services.AddScoped<IResponseModelAdapter, CustomResponseModelAdapter>();
 ```
diff --git a/docs/usage/extensibility/middleware.md b/docs/usage/extensibility/middleware.md
index c05efa2e41..62528893d3 100644
--- a/docs/usage/extensibility/middleware.md
+++ b/docs/usage/extensibility/middleware.md
@@ -10,46 +10,54 @@ It is possible to replace the built-in middleware components by configuring the
 The following example replaces the internal exception filter with a custom implementation.
 
 ```c#
-/// In Startup.ConfigureServices
-services.AddService<IAsyncJsonApiExceptionFilter, CustomAsyncExceptionFilter>();
+// Program.cs
+builder.Services.AddService<IAsyncJsonApiExceptionFilter, CustomAsyncExceptionFilter>();
 ```
 
 ## Configuring `MvcOptions`
 
-The following example replaces all internal filters with a custom filter.
+The following example replaces the built-in query string action filter with a custom filter.
 
 ```c#
-public class Startup
+// Program.cs
+
+// Add services to the container.
+
+builder.Services.AddScoped<CustomAsyncQueryStringActionFilter>();
+
+IMvcCoreBuilder mvcCoreBuilder = builder.Services.AddMvcCore();
+builder.Services.AddJsonApi<AppDbContext>(mvcBuilder: mvcCoreBuilder);
+
+Action<MvcOptions>? postConfigureMvcOptions = null;
+
+// Ensure this is placed after the AddJsonApi() call.
+mvcCoreBuilder.AddMvcOptions(mvcOptions =>
+{
+    postConfigureMvcOptions?.Invoke(mvcOptions);
+});
+
+// Configure the HTTP request pipeline.
+
+// Ensure this is placed before the MapControllers() call.
+postConfigureMvcOptions = mvcOptions =>
 {
-    private Action<MvcOptions> _postConfigureMvcOptions;
-
-    public void ConfigureServices(IServiceCollection services)
-    {
-        services.AddSingleton<CustomAsyncQueryStringActionFilter>();
-
-        IMvcCoreBuilder mvcBuilder = services.AddMvcCore();
-        services.AddJsonApi<AppDbContext>(mvcBuilder: builder);
-
-        // Ensure this call is placed after the AddJsonApi call.
-        builder.AddMvcOptions(mvcOptions =>
-        {
-            _postConfigureMvcOptions.Invoke(mvcOptions);
-        });
-    }
-
-    public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-    {
-        // Ensure this call is placed before the UseEndpoints call.
-        _postConfigureMvcOptions = mvcOptions =>
-        {
-            mvcOptions.Filters.Clear();
-            mvcOptions.Filters.Insert(0,
-                app.ApplicationServices.GetService<CustomAsyncQueryStringActionFilter>());
-        };
-
-        app.UseRouting();
-        app.UseJsonApi();
-        app.UseEndpoints(endpoints => endpoints.MapControllers());
-    }
-}
+    IFilterMetadata existingFilter = mvcOptions.Filters.Single(filter =>
+        filter is ServiceFilterAttribute serviceFilter &&
+        serviceFilter.ServiceType == typeof(IAsyncQueryStringActionFilter));
+
+    mvcOptions.Filters.Remove(existingFilter);
+
+    using IServiceScope scope = app.Services.CreateScope();
+
+    var newFilter =
+        scope.ServiceProvider.GetRequiredService<CustomAsyncQueryStringActionFilter>();
+
+    mvcOptions.Filters.Insert(0, newFilter);
+};
+
+app.UseRouting();
+app.UseJsonApi();
+app.MapControllers();
+
+app.Run();
 ```
diff --git a/docs/usage/extensibility/query-strings.md b/docs/usage/extensibility/query-strings.md
index 1411717ffd..83d9f2e0ea 100644
--- a/docs/usage/extensibility/query-strings.md
+++ b/docs/usage/extensibility/query-strings.md
@@ -24,15 +24,17 @@ See [here](~/usage/extensibility/resource-definitions.md#custom-query-string-par
 In order to add parsing of custom query string parameters, you can implement the `IQueryStringParameterReader` interface and register your reader.
 
 ```c#
-public class YourQueryStringParameterReader : IQueryStringParameterReader
+public class CustomQueryStringParameterReader : IQueryStringParameterReader
 {
     // ...
 }
 ```
 
 ```c#
-services.AddScoped<YourQueryStringParameterReader>();
-services.AddScoped<IQueryStringParameterReader>(sp => sp.GetService<YourQueryStringParameterReader>());
+// Program.cs
+builder.Services.AddScoped<CustomQueryStringParameterReader>();
+builder.Services.AddScoped<IQueryStringParameterReader>(serviceProvider =>
+    serviceProvider.GetRequiredService<CustomQueryStringParameterReader>());
 ```
 
 Now you can inject your custom reader in resource services, repositories, resource definitions etc.
diff --git a/docs/usage/extensibility/repositories.md b/docs/usage/extensibility/repositories.md
index 7d76f2389a..102406e71b 100644
--- a/docs/usage/extensibility/repositories.md
+++ b/docs/usage/extensibility/repositories.md
@@ -3,15 +3,11 @@
 If you want to use a data access technology other than Entity Framework Core, you can create an implementation of `IResourceRepository<TResource, TId>`.
 If you only need minor changes you can override the methods defined in `EntityFrameworkCoreRepository<TResource, TId>`.
 
-The repository should then be registered in Startup.cs.
-
 ```c#
-public void ConfigureServices(IServiceCollection services)
-{
-    services.AddScoped<IResourceRepository<Article, int>, ArticleRepository>();
-    services.AddScoped<IResourceReadRepository<Article, int>, ArticleRepository>();
-    services.AddScoped<IResourceWriteRepository<Article, int>, ArticleRepository>();
-}
+// Program.cs
+builder.Services.AddScoped<IResourceRepository<Article, int>, ArticleRepository>();
+builder.Services.AddScoped<IResourceReadRepository<Article, int>, ArticleRepository>();
+builder.Services.AddScoped<IResourceWriteRepository<Article, int>, ArticleRepository>();
 ```
 
 In v4.0 we introduced an extension method that you can use to register a resource repository on all of its JsonApiDotNetCore interfaces.
@@ -20,13 +16,8 @@ This is helpful when you implement (a subset of) the resource interfaces and wan
 **Note:** If you're using [auto-discovery](~/usage/resource-graph.md#auto-discovery), this happens automatically.
 
 ```c#
-public class Startup
-{
-    public void ConfigureServices(IServiceCollection services)
-    {
-        services.AddResourceRepository<ArticleRepository>();
-    }
-}
+// Program.cs
+builder.Services.AddResourceRepository<ArticleRepository>();
 ```
 
 A sample implementation that performs authorization might look like this.
@@ -64,7 +55,8 @@ If you need to use multiple Entity Framework Core DbContexts, first create a rep
 This example shows a single `DbContextARepository` for all entities that are members of `DbContextA`.
 
 ```c#
-public class DbContextARepository<TResource, TId> : EntityFrameworkCoreRepository<TResource, TId>
+public class DbContextARepository<TResource, TId>
+    : EntityFrameworkCoreRepository<TResource, TId>
     where TResource : class, IIdentifiable<TId>
 {
     public DbContextARepository(ITargetedFields targetedFields,
@@ -83,13 +75,12 @@ public class DbContextARepository<TResource, TId> : EntityFrameworkCoreRepositor
 Then register the added types and use the non-generic overload of `AddJsonApi` to add their resources to the graph.
 
 ```c#
-// In Startup.ConfigureServices
-
-services.AddDbContext<DbContextA>(options => options.UseSqlite("Data Source=A.db"));
-services.AddDbContext<DbContextB>(options => options.UseSqlite("Data Source=B.db"));
+// Program.cs
+builder.Services.AddDbContext<DbContextA>(options => options.UseSqlite("Data Source=A.db"));
+builder.Services.AddDbContext<DbContextB>(options => options.UseSqlite("Data Source=B.db"));
 
-services.AddScoped<IResourceRepository<ResourceA>, DbContextARepository<ResourceA>>();
-services.AddScoped<IResourceRepository<ResourceB>, DbContextBRepository<ResourceB>>();
+builder.Services.AddJsonApi(dbContextTypes: new[] { typeof(DbContextA), typeof(DbContextB) });
 
-services.AddJsonApi(dbContextTypes: new[] { typeof(DbContextA), typeof(DbContextB) });
+builder.Services.AddScoped<IResourceRepository<ResourceA>, DbContextARepository<ResourceA>>();
+builder.Services.AddScoped<IResourceRepository<ResourceB>, DbContextBRepository<ResourceB>>();
 ```
diff --git a/docs/usage/extensibility/resource-definitions.md b/docs/usage/extensibility/resource-definitions.md
index 4c9eeeb8a6..8696811e16 100644
--- a/docs/usage/extensibility/resource-definitions.md
+++ b/docs/usage/extensibility/resource-definitions.md
@@ -10,20 +10,15 @@ In v4.2 we introduced an extension method that you can use to register your reso
 **Note:** If you're using [auto-discovery](~/usage/resource-graph.md#auto-discovery), this happens automatically.
 
 ```c#
-public class Startup
-{
-    public void ConfigureServices(IServiceCollection services)
-    {
-        services.AddResourceDefinition<ArticleDefinition>();
-    }
-}
+// Program.cs
+builder.Services.AddResourceDefinition<ArticleDefinition>();
 ```
 
 **Note:** Prior to the introduction of auto-discovery (in v3), you needed to register the
 resource definition on the container yourself:
 
 ```c#
-services.AddScoped<ResourceDefinition<Product, int>, ProductDefinition>();
+builder.Services.AddScoped<ResourceDefinition<Article, int>, ArticleDefinition>();
 ```
 
 ## Customizing queries
diff --git a/docs/usage/extensibility/services.md b/docs/usage/extensibility/services.md
index 77d772435e..bc3dd5bff8 100644
--- a/docs/usage/extensibility/services.md
+++ b/docs/usage/extensibility/services.md
@@ -1,7 +1,8 @@
 # Resource Services
 
 The `IResourceService` acts as a service layer between the controller and the data access layer.
-This allows you to customize it however you want. This is also a good place to implement custom business logic.
+This allows you to customize it however you want. While this is still a potential place to implement custom business logic,
+since v4, [Resource Definitions](~/usage/extensibility/resource-definitions.md) are more suitable for that.
 
 ## Supplementing Default Behavior
 
@@ -47,17 +48,16 @@ As previously discussed, this library uses Entity Framework Core by default.
 If you'd like to use another ORM that does not provide what JsonApiResourceService depends upon, you can use a custom `IResourceService<TResource, TId>` implementation.
 
 ```c#
-// Startup.cs
-public void ConfigureServices(IServiceCollection services)
-{
-    // add the service override for Product
-    services.AddScoped<IResourceService<Product, int>, ProductService>();
+// Program.cs
 
-    // add your own Data Access Object
-    services.AddScoped<IProductDao, ProductDao>();
-}
+// Add the service override for Product.
+builder.Services.AddScoped<IResourceService<Product, int>, ProductService>();
+
+// Add your own Data Access Object.
+builder.Services.AddScoped<IProductDao, ProductDao>();
 
 // ProductService.cs
+
 public class ProductService : IResourceService<Product, int>
 {
     private readonly IProductDao _dao;
@@ -77,7 +77,7 @@ public class ProductService : IResourceService<Product, int>
 
 ## Limited Requirements
 
-In some cases it may be necessary to only expose a few methods on a resource. For this reason, we have created a hierarchy of service interfaces that can be used to get the exact implementation you require.
+In some cases it may be necessary to only expose a few actions on a resource. For this reason, we have created a hierarchy of service interfaces that can be used to get the exact implementation you require.
 
 This interface hierarchy is defined by this tree structure.
 
@@ -127,14 +127,9 @@ public class ArticleService : ICreateService<Article, int>, IDeleteService<Artic
     // ...
 }
 
-public class Startup
-{
-    public void ConfigureServices(IServiceCollection services)
-    {
-        services.AddScoped<ICreateService<Article, int>, ArticleService>();
-        services.AddScoped<IDeleteService<Article, int>, ArticleService>();
-    }
-}
+// Program.cs
+builder.Services.AddScoped<ICreateService<Article, int>, ArticleService>();
+builder.Services.AddScoped<IDeleteService<Article, int>, ArticleService>();
 ```
 
 In v3.0 we introduced an extension method that you can use to register a resource service on all of its JsonApiDotNetCore interfaces.
@@ -143,16 +138,22 @@ This is helpful when you implement (a subset of) the resource interfaces and wan
 **Note:** If you're using [auto-discovery](~/usage/resource-graph.md#auto-discovery), this happens automatically.
 
 ```c#
-public class Startup
+// Program.cs
+builder.Services.AddResourceService<ArticleService>();
+```
+
+Then on your model, pass in the set of endpoints to expose (the ones that you've registered services for):
+
+```c#
+[Resource(GenerateControllerEndpoints =
+    JsonApiEndpoints.Create | JsonApiEndpoints.Delete)]
+public class Article : Identifiable<int>
 {
-    public void ConfigureServices(IServiceCollection services)
-    {
-        services.AddResourceService<ArticleService>();
-    }
+    // ...
 }
 ```
 
-Then in the controller, you should inherit from the JSON:API controller and pass the services into the named, optional base parameters:
+Alternatively, when using a hand-written controller, you should inherit from the JSON:API controller and pass the services into the named, optional base parameters:
 
 ```c#
 public class ArticlesController : JsonApiController<Article, int>
diff --git a/docs/usage/meta.md b/docs/usage/meta.md
index 29c074b8b6..a115e25740 100644
--- a/docs/usage/meta.md
+++ b/docs/usage/meta.md
@@ -8,11 +8,12 @@ Global metadata can be added to the root of the response document by registering
 This is useful if you need access to other registered services to build the meta object.
 
 ```c#
-#nullable enable
+// Program.cs
+builder.Services.AddSingleton<IResponseMeta, CopyrightResponseMeta>();
 
-// In Startup.ConfigureServices
-services.AddSingleton<IResponseMeta, CopyrightResponseMeta>();
+// CopyrightResponseMeta.cs
 
+#nullable enable
 public sealed class CopyrightResponseMeta : IResponseMeta
 {
     public IReadOnlyDictionary<string, object?> GetMeta()
diff --git a/docs/usage/openapi.md b/docs/usage/openapi.md
index 07e731dce7..f0880e1c5f 100644
--- a/docs/usage/openapi.md
+++ b/docs/usage/openapi.md
@@ -11,47 +11,33 @@ JsonApiDotNetCore provides an extension package that enables you to produce an [
     dotnet add package JsonApiDotNetCore.OpenApi
     ```
 
-2.  Add the integration in your `Startup` class.
+2.  Add the integration in your `Program.cs` file.
 
     ```c#
-    public class Startup
-    {
-        public void ConfigureServices(IServiceCollection services)
-        {
-            IMvcCoreBuilder mvcBuilder = services.AddMvcCore();
-
-            services.AddJsonApi<AppDbContext>(mvcBuilder: mvcBuilder);
-
-            // Adds the Swashbuckle integration.
-            services.AddOpenApi(mvcBuilder);
-        }
-
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-        {
-            app.UseRouting();
-            app.UseJsonApi();
-        
-            // Adds the Swashbuckle middleware.
-            app.UseSwagger();
-
-            app.UseEndpoints(endpoints => endpoints.MapControllers());
-        }
-    }
+    IMvcCoreBuilder mvcCoreBuilder = builder.Services.AddMvcCore();
+
+    builder.Services.AddJsonApi<AppDbContext>(mvcBuilder: mvcCoreBuilder);
+
+    // Configures Swashbuckle for JSON:API.
+    builder.Services.AddOpenApi(mvcCoreBuilder);
+
+    var app = builder.Build();
+
+    app.UseRouting();
+    app.UseJsonApi();
+
+    // Adds the Swashbuckle middleware.
+    app.UseSwagger();
     ```
 
 By default, the OpenAPI specification will be available at `http://localhost:<port>/swagger/v1/swagger.json`.
 
 ## Documentation
 
-Swashbuckle also ships with [SwaggerUI](https://swagger.io/tools/swagger-ui/), tooling for a generated documentation page. This can be enabled by installing the `Swashbuckle.AspNetCore.SwaggerUI` NuGet package and adding the following to your `Startup` class:
+Swashbuckle also ships with [SwaggerUI](https://swagger.io/tools/swagger-ui/), tooling for a generated documentation page. This can be enabled by installing the `Swashbuckle.AspNetCore.SwaggerUI` NuGet package and adding the following to your `Program.cs` file:
 
 ```c#
-// Startup.cs
-public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
-{
-    app.UseSwaggerUI();
-}
+app.UseSwaggerUI();
 ```
 
 By default, SwaggerUI will be available at `http://localhost:<port>/swagger`.
-
diff --git a/docs/usage/options.md b/docs/usage/options.md
index 2f350b8bf9..83d535bce4 100644
--- a/docs/usage/options.md
+++ b/docs/usage/options.md
@@ -1,19 +1,13 @@
 # Global Options
 
-Configuration can be applied when adding the services to the dependency injection container.
+Configuration can be applied when adding services to the dependency injection container at startup.
 
 ```c#
-public class Startup
+// Program.cs
+builder.Services.AddJsonApi<AppDbContext>(options =>
 {
-    // This method gets called by the runtime. Use this method to add services to the container.
-    public void ConfigureServices(IServiceCollection services)
-    {
-        services.AddJsonApi<AppDbContext>(options =>
-        {
-            // configure the options here
-        });
-    }
-}
+    // Configure the options here...
+});
 ```
 
 ## Client Generated IDs
diff --git a/docs/usage/resource-graph.md b/docs/usage/resource-graph.md
index beb20d2d92..4010cbea5f 100644
--- a/docs/usage/resource-graph.md
+++ b/docs/usage/resource-graph.md
@@ -23,36 +23,27 @@ Auto-discovery refers to the process of reflecting on an assembly and
 detecting all of the JSON:API resources, resource definitions, resource services and repositories.
 
 The following command builds the resource graph using all `IIdentifiable` implementations and registers the services mentioned.
-You can enable auto-discovery for the current assembly by adding the following to your `Startup` class.
+You can enable auto-discovery for the current assembly by adding the following at startup.
 
 ```c#
-// Startup.cs
-public void ConfigureServices(IServiceCollection services)
-{
-    services.AddJsonApi(discovery => discovery.AddCurrentAssembly());
-}
+// Program.cs
+builder.Services.AddJsonApi(discovery => discovery.AddCurrentAssembly());
 ```
 
 ### Specifying an Entity Framework Core DbContext
 
-If you are using Entity Framework Core as your ORM, you can add all the models of a `DbContext`  to the resource graph.
+If you are using Entity Framework Core as your ORM, you can add all the models of a `DbContext` to the resource graph.
 
 ```c#
-// Startup.cs
-public void ConfigureServices(IServiceCollection services)
-{
-    services.AddJsonApi<AppDbContext>();
-}
+// Program.cs
+builder.Services.AddJsonApi<AppDbContext>();
 ```
 
 Be aware that this does not register resource definitions, resource services and repositories. You can combine it with auto-discovery to achieve this.
 
 ```c#
-// Startup.cs
-public void ConfigureServices(IServiceCollection services)
-{
-    services.AddJsonApi<AppDbContext>(discovery => discovery.AddCurrentAssembly());
-}
+// Program.cs
+builder.Services.AddJsonApi<AppDbContext>(discovery => discovery.AddCurrentAssembly());
 ```
 
 ### Manual Specification
@@ -60,40 +51,36 @@ public void ConfigureServices(IServiceCollection services)
 You can manually construct the graph.
 
 ```c#
-// Startup.cs
-public void ConfigureServices(IServiceCollection services)
-{
-    services.AddJsonApi(resources: builder =>
-    {
-        builder.Add<Person, int>();
-    });
-}
+// Program.cs
+builder.Services.AddJsonApi(resources: resourceGraphBuilder =>
+    resourceGraphBuilder.Add<Person, int>());
 ```
 
 ## Resource Name
 
-The public resource name is exposed through the `type` member in the JSON:API payload. This can be configured by the following approaches (in order of priority):
+The public resource name is exposed through the `type` member in the JSON:API payload. This can be configured using the following approaches (in order of priority):
 
-1. The `publicName` parameter when manually adding a resource to the graph
+1. The `publicName` parameter when manually adding a resource to the graph.
 ```c#
-services.AddJsonApi(resources: builder =>
+// Program.cs
+builder.Services.AddJsonApi(resources: resourceGraphBuilder =>
 {
-    builder.Add<Person, int>(publicName: "people");
+    resourceGraphBuilder.Add<Person, int>(publicName: "individuals");
 });
 ```
 
-2. The model is decorated with a `ResourceAttribute`
+2. The `PublicName` property when a model is decorated with a `ResourceAttribute`.
 ```c#
-[Resource("myResources")]
-public class MyModel : Identifiable<int>
+[Resource(PublicName = "individuals")]
+public class Person : Identifiable<int>
 {
 }
 ```
 
-3. The configured naming convention (by default this is camel-case).
+3. The configured naming convention (by default this is camel-case), after pluralization.
 ```c#
-// this will be registered as "myModels"
-public class MyModel : Identifiable<int>
+// this will be registered as "people"
+public class Person : Identifiable<int>
 {
 }
 ```
diff --git a/docs/usage/routing.md b/docs/usage/routing.md
index c68914a04a..a264622931 100644
--- a/docs/usage/routing.md
+++ b/docs/usage/routing.md
@@ -6,27 +6,28 @@ An endpoint URL provides access to a resource or a relationship. Resource endpoi
 
 In the relationship endpoint "/articles/1/relationships/comments", "articles" is the left side of the relationship and "comments" the right side.
 
-## Namespacing and Versioning URLs
-You can add a namespace to all URLs by specifying it in ConfigureServices.
+## Namespacing and versioning of URLs
+You can add a namespace to all URLs by specifying it at startup.
 
 ```c#
-public void ConfigureServices(IServiceCollection services)
-{
-  services.AddJsonApi<AppDbContext>(options => options.Namespace = "api/v1");
-}
+// Program.cs
+builder.Services.AddJsonApi<AppDbContext>(options => options.Namespace = "api/v1");
 ```
 
 Which results in URLs like: https://yourdomain.com/api/v1/people
 
-## Default Routing Convention
+## Default routing convention
 
-The library will configure routes for all controllers in your project. By default, routes are camel-cased. This is based on the [recommendations](https://jsonapi.org/recommendations/) outlined in the JSON:API spec.
+The library will configure routes for all auto-generated and hand-written controllers in your project. By default, routes are camel-cased. This is based on the [recommendations](https://jsonapi.org/recommendations/) outlined in the JSON:API spec.
 
 ```c#
-public class OrderLine : Identifiable<int>
+// Auto-generated
+[Resource]
+public class OrderSummary : Identifiable<int>
 {
 }
 
+// Hand-written
 public class OrderLineController : JsonApiController<OrderLine, int>
 {
     public OrderLineController(IJsonApiOptions options, IResourceGraph resourceGraph,
@@ -38,6 +39,7 @@ public class OrderLineController : JsonApiController<OrderLine, int>
 ```
 
 ```http
+GET /orderSummaries HTTP/1.1
 GET /orderLines HTTP/1.1
 ```
 
@@ -57,12 +59,21 @@ public class OrderLineController : ControllerBase
 GET /orderLines HTTP/1.1
 ```
 
-## Disabling the Default Routing Convention
+### Customized routes
 
-It is possible to bypass the default routing convention for a controller.
+It is possible to override the default routing convention for an auto-generated or hand-written controller.
 
 ```c#
-[Route("v1/custom/route/lines-in-order"), DisableRoutingConvention]
+// Auto-generated
+[DisableRoutingConvention]
+[Route("v1/custom/route/summaries-for-orders")]
+partial class OrderSummariesController
+{
+}
+
+// Hand-written
+[DisableRoutingConvention]
+[Route("v1/custom/route/lines-in-order")]
 public class OrderLineController : JsonApiController<OrderLine, int>
 {
     public OrderLineController(IJsonApiOptions options, IResourceGraph resourceGraph,
@@ -73,13 +84,11 @@ public class OrderLineController : JsonApiController<OrderLine, int>
 }
 ```
 
-## Advanced Usage: Custom Routing Convention
+## Advanced usage: custom routing convention
 
 It is possible to replace the built-in routing convention with a [custom routing convention](https://docs.microsoft.com/en-us/aspnet/core/mvc/controllers/application-model?view=aspnetcore-3.1#sample-custom-routing-convention) by registering an implementation of `IJsonApiRoutingConvention`.
 
 ```c#
-public void ConfigureServices(IServiceCollection services)
-{
-	services.AddSingleton<IJsonApiRoutingConvention, CustomRoutingConvention>();
-}
+// Program.cs
+builder.Services.AddSingleton<IJsonApiRoutingConvention, CustomRoutingConvention>();
 ```
diff --git a/docs/usage/writing/bulk-batch-operations.md b/docs/usage/writing/bulk-batch-operations.md
index 21fe04b636..1ac35fd3fc 100644
--- a/docs/usage/writing/bulk-batch-operations.md
+++ b/docs/usage/writing/bulk-batch-operations.md
@@ -85,10 +85,11 @@ For example requests, see our suite of tests in JsonApiDotNetCoreTests.Integrati
 
 ## Configuration
 
-The maximum number of operations per request defaults to 10, which you can change from Startup.cs:
+The maximum number of operations per request defaults to 10, which you can change at startup:
 
 ```c#
-services.AddJsonApi(options => options.MaximumOperationsPerRequest = 250);
+// Program.cs
+builder.Services.AddJsonApi(options => options.MaximumOperationsPerRequest = 250);
 ```
 
 Or, if you want to allow unconstrained, set it to `null` instead.
diff --git a/src/Examples/GettingStarted/Controllers/BooksController.cs b/src/Examples/GettingStarted/Controllers/BooksController.cs
deleted file mode 100644
index 3f049429cd..0000000000
--- a/src/Examples/GettingStarted/Controllers/BooksController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using GettingStarted.Models;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace GettingStarted.Controllers
-{
-    public sealed class BooksController : JsonApiController<Book, int>
-    {
-        public BooksController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<Book, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/src/Examples/GettingStarted/Controllers/PeopleController.cs b/src/Examples/GettingStarted/Controllers/PeopleController.cs
deleted file mode 100644
index e7a5537f14..0000000000
--- a/src/Examples/GettingStarted/Controllers/PeopleController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using GettingStarted.Models;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace GettingStarted.Controllers
-{
-    public sealed class PeopleController : JsonApiController<Person, int>
-    {
-        public PeopleController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Person, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/src/Examples/GettingStarted/Data/SampleDbContext.cs b/src/Examples/GettingStarted/Data/SampleDbContext.cs
index c5460db810..44662c388b 100644
--- a/src/Examples/GettingStarted/Data/SampleDbContext.cs
+++ b/src/Examples/GettingStarted/Data/SampleDbContext.cs
@@ -2,16 +2,15 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace GettingStarted.Data
+namespace GettingStarted.Data;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public class SampleDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public class SampleDbContext : DbContext
-    {
-        public DbSet<Book> Books => Set<Book>();
+    public DbSet<Book> Books => Set<Book>();
 
-        public SampleDbContext(DbContextOptions<SampleDbContext> options)
-            : base(options)
-        {
-        }
+    public SampleDbContext(DbContextOptions<SampleDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/src/Examples/GettingStarted/GettingStarted.csproj b/src/Examples/GettingStarted/GettingStarted.csproj
index b28d7a0c5a..ab152b79d5 100644
--- a/src/Examples/GettingStarted/GettingStarted.csproj
+++ b/src/Examples/GettingStarted/GettingStarted.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
+    <ProjectReference Include="..\..\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
+      ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Examples/GettingStarted/Models/Book.cs b/src/Examples/GettingStarted/Models/Book.cs
index 0957461cd7..66beed1072 100644
--- a/src/Examples/GettingStarted/Models/Book.cs
+++ b/src/Examples/GettingStarted/Models/Book.cs
@@ -2,18 +2,18 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace GettingStarted.Models
+namespace GettingStarted.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource]
+public sealed class Book : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Book : Identifiable<int>
-    {
-        [Attr]
-        public string Title { get; set; } = null!;
+    [Attr]
+    public string Title { get; set; } = null!;
 
-        [Attr]
-        public int PublishYear { get; set; }
+    [Attr]
+    public int PublishYear { get; set; }
 
-        [HasOne]
-        public Person Author { get; set; } = null!;
-    }
+    [HasOne]
+    public Person Author { get; set; } = null!;
 }
diff --git a/src/Examples/GettingStarted/Models/Person.cs b/src/Examples/GettingStarted/Models/Person.cs
index f9b8e55fff..89ca4c5a69 100644
--- a/src/Examples/GettingStarted/Models/Person.cs
+++ b/src/Examples/GettingStarted/Models/Person.cs
@@ -1,17 +1,16 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace GettingStarted.Models
+namespace GettingStarted.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource]
+public sealed class Person : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Person : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [HasMany]
-        public ICollection<Book> Books { get; set; } = new List<Book>();
-    }
+    [HasMany]
+    public ICollection<Book> Books { get; set; } = new List<Book>();
 }
diff --git a/src/Examples/GettingStarted/Program.cs b/src/Examples/GettingStarted/Program.cs
index 68bca0ae86..cf19380c6c 100644
--- a/src/Examples/GettingStarted/Program.cs
+++ b/src/Examples/GettingStarted/Program.cs
@@ -1,21 +1,73 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
+using GettingStarted.Data;
+using GettingStarted.Models;
+using JsonApiDotNetCore.Configuration;
 
-namespace GettingStarted
+WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+
+builder.Services.AddSqlite<SampleDbContext>("Data Source=sample.db;Pooling=False");
+
+builder.Services.AddJsonApi<SampleDbContext>(options =>
+{
+    options.Namespace = "api";
+    options.UseRelativeLinks = true;
+    options.IncludeTotalResourceCount = true;
+    options.SerializerOptions.WriteIndented = true;
+});
+
+WebApplication app = builder.Build();
+
+// Configure the HTTP request pipeline.
+
+app.UseRouting();
+app.UseJsonApi();
+app.MapControllers();
+
+await CreateDatabaseAsync(app.Services);
+
+app.Run();
+
+static async Task CreateDatabaseAsync(IServiceProvider serviceProvider)
+{
+    await using AsyncServiceScope scope = serviceProvider.CreateAsyncScope();
+
+    var dbContext = scope.ServiceProvider.GetRequiredService<SampleDbContext>();
+    await dbContext.Database.EnsureDeletedAsync();
+    await dbContext.Database.EnsureCreatedAsync();
+
+    await CreateSampleDataAsync(dbContext);
+}
+
+static async Task CreateSampleDataAsync(SampleDbContext dbContext)
 {
-    internal static class Program
+    // Note: The generate-examples.ps1 script (to create example requests in documentation) depends on these.
+
+    dbContext.Books.AddRange(new Book
     {
-        public static void Main(string[] args)
+        Title = "Frankenstein",
+        PublishYear = 1818,
+        Author = new Person
         {
-            CreateHostBuilder(args).Build().Run();
+            Name = "Mary Shelley"
         }
-
-        private static IHostBuilder CreateHostBuilder(string[] args)
+    }, new Book
+    {
+        Title = "Robinson Crusoe",
+        PublishYear = 1719,
+        Author = new Person
         {
-            return Host.CreateDefaultBuilder(args).ConfigureWebHostDefaults(webBuilder =>
-            {
-                webBuilder.UseStartup<Startup>();
-            });
+            Name = "Daniel Defoe"
         }
-    }
+    }, new Book
+    {
+        Title = "Gulliver's Travels",
+        PublishYear = 1726,
+        Author = new Person
+        {
+            Name = "Jonathan Swift"
+        }
+    });
+
+    await dbContext.SaveChangesAsync();
 }
diff --git a/src/Examples/GettingStarted/Startup.cs b/src/Examples/GettingStarted/Startup.cs
deleted file mode 100644
index 13beab63fe..0000000000
--- a/src/Examples/GettingStarted/Startup.cs
+++ /dev/null
@@ -1,73 +0,0 @@
-using GettingStarted.Data;
-using GettingStarted.Models;
-using JetBrains.Annotations;
-using JsonApiDotNetCore.Configuration;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace GettingStarted
-{
-    public sealed class Startup
-    {
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDbContext<SampleDbContext>(options => options.UseSqlite("Data Source=sample.db"));
-
-            services.AddJsonApi<SampleDbContext>(options =>
-            {
-                options.Namespace = "api";
-                options.UseRelativeLinks = true;
-                options.IncludeTotalResourceCount = true;
-                options.SerializerOptions.WriteIndented = true;
-            });
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        [UsedImplicitly]
-        public void Configure(IApplicationBuilder app, SampleDbContext dbContext)
-        {
-            dbContext.Database.EnsureDeleted();
-            dbContext.Database.EnsureCreated();
-            CreateSampleData(dbContext);
-
-            app.UseRouting();
-            app.UseJsonApi();
-            app.UseEndpoints(endpoints => endpoints.MapControllers());
-        }
-
-        private static void CreateSampleData(SampleDbContext dbContext)
-        {
-            // Note: The generate-examples.ps1 script (to create example requests in documentation) depends on these.
-
-            dbContext.Books.AddRange(new Book
-            {
-                Title = "Frankenstein",
-                PublishYear = 1818,
-                Author = new Person
-                {
-                    Name = "Mary Shelley"
-                }
-            }, new Book
-            {
-                Title = "Robinson Crusoe",
-                PublishYear = 1719,
-                Author = new Person
-                {
-                    Name = "Daniel Defoe"
-                }
-            }, new Book
-            {
-                Title = "Gulliver's Travels",
-                PublishYear = 1726,
-                Author = new Person
-                {
-                    Name = "Jonathan Swift"
-                }
-            });
-
-            dbContext.SaveChanges();
-        }
-    }
-}
diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/NonJsonApiController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/NonJsonApiController.cs
index b26b82d27d..be5e01b7a9 100644
--- a/src/Examples/JsonApiDotNetCoreExample/Controllers/NonJsonApiController.cs
+++ b/src/Examples/JsonApiDotNetCoreExample/Controllers/NonJsonApiController.cs
@@ -1,55 +1,52 @@
-using System.IO;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 
-namespace JsonApiDotNetCoreExample.Controllers
+namespace JsonApiDotNetCoreExample.Controllers;
+
+[Route("[controller]")]
+public sealed class NonJsonApiController : ControllerBase
 {
-    [Route("[controller]")]
-    public sealed class NonJsonApiController : ControllerBase
+    [HttpGet]
+    public IActionResult Get()
     {
-        [HttpGet]
-        public IActionResult Get()
-        {
-            string[] result =
-            {
-                "Welcome!"
-            };
-
-            return Ok(result);
-        }
-
-        [HttpPost]
-        public async Task<IActionResult> PostAsync()
+        string[] result =
         {
-            string name = await new StreamReader(Request.Body).ReadToEndAsync();
+            "Welcome!"
+        };
 
-            if (string.IsNullOrEmpty(name))
-            {
-                return BadRequest("Please send your name.");
-            }
+        return Ok(result);
+    }
 
-            string result = $"Hello, {name}";
-            return Ok(result);
-        }
+    [HttpPost]
+    public async Task<IActionResult> PostAsync()
+    {
+        string name = await new StreamReader(Request.Body).ReadToEndAsync();
 
-        [HttpPut]
-        public IActionResult Put([FromBody] string name)
+        if (string.IsNullOrEmpty(name))
         {
-            string result = $"Hi, {name}";
-            return Ok(result);
+            return BadRequest("Please send your name.");
         }
 
-        [HttpPatch]
-        public IActionResult Patch(string name)
-        {
-            string result = $"Good day, {name}";
-            return Ok(result);
-        }
+        string result = $"Hello, {name}";
+        return Ok(result);
+    }
 
-        [HttpDelete]
-        public IActionResult Delete()
-        {
-            return Ok("Bye.");
-        }
+    [HttpPut]
+    public IActionResult Put([FromBody] string name)
+    {
+        string result = $"Hi, {name}";
+        return Ok(result);
+    }
+
+    [HttpPatch]
+    public IActionResult Patch(string name)
+    {
+        string result = $"Good day, {name}";
+        return Ok(result);
+    }
+
+    [HttpDelete]
+    public IActionResult Delete()
+    {
+        return Ok("Bye.");
     }
 }
diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/OperationsController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/OperationsController.cs
index 3d29f72af1..6dd2bcb9ba 100644
--- a/src/Examples/JsonApiDotNetCoreExample/Controllers/OperationsController.cs
+++ b/src/Examples/JsonApiDotNetCoreExample/Controllers/OperationsController.cs
@@ -3,16 +3,14 @@
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources;
-using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreExample.Controllers
+namespace JsonApiDotNetCoreExample.Controllers;
+
+public sealed class OperationsController : JsonApiOperationsController
 {
-    public sealed class OperationsController : JsonApiOperationsController
+    public OperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor,
+        IJsonApiRequest request, ITargetedFields targetedFields)
+        : base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
     {
-        public OperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor,
-            IJsonApiRequest request, ITargetedFields targetedFields)
-            : base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
-        {
-        }
     }
 }
diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/PeopleController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/PeopleController.cs
deleted file mode 100644
index 0ebafd1767..0000000000
--- a/src/Examples/JsonApiDotNetCoreExample/Controllers/PeopleController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using JsonApiDotNetCoreExample.Models;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreExample.Controllers
-{
-    public sealed class PeopleController : JsonApiController<Person, int>
-    {
-        public PeopleController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Person, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/TagsController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/TagsController.cs
deleted file mode 100644
index b08af4e399..0000000000
--- a/src/Examples/JsonApiDotNetCoreExample/Controllers/TagsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using JsonApiDotNetCoreExample.Models;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreExample.Controllers
-{
-    public sealed class TagsController : JsonApiController<Tag, int>
-    {
-        public TagsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<Tag, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/src/Examples/JsonApiDotNetCoreExample/Controllers/TodoItemsController.cs b/src/Examples/JsonApiDotNetCoreExample/Controllers/TodoItemsController.cs
deleted file mode 100644
index c862853302..0000000000
--- a/src/Examples/JsonApiDotNetCoreExample/Controllers/TodoItemsController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using JsonApiDotNetCoreExample.Models;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreExample.Controllers
-{
-    public sealed class TodoItemsController : JsonApiController<TodoItem, int>
-    {
-        public TodoItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<TodoItem, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/src/Examples/JsonApiDotNetCoreExample/Data/AppDbContext.cs b/src/Examples/JsonApiDotNetCoreExample/Data/AppDbContext.cs
index f9f6752990..24378e3182 100644
--- a/src/Examples/JsonApiDotNetCoreExample/Data/AppDbContext.cs
+++ b/src/Examples/JsonApiDotNetCoreExample/Data/AppDbContext.cs
@@ -4,29 +4,28 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreExample.Data
+namespace JsonApiDotNetCoreExample.Data;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class AppDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class AppDbContext : DbContext
-    {
-        public DbSet<TodoItem> TodoItems => Set<TodoItem>();
+    public DbSet<TodoItem> TodoItems => Set<TodoItem>();
 
-        public AppDbContext(DbContextOptions<AppDbContext> options)
-            : base(options)
-        {
-        }
+    public AppDbContext(DbContextOptions<AppDbContext> options)
+        : base(options)
+    {
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            // When deleting a person, un-assign him/her from existing todo items.
-            builder.Entity<Person>()
-                .HasMany(person => person.AssignedTodoItems)
-                .WithOne(todoItem => todoItem.Assignee!);
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        // When deleting a person, un-assign him/her from existing todo items.
+        builder.Entity<Person>()
+            .HasMany(person => person.AssignedTodoItems)
+            .WithOne(todoItem => todoItem.Assignee!);
 
-            // When deleting a person, the todo items he/she owns are deleted too.
-            builder.Entity<TodoItem>()
-                .HasOne(todoItem => todoItem.Owner)
-                .WithMany();
-        }
+        // When deleting a person, the todo items he/she owns are deleted too.
+        builder.Entity<TodoItem>()
+            .HasOne(todoItem => todoItem.Owner)
+            .WithMany();
     }
 }
diff --git a/src/Examples/JsonApiDotNetCoreExample/Definitions/TodoItemDefinition.cs b/src/Examples/JsonApiDotNetCoreExample/Definitions/TodoItemDefinition.cs
index 306315d05f..ee7b874fc4 100644
--- a/src/Examples/JsonApiDotNetCoreExample/Definitions/TodoItemDefinition.cs
+++ b/src/Examples/JsonApiDotNetCoreExample/Definitions/TodoItemDefinition.cs
@@ -1,6 +1,4 @@
 using System.ComponentModel;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -9,45 +7,44 @@
 using JsonApiDotNetCoreExample.Models;
 using Microsoft.AspNetCore.Authentication;
 
-namespace JsonApiDotNetCoreExample.Definitions
+namespace JsonApiDotNetCoreExample.Definitions;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class TodoItemDefinition : JsonApiResourceDefinition<TodoItem, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class TodoItemDefinition : JsonApiResourceDefinition<TodoItem, int>
+    private readonly ISystemClock _systemClock;
+
+    public TodoItemDefinition(IResourceGraph resourceGraph, ISystemClock systemClock)
+        : base(resourceGraph)
     {
-        private readonly ISystemClock _systemClock;
+        _systemClock = systemClock;
+    }
 
-        public TodoItemDefinition(IResourceGraph resourceGraph, ISystemClock systemClock)
-            : base(resourceGraph)
-        {
-            _systemClock = systemClock;
-        }
+    public override SortExpression OnApplySort(SortExpression? existingSort)
+    {
+        return existingSort ?? GetDefaultSortOrder();
+    }
 
-        public override SortExpression OnApplySort(SortExpression? existingSort)
+    private SortExpression GetDefaultSortOrder()
+    {
+        return CreateSortExpressionFromLambda(new PropertySortOrder
         {
-            return existingSort ?? GetDefaultSortOrder();
-        }
+            (todoItem => todoItem.Priority, ListSortDirection.Descending),
+            (todoItem => todoItem.LastModifiedAt, ListSortDirection.Descending)
+        });
+    }
 
-        private SortExpression GetDefaultSortOrder()
+    public override Task OnWritingAsync(TodoItem resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (writeOperation == WriteOperationKind.CreateResource)
         {
-            return CreateSortExpressionFromLambda(new PropertySortOrder
-            {
-                (todoItem => todoItem.Priority, ListSortDirection.Descending),
-                (todoItem => todoItem.LastModifiedAt, ListSortDirection.Descending)
-            });
+            resource.CreatedAt = _systemClock.UtcNow;
         }
-
-        public override Task OnWritingAsync(TodoItem resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        else if (writeOperation == WriteOperationKind.UpdateResource)
         {
-            if (writeOperation == WriteOperationKind.CreateResource)
-            {
-                resource.CreatedAt = _systemClock.UtcNow;
-            }
-            else if (writeOperation == WriteOperationKind.UpdateResource)
-            {
-                resource.LastModifiedAt = _systemClock.UtcNow;
-            }
-
-            return Task.CompletedTask;
+            resource.LastModifiedAt = _systemClock.UtcNow;
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
index 8dba30b456..32dcff4edf 100644
--- a/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
+++ b/src/Examples/JsonApiDotNetCoreExample/JsonApiDotNetCoreExample.csproj
@@ -1,16 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
+    <ProjectReference Include="..\..\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
+      ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\..\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
     <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="$(SwashbuckleVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/Examples/JsonApiDotNetCoreExample/Models/Person.cs b/src/Examples/JsonApiDotNetCoreExample/Models/Person.cs
index 44be2df864..5415d37bb3 100644
--- a/src/Examples/JsonApiDotNetCoreExample/Models/Person.cs
+++ b/src/Examples/JsonApiDotNetCoreExample/Models/Person.cs
@@ -1,20 +1,19 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreExample.Models
+namespace JsonApiDotNetCoreExample.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource]
+public sealed class Person : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Person : Identifiable<int>
-    {
-        [Attr]
-        public string? FirstName { get; set; }
+    [Attr]
+    public string? FirstName { get; set; }
 
-        [Attr]
-        public string LastName { get; set; } = null!;
+    [Attr]
+    public string LastName { get; set; } = null!;
 
-        [HasMany]
-        public ISet<TodoItem> AssignedTodoItems { get; set; } = new HashSet<TodoItem>();
-    }
+    [HasMany]
+    public ISet<TodoItem> AssignedTodoItems { get; set; } = new HashSet<TodoItem>();
 }
diff --git a/src/Examples/JsonApiDotNetCoreExample/Models/Tag.cs b/src/Examples/JsonApiDotNetCoreExample/Models/Tag.cs
index 713eafe605..9095b0af80 100644
--- a/src/Examples/JsonApiDotNetCoreExample/Models/Tag.cs
+++ b/src/Examples/JsonApiDotNetCoreExample/Models/Tag.cs
@@ -1,19 +1,18 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreExample.Models
+namespace JsonApiDotNetCoreExample.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource]
+public sealed class Tag : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Tag : Identifiable<int>
-    {
-        [Attr]
-        [MinLength(1)]
-        public string Name { get; set; } = null!;
+    [Attr]
+    [MinLength(1)]
+    public string Name { get; set; } = null!;
 
-        [HasMany]
-        public ISet<TodoItem> TodoItems { get; set; } = new HashSet<TodoItem>();
-    }
+    [HasMany]
+    public ISet<TodoItem> TodoItems { get; set; } = new HashSet<TodoItem>();
 }
diff --git a/src/Examples/JsonApiDotNetCoreExample/Models/TodoItem.cs b/src/Examples/JsonApiDotNetCoreExample/Models/TodoItem.cs
index 5c4d5c6ea1..9be7e6e64e 100644
--- a/src/Examples/JsonApiDotNetCoreExample/Models/TodoItem.cs
+++ b/src/Examples/JsonApiDotNetCoreExample/Models/TodoItem.cs
@@ -1,35 +1,33 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreExample.Models
+namespace JsonApiDotNetCoreExample.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource]
+public sealed class TodoItem : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class TodoItem : Identifiable<int>
-    {
-        [Attr]
-        public string Description { get; set; } = null!;
+    [Attr]
+    public string Description { get; set; } = null!;
 
-        [Attr]
-        [Required]
-        public TodoItemPriority? Priority { get; set; }
+    [Attr]
+    [Required]
+    public TodoItemPriority? Priority { get; set; }
 
-        [Attr(Capabilities = AttrCapabilities.AllowFilter | AttrCapabilities.AllowSort | AttrCapabilities.AllowView)]
-        public DateTimeOffset CreatedAt { get; set; }
+    [Attr(Capabilities = AttrCapabilities.AllowFilter | AttrCapabilities.AllowSort | AttrCapabilities.AllowView)]
+    public DateTimeOffset CreatedAt { get; set; }
 
-        [Attr(PublicName = "modifiedAt", Capabilities = AttrCapabilities.AllowFilter | AttrCapabilities.AllowSort | AttrCapabilities.AllowView)]
-        public DateTimeOffset? LastModifiedAt { get; set; }
+    [Attr(PublicName = "modifiedAt", Capabilities = AttrCapabilities.AllowFilter | AttrCapabilities.AllowSort | AttrCapabilities.AllowView)]
+    public DateTimeOffset? LastModifiedAt { get; set; }
 
-        [HasOne]
-        public Person Owner { get; set; } = null!;
+    [HasOne]
+    public Person Owner { get; set; } = null!;
 
-        [HasOne]
-        public Person? Assignee { get; set; }
+    [HasOne]
+    public Person? Assignee { get; set; }
 
-        [HasMany]
-        public ISet<Tag> Tags { get; set; } = new HashSet<Tag>();
-    }
+    [HasMany]
+    public ISet<Tag> Tags { get; set; } = new HashSet<Tag>();
 }
diff --git a/src/Examples/JsonApiDotNetCoreExample/Models/TodoItemPriority.cs b/src/Examples/JsonApiDotNetCoreExample/Models/TodoItemPriority.cs
index 5f8687a064..9ef85348f1 100644
--- a/src/Examples/JsonApiDotNetCoreExample/Models/TodoItemPriority.cs
+++ b/src/Examples/JsonApiDotNetCoreExample/Models/TodoItemPriority.cs
@@ -1,12 +1,11 @@
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreExample.Models
+namespace JsonApiDotNetCoreExample.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public enum TodoItemPriority
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public enum TodoItemPriority
-    {
-        Low,
-        Medium,
-        High
-    }
+    Low,
+    Medium,
+    High
 }
diff --git a/src/Examples/JsonApiDotNetCoreExample/Program.cs b/src/Examples/JsonApiDotNetCoreExample/Program.cs
index e185c3b4c2..3eb8de8fef 100644
--- a/src/Examples/JsonApiDotNetCoreExample/Program.cs
+++ b/src/Examples/JsonApiDotNetCoreExample/Program.cs
@@ -1,21 +1,110 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
+using System.Text.Json.Serialization;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Diagnostics;
+using JsonApiDotNetCore.OpenApi;
+using JsonApiDotNetCoreExample.Data;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
-namespace JsonApiDotNetCoreExample
+WebApplication app = CreateWebApplication(args);
+
+await CreateDatabaseAsync(app.Services);
+
+app.Run();
+
+static WebApplication CreateWebApplication(string[] args)
 {
-    internal static class Program
+    using ICodeTimerSession codeTimerSession = new DefaultCodeTimerSession();
+    CodeTimingSessionManager.Capture(codeTimerSession);
+
+    WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+
+    // Add services to the container.
+    ConfigureServices(builder);
+
+    WebApplication webApplication = builder.Build();
+
+    // Configure the HTTP request pipeline.
+    ConfigurePipeline(webApplication);
+
+    if (CodeTimingSessionManager.IsEnabled)
     {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
+        string timingResults = CodeTimingSessionManager.Current.GetResults();
+        webApplication.Logger.LogInformation($"Measurement results for application startup:{Environment.NewLine}{timingResults}");
+    }
 
-        private static IHostBuilder CreateHostBuilder(string[] args)
+    return webApplication;
+}
+
+static void ConfigureServices(WebApplicationBuilder builder)
+{
+    using IDisposable _ = CodeTimingSessionManager.Current.Measure("Configure services");
+
+    builder.Services.TryAddSingleton<ISystemClock, SystemClock>();
+
+    builder.Services.AddDbContext<AppDbContext>(options =>
+    {
+        string connectionString = GetConnectionString(builder.Configuration);
+
+        options.UseNpgsql(connectionString);
+#if DEBUG
+        options.EnableSensitiveDataLogging();
+        options.EnableDetailedErrors();
+#endif
+    });
+
+    IMvcCoreBuilder mvcCoreBuilder = builder.Services.AddMvcCore();
+
+    using (CodeTimingSessionManager.Current.Measure("AddJsonApi()"))
+    {
+        builder.Services.AddJsonApi<AppDbContext>(options =>
         {
-            return Host.CreateDefaultBuilder(args).ConfigureWebHostDefaults(webBuilder =>
-            {
-                webBuilder.UseStartup<Startup>();
-            });
-        }
+            options.Namespace = "api/v1";
+            options.UseRelativeLinks = true;
+            options.IncludeTotalResourceCount = true;
+            options.SerializerOptions.WriteIndented = true;
+            options.SerializerOptions.Converters.Add(new JsonStringEnumConverter());
+#if DEBUG
+            options.IncludeExceptionStackTraceInErrors = true;
+            options.IncludeRequestBodyInErrors = true;
+#endif
+        }, discovery => discovery.AddCurrentAssembly(), mvcBuilder: mvcCoreBuilder);
     }
+
+    using (CodeTimingSessionManager.Current.Measure("AddOpenApi()"))
+    {
+        builder.Services.AddOpenApi(mvcCoreBuilder);
+    }
+}
+
+static string GetConnectionString(IConfiguration configuration)
+{
+    string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
+    return configuration["Data:DefaultConnection"].Replace("###", postgresPassword);
+}
+
+static void ConfigurePipeline(WebApplication webApplication)
+{
+    using IDisposable _ = CodeTimingSessionManager.Current.Measure("Configure pipeline");
+
+    webApplication.UseRouting();
+
+    using (CodeTimingSessionManager.Current.Measure("UseJsonApi()"))
+    {
+        webApplication.UseJsonApi();
+    }
+
+    webApplication.UseSwagger();
+    webApplication.UseSwaggerUI();
+
+    webApplication.MapControllers();
+}
+
+static async Task CreateDatabaseAsync(IServiceProvider serviceProvider)
+{
+    await using AsyncServiceScope scope = serviceProvider.CreateAsyncScope();
+
+    var dbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+    await dbContext.Database.EnsureCreatedAsync();
 }
diff --git a/src/Examples/JsonApiDotNetCoreExample/Startup.cs b/src/Examples/JsonApiDotNetCoreExample/Startup.cs
deleted file mode 100644
index 67c6a223b5..0000000000
--- a/src/Examples/JsonApiDotNetCoreExample/Startup.cs
+++ /dev/null
@@ -1,100 +0,0 @@
-using System;
-using System.Text.Json.Serialization;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Diagnostics;
-using JsonApiDotNetCore.OpenApi;
-using JsonApiDotNetCoreExample.Data;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreExample
-{
-    public sealed class Startup
-    {
-        private readonly ICodeTimerSession _codeTimingSession;
-        private readonly string _connectionString;
-
-        public Startup(IConfiguration configuration)
-        {
-            _codeTimingSession = new DefaultCodeTimerSession();
-            CodeTimingSessionManager.Capture(_codeTimingSession);
-
-            string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
-            _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);
-        }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            using (CodeTimingSessionManager.Current.Measure("Configure other (startup)"))
-            {
-                services.AddSingleton<ISystemClock, SystemClock>();
-
-                services.AddDbContext<AppDbContext>(options =>
-                {
-                    options.UseNpgsql(_connectionString);
-#if DEBUG
-                    options.EnableSensitiveDataLogging();
-                    options.EnableDetailedErrors();
-#endif
-                });
-
-                IMvcCoreBuilder mvcBuilder = services.AddMvcCore();
-
-                using (CodeTimingSessionManager.Current.Measure("Configure JSON:API (startup)"))
-                {
-                    services.AddJsonApi<AppDbContext>(options =>
-                    {
-                        options.Namespace = "api/v1";
-                        options.UseRelativeLinks = true;
-                        options.IncludeTotalResourceCount = true;
-                        options.SerializerOptions.WriteIndented = true;
-                        options.SerializerOptions.Converters.Add(new JsonStringEnumConverter());
-#if DEBUG
-                        options.IncludeExceptionStackTraceInErrors = true;
-                        options.IncludeRequestBodyInErrors = true;
-#endif
-                    }, discovery => discovery.AddCurrentAssembly(), mvcBuilder: mvcBuilder);
-                }
-
-                services.AddOpenApi(mvcBuilder);
-            }
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory, AppDbContext dbContext)
-        {
-            ILogger<Startup> logger = loggerFactory.CreateLogger<Startup>();
-
-            using (CodeTimingSessionManager.Current.Measure("Initialize other (startup)"))
-            {
-                dbContext.Database.EnsureCreated();
-
-                app.UseRouting();
-
-                using (CodeTimingSessionManager.Current.Measure("Initialize JSON:API (startup)"))
-                {
-                    app.UseJsonApi();
-                }
-
-                app.UseSwagger();
-                app.UseSwaggerUI();
-
-                app.UseEndpoints(endpoints => endpoints.MapControllers());
-            }
-
-            if (CodeTimingSessionManager.IsEnabled)
-            {
-                string timingResults = CodeTimingSessionManager.Current.GetResults();
-                logger.LogInformation($"Measurement results for application startup:{Environment.NewLine}{timingResults}");
-            }
-
-            _codeTimingSession.Dispose();
-        }
-    }
-}
diff --git a/src/Examples/JsonApiDotNetCoreExample/appsettings.json b/src/Examples/JsonApiDotNetCoreExample/appsettings.json
index ec2ea30102..0e63c6a380 100644
--- a/src/Examples/JsonApiDotNetCoreExample/appsettings.json
+++ b/src/Examples/JsonApiDotNetCoreExample/appsettings.json
@@ -9,7 +9,7 @@
       "Microsoft.EntityFrameworkCore.Update": "Critical",
       "Microsoft.EntityFrameworkCore.Database.Command": "Critical",
       "JsonApiDotNetCore.Middleware.JsonApiMiddleware": "Information",
-      "JsonApiDotNetCoreExample": "Information"
+      "Program": "Information"
     }
   },
   "AllowedHosts": "*"
diff --git a/src/Examples/JsonApiDotNetCoreExampleClient/ExampleApiClient.cs b/src/Examples/JsonApiDotNetCoreExampleClient/ExampleApiClient.cs
index 52878e55e3..429dae1ac0 100644
--- a/src/Examples/JsonApiDotNetCoreExampleClient/ExampleApiClient.cs
+++ b/src/Examples/JsonApiDotNetCoreExampleClient/ExampleApiClient.cs
@@ -1,15 +1,14 @@
 using JsonApiDotNetCore.OpenApi.Client;
 using Newtonsoft.Json;
 
-namespace JsonApiDotNetCoreExampleClient
+namespace JsonApiDotNetCoreExampleClient;
+
+public partial class ExampleApiClient : JsonApiClient
 {
-    public partial class ExampleApiClient : JsonApiClient
+    partial void UpdateJsonSerializerSettings(JsonSerializerSettings settings)
     {
-        partial void UpdateJsonSerializerSettings(JsonSerializerSettings settings)
-        {
-            SetSerializerSettingsForJsonApi(settings);
+        SetSerializerSettingsForJsonApi(settings);
 
-            settings.Formatting = Formatting.Indented;
-        }
+        settings.Formatting = Formatting.Indented;
     }
 }
diff --git a/src/Examples/JsonApiDotNetCoreExampleClient/JsonApiDotNetCoreExampleClient.csproj b/src/Examples/JsonApiDotNetCoreExampleClient/JsonApiDotNetCoreExampleClient.csproj
index b736fd0859..17a8f6b436 100644
--- a/src/Examples/JsonApiDotNetCoreExampleClient/JsonApiDotNetCoreExampleClient.csproj
+++ b/src/Examples/JsonApiDotNetCoreExampleClient/JsonApiDotNetCoreExampleClient.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
     <OutputType>Exe</OutputType>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/Examples/JsonApiDotNetCoreExampleClient/Program.cs b/src/Examples/JsonApiDotNetCoreExampleClient/Program.cs
index a4a8b6ff08..3218889f4f 100644
--- a/src/Examples/JsonApiDotNetCoreExampleClient/Program.cs
+++ b/src/Examples/JsonApiDotNetCoreExampleClient/Program.cs
@@ -1,31 +1,26 @@
-using System;
-using System.Net.Http;
-using System.Threading.Tasks;
+namespace JsonApiDotNetCoreExampleClient;
 
-namespace JsonApiDotNetCoreExampleClient
+internal static class Program
 {
-    internal static class Program
-    {
-        private const string BaseUrl = "http://localhost:14140";
-
-        private static async Task Main()
-        {
-            using var httpClient = new HttpClient();
+    private const string BaseUrl = "http://localhost:14140";
 
-            ExampleApiClient exampleApiClient = new(BaseUrl, httpClient);
+    private static async Task Main()
+    {
+        using var httpClient = new HttpClient();
 
-            try
-            {
-                const int nonExistingId = int.MaxValue;
-                await exampleApiClient.Delete_personAsync(nonExistingId);
-            }
-            catch (ApiException exception)
-            {
-                Console.WriteLine(exception.Response);
-            }
+        ExampleApiClient exampleApiClient = new(BaseUrl, httpClient);
 
-            Console.WriteLine("Press any key to close.");
-            Console.ReadKey();
+        try
+        {
+            const int nonExistingId = int.MaxValue;
+            await exampleApiClient.Delete_personAsync(nonExistingId);
+        }
+        catch (ApiException exception)
+        {
+            Console.WriteLine(exception.Response);
         }
+
+        Console.WriteLine("Press any key to close.");
+        Console.ReadKey();
     }
 }
diff --git a/src/Examples/MultiDbContextExample/Controllers/ResourceAsController.cs b/src/Examples/MultiDbContextExample/Controllers/ResourceAsController.cs
deleted file mode 100644
index 5fd3c662a4..0000000000
--- a/src/Examples/MultiDbContextExample/Controllers/ResourceAsController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-using MultiDbContextExample.Models;
-
-namespace MultiDbContextExample.Controllers
-{
-    public sealed class ResourceAsController : JsonApiController<ResourceA, int>
-    {
-        public ResourceAsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<ResourceA, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/src/Examples/MultiDbContextExample/Controllers/ResourceBsController.cs b/src/Examples/MultiDbContextExample/Controllers/ResourceBsController.cs
deleted file mode 100644
index 33b89aa9ec..0000000000
--- a/src/Examples/MultiDbContextExample/Controllers/ResourceBsController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-using MultiDbContextExample.Models;
-
-namespace MultiDbContextExample.Controllers
-{
-    public sealed class ResourceBsController : JsonApiController<ResourceB, int>
-    {
-        public ResourceBsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<ResourceB, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/src/Examples/MultiDbContextExample/Data/DbContextA.cs b/src/Examples/MultiDbContextExample/Data/DbContextA.cs
index 23b2f4a37c..b21e69f2ff 100644
--- a/src/Examples/MultiDbContextExample/Data/DbContextA.cs
+++ b/src/Examples/MultiDbContextExample/Data/DbContextA.cs
@@ -2,16 +2,15 @@
 using Microsoft.EntityFrameworkCore;
 using MultiDbContextExample.Models;
 
-namespace MultiDbContextExample.Data
+namespace MultiDbContextExample.Data;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class DbContextA : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class DbContextA : DbContext
-    {
-        public DbSet<ResourceA> ResourceAs => Set<ResourceA>();
+    public DbSet<ResourceA> ResourceAs => Set<ResourceA>();
 
-        public DbContextA(DbContextOptions<DbContextA> options)
-            : base(options)
-        {
-        }
+    public DbContextA(DbContextOptions<DbContextA> options)
+        : base(options)
+    {
     }
 }
diff --git a/src/Examples/MultiDbContextExample/Data/DbContextB.cs b/src/Examples/MultiDbContextExample/Data/DbContextB.cs
index bf9c575fa9..9bc82c5257 100644
--- a/src/Examples/MultiDbContextExample/Data/DbContextB.cs
+++ b/src/Examples/MultiDbContextExample/Data/DbContextB.cs
@@ -2,16 +2,15 @@
 using Microsoft.EntityFrameworkCore;
 using MultiDbContextExample.Models;
 
-namespace MultiDbContextExample.Data
+namespace MultiDbContextExample.Data;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class DbContextB : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class DbContextB : DbContext
-    {
-        public DbSet<ResourceB> ResourceBs => Set<ResourceB>();
+    public DbSet<ResourceB> ResourceBs => Set<ResourceB>();
 
-        public DbContextB(DbContextOptions<DbContextB> options)
-            : base(options)
-        {
-        }
+    public DbContextB(DbContextOptions<DbContextB> options)
+        : base(options)
+    {
     }
 }
diff --git a/src/Examples/MultiDbContextExample/Models/ResourceA.cs b/src/Examples/MultiDbContextExample/Models/ResourceA.cs
index 1c754be6ed..44a313a32f 100644
--- a/src/Examples/MultiDbContextExample/Models/ResourceA.cs
+++ b/src/Examples/MultiDbContextExample/Models/ResourceA.cs
@@ -2,12 +2,12 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace MultiDbContextExample.Models
+namespace MultiDbContextExample.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource]
+public sealed class ResourceA : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ResourceA : Identifiable<int>
-    {
-        [Attr]
-        public string? NameA { get; set; }
-    }
+    [Attr]
+    public string? NameA { get; set; }
 }
diff --git a/src/Examples/MultiDbContextExample/Models/ResourceB.cs b/src/Examples/MultiDbContextExample/Models/ResourceB.cs
index 70941a1f4d..3a6bc7316e 100644
--- a/src/Examples/MultiDbContextExample/Models/ResourceB.cs
+++ b/src/Examples/MultiDbContextExample/Models/ResourceB.cs
@@ -2,12 +2,12 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace MultiDbContextExample.Models
+namespace MultiDbContextExample.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource]
+public sealed class ResourceB : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ResourceB : Identifiable<int>
-    {
-        [Attr]
-        public string? NameB { get; set; }
-    }
+    [Attr]
+    public string? NameB { get; set; }
 }
diff --git a/src/Examples/MultiDbContextExample/MultiDbContextExample.csproj b/src/Examples/MultiDbContextExample/MultiDbContextExample.csproj
index b28d7a0c5a..ab152b79d5 100644
--- a/src/Examples/MultiDbContextExample/MultiDbContextExample.csproj
+++ b/src/Examples/MultiDbContextExample/MultiDbContextExample.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
+    <ProjectReference Include="..\..\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
+      ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Examples/MultiDbContextExample/Program.cs b/src/Examples/MultiDbContextExample/Program.cs
index d5800d95e8..f8a99654de 100644
--- a/src/Examples/MultiDbContextExample/Program.cs
+++ b/src/Examples/MultiDbContextExample/Program.cs
@@ -1,18 +1,73 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
+using JsonApiDotNetCore.Configuration;
+using MultiDbContextExample.Data;
+using MultiDbContextExample.Models;
+using MultiDbContextExample.Repositories;
 
-namespace MultiDbContextExample
+WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+
+builder.Services.AddSqlite<DbContextA>("Data Source=A.db;Pooling=False");
+builder.Services.AddSqlite<DbContextB>("Data Source=B.db;Pooling=False");
+
+builder.Services.AddJsonApi(options =>
+{
+    options.IncludeExceptionStackTraceInErrors = true;
+    options.IncludeRequestBodyInErrors = true;
+}, dbContextTypes: new[]
 {
-    internal static class Program
+    typeof(DbContextA),
+    typeof(DbContextB)
+});
+
+builder.Services.AddResourceRepository<DbContextARepository<ResourceA>>();
+builder.Services.AddResourceRepository<DbContextBRepository<ResourceB>>();
+
+WebApplication app = builder.Build();
+
+// Configure the HTTP request pipeline.
+
+app.UseRouting();
+app.UseJsonApi();
+app.MapControllers();
+
+await CreateDatabaseAsync(app.Services);
+
+app.Run();
+
+static async Task CreateDatabaseAsync(IServiceProvider serviceProvider)
+{
+    await using AsyncServiceScope scope = serviceProvider.CreateAsyncScope();
+
+    var dbContextA = scope.ServiceProvider.GetRequiredService<DbContextA>();
+    await CreateSampleDataAAsync(dbContextA);
+
+    var dbContextB = scope.ServiceProvider.GetRequiredService<DbContextB>();
+    await CreateSampleDataBAsync(dbContextB);
+}
+
+static async Task CreateSampleDataAAsync(DbContextA dbContextA)
+{
+    await dbContextA.Database.EnsureDeletedAsync();
+    await dbContextA.Database.EnsureCreatedAsync();
+
+    dbContextA.ResourceAs.Add(new ResourceA
+    {
+        NameA = "SampleA"
+    });
+
+    await dbContextA.SaveChangesAsync();
+}
+
+static async Task CreateSampleDataBAsync(DbContextB dbContextB)
+{
+    await dbContextB.Database.EnsureDeletedAsync();
+    await dbContextB.Database.EnsureCreatedAsync();
+
+    dbContextB.ResourceBs.Add(new ResourceB
     {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        private static IHostBuilder CreateHostBuilder(string[] args)
-        {
-            return Host.CreateDefaultBuilder(args).ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
-        }
-    }
+        NameB = "SampleB"
+    });
+
+    await dbContextB.SaveChangesAsync();
 }
diff --git a/src/Examples/MultiDbContextExample/Properties/launchSettings.json b/src/Examples/MultiDbContextExample/Properties/launchSettings.json
index e328cc07be..a77f78562b 100644
--- a/src/Examples/MultiDbContextExample/Properties/launchSettings.json
+++ b/src/Examples/MultiDbContextExample/Properties/launchSettings.json
@@ -11,7 +11,7 @@
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
-      "launchBrowser": false,
+      "launchBrowser": true,
       "launchUrl": "resourceBs",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
@@ -19,7 +19,7 @@
     },
     "Kestrel": {
       "commandName": "Project",
-      "launchBrowser": false,
+      "launchBrowser": true,
       "launchUrl": "resourceBs",
       "applicationUrl": "https://localhost:44350;http://localhost:14150",
       "environmentVariables": {
diff --git a/src/Examples/MultiDbContextExample/Repositories/DbContextARepository.cs b/src/Examples/MultiDbContextExample/Repositories/DbContextARepository.cs
index 820c78f241..aadeb889cc 100644
--- a/src/Examples/MultiDbContextExample/Repositories/DbContextARepository.cs
+++ b/src/Examples/MultiDbContextExample/Repositories/DbContextARepository.cs
@@ -1,23 +1,20 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Repositories;
 using JsonApiDotNetCore.Resources;
-using Microsoft.Extensions.Logging;
 using MultiDbContextExample.Data;
 
-namespace MultiDbContextExample.Repositories
+namespace MultiDbContextExample.Repositories;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class DbContextARepository<TResource> : EntityFrameworkCoreRepository<TResource, int>
+    where TResource : class, IIdentifiable<int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class DbContextARepository<TResource> : EntityFrameworkCoreRepository<TResource, int>
-        where TResource : class, IIdentifiable<int>
+    public DbContextARepository(ITargetedFields targetedFields, DbContextResolver<DbContextA> dbContextResolver, IResourceGraph resourceGraph,
+        IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
+        IResourceDefinitionAccessor resourceDefinitionAccessor)
+        : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
     {
-        public DbContextARepository(ITargetedFields targetedFields, DbContextResolver<DbContextA> dbContextResolver, IResourceGraph resourceGraph,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
-            IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
-        {
-        }
     }
 }
diff --git a/src/Examples/MultiDbContextExample/Repositories/DbContextBRepository.cs b/src/Examples/MultiDbContextExample/Repositories/DbContextBRepository.cs
index 98156a7295..ac4ce8789c 100644
--- a/src/Examples/MultiDbContextExample/Repositories/DbContextBRepository.cs
+++ b/src/Examples/MultiDbContextExample/Repositories/DbContextBRepository.cs
@@ -1,23 +1,20 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Repositories;
 using JsonApiDotNetCore.Resources;
-using Microsoft.Extensions.Logging;
 using MultiDbContextExample.Data;
 
-namespace MultiDbContextExample.Repositories
+namespace MultiDbContextExample.Repositories;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class DbContextBRepository<TResource> : EntityFrameworkCoreRepository<TResource, int>
+    where TResource : class, IIdentifiable<int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class DbContextBRepository<TResource> : EntityFrameworkCoreRepository<TResource, int>
-        where TResource : class, IIdentifiable<int>
+    public DbContextBRepository(ITargetedFields targetedFields, DbContextResolver<DbContextB> dbContextResolver, IResourceGraph resourceGraph,
+        IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
+        IResourceDefinitionAccessor resourceDefinitionAccessor)
+        : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
     {
-        public DbContextBRepository(ITargetedFields targetedFields, DbContextResolver<DbContextB> dbContextResolver, IResourceGraph resourceGraph,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
-            IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
-        {
-        }
     }
 }
diff --git a/src/Examples/MultiDbContextExample/Startup.cs b/src/Examples/MultiDbContextExample/Startup.cs
deleted file mode 100644
index 705bf8ef4c..0000000000
--- a/src/Examples/MultiDbContextExample/Startup.cs
+++ /dev/null
@@ -1,79 +0,0 @@
-using JetBrains.Annotations;
-using JsonApiDotNetCore.Configuration;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using MultiDbContextExample.Data;
-using MultiDbContextExample.Models;
-using MultiDbContextExample.Repositories;
-
-namespace MultiDbContextExample
-{
-    public sealed class Startup
-    {
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddDbContext<DbContextA>(options => options.UseSqlite("Data Source=A.db"));
-            services.AddDbContext<DbContextB>(options => options.UseSqlite("Data Source=B.db"));
-
-            services.AddResourceRepository<DbContextARepository<ResourceA>>();
-            services.AddResourceRepository<DbContextBRepository<ResourceB>>();
-
-            services.AddJsonApi(options =>
-            {
-                options.IncludeExceptionStackTraceInErrors = true;
-                options.IncludeRequestBodyInErrors = true;
-            }, dbContextTypes: new[]
-            {
-                typeof(DbContextA),
-                typeof(DbContextB)
-            });
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        [UsedImplicitly]
-        public void Configure(IApplicationBuilder app, IWebHostEnvironment env, DbContextA dbContextA, DbContextB dbContextB)
-        {
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-
-            EnsureSampleDataA(dbContextA);
-            EnsureSampleDataB(dbContextB);
-
-            app.UseRouting();
-            app.UseJsonApi();
-            app.UseEndpoints(endpoints => endpoints.MapControllers());
-        }
-
-        private static void EnsureSampleDataA(DbContextA dbContextA)
-        {
-            dbContextA.Database.EnsureDeleted();
-            dbContextA.Database.EnsureCreated();
-
-            dbContextA.ResourceAs.Add(new ResourceA
-            {
-                NameA = "SampleA"
-            });
-
-            dbContextA.SaveChanges();
-        }
-
-        private static void EnsureSampleDataB(DbContextB dbContextB)
-        {
-            dbContextB.Database.EnsureDeleted();
-            dbContextB.Database.EnsureCreated();
-
-            dbContextB.ResourceBs.Add(new ResourceB
-            {
-                NameB = "SampleB"
-            });
-
-            dbContextB.SaveChanges();
-        }
-    }
-}
diff --git a/src/Examples/NoEntityFrameworkExample/Controllers/WorkItemsController.cs b/src/Examples/NoEntityFrameworkExample/Controllers/WorkItemsController.cs
deleted file mode 100644
index 055fa60ed8..0000000000
--- a/src/Examples/NoEntityFrameworkExample/Controllers/WorkItemsController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-using NoEntityFrameworkExample.Models;
-
-namespace NoEntityFrameworkExample.Controllers
-{
-    public sealed class WorkItemsController : JsonApiController<WorkItem, int>
-    {
-        public WorkItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<WorkItem, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/src/Examples/NoEntityFrameworkExample/Data/AppDbContext.cs b/src/Examples/NoEntityFrameworkExample/Data/AppDbContext.cs
index bfe2115f7d..c10cda8e6c 100644
--- a/src/Examples/NoEntityFrameworkExample/Data/AppDbContext.cs
+++ b/src/Examples/NoEntityFrameworkExample/Data/AppDbContext.cs
@@ -2,16 +2,15 @@
 using Microsoft.EntityFrameworkCore;
 using NoEntityFrameworkExample.Models;
 
-namespace NoEntityFrameworkExample.Data
+namespace NoEntityFrameworkExample.Data;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class AppDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class AppDbContext : DbContext
-    {
-        public DbSet<WorkItem> WorkItems => Set<WorkItem>();
+    public DbSet<WorkItem> WorkItems => Set<WorkItem>();
 
-        public AppDbContext(DbContextOptions<AppDbContext> options)
-            : base(options)
-        {
-        }
+    public AppDbContext(DbContextOptions<AppDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/src/Examples/NoEntityFrameworkExample/Models/WorkItem.cs b/src/Examples/NoEntityFrameworkExample/Models/WorkItem.cs
index 083894fd04..43bf1f422e 100644
--- a/src/Examples/NoEntityFrameworkExample/Models/WorkItem.cs
+++ b/src/Examples/NoEntityFrameworkExample/Models/WorkItem.cs
@@ -1,23 +1,22 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace NoEntityFrameworkExample.Models
+namespace NoEntityFrameworkExample.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource]
+public sealed class WorkItem : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class WorkItem : Identifiable<int>
-    {
-        [Attr]
-        public bool IsBlocked { get; set; }
+    [Attr]
+    public bool IsBlocked { get; set; }
 
-        [Attr]
-        public string Title { get; set; } = null!;
+    [Attr]
+    public string Title { get; set; } = null!;
 
-        [Attr]
-        public long DurationInHours { get; set; }
+    [Attr]
+    public long DurationInHours { get; set; }
 
-        [Attr]
-        public Guid ProjectId { get; set; } = Guid.NewGuid();
-    }
+    [Attr]
+    public Guid ProjectId { get; set; } = Guid.NewGuid();
 }
diff --git a/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj b/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj
index f7c5aa19ec..358d82c02f 100644
--- a/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj
+++ b/src/Examples/NoEntityFrameworkExample/NoEntityFrameworkExample.csproj
@@ -1,15 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
+    <ProjectReference Include="..\..\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
+      ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Dapper" Version="2.0.90" />
+    <PackageReference Include="Dapper" Version="2.0.123" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/Examples/NoEntityFrameworkExample/Program.cs b/src/Examples/NoEntityFrameworkExample/Program.cs
index 6653408dc7..43a14f7896 100755
--- a/src/Examples/NoEntityFrameworkExample/Program.cs
+++ b/src/Examples/NoEntityFrameworkExample/Program.cs
@@ -1,21 +1,41 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
+using JsonApiDotNetCore.Configuration;
+using NoEntityFrameworkExample.Data;
+using NoEntityFrameworkExample.Models;
+using NoEntityFrameworkExample.Services;
 
-namespace NoEntityFrameworkExample
+WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
+
+// Add services to the container.
+
+string connectionString = GetConnectionString(builder.Configuration);
+builder.Services.AddNpgsql<AppDbContext>(connectionString);
+
+builder.Services.AddJsonApi(options => options.Namespace = "api/v1", resources: resourceGraphBuilder => resourceGraphBuilder.Add<WorkItem, int>());
+
+builder.Services.AddResourceService<WorkItemService>();
+
+WebApplication app = builder.Build();
+
+// Configure the HTTP request pipeline.
+
+app.UseRouting();
+app.UseJsonApi();
+app.MapControllers();
+
+await CreateDatabaseAsync(app.Services);
+
+app.Run();
+
+static string GetConnectionString(IConfiguration configuration)
 {
-    internal static class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
-
-        private static IHostBuilder CreateHostBuilder(string[] args)
-        {
-            return Host.CreateDefaultBuilder(args).ConfigureWebHostDefaults(webBuilder =>
-            {
-                webBuilder.UseStartup<Startup>();
-            });
-        }
-    }
+    string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
+    return configuration["Data:DefaultConnection"].Replace("###", postgresPassword);
+}
+
+static async Task CreateDatabaseAsync(IServiceProvider serviceProvider)
+{
+    await using AsyncServiceScope scope = serviceProvider.CreateAsyncScope();
+
+    var dbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+    await dbContext.Database.EnsureCreatedAsync();
 }
diff --git a/src/Examples/NoEntityFrameworkExample/Properties/launchSettings.json b/src/Examples/NoEntityFrameworkExample/Properties/launchSettings.json
index d28c050bd8..82c88ace03 100644
--- a/src/Examples/NoEntityFrameworkExample/Properties/launchSettings.json
+++ b/src/Examples/NoEntityFrameworkExample/Properties/launchSettings.json
@@ -11,7 +11,7 @@
   "profiles": {
     "IIS Express": {
       "commandName": "IISExpress",
-      "launchBrowser": false,
+      "launchBrowser": true,
       "launchUrl": "api/v1/workItems",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
@@ -19,7 +19,7 @@
     },
     "Kestrel": {
       "commandName": "Project",
-      "launchBrowser": false,
+      "launchBrowser": true,
       "launchUrl": "api/v1/workItems",
       "applicationUrl": "https://localhost:44349;http://localhost:14149",
       "environmentVariables": {
diff --git a/src/Examples/NoEntityFrameworkExample/Services/WorkItemService.cs b/src/Examples/NoEntityFrameworkExample/Services/WorkItemService.cs
index 5fbd062b11..6df109e5ba 100644
--- a/src/Examples/NoEntityFrameworkExample/Services/WorkItemService.cs
+++ b/src/Examples/NoEntityFrameworkExample/Services/WorkItemService.cs
@@ -1,116 +1,109 @@
-using System;
-using System.Collections.Generic;
 using System.Data;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using Dapper;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Configuration;
 using NoEntityFrameworkExample.Models;
 using Npgsql;
 
-namespace NoEntityFrameworkExample.Services
+namespace NoEntityFrameworkExample.Services;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class WorkItemService : IResourceService<WorkItem, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class WorkItemService : IResourceService<WorkItem, int>
+    private readonly string _connectionString;
+
+    public WorkItemService(IConfiguration configuration)
     {
-        private readonly string _connectionString;
+        string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
+        _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);
+    }
 
-        public WorkItemService(IConfiguration configuration)
-        {
-            string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
-            _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);
-        }
+    public async Task<IReadOnlyCollection<WorkItem>> GetAsync(CancellationToken cancellationToken)
+    {
+        const string commandText = @"select * from ""WorkItems""";
+        var commandDefinition = new CommandDefinition(commandText, cancellationToken: cancellationToken);
 
-        public async Task<IReadOnlyCollection<WorkItem>> GetAsync(CancellationToken cancellationToken)
-        {
-            const string commandText = @"select * from ""WorkItems""";
-            var commandDefinition = new CommandDefinition(commandText, cancellationToken: cancellationToken);
+        return await QueryAsync(async connection => await connection.QueryAsync<WorkItem>(commandDefinition));
+    }
 
-            return await QueryAsync(async connection => await connection.QueryAsync<WorkItem>(commandDefinition));
-        }
+    public async Task<WorkItem> GetAsync(int id, CancellationToken cancellationToken)
+    {
+        const string commandText = @"select * from ""WorkItems"" where ""Id""=@id";
 
-        public async Task<WorkItem> GetAsync(int id, CancellationToken cancellationToken)
+        var commandDefinition = new CommandDefinition(commandText, new
         {
-            const string commandText = @"select * from ""WorkItems"" where ""Id""=@id";
+            id
+        }, cancellationToken: cancellationToken);
 
-            var commandDefinition = new CommandDefinition(commandText, new
-            {
-                id
-            }, cancellationToken: cancellationToken);
+        IReadOnlyCollection<WorkItem> workItems = await QueryAsync(async connection => await connection.QueryAsync<WorkItem>(commandDefinition));
+        return workItems.Single();
+    }
 
-            IReadOnlyCollection<WorkItem> workItems = await QueryAsync(async connection => await connection.QueryAsync<WorkItem>(commandDefinition));
-            return workItems.Single();
-        }
+    public Task<object?> GetSecondaryAsync(int id, string relationshipName, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-        public Task<object?> GetSecondaryAsync(int id, string relationshipName, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task<object?> GetRelationshipAsync(int id, string relationshipName, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-        public Task<object?> GetRelationshipAsync(int id, string relationshipName, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public async Task<WorkItem?> CreateAsync(WorkItem resource, CancellationToken cancellationToken)
+    {
+        const string commandText = @"insert into ""WorkItems"" (""Title"", ""IsBlocked"", ""DurationInHours"", ""ProjectId"") values " +
+            @"(@title, @isBlocked, @durationInHours, @projectId) returning ""Id"", ""Title"", ""IsBlocked"", ""DurationInHours"", ""ProjectId""";
 
-        public async Task<WorkItem?> CreateAsync(WorkItem resource, CancellationToken cancellationToken)
-        {
-            const string commandText = @"insert into ""WorkItems"" (""Title"", ""IsBlocked"", ""DurationInHours"", ""ProjectId"") values " +
-                @"(@title, @isBlocked, @durationInHours, @projectId) returning ""Id"", ""Title"", ""IsBlocked"", ""DurationInHours"", ""ProjectId""";
-
-            var commandDefinition = new CommandDefinition(commandText, new
-            {
-                title = resource.Title,
-                isBlocked = resource.IsBlocked,
-                durationInHours = resource.DurationInHours,
-                projectId = resource.ProjectId
-            }, cancellationToken: cancellationToken);
-
-            IReadOnlyCollection<WorkItem> workItems = await QueryAsync(async connection => await connection.QueryAsync<WorkItem>(commandDefinition));
-            return workItems.Single();
-        }
-
-        public Task AddToToManyRelationshipAsync(int leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+        var commandDefinition = new CommandDefinition(commandText, new
         {
-            throw new NotImplementedException();
-        }
+            title = resource.Title,
+            isBlocked = resource.IsBlocked,
+            durationInHours = resource.DurationInHours,
+            projectId = resource.ProjectId
+        }, cancellationToken: cancellationToken);
+
+        IReadOnlyCollection<WorkItem> workItems = await QueryAsync(async connection => await connection.QueryAsync<WorkItem>(commandDefinition));
+        return workItems.Single();
+    }
 
-        public Task<WorkItem?> UpdateAsync(int id, WorkItem resource, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task AddToToManyRelationshipAsync(int leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-        public Task SetRelationshipAsync(int leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task<WorkItem?> UpdateAsync(int id, WorkItem resource, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-        public async Task DeleteAsync(int id, CancellationToken cancellationToken)
-        {
-            const string commandText = @"delete from ""WorkItems"" where ""Id""=@id";
+    public Task SetRelationshipAsync(int leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
 
-            await QueryAsync(async connection => await connection.QueryAsync<WorkItem>(new CommandDefinition(commandText, new
-            {
-                id
-            }, cancellationToken: cancellationToken)));
-        }
+    public async Task DeleteAsync(int id, CancellationToken cancellationToken)
+    {
+        const string commandText = @"delete from ""WorkItems"" where ""Id""=@id";
 
-        public Task RemoveFromToManyRelationshipAsync(int leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
+        await QueryAsync(async connection => await connection.QueryAsync<WorkItem>(new CommandDefinition(commandText, new
         {
-            throw new NotImplementedException();
-        }
+            id
+        }, cancellationToken: cancellationToken)));
+    }
 
-        private async Task<IReadOnlyCollection<T>> QueryAsync<T>(Func<IDbConnection, Task<IEnumerable<T>>> query)
-        {
-            using IDbConnection dbConnection = new NpgsqlConnection(_connectionString);
-            dbConnection.Open();
+    public Task RemoveFromToManyRelationshipAsync(int leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        throw new NotImplementedException();
+    }
+
+    private async Task<IReadOnlyCollection<T>> QueryAsync<T>(Func<IDbConnection, Task<IEnumerable<T>>> query)
+    {
+        using IDbConnection dbConnection = new NpgsqlConnection(_connectionString);
+        dbConnection.Open();
 
-            IEnumerable<T> resources = await query(dbConnection);
-            return resources.ToList();
-        }
+        IEnumerable<T> resources = await query(dbConnection);
+        return resources.ToList();
     }
 }
diff --git a/src/Examples/NoEntityFrameworkExample/Startup.cs b/src/Examples/NoEntityFrameworkExample/Startup.cs
deleted file mode 100644
index dc86192832..0000000000
--- a/src/Examples/NoEntityFrameworkExample/Startup.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using JetBrains.Annotations;
-using JsonApiDotNetCore.Configuration;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using NoEntityFrameworkExample.Data;
-using NoEntityFrameworkExample.Models;
-using NoEntityFrameworkExample.Services;
-
-namespace NoEntityFrameworkExample
-{
-    public sealed class Startup
-    {
-        private readonly string _connectionString;
-
-        public Startup(IConfiguration configuration)
-        {
-            string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
-            _connectionString = configuration["Data:DefaultConnection"].Replace("###", postgresPassword);
-        }
-
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddJsonApi(options => options.Namespace = "api/v1", resources: builder => builder.Add<WorkItem, int>("workItems"));
-
-            services.AddResourceService<WorkItemService>();
-
-            services.AddDbContext<AppDbContext>(options => options.UseNpgsql(_connectionString));
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        [UsedImplicitly]
-        public void Configure(IApplicationBuilder app, AppDbContext dbContext)
-        {
-            dbContext.Database.EnsureCreated();
-
-            app.UseRouting();
-            app.UseJsonApi();
-            app.UseEndpoints(endpoints => endpoints.MapControllers());
-        }
-    }
-}
diff --git a/src/Examples/ReportsExample/Controllers/ReportsController.cs b/src/Examples/ReportsExample/Controllers/ReportsController.cs
deleted file mode 100644
index 8c177e7db0..0000000000
--- a/src/Examples/ReportsExample/Controllers/ReportsController.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Threading;
-using System.Threading.Tasks;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
-using ReportsExample.Models;
-
-namespace ReportsExample.Controllers
-{
-    [Route("api/[controller]")]
-    public class ReportsController : BaseJsonApiController<Report, int>
-    {
-        public ReportsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IGetAllService<Report, int> getAllService)
-            : base(options, resourceGraph, loggerFactory, getAllService)
-        {
-        }
-
-        [HttpGet]
-        public override async Task<IActionResult> GetAsync(CancellationToken cancellationToken)
-        {
-            return await base.GetAsync(cancellationToken);
-        }
-    }
-}
diff --git a/src/Examples/ReportsExample/Models/Report.cs b/src/Examples/ReportsExample/Models/Report.cs
index 65f6972d16..5344025d2e 100644
--- a/src/Examples/ReportsExample/Models/Report.cs
+++ b/src/Examples/ReportsExample/Models/Report.cs
@@ -1,16 +1,17 @@
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace ReportsExample.Models
+namespace ReportsExample.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(GenerateControllerEndpoints = JsonApiEndpoints.GetCollection)]
+public sealed class Report : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Report : Identifiable<int>
-    {
-        [Attr]
-        public string Title { get; set; } = null!;
+    [Attr]
+    public string Title { get; set; } = null!;
 
-        [Attr]
-        public ReportStatistics Statistics { get; set; } = null!;
-    }
+    [Attr]
+    public ReportStatistics Statistics { get; set; } = null!;
 }
diff --git a/src/Examples/ReportsExample/Models/ReportStatistics.cs b/src/Examples/ReportsExample/Models/ReportStatistics.cs
index 7c520eded8..2df01f9b5e 100644
--- a/src/Examples/ReportsExample/Models/ReportStatistics.cs
+++ b/src/Examples/ReportsExample/Models/ReportStatistics.cs
@@ -1,11 +1,10 @@
 using JetBrains.Annotations;
 
-namespace ReportsExample.Models
+namespace ReportsExample.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class ReportStatistics
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ReportStatistics
-    {
-        public string ProgressIndication { get; set; } = null!;
-        public int HoursSpent { get; set; }
-    }
+    public string ProgressIndication { get; set; } = null!;
+    public int HoursSpent { get; set; }
 }
diff --git a/src/Examples/ReportsExample/Program.cs b/src/Examples/ReportsExample/Program.cs
index 6356b0f52a..16abac381f 100644
--- a/src/Examples/ReportsExample/Program.cs
+++ b/src/Examples/ReportsExample/Program.cs
@@ -1,21 +1,17 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.Extensions.Hosting;
+using JsonApiDotNetCore.Configuration;
 
-namespace ReportsExample
-{
-    internal static class Program
-    {
-        public static void Main(string[] args)
-        {
-            CreateHostBuilder(args).Build().Run();
-        }
+WebApplicationBuilder builder = WebApplication.CreateBuilder(args);
 
-        private static IHostBuilder CreateHostBuilder(string[] args)
-        {
-            return Host.CreateDefaultBuilder(args).ConfigureWebHostDefaults(webBuilder =>
-            {
-                webBuilder.UseStartup<Startup>();
-            });
-        }
-    }
-}
+// Add services to the container.
+
+builder.Services.AddJsonApi(options => options.Namespace = "api", discovery => discovery.AddCurrentAssembly());
+
+WebApplication app = builder.Build();
+
+// Configure the HTTP request pipeline.
+
+app.UseRouting();
+app.UseJsonApi();
+app.MapControllers();
+
+app.Run();
diff --git a/src/Examples/ReportsExample/ReportsExample.csproj b/src/Examples/ReportsExample/ReportsExample.csproj
index 95c1faf884..b243e99ec2 100644
--- a/src/Examples/ReportsExample/ReportsExample.csproj
+++ b/src/Examples/ReportsExample/ReportsExample.csproj
@@ -1,14 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
+    <ProjectReference Include="..\..\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
+      ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/Examples/ReportsExample/Services/ReportService.cs b/src/Examples/ReportsExample/Services/ReportService.cs
index 19f18bfed3..61a97ecde5 100644
--- a/src/Examples/ReportsExample/Services/ReportService.cs
+++ b/src/Examples/ReportsExample/Services/ReportService.cs
@@ -1,47 +1,42 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
 using ReportsExample.Models;
 
-namespace ReportsExample.Services
+namespace ReportsExample.Services;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public class ReportService : IGetAllService<Report, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public class ReportService : IGetAllService<Report, int>
-    {
-        private readonly ILogger<ReportService> _logger;
+    private readonly ILogger<ReportService> _logger;
 
-        public ReportService(ILoggerFactory loggerFactory)
-        {
-            _logger = loggerFactory.CreateLogger<ReportService>();
-        }
+    public ReportService(ILoggerFactory loggerFactory)
+    {
+        _logger = loggerFactory.CreateLogger<ReportService>();
+    }
 
-        public Task<IReadOnlyCollection<Report>> GetAsync(CancellationToken cancellationToken)
-        {
-            _logger.LogInformation("GetAsync");
+    public Task<IReadOnlyCollection<Report>> GetAsync(CancellationToken cancellationToken)
+    {
+        _logger.LogInformation("GetAsync");
 
-            IReadOnlyCollection<Report> reports = GetReports();
+        IReadOnlyCollection<Report> reports = GetReports();
 
-            return Task.FromResult(reports);
-        }
+        return Task.FromResult(reports);
+    }
 
-        private IReadOnlyCollection<Report> GetReports()
+    private IReadOnlyCollection<Report> GetReports()
+    {
+        return new List<Report>
         {
-            return new List<Report>
+            new()
             {
-                new()
+                Id = 1,
+                Title = "Status Report",
+                Statistics = new ReportStatistics
                 {
-                    Id = 1,
-                    Title = "Status Report",
-                    Statistics = new ReportStatistics
-                    {
-                        ProgressIndication = "Almost done",
-                        HoursSpent = 24
-                    }
+                    ProgressIndication = "Almost done",
+                    HoursSpent = 24
                 }
-            };
-        }
+            }
+        };
     }
 }
diff --git a/src/Examples/ReportsExample/Startup.cs b/src/Examples/ReportsExample/Startup.cs
deleted file mode 100644
index a030441258..0000000000
--- a/src/Examples/ReportsExample/Startup.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace ReportsExample
-{
-    public sealed class Startup
-    {
-        // This method gets called by the runtime. Use this method to add services to the container.
-        public void ConfigureServices(IServiceCollection services)
-        {
-            services.AddJsonApi(options => options.Namespace = "api", discovery => discovery.AddCurrentAssembly());
-        }
-
-        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app)
-        {
-            app.UseRouting();
-            app.UseJsonApi();
-            app.UseEndpoints(endpoints => endpoints.MapControllers());
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore.Annotations/.editorconfig b/src/JsonApiDotNetCore.Annotations/.editorconfig
new file mode 100644
index 0000000000..6e602763d4
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/.editorconfig
@@ -0,0 +1,4 @@
+[*.cs]
+
+# AV1505: Namespace should match with assembly name
+dotnet_diagnostic.AV1505.severity = none
diff --git a/src/JsonApiDotNetCore.Annotations/ArgumentGuard.cs b/src/JsonApiDotNetCore.Annotations/ArgumentGuard.cs
new file mode 100644
index 0000000000..23b64d1044
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/ArgumentGuard.cs
@@ -0,0 +1,41 @@
+using JetBrains.Annotations;
+using SysNotNull = System.Diagnostics.CodeAnalysis.NotNullAttribute;
+
+#pragma warning disable AV1008 // Class should not be static
+
+namespace JsonApiDotNetCore;
+
+internal static class ArgumentGuard
+{
+    [AssertionMethod]
+    public static void NotNull<T>([NoEnumeration] [SysNotNull] T? value, [InvokerParameterName] string name)
+        where T : class
+    {
+        if (value is null)
+        {
+            throw new ArgumentNullException(name);
+        }
+    }
+
+    [AssertionMethod]
+    public static void NotNullNorEmpty<T>([SysNotNull] IEnumerable<T>? value, [InvokerParameterName] string name, string? collectionName = null)
+    {
+        NotNull(value, name);
+
+        if (!value.Any())
+        {
+            throw new ArgumentException($"Must have one or more {collectionName ?? name}.", name);
+        }
+    }
+
+    [AssertionMethod]
+    public static void NotNullNorEmpty([SysNotNull] string? value, [InvokerParameterName] string name)
+    {
+        NotNull(value, name);
+
+        if (value == string.Empty)
+        {
+            throw new ArgumentException("String cannot be null or empty.", name);
+        }
+    }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/CollectionConverter.cs b/src/JsonApiDotNetCore.Annotations/CollectionConverter.cs
new file mode 100644
index 0000000000..88037e66e3
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/CollectionConverter.cs
@@ -0,0 +1,124 @@
+using System.Collections;
+using JsonApiDotNetCore.Resources;
+
+namespace JsonApiDotNetCore;
+
+internal sealed class CollectionConverter
+{
+    private static readonly ISet<Type> HashSetCompatibleCollectionTypes = new HashSet<Type>
+    {
+        typeof(HashSet<>),
+        typeof(ISet<>),
+        typeof(IReadOnlySet<>),
+        typeof(ICollection<>),
+        typeof(IReadOnlyCollection<>),
+        typeof(IEnumerable<>)
+    };
+
+    /// <summary>
+    /// Creates a collection instance based on the specified collection type and copies the specified elements into it.
+    /// </summary>
+    /// <param name="source">
+    /// Source to copy from.
+    /// </param>
+    /// <param name="collectionType">
+    /// Target collection type, for example: typeof(List{Article}) or typeof(ISet{Person}).
+    /// </param>
+    public IEnumerable CopyToTypedCollection(IEnumerable source, Type collectionType)
+    {
+        ArgumentGuard.NotNull(source, nameof(source));
+        ArgumentGuard.NotNull(collectionType, nameof(collectionType));
+
+        Type concreteCollectionType = ToConcreteCollectionType(collectionType);
+        dynamic concreteCollectionInstance = Activator.CreateInstance(concreteCollectionType)!;
+
+        foreach (object item in source)
+        {
+            concreteCollectionInstance.Add((dynamic)item);
+        }
+
+        return concreteCollectionInstance;
+    }
+
+    /// <summary>
+    /// Returns a compatible collection type that can be instantiated, for example IList{Article} -> List{Article} or ISet{Article} -> HashSet{Article}
+    /// </summary>
+    private Type ToConcreteCollectionType(Type collectionType)
+    {
+        if (collectionType.IsInterface && collectionType.IsGenericType)
+        {
+            Type openCollectionType = collectionType.GetGenericTypeDefinition();
+
+            if (HashSetCompatibleCollectionTypes.Contains(openCollectionType))
+            {
+                return typeof(HashSet<>).MakeGenericType(collectionType.GenericTypeArguments[0]);
+            }
+
+            if (openCollectionType == typeof(IList<>) || openCollectionType == typeof(IReadOnlyList<>))
+            {
+                return typeof(List<>).MakeGenericType(collectionType.GenericTypeArguments[0]);
+            }
+        }
+
+        return collectionType;
+    }
+
+    /// <summary>
+    /// Returns a collection that contains zero, one or multiple resources, depending on the specified value.
+    /// </summary>
+    public ICollection<IIdentifiable> ExtractResources(object? value)
+    {
+        if (value is ICollection<IIdentifiable> resourceCollection)
+        {
+            return resourceCollection;
+        }
+
+        if (value is IEnumerable<IIdentifiable> resources)
+        {
+            return resources.ToList();
+        }
+
+        if (value is IIdentifiable resource)
+        {
+            return resource.AsArray();
+        }
+
+        return Array.Empty<IIdentifiable>();
+    }
+
+    /// <summary>
+    /// Returns the element type if the specified type is a generic collection, for example: IList{string} -> string or IList -> null.
+    /// </summary>
+    public Type? FindCollectionElementType(Type? type)
+    {
+        if (type != null)
+        {
+            if (type.IsGenericType && type.GenericTypeArguments.Length == 1)
+            {
+                if (type.IsOrImplementsInterface<IEnumerable>())
+                {
+                    return type.GenericTypeArguments[0];
+                }
+            }
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Indicates whether a <see cref="HashSet{T}" /> instance can be assigned to the specified type, for example IList{Article} -> false or ISet{Article} ->
+    /// true.
+    /// </summary>
+    public bool TypeCanContainHashSet(Type collectionType)
+    {
+        ArgumentGuard.NotNull(collectionType, nameof(collectionType));
+
+        if (collectionType.IsGenericType)
+        {
+            Type openCollectionType = collectionType.GetGenericTypeDefinition();
+            return HashSetCompatibleCollectionTypes.Contains(openCollectionType);
+        }
+
+        return false;
+    }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Configuration/ResourceType.cs b/src/JsonApiDotNetCore.Annotations/Configuration/ResourceType.cs
new file mode 100644
index 0000000000..ce7ccd1870
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Configuration/ResourceType.cs
@@ -0,0 +1,217 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Metadata about the shape of a JSON:API resource in the resource graph.
+/// </summary>
+[PublicAPI]
+public sealed class ResourceType
+{
+    private readonly Dictionary<string, ResourceFieldAttribute> _fieldsByPublicName = new();
+    private readonly Dictionary<string, ResourceFieldAttribute> _fieldsByPropertyName = new();
+
+    /// <summary>
+    /// The publicly exposed resource name.
+    /// </summary>
+    public string PublicName { get; }
+
+    /// <summary>
+    /// The CLR type of the resource.
+    /// </summary>
+    public Type ClrType { get; }
+
+    /// <summary>
+    /// The CLR type of the resource identity.
+    /// </summary>
+    public Type IdentityClrType { get; }
+
+    /// <summary>
+    /// Exposed resource attributes and relationships. See https://jsonapi.org/format/#document-resource-object-fields.
+    /// </summary>
+    public IReadOnlyCollection<ResourceFieldAttribute> Fields { get; }
+
+    /// <summary>
+    /// Exposed resource attributes. See https://jsonapi.org/format/#document-resource-object-attributes.
+    /// </summary>
+    public IReadOnlyCollection<AttrAttribute> Attributes { get; }
+
+    /// <summary>
+    /// Exposed resource relationships. See https://jsonapi.org/format/#document-resource-object-relationships.
+    /// </summary>
+    public IReadOnlyCollection<RelationshipAttribute> Relationships { get; }
+
+    /// <summary>
+    /// Related entities that are not exposed as resource relationships.
+    /// </summary>
+    public IReadOnlyCollection<EagerLoadAttribute> EagerLoads { get; }
+
+    /// <summary>
+    /// Configures which links to write in the top-level links object for this resource type. Defaults to <see cref="LinkTypes.NotConfigured" />, which falls
+    /// back to TopLevelLinks in global options.
+    /// </summary>
+    /// <remarks>
+    /// In the process of building the resource graph, this value is set based on <see cref="ResourceLinksAttribute.TopLevelLinks" /> usage.
+    /// </remarks>
+    public LinkTypes TopLevelLinks { get; }
+
+    /// <summary>
+    /// Configures which links to write in the resource-level links object for this resource type. Defaults to <see cref="LinkTypes.NotConfigured" />, which
+    /// falls back to ResourceLinks in global options.
+    /// </summary>
+    /// <remarks>
+    /// In the process of building the resource graph, this value is set based on <see cref="ResourceLinksAttribute.ResourceLinks" /> usage.
+    /// </remarks>
+    public LinkTypes ResourceLinks { get; }
+
+    /// <summary>
+    /// Configures which links to write in the relationship-level links object for all relationships of this resource type. Defaults to
+    /// <see cref="LinkTypes.NotConfigured" />, which falls back to RelationshipLinks in global options. This can be overruled per relationship by setting
+    /// <see cref="RelationshipAttribute.Links" />.
+    /// </summary>
+    /// <remarks>
+    /// In the process of building the resource graph, this value is set based on <see cref="ResourceLinksAttribute.RelationshipLinks" /> usage.
+    /// </remarks>
+    public LinkTypes RelationshipLinks { get; }
+
+    public ResourceType(string publicName, Type clrType, Type identityClrType, IReadOnlyCollection<AttrAttribute>? attributes = null,
+        IReadOnlyCollection<RelationshipAttribute>? relationships = null, IReadOnlyCollection<EagerLoadAttribute>? eagerLoads = null,
+        LinkTypes topLevelLinks = LinkTypes.NotConfigured, LinkTypes resourceLinks = LinkTypes.NotConfigured,
+        LinkTypes relationshipLinks = LinkTypes.NotConfigured)
+    {
+        ArgumentGuard.NotNullNorEmpty(publicName, nameof(publicName));
+        ArgumentGuard.NotNull(clrType, nameof(clrType));
+        ArgumentGuard.NotNull(identityClrType, nameof(identityClrType));
+
+        PublicName = publicName;
+        ClrType = clrType;
+        IdentityClrType = identityClrType;
+        Attributes = attributes ?? Array.Empty<AttrAttribute>();
+        Relationships = relationships ?? Array.Empty<RelationshipAttribute>();
+        EagerLoads = eagerLoads ?? Array.Empty<EagerLoadAttribute>();
+        TopLevelLinks = topLevelLinks;
+        ResourceLinks = resourceLinks;
+        RelationshipLinks = relationshipLinks;
+        Fields = Attributes.Cast<ResourceFieldAttribute>().Concat(Relationships).ToArray();
+
+        foreach (ResourceFieldAttribute field in Fields)
+        {
+            _fieldsByPublicName.Add(field.PublicName, field);
+            _fieldsByPropertyName.Add(field.Property.Name, field);
+        }
+    }
+
+    public AttrAttribute GetAttributeByPublicName(string publicName)
+    {
+        AttrAttribute? attribute = FindAttributeByPublicName(publicName);
+        return attribute ?? throw new InvalidOperationException($"Attribute '{publicName}' does not exist on resource type '{PublicName}'.");
+    }
+
+    public AttrAttribute? FindAttributeByPublicName(string publicName)
+    {
+        ArgumentGuard.NotNull(publicName, nameof(publicName));
+
+        return _fieldsByPublicName.TryGetValue(publicName, out ResourceFieldAttribute? field) && field is AttrAttribute attribute ? attribute : null;
+    }
+
+    public AttrAttribute GetAttributeByPropertyName(string propertyName)
+    {
+        AttrAttribute? attribute = FindAttributeByPropertyName(propertyName);
+
+        return attribute ?? throw new InvalidOperationException($"Attribute for property '{propertyName}' does not exist on resource type '{ClrType.Name}'.");
+    }
+
+    public AttrAttribute? FindAttributeByPropertyName(string propertyName)
+    {
+        ArgumentGuard.NotNull(propertyName, nameof(propertyName));
+
+        return _fieldsByPropertyName.TryGetValue(propertyName, out ResourceFieldAttribute? field) && field is AttrAttribute attribute ? attribute : null;
+    }
+
+    public RelationshipAttribute GetRelationshipByPublicName(string publicName)
+    {
+        RelationshipAttribute? relationship = FindRelationshipByPublicName(publicName);
+        return relationship ?? throw new InvalidOperationException($"Relationship '{publicName}' does not exist on resource type '{PublicName}'.");
+    }
+
+    public RelationshipAttribute? FindRelationshipByPublicName(string publicName)
+    {
+        ArgumentGuard.NotNull(publicName, nameof(publicName));
+
+        return _fieldsByPublicName.TryGetValue(publicName, out ResourceFieldAttribute? field) && field is RelationshipAttribute relationship
+            ? relationship
+            : null;
+    }
+
+    public RelationshipAttribute GetRelationshipByPropertyName(string propertyName)
+    {
+        RelationshipAttribute? relationship = FindRelationshipByPropertyName(propertyName);
+
+        return relationship ??
+            throw new InvalidOperationException($"Relationship for property '{propertyName}' does not exist on resource type '{ClrType.Name}'.");
+    }
+
+    public RelationshipAttribute? FindRelationshipByPropertyName(string propertyName)
+    {
+        ArgumentGuard.NotNull(propertyName, nameof(propertyName));
+
+        return _fieldsByPropertyName.TryGetValue(propertyName, out ResourceFieldAttribute? field) && field is RelationshipAttribute relationship
+            ? relationship
+            : null;
+    }
+
+    public override string ToString()
+    {
+        return PublicName;
+    }
+
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
+        }
+
+        if (obj is null || GetType() != obj.GetType())
+        {
+            return false;
+        }
+
+        var other = (ResourceType)obj;
+
+        return PublicName == other.PublicName && ClrType == other.ClrType && IdentityClrType == other.IdentityClrType &&
+            Attributes.SequenceEqual(other.Attributes) && Relationships.SequenceEqual(other.Relationships) && EagerLoads.SequenceEqual(other.EagerLoads) &&
+            TopLevelLinks == other.TopLevelLinks && ResourceLinks == other.ResourceLinks && RelationshipLinks == other.RelationshipLinks;
+    }
+
+    public override int GetHashCode()
+    {
+        var hashCode = new HashCode();
+
+        hashCode.Add(PublicName);
+        hashCode.Add(ClrType);
+        hashCode.Add(IdentityClrType);
+
+        foreach (AttrAttribute attribute in Attributes)
+        {
+            hashCode.Add(attribute);
+        }
+
+        foreach (RelationshipAttribute relationship in Relationships)
+        {
+            hashCode.Add(relationship);
+        }
+
+        foreach (EagerLoadAttribute eagerLoad in EagerLoads)
+        {
+            hashCode.Add(eagerLoad);
+        }
+
+        hashCode.Add(TopLevelLinks);
+        hashCode.Add(ResourceLinks);
+        hashCode.Add(RelationshipLinks);
+
+        return hashCode.ToHashCode();
+    }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Controllers/JsonApiEndpoints.cs b/src/JsonApiDotNetCore.Annotations/Controllers/JsonApiEndpoints.cs
new file mode 100644
index 0000000000..92ba933fe3
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Controllers/JsonApiEndpoints.cs
@@ -0,0 +1,29 @@
+using JetBrains.Annotations;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Controllers;
+
+// IMPORTANT: An internal copy of this type exists in the SourceGenerators project. Keep these in sync when making changes.
+[PublicAPI]
+[Flags]
+public enum JsonApiEndpoints
+{
+    None = 0,
+    GetCollection = 1,
+    GetSingle = 1 << 1,
+    GetSecondary = 1 << 2,
+    GetRelationship = 1 << 3,
+    Post = 1 << 4,
+    PostRelationship = 1 << 5,
+    Patch = 1 << 6,
+    PatchRelationship = 1 << 7,
+    Delete = 1 << 8,
+    DeleteRelationship = 1 << 9,
+
+    Query = GetCollection | GetSingle | GetSecondary | GetRelationship,
+    Command = Post | PostRelationship | Patch | PatchRelationship | Delete | DeleteRelationship,
+
+    All = Query | Command
+}
diff --git a/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj b/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj
new file mode 100644
index 0000000000..7c78f620ed
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/JsonApiDotNetCore.Annotations.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
+    <IsPackable>true</IsPackable>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <RootNamespace>JsonApiDotNetCore</RootNamespace>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
+    <PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net;rest;web-api</PackageTags>
+    <Description>Annotations for JsonApiDotNetCore, a framework for building JSON:API compliant REST APIs using ASP.NET and Entity Framework Core.</Description>
+    <Authors>json-api-dotnet</Authors>
+    <PackageProjectUrl>https://www.jsonapi.net/</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageReleaseNotes>See https://github.com/json-api-dotnet/JsonApiDotNetCore/releases.</PackageReleaseNotes>
+    <PackageIcon>logo.png</PackageIcon>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <DebugType>embedded</DebugType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\..\logo.png" Visible="false">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+</Project>
diff --git a/src/JsonApiDotNetCore.Annotations/ObjectExtensions.cs b/src/JsonApiDotNetCore.Annotations/ObjectExtensions.cs
new file mode 100644
index 0000000000..bd42993803
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/ObjectExtensions.cs
@@ -0,0 +1,35 @@
+#pragma warning disable AV1130 // Return type in method signature should be a collection interface instead of a concrete type
+
+namespace JsonApiDotNetCore;
+
+internal static class ObjectExtensions
+{
+    public static IEnumerable<T> AsEnumerable<T>(this T element)
+    {
+        yield return element;
+    }
+
+    public static T[] AsArray<T>(this T element)
+    {
+        return new[]
+        {
+            element
+        };
+    }
+
+    public static List<T> AsList<T>(this T element)
+    {
+        return new List<T>
+        {
+            element
+        };
+    }
+
+    public static HashSet<T> AsHashSet<T>(this T element)
+    {
+        return new HashSet<T>
+        {
+            element
+        };
+    }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Properties/AssemblyInfo.cs b/src/JsonApiDotNetCore.Annotations/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000000..e8f009badb
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Properties/AssemblyInfo.cs
@@ -0,0 +1,8 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("Benchmarks")]
+[assembly: InternalsVisibleTo("JsonApiDotNetCore")]
+[assembly: InternalsVisibleTo("JsonApiDotNetCore.OpenApi")]
+[assembly: InternalsVisibleTo("JsonApiDotNetCoreTests")]
+[assembly: InternalsVisibleTo("UnitTests")]
+[assembly: InternalsVisibleTo("TestBuildingBlocks")]
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/AttrAttribute.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/AttrAttribute.cs
new file mode 100644
index 0000000000..d3d6133f6e
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/AttrAttribute.cs
@@ -0,0 +1,56 @@
+using JetBrains.Annotations;
+
+namespace JsonApiDotNetCore.Resources.Annotations;
+
+/// <summary>
+/// Used to expose a property on a resource class as a JSON:API attribute (https://jsonapi.org/format/#document-resource-object-attributes).
+/// </summary>
+[PublicAPI]
+[AttributeUsage(AttributeTargets.Property)]
+public sealed class AttrAttribute : ResourceFieldAttribute
+{
+    private AttrCapabilities? _capabilities;
+
+    internal bool HasExplicitCapabilities => _capabilities != null;
+
+    /// <summary>
+    /// The set of capabilities that are allowed to be performed on this attribute. When not explicitly assigned, the configured default set of capabilities
+    /// is used.
+    /// </summary>
+    /// <example>
+    /// <code>
+    /// public class Author : Identifiable
+    /// {
+    ///     [Attr(Capabilities = AttrCapabilities.AllowFilter | AttrCapabilities.AllowSort)]
+    ///     public string Name { get; set; }
+    /// }
+    /// </code>
+    /// </example>
+    public AttrCapabilities Capabilities
+    {
+        get => _capabilities ?? default;
+        set => _capabilities = value;
+    }
+
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
+        }
+
+        if (obj is null || GetType() != obj.GetType())
+        {
+            return false;
+        }
+
+        var other = (AttrAttribute)obj;
+
+        return Capabilities == other.Capabilities && base.Equals(other);
+    }
+
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(Capabilities, base.GetHashCode());
+    }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/AttrCapabilities.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/AttrCapabilities.cs
new file mode 100644
index 0000000000..c6f849fdff
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/AttrCapabilities.cs
@@ -0,0 +1,37 @@
+namespace JsonApiDotNetCore.Resources.Annotations;
+
+/// <summary>
+/// Indicates capabilities that can be performed on an <see cref="AttrAttribute" />.
+/// </summary>
+[Flags]
+public enum AttrCapabilities
+{
+    None = 0,
+
+    /// <summary>
+    /// Whether or not GET requests can retrieve the attribute. Attempts to retrieve when disabled will return an HTTP 400 response.
+    /// </summary>
+    AllowView = 1,
+
+    /// <summary>
+    /// Whether or not POST requests can assign the attribute value. Attempts to assign when disabled will return an HTTP 422 response.
+    /// </summary>
+    AllowCreate = 2,
+
+    /// <summary>
+    /// Whether or not PATCH requests can update the attribute value. Attempts to update when disabled will return an HTTP 422 response.
+    /// </summary>
+    AllowChange = 4,
+
+    /// <summary>
+    /// Whether or not an attribute can be filtered on via a query string parameter. Attempts to filter when disabled will return an HTTP 400 response.
+    /// </summary>
+    AllowFilter = 8,
+
+    /// <summary>
+    /// Whether or not an attribute can be sorted on via a query string parameter. Attempts to sort when disabled will return an HTTP 400 response.
+    /// </summary>
+    AllowSort = 16,
+
+    All = AllowView | AllowCreate | AllowChange | AllowFilter | AllowSort
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/EagerLoadAttribute.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/EagerLoadAttribute.cs
new file mode 100644
index 0000000000..7879d74e88
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/EagerLoadAttribute.cs
@@ -0,0 +1,44 @@
+using System.Reflection;
+using JetBrains.Annotations;
+
+namespace JsonApiDotNetCore.Resources.Annotations;
+
+/// <summary>
+/// Used to unconditionally load a related entity that is not exposed as a JSON:API relationship.
+/// </summary>
+/// <remarks>
+/// This is intended for calculated properties that are exposed as JSON:API attributes, which depend on a related entity to always be loaded.
+/// <example><![CDATA[
+/// public class User : Identifiable
+/// {
+///     [Attr(AttrCapabilities.AllowFilter | AttrCapabilities.AllowSort)]
+///     [NotMapped]
+///     public string DisplayName => Name.First + " " + Name.Last;
+/// 
+///     [EagerLoad]
+///     public Name Name { get; set; }
+/// }
+/// 
+/// public class Name // not exposed as resource, only database table
+/// {
+///     public string First { get; set; }
+///     public string Last { get; set; }
+/// }
+/// 
+/// public class Blog : Identifiable
+/// {
+///     [HasOne]
+///     public User Author { get; set; }
+/// }
+/// ]]></example>
+/// </remarks>
+[PublicAPI]
+[AttributeUsage(AttributeTargets.Property)]
+public sealed class EagerLoadAttribute : Attribute
+{
+    // These properties are definitely assigned after building the resource graph, which is why they are declared as non-nullable.
+
+    public PropertyInfo Property { get; internal set; } = null!;
+
+    public IReadOnlyCollection<EagerLoadAttribute> Children { get; internal set; } = null!;
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasManyAttribute.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasManyAttribute.cs
new file mode 100644
index 0000000000..39bcf34b3f
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasManyAttribute.cs
@@ -0,0 +1,44 @@
+using JetBrains.Annotations;
+
+namespace JsonApiDotNetCore.Resources.Annotations;
+
+/// <summary>
+/// Used to expose a property on a resource class as a JSON:API to-many relationship
+/// (https://jsonapi.org/format/#document-resource-object-relationships).
+/// </summary>
+/// <example>
+/// <code><![CDATA[
+/// public class Author : Identifiable
+/// {
+///     [HasMany]
+///     public ISet<Article> Articles { get; set; }
+/// }
+/// ]]></code>
+/// </example>
+[PublicAPI]
+[AttributeUsage(AttributeTargets.Property)]
+public sealed class HasManyAttribute : RelationshipAttribute
+{
+    private readonly Lazy<bool> _lazyIsManyToMany;
+
+    /// <summary>
+    /// Inspects <see cref="RelationshipAttribute.InverseNavigationProperty" /> to determine if this is a many-to-many relationship.
+    /// </summary>
+    internal bool IsManyToMany => _lazyIsManyToMany.Value;
+
+    public HasManyAttribute()
+    {
+        _lazyIsManyToMany = new Lazy<bool>(EvaluateIsManyToMany, LazyThreadSafetyMode.PublicationOnly);
+    }
+
+    private bool EvaluateIsManyToMany()
+    {
+        if (InverseNavigationProperty != null)
+        {
+            Type? elementType = CollectionConverter.FindCollectionElementType(InverseNavigationProperty.PropertyType);
+            return elementType != null;
+        }
+
+        return false;
+    }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasOneAttribute.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasOneAttribute.cs
new file mode 100644
index 0000000000..0a68f702d3
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/HasOneAttribute.cs
@@ -0,0 +1,43 @@
+using JetBrains.Annotations;
+
+namespace JsonApiDotNetCore.Resources.Annotations;
+
+/// <summary>
+/// Used to expose a property on a resource class as a JSON:API to-one relationship (https://jsonapi.org/format/#document-resource-object-relationships).
+/// </summary>
+/// <example>
+/// <code><![CDATA[
+/// public class Article : Identifiable
+/// {
+///     [HasOne]
+///     public Author Author { get; set; }
+/// }
+/// ]]></code>
+/// </example>
+[PublicAPI]
+[AttributeUsage(AttributeTargets.Property)]
+public sealed class HasOneAttribute : RelationshipAttribute
+{
+    private readonly Lazy<bool> _lazyIsOneToOne;
+
+    /// <summary>
+    /// Inspects <see cref="RelationshipAttribute.InverseNavigationProperty" /> to determine if this is a one-to-one relationship.
+    /// </summary>
+    internal bool IsOneToOne => _lazyIsOneToOne.Value;
+
+    public HasOneAttribute()
+    {
+        _lazyIsOneToOne = new Lazy<bool>(EvaluateIsOneToOne, LazyThreadSafetyMode.PublicationOnly);
+    }
+
+    private bool EvaluateIsOneToOne()
+    {
+        if (InverseNavigationProperty != null)
+        {
+            Type? elementType = CollectionConverter.FindCollectionElementType(InverseNavigationProperty.PropertyType);
+            return elementType == null;
+        }
+
+        return false;
+    }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/LinkTypes.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/LinkTypes.cs
new file mode 100644
index 0000000000..61c7e9d927
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/LinkTypes.cs
@@ -0,0 +1,12 @@
+namespace JsonApiDotNetCore.Resources.Annotations;
+
+[Flags]
+public enum LinkTypes
+{
+    Self = 1 << 0,
+    Related = 1 << 1,
+    Paging = 1 << 2,
+    NotConfigured = 1 << 3,
+    None = 1 << 4,
+    All = Self | Related | Paging
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/NoResourceAttribute.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/NoResourceAttribute.cs
new file mode 100644
index 0000000000..8be53b0d03
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/NoResourceAttribute.cs
@@ -0,0 +1,13 @@
+using JetBrains.Annotations;
+
+namespace JsonApiDotNetCore.Resources.Annotations;
+
+/// <summary>
+/// When put on an Entity Framework Core entity, indicates that the type should not be added to the resource graph. This effectively suppresses the
+/// warning at startup that this type does not implement <see cref="IIdentifiable" /> .
+/// </summary>
+[PublicAPI]
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
+public sealed class NoResourceAttribute : Attribute
+{
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/RelationshipAttribute.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/RelationshipAttribute.cs
new file mode 100644
index 0000000000..6406ba17ff
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/RelationshipAttribute.cs
@@ -0,0 +1,102 @@
+using System.Reflection;
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Configuration;
+
+// ReSharper disable NonReadonlyMemberInGetHashCode
+
+namespace JsonApiDotNetCore.Resources.Annotations;
+
+/// <summary>
+/// Used to expose a property on a resource class as a JSON:API relationship (https://jsonapi.org/format/#document-resource-object-relationships).
+/// </summary>
+[PublicAPI]
+public abstract class RelationshipAttribute : ResourceFieldAttribute
+{
+    private protected static readonly CollectionConverter CollectionConverter = new();
+
+    /// <summary>
+    /// The CLR type in which this relationship is declared.
+    /// </summary>
+    internal Type? LeftClrType { get; set; }
+
+    /// <summary>
+    /// The CLR type this relationship points to. In the case of a <see cref="HasManyAttribute" /> relationship, this value will be the collection element
+    /// type.
+    /// </summary>
+    /// <example>
+    /// <code><![CDATA[
+    /// public ISet<Tag> Tags { get; set; } // RightClrType: typeof(Tag)
+    /// ]]></code>
+    /// </example>
+    internal Type? RightClrType { get; set; }
+
+    /// <summary>
+    /// The <see cref="PropertyInfo" /> of the Entity Framework Core inverse navigation, which may or may not exist. Even if it exists, it may not be exposed
+    /// as a JSON:API relationship.
+    /// </summary>
+    /// <example>
+    /// <code><![CDATA[
+    /// public class Article : Identifiable
+    /// {
+    ///     [HasOne] // InverseNavigationProperty: Person.Articles
+    ///     public Person Owner { get; set; }
+    /// }
+    /// 
+    /// public class Person : Identifiable
+    /// {
+    ///     [HasMany] // InverseNavigationProperty: Article.Owner
+    ///     public ICollection<Article> Articles { get; set; }
+    /// }
+    /// ]]></code>
+    /// </example>
+    public PropertyInfo? InverseNavigationProperty { get; set; }
+
+    /// <summary>
+    /// The containing resource type in which this relationship is declared.
+    /// </summary>
+    public ResourceType LeftType { get; internal set; } = null!;
+
+    /// <summary>
+    /// The resource type this relationship points to. In the case of a <see cref="HasManyAttribute" /> relationship, this value will be the collection
+    /// element type.
+    /// </summary>
+    public ResourceType RightType { get; internal set; } = null!;
+
+    /// <summary>
+    /// Configures which links to write in the relationship-level links object for this relationship. Defaults to <see cref="LinkTypes.NotConfigured" />,
+    /// which falls back to <see cref="ResourceLinksAttribute.RelationshipLinks" /> and then falls back to RelationshipLinks in global options.
+    /// </summary>
+    public LinkTypes Links { get; set; } = LinkTypes.NotConfigured;
+
+    /// <summary>
+    /// Whether or not this relationship can be included using the
+    /// <c>
+    /// ?include=publicName
+    /// </c>
+    /// query string parameter. This is <c>true</c> by default.
+    /// </summary>
+    public bool CanInclude { get; set; } = true;
+
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
+        }
+
+        if (obj is null || GetType() != obj.GetType())
+        {
+            return false;
+        }
+
+        var other = (RelationshipAttribute)obj;
+
+        return LeftClrType == other.LeftClrType && RightClrType == other.RightClrType && Links == other.Links && CanInclude == other.CanInclude &&
+            base.Equals(other);
+    }
+
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(LeftClrType, RightClrType, Links, CanInclude, base.GetHashCode());
+    }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/ResourceAttribute.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/ResourceAttribute.cs
new file mode 100644
index 0000000000..ca517e3e99
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/ResourceAttribute.cs
@@ -0,0 +1,32 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Resources.Annotations;
+
+/// <summary>
+/// When put on a resource class, overrides the convention-based public resource name and auto-generates an ASP.NET controller.
+/// </summary>
+[PublicAPI]
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
+public sealed class ResourceAttribute : Attribute
+{
+    /// <summary>
+    /// Optional. The publicly exposed name of this resource type.
+    /// </summary>
+    public string? PublicName { get; set; }
+
+    /// <summary>
+    /// The set of endpoints to auto-generate an ASP.NET controller for. Defaults to <see cref="JsonApiEndpoints.All" />. Set to
+    /// <see cref="JsonApiEndpoints.None" /> to disable controller generation.
+    /// </summary>
+    public JsonApiEndpoints GenerateControllerEndpoints { get; set; } = JsonApiEndpoints.All;
+
+    /// <summary>
+    /// Optional. The full namespace in which to auto-generate the ASP.NET controller. Defaults to the sibling namespace "Controllers". For example, a
+    /// resource class that is declared in namespace "ExampleCompany.ExampleApi.Models" will use "ExampleCompany.ExampleApi.Controllers" by default.
+    /// </summary>
+    public string? ControllerNamespace { get; set; }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/ResourceFieldAttribute.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/ResourceFieldAttribute.cs
new file mode 100644
index 0000000000..c7a44f59c8
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/ResourceFieldAttribute.cs
@@ -0,0 +1,125 @@
+using System.Reflection;
+using JetBrains.Annotations;
+
+// ReSharper disable NonReadonlyMemberInGetHashCode
+
+namespace JsonApiDotNetCore.Resources.Annotations;
+
+/// <summary>
+/// Used to expose a property on a resource class as a JSON:API field (attribute or relationship). See
+/// https://jsonapi.org/format/#document-resource-object-fields.
+/// </summary>
+[PublicAPI]
+public abstract class ResourceFieldAttribute : Attribute
+{
+    // These are definitely assigned after building the resource graph, which is why their public equivalents are declared as non-nullable.
+    private string? _publicName;
+    private PropertyInfo? _property;
+
+    /// <summary>
+    /// The publicly exposed name of this JSON:API field. When not explicitly assigned, the configured naming convention is applied on the property name.
+    /// </summary>
+    public string PublicName
+    {
+        get => _publicName!;
+        set
+        {
+            if (string.IsNullOrWhiteSpace(value))
+            {
+                throw new ArgumentException("Exposed name cannot be null, empty or contain only whitespace.", nameof(value));
+            }
+
+            _publicName = value;
+        }
+    }
+
+    /// <summary>
+    /// The resource property that this attribute is declared on.
+    /// </summary>
+    public PropertyInfo Property
+    {
+        get => _property!;
+        internal set
+        {
+            ArgumentGuard.NotNull(value, nameof(value));
+            _property = value;
+        }
+    }
+
+    /// <summary>
+    /// Gets the value of this field on the specified resource instance. Throws if the property is write-only or if the field does not belong to the
+    /// specified resource instance.
+    /// </summary>
+    public object? GetValue(object resource)
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
+
+        if (Property.GetMethod == null)
+        {
+            throw new InvalidOperationException($"Property '{Property.DeclaringType?.Name}.{Property.Name}' is write-only.");
+        }
+
+        try
+        {
+            return Property.GetValue(resource);
+        }
+        catch (TargetException exception)
+        {
+            throw new InvalidOperationException(
+                $"Unable to get property value of '{Property.DeclaringType!.Name}.{Property.Name}' on instance of type '{resource.GetType().Name}'.",
+                exception);
+        }
+    }
+
+    /// <summary>
+    /// Sets the value of this field on the specified resource instance. Throws if the property is read-only or if the field does not belong to the specified
+    /// resource instance.
+    /// </summary>
+    public void SetValue(object resource, object? newValue)
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
+
+        if (Property.SetMethod == null)
+        {
+            throw new InvalidOperationException($"Property '{Property.DeclaringType?.Name}.{Property.Name}' is read-only.");
+        }
+
+        try
+        {
+            Property.SetValue(resource, newValue);
+        }
+        catch (TargetException exception)
+        {
+            throw new InvalidOperationException(
+                $"Unable to set property value of '{Property.DeclaringType!.Name}.{Property.Name}' on instance of type '{resource.GetType().Name}'.",
+                exception);
+        }
+    }
+
+    public override string? ToString()
+    {
+        return _publicName ?? (_property != null ? _property.Name : base.ToString());
+    }
+
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
+        }
+
+        if (obj is null || GetType() != obj.GetType())
+        {
+            return false;
+        }
+
+        var other = (ResourceFieldAttribute)obj;
+
+        return _publicName == other._publicName && _property == other._property;
+    }
+
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(_publicName, _property);
+    }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Annotations/ResourceLinksAttribute.cs b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/ResourceLinksAttribute.cs
new file mode 100644
index 0000000000..010f87db5e
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Annotations/ResourceLinksAttribute.cs
@@ -0,0 +1,30 @@
+using JetBrains.Annotations;
+
+namespace JsonApiDotNetCore.Resources.Annotations;
+
+/// <summary>
+/// When put on a resource class, overrides global configuration for which links to render.
+/// </summary>
+[PublicAPI]
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
+public sealed class ResourceLinksAttribute : Attribute
+{
+    /// <summary>
+    /// Configures which links to write in the top-level links object for this resource type. Defaults to <see cref="LinkTypes.NotConfigured" />, which falls
+    /// back to TopLevelLinks in global options.
+    /// </summary>
+    public LinkTypes TopLevelLinks { get; set; } = LinkTypes.NotConfigured;
+
+    /// <summary>
+    /// Configures which links to write in the resource-level links object for this resource type. Defaults to <see cref="LinkTypes.NotConfigured" />, which
+    /// falls back to ResourceLinks in global options.
+    /// </summary>
+    public LinkTypes ResourceLinks { get; set; } = LinkTypes.NotConfigured;
+
+    /// <summary>
+    /// Configures which links to write in the relationship-level links object for all relationships of this resource type. Defaults to
+    /// <see cref="LinkTypes.NotConfigured" />, which falls back to RelationshipLinks in global options. This can be overruled per relationship by setting
+    /// <see cref="RelationshipAttribute.Links" />.
+    /// </summary>
+    public LinkTypes RelationshipLinks { get; set; } = LinkTypes.NotConfigured;
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/IIdentifiable.cs b/src/JsonApiDotNetCore.Annotations/Resources/IIdentifiable.cs
new file mode 100644
index 0000000000..2c6dc02025
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/IIdentifiable.cs
@@ -0,0 +1,31 @@
+namespace JsonApiDotNetCore.Resources;
+
+/// <summary>
+/// Defines the basic contract for a JSON:API resource. All resource classes must implement <see cref="IIdentifiable{TId}" />.
+/// </summary>
+public interface IIdentifiable
+{
+    /// <summary>
+    /// The value for element 'id' in a JSON:API request or response.
+    /// </summary>
+    string? StringId { get; set; }
+
+    /// <summary>
+    /// The value for element 'lid' in a JSON:API request.
+    /// </summary>
+    string? LocalId { get; set; }
+}
+
+/// <summary>
+/// When implemented by a class, indicates to JsonApiDotNetCore that the class represents a JSON:API resource.
+/// </summary>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+public interface IIdentifiable<TId> : IIdentifiable
+{
+    /// <summary>
+    /// The typed identifier as used by the underlying data store (usually numeric or Guid).
+    /// </summary>
+    TId Id { get; set; }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Identifiable.cs b/src/JsonApiDotNetCore.Annotations/Resources/Identifiable.cs
new file mode 100644
index 0000000000..bb854dac23
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Identifiable.cs
@@ -0,0 +1,45 @@
+using System.ComponentModel.DataAnnotations.Schema;
+using JsonApiDotNetCore.Resources.Internal;
+
+namespace JsonApiDotNetCore.Resources;
+
+/// <summary>
+/// A convenient basic implementation of <see cref="IIdentifiable{TId}" /> that provides conversion between typed <see cref="Id" /> and
+/// <see cref="StringId" />.
+/// </summary>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+public abstract class Identifiable<TId> : IIdentifiable<TId>
+{
+    /// <inheritdoc />
+    public virtual TId Id { get; set; } = default!;
+
+    /// <inheritdoc />
+    [NotMapped]
+    public string? StringId
+    {
+        get => GetStringId(Id);
+        set => Id = GetTypedId(value);
+    }
+
+    /// <inheritdoc />
+    [NotMapped]
+    public string? LocalId { get; set; }
+
+    /// <summary>
+    /// Converts an outgoing typed resource identifier to string format for use in a JSON:API response.
+    /// </summary>
+    protected virtual string? GetStringId(TId value)
+    {
+        return EqualityComparer<TId>.Default.Equals(value, default) ? null : value!.ToString();
+    }
+
+    /// <summary>
+    /// Converts an incoming 'id' element from a JSON:API request to the typed resource identifier.
+    /// </summary>
+    protected virtual TId GetTypedId(string? value)
+    {
+        return value == null ? default! : (TId)RuntimeTypeConverter.ConvertType(value, typeof(TId))!;
+    }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/Resources/Internal/RuntimeTypeConverter.cs b/src/JsonApiDotNetCore.Annotations/Resources/Internal/RuntimeTypeConverter.cs
new file mode 100644
index 0000000000..8722458938
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/Resources/Internal/RuntimeTypeConverter.cs
@@ -0,0 +1,98 @@
+using System.Globalization;
+using JetBrains.Annotations;
+
+#pragma warning disable AV1008 // Class should not be static
+
+namespace JsonApiDotNetCore.Resources.Internal;
+
+[PublicAPI]
+public static class RuntimeTypeConverter
+{
+    public static object? ConvertType(object? value, Type type)
+    {
+        ArgumentGuard.NotNull(type, nameof(type));
+
+        if (value == null)
+        {
+            if (!CanContainNull(type))
+            {
+                string targetTypeName = type.GetFriendlyTypeName();
+                throw new FormatException($"Failed to convert 'null' to type '{targetTypeName}'.");
+            }
+
+            return null;
+        }
+
+        Type runtimeType = value.GetType();
+
+        if (type == runtimeType || type.IsAssignableFrom(runtimeType))
+        {
+            return value;
+        }
+
+        string? stringValue = value.ToString();
+
+        if (string.IsNullOrEmpty(stringValue))
+        {
+            return GetDefaultValue(type);
+        }
+
+        bool isNullableTypeRequested = type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>);
+        Type nonNullableType = Nullable.GetUnderlyingType(type) ?? type;
+
+        try
+        {
+            if (nonNullableType == typeof(Guid))
+            {
+                Guid convertedValue = Guid.Parse(stringValue);
+                return isNullableTypeRequested ? (Guid?)convertedValue : convertedValue;
+            }
+
+            if (nonNullableType == typeof(DateTime))
+            {
+                DateTime convertedValue = DateTime.Parse(stringValue, null, DateTimeStyles.RoundtripKind);
+                return isNullableTypeRequested ? (DateTime?)convertedValue : convertedValue;
+            }
+
+            if (nonNullableType == typeof(DateTimeOffset))
+            {
+                DateTimeOffset convertedValue = DateTimeOffset.Parse(stringValue, null, DateTimeStyles.RoundtripKind);
+                return isNullableTypeRequested ? (DateTimeOffset?)convertedValue : convertedValue;
+            }
+
+            if (nonNullableType == typeof(TimeSpan))
+            {
+                TimeSpan convertedValue = TimeSpan.Parse(stringValue);
+                return isNullableTypeRequested ? (TimeSpan?)convertedValue : convertedValue;
+            }
+
+            if (nonNullableType.IsEnum)
+            {
+                object convertedValue = Enum.Parse(nonNullableType, stringValue);
+
+                // https://bradwilson.typepad.com/blog/2008/07/creating-nullab.html
+                return convertedValue;
+            }
+
+            // https://bradwilson.typepad.com/blog/2008/07/creating-nullab.html
+            return Convert.ChangeType(stringValue, nonNullableType);
+        }
+        catch (Exception exception) when (exception is FormatException or OverflowException or InvalidCastException or ArgumentException)
+        {
+            string runtimeTypeName = runtimeType.GetFriendlyTypeName();
+            string targetTypeName = type.GetFriendlyTypeName();
+
+            throw new FormatException($"Failed to convert '{value}' of type '{runtimeTypeName}' to type '{targetTypeName}'.", exception);
+        }
+    }
+
+    public static bool CanContainNull(Type type)
+    {
+        return !type.IsValueType || Nullable.GetUnderlyingType(type) != null;
+    }
+
+    public static object? GetDefaultValue(Type type)
+    {
+        return type.IsValueType ? Activator.CreateInstance(type) : null;
+    }
+}
diff --git a/src/JsonApiDotNetCore.Annotations/TypeExtensions.cs b/src/JsonApiDotNetCore.Annotations/TypeExtensions.cs
new file mode 100644
index 0000000000..c28ea84332
--- /dev/null
+++ b/src/JsonApiDotNetCore.Annotations/TypeExtensions.cs
@@ -0,0 +1,56 @@
+namespace JsonApiDotNetCore;
+
+internal static class TypeExtensions
+{
+    /// <summary>
+    /// Whether the specified source type implements or equals the specified interface.
+    /// </summary>
+    public static bool IsOrImplementsInterface<TInterface>(this Type? source)
+    {
+        return IsOrImplementsInterface(source, typeof(TInterface));
+    }
+
+    /// <summary>
+    /// Whether the specified source type implements or equals the specified interface. This overload enables to test for an open generic interface.
+    /// </summary>
+    private static bool IsOrImplementsInterface(this Type? source, Type interfaceType)
+    {
+        ArgumentGuard.NotNull(interfaceType, nameof(interfaceType));
+
+        if (source == null)
+        {
+            return false;
+        }
+
+        return AreTypesEqual(interfaceType, source, interfaceType.IsGenericType) ||
+            source.GetInterfaces().Any(type => AreTypesEqual(interfaceType, type, interfaceType.IsGenericType));
+    }
+
+    private static bool AreTypesEqual(Type left, Type right, bool isLeftGeneric)
+    {
+        return isLeftGeneric ? right.IsGenericType && right.GetGenericTypeDefinition() == left : left == right;
+    }
+
+    /// <summary>
+    /// Gets the name of a type, including the names of its generic type arguments.
+    /// <example>
+    /// <code><![CDATA[
+    /// KeyValuePair<TimeSpan, Nullable<DateTimeOffset>>
+    /// ]]></code>
+    /// </example>
+    /// </summary>
+    public static string GetFriendlyTypeName(this Type type)
+    {
+        ArgumentGuard.NotNull(type, nameof(type));
+
+        // Based on https://stackoverflow.com/questions/2581642/how-do-i-get-the-type-name-of-a-generic-type-argument.
+
+        if (type.IsGenericType)
+        {
+            string typeArguments = type.GetGenericArguments().Select(GetFriendlyTypeName).Aggregate((firstType, secondType) => $"{firstType}, {secondType}");
+            return $"{type.Name[..type.Name.IndexOf("`", StringComparison.Ordinal)]}<{typeArguments}>";
+        }
+
+        return type.Name;
+    }
+}
diff --git a/src/JsonApiDotNetCore.OpenApi.Client/ArgumentGuard.cs b/src/JsonApiDotNetCore.OpenApi.Client/ArgumentGuard.cs
index cef5458920..da71b2c8e5 100644
--- a/src/JsonApiDotNetCore.OpenApi.Client/ArgumentGuard.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Client/ArgumentGuard.cs
@@ -1,21 +1,19 @@
-using System;
 using JetBrains.Annotations;
 using SysNotNull = System.Diagnostics.CodeAnalysis.NotNullAttribute;
 
 #pragma warning disable AV1008 // Class should not be static
 
-namespace JsonApiDotNetCore.OpenApi.Client
+namespace JsonApiDotNetCore.OpenApi.Client;
+
+internal static class ArgumentGuard
 {
-    internal static class ArgumentGuard
+    [AssertionMethod]
+    public static void NotNull<T>([NoEnumeration] [SysNotNull] T? value, [InvokerParameterName] string name)
+        where T : class
     {
-        [AssertionMethod]
-        public static void NotNull<T>([NoEnumeration] [SysNotNull] T? value, [InvokerParameterName] string name)
-            where T : class
+        if (value is null)
         {
-            if (value is null)
-            {
-                throw new ArgumentNullException(name);
-            }
+            throw new ArgumentNullException(name);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi.Client/IJsonApiClient.cs b/src/JsonApiDotNetCore.OpenApi.Client/IJsonApiClient.cs
index 672e7d125e..a994d78a0e 100644
--- a/src/JsonApiDotNetCore.OpenApi.Client/IJsonApiClient.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Client/IJsonApiClient.cs
@@ -1,38 +1,36 @@
-using System;
 using System.Linq.Expressions;
 
-namespace JsonApiDotNetCore.OpenApi.Client
+namespace JsonApiDotNetCore.OpenApi.Client;
+
+public interface IJsonApiClient
 {
-    public interface IJsonApiClient
-    {
-        /// <summary>
-        /// Ensures correct serialization of attributes in a POST/PATCH Resource request body. In JSON:API, an omitted attribute indicates to ignore it, while an
-        /// attribute that is set to "null" means to clear it. This poses a problem because the serializer cannot distinguish between "you have explicitly set
-        /// this .NET property to null" vs "you didn't touch it, so it is null by default" when converting an instance to JSON. Therefore, calling this method
-        /// treats all attributes that contain their default value (<c>null</c> for reference types, <c>0</c> for integers, <c>false</c> for booleans, etc) as
-        /// omitted unless explicitly listed to include them using <paramref name="alwaysIncludedAttributeSelectors" />.
-        /// </summary>
-        /// <param name="requestDocument">
-        /// The request document instance for which this registration applies.
-        /// </param>
-        /// <param name="alwaysIncludedAttributeSelectors">
-        /// Optional. A list of expressions to indicate which properties to unconditionally include in the JSON request body. For example:
-        /// <code><![CDATA[
-        /// video => video.Title, video => video.Summary
-        /// ]]></code>
-        /// </param>
-        /// <typeparam name="TRequestDocument">
-        /// The type of the request document.
-        /// </typeparam>
-        /// <typeparam name="TAttributesObject">
-        /// The type of the attributes object inside <typeparamref name="TRequestDocument" />.
-        /// </typeparam>
-        /// <returns>
-        /// An <see cref="IDisposable" /> to clear the current registration. For efficient memory usage, it is recommended to wrap calls to this method in a
-        /// <c>using</c> statement, so the registrations are cleaned up after executing the request.
-        /// </returns>
-        IDisposable RegisterAttributesForRequestDocument<TRequestDocument, TAttributesObject>(TRequestDocument requestDocument,
-            params Expression<Func<TAttributesObject, object?>>[] alwaysIncludedAttributeSelectors)
-            where TRequestDocument : class;
-    }
+    /// <summary>
+    /// Ensures correct serialization of attributes in a POST/PATCH Resource request body. In JSON:API, an omitted attribute indicates to ignore it, while an
+    /// attribute that is set to "null" means to clear it. This poses a problem because the serializer cannot distinguish between "you have explicitly set
+    /// this .NET property to null" vs "you didn't touch it, so it is null by default" when converting an instance to JSON. Therefore, calling this method
+    /// treats all attributes that contain their default value (<c>null</c> for reference types, <c>0</c> for integers, <c>false</c> for booleans, etc) as
+    /// omitted unless explicitly listed to include them using <paramref name="alwaysIncludedAttributeSelectors" />.
+    /// </summary>
+    /// <param name="requestDocument">
+    /// The request document instance for which this registration applies.
+    /// </param>
+    /// <param name="alwaysIncludedAttributeSelectors">
+    /// Optional. A list of expressions to indicate which properties to unconditionally include in the JSON request body. For example:
+    /// <code><![CDATA[
+    /// video => video.Title, video => video.Summary
+    /// ]]></code>
+    /// </param>
+    /// <typeparam name="TRequestDocument">
+    /// The type of the request document.
+    /// </typeparam>
+    /// <typeparam name="TAttributesObject">
+    /// The type of the attributes object inside <typeparamref name="TRequestDocument" />.
+    /// </typeparam>
+    /// <returns>
+    /// An <see cref="IDisposable" /> to clear the current registration. For efficient memory usage, it is recommended to wrap calls to this method in a
+    /// <c>using</c> statement, so the registrations are cleaned up after executing the request.
+    /// </returns>
+    IDisposable RegisterAttributesForRequestDocument<TRequestDocument, TAttributesObject>(TRequestDocument requestDocument,
+        params Expression<Func<TAttributesObject, object?>>[] alwaysIncludedAttributeSelectors)
+        where TRequestDocument : class;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi.Client/JsonApiClient.cs b/src/JsonApiDotNetCore.OpenApi.Client/JsonApiClient.cs
index 7f9904af8c..7a1ba5883d 100644
--- a/src/JsonApiDotNetCore.OpenApi.Client/JsonApiClient.cs
+++ b/src/JsonApiDotNetCore.OpenApi.Client/JsonApiClient.cs
@@ -1,129 +1,127 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
-namespace JsonApiDotNetCore.OpenApi.Client
+namespace JsonApiDotNetCore.OpenApi.Client;
+
+/// <summary>
+/// Base class to inherit auto-generated client from. Enables to mark fields to be explicitly included in a request body, even if they are null or
+/// default.
+/// </summary>
+[PublicAPI]
+public abstract class JsonApiClient : IJsonApiClient
 {
-    /// <summary>
-    /// Base class to inherit auto-generated client from. Enables to mark fields to be explicitly included in a request body, even if they are null or
-    /// default.
-    /// </summary>
-    [PublicAPI]
-    public abstract class JsonApiClient : IJsonApiClient
+    private readonly JsonApiJsonConverter _jsonApiJsonConverter = new();
+
+    protected void SetSerializerSettingsForJsonApi(JsonSerializerSettings settings)
     {
-        private readonly JsonApiJsonConverter _jsonApiJsonConverter = new();
+        ArgumentGuard.NotNull(settings, nameof(settings));
 
-        protected void SetSerializerSettingsForJsonApi(JsonSerializerSettings settings)
-        {
-            ArgumentGuard.NotNull(settings, nameof(settings));
+        settings.Converters.Add(_jsonApiJsonConverter);
+    }
 
-            settings.Converters.Add(_jsonApiJsonConverter);
-        }
+    /// <inheritdoc />
+    public IDisposable RegisterAttributesForRequestDocument<TRequestDocument, TAttributesObject>(TRequestDocument requestDocument,
+        params Expression<Func<TAttributesObject, object?>>[] alwaysIncludedAttributeSelectors)
+        where TRequestDocument : class
+    {
+        ArgumentGuard.NotNull(requestDocument, nameof(requestDocument));
 
-        /// <inheritdoc />
-        public IDisposable RegisterAttributesForRequestDocument<TRequestDocument, TAttributesObject>(TRequestDocument requestDocument,
-            params Expression<Func<TAttributesObject, object?>>[] alwaysIncludedAttributeSelectors)
-            where TRequestDocument : class
+        var attributeNames = new HashSet<string>();
+
+        foreach (Expression<Func<TAttributesObject, object?>> selector in alwaysIncludedAttributeSelectors)
         {
-            ArgumentGuard.NotNull(requestDocument, nameof(requestDocument));
+            if (RemoveConvert(selector.Body) is MemberExpression selectorBody)
+            {
+                attributeNames.Add(selectorBody.Member.Name);
+            }
+            else
+            {
+                throw new ArgumentException($"The expression '{selector}' should select a single property. For example: 'article => article.Title'.");
+            }
+        }
+
+        _jsonApiJsonConverter.RegisterRequestDocument(requestDocument, new AttributeNamesContainer(attributeNames, typeof(TAttributesObject)));
+
+        return new AttributesRegistrationScope(_jsonApiJsonConverter, requestDocument);
+    }
 
-            var attributeNames = new HashSet<string>();
+    private static Expression RemoveConvert(Expression expression)
+    {
+        Expression innerExpression = expression;
 
-            foreach (Expression<Func<TAttributesObject, object?>> selector in alwaysIncludedAttributeSelectors)
+        while (true)
+        {
+            if (innerExpression is UnaryExpression { NodeType: ExpressionType.Convert } unaryExpression)
             {
-                if (RemoveConvert(selector.Body) is MemberExpression selectorBody)
-                {
-                    attributeNames.Add(selectorBody.Member.Name);
-                }
-                else
-                {
-                    throw new ArgumentException($"The expression '{selector}' should select a single property. For example: 'article => article.Title'.");
-                }
+                innerExpression = unaryExpression.Operand;
             }
+            else
+            {
+                return innerExpression;
+            }
+        }
+    }
 
-            _jsonApiJsonConverter.RegisterRequestDocument(requestDocument, new AttributeNamesContainer(attributeNames, typeof(TAttributesObject)));
+    private sealed class JsonApiJsonConverter : JsonConverter
+    {
+        private readonly Dictionary<object, AttributeNamesContainer> _alwaysIncludedAttributesPerRequestDocumentInstance = new();
+        private readonly Dictionary<Type, ISet<object>> _requestDocumentInstancesPerRequestDocumentType = new();
+        private bool _isSerializing;
 
-            return new AttributesRegistrationScope(_jsonApiJsonConverter, requestDocument);
-        }
+        public override bool CanRead => false;
 
-        private static Expression RemoveConvert(Expression expression)
+        public void RegisterRequestDocument(object requestDocument, AttributeNamesContainer attributes)
         {
-            Expression innerExpression = expression;
+            _alwaysIncludedAttributesPerRequestDocumentInstance[requestDocument] = attributes;
+
+            Type requestDocumentType = requestDocument.GetType();
 
-            while (true)
+            if (!_requestDocumentInstancesPerRequestDocumentType.ContainsKey(requestDocumentType))
             {
-                if (innerExpression is UnaryExpression { NodeType: ExpressionType.Convert } unaryExpression)
-                {
-                    innerExpression = unaryExpression.Operand;
-                }
-                else
-                {
-                    return innerExpression;
-                }
+                _requestDocumentInstancesPerRequestDocumentType[requestDocumentType] = new HashSet<object>();
             }
+
+            _requestDocumentInstancesPerRequestDocumentType[requestDocumentType].Add(requestDocument);
         }
 
-        private sealed class JsonApiJsonConverter : JsonConverter
+        public void RemoveAttributeRegistration(object requestDocument)
         {
-            private readonly Dictionary<object, AttributeNamesContainer> _alwaysIncludedAttributesPerRequestDocumentInstance = new();
-            private readonly Dictionary<Type, ISet<object>> _requestDocumentInstancesPerRequestDocumentType = new();
-            private bool _isSerializing;
-
-            public override bool CanRead => false;
-
-            public void RegisterRequestDocument(object requestDocument, AttributeNamesContainer attributes)
+            if (_alwaysIncludedAttributesPerRequestDocumentInstance.ContainsKey(requestDocument))
             {
-                _alwaysIncludedAttributesPerRequestDocumentInstance[requestDocument] = attributes;
+                _alwaysIncludedAttributesPerRequestDocumentInstance.Remove(requestDocument);
 
                 Type requestDocumentType = requestDocument.GetType();
+                _requestDocumentInstancesPerRequestDocumentType[requestDocumentType].Remove(requestDocument);
 
-                if (!_requestDocumentInstancesPerRequestDocumentType.ContainsKey(requestDocumentType))
+                if (!_requestDocumentInstancesPerRequestDocumentType[requestDocumentType].Any())
                 {
-                    _requestDocumentInstancesPerRequestDocumentType[requestDocumentType] = new HashSet<object>();
+                    _requestDocumentInstancesPerRequestDocumentType.Remove(requestDocumentType);
                 }
-
-                _requestDocumentInstancesPerRequestDocumentType[requestDocumentType].Add(requestDocument);
             }
+        }
 
-            public void RemoveAttributeRegistration(object requestDocument)
-            {
-                if (_alwaysIncludedAttributesPerRequestDocumentInstance.ContainsKey(requestDocument))
-                {
-                    _alwaysIncludedAttributesPerRequestDocumentInstance.Remove(requestDocument);
-
-                    Type requestDocumentType = requestDocument.GetType();
-                    _requestDocumentInstancesPerRequestDocumentType[requestDocumentType].Remove(requestDocument);
-
-                    if (!_requestDocumentInstancesPerRequestDocumentType[requestDocumentType].Any())
-                    {
-                        _requestDocumentInstancesPerRequestDocumentType.Remove(requestDocumentType);
-                    }
-                }
-            }
+        public override bool CanConvert(Type objectType)
+        {
+            ArgumentGuard.NotNull(objectType, nameof(objectType));
 
-            public override bool CanConvert(Type objectType)
-            {
-                ArgumentGuard.NotNull(objectType, nameof(objectType));
+            return !_isSerializing && _requestDocumentInstancesPerRequestDocumentType.ContainsKey(objectType);
+        }
 
-                return !_isSerializing && _requestDocumentInstancesPerRequestDocumentType.ContainsKey(objectType);
-            }
+        public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+        {
+            throw new Exception("This code should not be reachable.");
+        }
 
-            public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
-            {
-                throw new Exception("This code should not be reachable.");
-            }
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+        {
+            ArgumentGuard.NotNull(writer, nameof(writer));
+            ArgumentGuard.NotNull(serializer, nameof(serializer));
 
-            public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
+            if (value != null)
             {
-                ArgumentGuard.NotNull(writer, nameof(writer));
-                ArgumentGuard.NotNull(value, nameof(value));
-                ArgumentGuard.NotNull(serializer, nameof(serializer));
-
                 if (_alwaysIncludedAttributesPerRequestDocumentInstance.ContainsKey(value))
                 {
                     AttributeNamesContainer attributeNamesContainer = _alwaysIncludedAttributesPerRequestDocumentInstance[value];
@@ -141,83 +139,83 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
                 }
             }
         }
+    }
 
-        private sealed class AttributeNamesContainer
-        {
-            private readonly ISet<string> _attributeNames;
-            private readonly Type _containerType;
-
-            public AttributeNamesContainer(ISet<string> attributeNames, Type containerType)
-            {
-                ArgumentGuard.NotNull(attributeNames, nameof(attributeNames));
-                ArgumentGuard.NotNull(containerType, nameof(containerType));
+    private sealed class AttributeNamesContainer
+    {
+        private readonly ISet<string> _attributeNames;
+        private readonly Type _containerType;
 
-                _attributeNames = attributeNames;
-                _containerType = containerType;
-            }
+        public AttributeNamesContainer(ISet<string> attributeNames, Type containerType)
+        {
+            ArgumentGuard.NotNull(attributeNames, nameof(attributeNames));
+            ArgumentGuard.NotNull(containerType, nameof(containerType));
 
-            public bool ContainsAttribute(string name)
-            {
-                return _attributeNames.Contains(name);
-            }
+            _attributeNames = attributeNames;
+            _containerType = containerType;
+        }
 
-            public bool ContainerMatchesType(Type type)
-            {
-                return _containerType == type;
-            }
+        public bool ContainsAttribute(string name)
+        {
+            return _attributeNames.Contains(name);
         }
 
-        private sealed class AttributesRegistrationScope : IDisposable
+        public bool ContainerMatchesType(Type type)
         {
-            private readonly JsonApiJsonConverter _jsonApiJsonConverter;
-            private readonly object _requestDocument;
+            return _containerType == type;
+        }
+    }
 
-            public AttributesRegistrationScope(JsonApiJsonConverter jsonApiJsonConverter, object requestDocument)
-            {
-                ArgumentGuard.NotNull(jsonApiJsonConverter, nameof(jsonApiJsonConverter));
-                ArgumentGuard.NotNull(requestDocument, nameof(requestDocument));
+    private sealed class AttributesRegistrationScope : IDisposable
+    {
+        private readonly JsonApiJsonConverter _jsonApiJsonConverter;
+        private readonly object _requestDocument;
 
-                _jsonApiJsonConverter = jsonApiJsonConverter;
-                _requestDocument = requestDocument;
-            }
+        public AttributesRegistrationScope(JsonApiJsonConverter jsonApiJsonConverter, object requestDocument)
+        {
+            ArgumentGuard.NotNull(jsonApiJsonConverter, nameof(jsonApiJsonConverter));
+            ArgumentGuard.NotNull(requestDocument, nameof(requestDocument));
 
-            public void Dispose()
-            {
-                _jsonApiJsonConverter.RemoveAttributeRegistration(_requestDocument);
-            }
+            _jsonApiJsonConverter = jsonApiJsonConverter;
+            _requestDocument = requestDocument;
         }
 
-        private sealed class JsonApiDocumentContractResolver : DefaultContractResolver
+        public void Dispose()
         {
-            private readonly AttributeNamesContainer _attributeNamesContainer;
+            _jsonApiJsonConverter.RemoveAttributeRegistration(_requestDocument);
+        }
+    }
 
-            public JsonApiDocumentContractResolver(AttributeNamesContainer attributeNamesContainer)
-            {
-                ArgumentGuard.NotNull(attributeNamesContainer, nameof(attributeNamesContainer));
+    private sealed class JsonApiDocumentContractResolver : DefaultContractResolver
+    {
+        private readonly AttributeNamesContainer _attributeNamesContainer;
 
-                _attributeNamesContainer = attributeNamesContainer;
-            }
+        public JsonApiDocumentContractResolver(AttributeNamesContainer attributeNamesContainer)
+        {
+            ArgumentGuard.NotNull(attributeNamesContainer, nameof(attributeNamesContainer));
 
-            protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
-            {
-                JsonProperty property = base.CreateProperty(member, memberSerialization);
+            _attributeNamesContainer = attributeNamesContainer;
+        }
 
-                if (_attributeNamesContainer.ContainerMatchesType(property.DeclaringType))
+        protected override JsonProperty CreateProperty(MemberInfo member, MemberSerialization memberSerialization)
+        {
+            JsonProperty property = base.CreateProperty(member, memberSerialization);
+
+            if (_attributeNamesContainer.ContainerMatchesType(property.DeclaringType!))
+            {
+                if (_attributeNamesContainer.ContainsAttribute(property.UnderlyingName!))
                 {
-                    if (_attributeNamesContainer.ContainsAttribute(property.UnderlyingName))
-                    {
-                        property.NullValueHandling = NullValueHandling.Include;
-                        property.DefaultValueHandling = DefaultValueHandling.Include;
-                    }
-                    else
-                    {
-                        property.NullValueHandling = NullValueHandling.Ignore;
-                        property.DefaultValueHandling = DefaultValueHandling.Ignore;
-                    }
+                    property.NullValueHandling = NullValueHandling.Include;
+                    property.DefaultValueHandling = DefaultValueHandling.Include;
+                }
+                else
+                {
+                    property.NullValueHandling = NullValueHandling.Ignore;
+                    property.DefaultValueHandling = DefaultValueHandling.Ignore;
                 }
-
-                return property;
             }
+
+            return property;
         }
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi.Client/JsonApiDotNetCore.OpenApi.Client.csproj b/src/JsonApiDotNetCore.OpenApi.Client/JsonApiDotNetCore.OpenApi.Client.csproj
index 8fdd3d9021..5b48e853cb 100644
--- a/src/JsonApiDotNetCore.OpenApi.Client/JsonApiDotNetCore.OpenApi.Client.csproj
+++ b/src/JsonApiDotNetCore.OpenApi.Client/JsonApiDotNetCore.OpenApi.Client.csproj
@@ -1,22 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
+    <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net;openapi;swagger;client;nswag</PackageTags>
+    <VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
+    <PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net;rest;web-api;openapi;swagger;client;nswag</PackageTags>
     <Description>Provides support for OpenAPI generated clients in sending partial POST/PATCH requests against JSON:API endpoints.</Description>
     <Authors>json-api-dotnet</Authors>
     <PackageProjectUrl>https://www.jsonapi.net/</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageReleaseNotes>See https://github.com/json-api-dotnet/JsonApiDotNetCore/releases.</PackageReleaseNotes>
+    <PackageIcon>logo.png</PackageIcon>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\logo.png" Visible="false">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/JsonApiDotNetCore.OpenApi/ActionDescriptorExtensions.cs b/src/JsonApiDotNetCore.OpenApi/ActionDescriptorExtensions.cs
index 43e9592119..4ace6ada42 100644
--- a/src/JsonApiDotNetCore.OpenApi/ActionDescriptorExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi/ActionDescriptorExtensions.cs
@@ -1,40 +1,38 @@
-using System.Linq;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal static class ActionDescriptorExtensions
 {
-    internal static class ActionDescriptorExtensions
+    public static MethodInfo GetActionMethod(this ActionDescriptor descriptor)
     {
-        public static MethodInfo GetActionMethod(this ActionDescriptor descriptor)
-        {
-            ArgumentGuard.NotNull(descriptor, nameof(descriptor));
+        ArgumentGuard.NotNull(descriptor, nameof(descriptor));
 
-            return ((ControllerActionDescriptor)descriptor).MethodInfo;
-        }
+        return ((ControllerActionDescriptor)descriptor).MethodInfo;
+    }
 
-        public static TFilterMetaData? GetFilterMetadata<TFilterMetaData>(this ActionDescriptor descriptor)
-            where TFilterMetaData : IFilterMetadata
-        {
-            ArgumentGuard.NotNull(descriptor, nameof(descriptor));
+    public static TFilterMetaData? GetFilterMetadata<TFilterMetaData>(this ActionDescriptor descriptor)
+        where TFilterMetaData : IFilterMetadata
+    {
+        ArgumentGuard.NotNull(descriptor, nameof(descriptor));
 
-            IFilterMetadata? filterMetadata = descriptor.FilterDescriptors.Select(filterDescriptor => filterDescriptor.Filter)
-                .FirstOrDefault(filter => filter is TFilterMetaData);
+        IFilterMetadata? filterMetadata = descriptor.FilterDescriptors.Select(filterDescriptor => filterDescriptor.Filter)
+            .FirstOrDefault(filter => filter is TFilterMetaData);
 
-            return (TFilterMetaData?)filterMetadata;
-        }
+        return (TFilterMetaData?)filterMetadata;
+    }
 
-        public static ControllerParameterDescriptor? GetBodyParameterDescriptor(this ActionDescriptor descriptor)
-        {
-            ArgumentGuard.NotNull(descriptor, nameof(descriptor));
+    public static ControllerParameterDescriptor? GetBodyParameterDescriptor(this ActionDescriptor descriptor)
+    {
+        ArgumentGuard.NotNull(descriptor, nameof(descriptor));
 
-            return (ControllerParameterDescriptor?)descriptor.Parameters.FirstOrDefault(parameterDescriptor =>
-                // ReSharper disable once ConstantConditionalAccessQualifier
-                // Justification: see https://github.com/dotnet/aspnetcore/issues/32538
-                parameterDescriptor.BindingInfo?.BindingSource == BindingSource.Body);
-        }
+        return (ControllerParameterDescriptor?)descriptor.Parameters.FirstOrDefault(parameterDescriptor =>
+            // ReSharper disable once ConstantConditionalAccessQualifier
+            // Justification: see https://github.com/dotnet/aspnetcore/issues/32538
+            parameterDescriptor.BindingInfo?.BindingSource == BindingSource.Body);
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiActionDescriptorCollectionProvider.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiActionDescriptorCollectionProvider.cs
index 16efa2485a..4330a6c21c 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiActionDescriptorCollectionProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiActionDescriptorCollectionProvider.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.OpenApi.JsonApiMetadata;
@@ -11,203 +8,201 @@
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.Routing;
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+/// <summary>
+/// Adds JsonApiDotNetCore metadata to <see cref="ControllerActionDescriptor" />s if available. This translates to updating response types in
+/// <see cref="ProducesResponseTypeAttribute" /> and performing an expansion for secondary and relationship endpoints (eg
+/// /article/{id}/{relationshipName} -> /article/{id}/author, /article/{id}/revisions, etc).
+/// </summary>
+internal sealed class JsonApiActionDescriptorCollectionProvider : IActionDescriptorCollectionProvider
 {
-    /// <summary>
-    /// Adds JsonApiDotNetCore metadata to <see cref="ControllerActionDescriptor" />s if available. This translates to updating response types in
-    /// <see cref="ProducesResponseTypeAttribute" /> and performing an expansion for secondary and relationship endpoints (eg
-    /// /article/{id}/{relationshipName} -> /article/{id}/author, /article/{id}/revisions, etc).
-    /// </summary>
-    internal sealed class JsonApiActionDescriptorCollectionProvider : IActionDescriptorCollectionProvider
-    {
-        private readonly IActionDescriptorCollectionProvider _defaultProvider;
-        private readonly JsonApiEndpointMetadataProvider _jsonApiEndpointMetadataProvider;
+    private readonly IActionDescriptorCollectionProvider _defaultProvider;
+    private readonly JsonApiEndpointMetadataProvider _jsonApiEndpointMetadataProvider;
 
-        public ActionDescriptorCollection ActionDescriptors => GetActionDescriptors();
+    public ActionDescriptorCollection ActionDescriptors => GetActionDescriptors();
 
-        public JsonApiActionDescriptorCollectionProvider(IControllerResourceMapping controllerResourceMapping,
-            IActionDescriptorCollectionProvider defaultProvider)
-        {
-            ArgumentGuard.NotNull(controllerResourceMapping, nameof(controllerResourceMapping));
-            ArgumentGuard.NotNull(defaultProvider, nameof(defaultProvider));
+    public JsonApiActionDescriptorCollectionProvider(IControllerResourceMapping controllerResourceMapping, IActionDescriptorCollectionProvider defaultProvider)
+    {
+        ArgumentGuard.NotNull(controllerResourceMapping, nameof(controllerResourceMapping));
+        ArgumentGuard.NotNull(defaultProvider, nameof(defaultProvider));
 
-            _defaultProvider = defaultProvider;
-            _jsonApiEndpointMetadataProvider = new JsonApiEndpointMetadataProvider(controllerResourceMapping);
-        }
+        _defaultProvider = defaultProvider;
+        _jsonApiEndpointMetadataProvider = new JsonApiEndpointMetadataProvider(controllerResourceMapping);
+    }
 
-        private ActionDescriptorCollection GetActionDescriptors()
-        {
-            List<ActionDescriptor> newDescriptors = _defaultProvider.ActionDescriptors.Items.ToList();
-            List<ActionDescriptor> endpoints = newDescriptors.Where(IsVisibleJsonApiEndpoint).ToList();
+    private ActionDescriptorCollection GetActionDescriptors()
+    {
+        List<ActionDescriptor> newDescriptors = _defaultProvider.ActionDescriptors.Items.ToList();
+        List<ActionDescriptor> endpoints = newDescriptors.Where(IsVisibleJsonApiEndpoint).ToList();
 
-            foreach (ActionDescriptor endpoint in endpoints)
-            {
-                JsonApiEndpointMetadataContainer endpointMetadataContainer = _jsonApiEndpointMetadataProvider.Get(endpoint.GetActionMethod());
+        foreach (ActionDescriptor endpoint in endpoints)
+        {
+            JsonApiEndpointMetadataContainer endpointMetadataContainer = _jsonApiEndpointMetadataProvider.Get(endpoint.GetActionMethod());
 
-                List<ActionDescriptor> replacementDescriptorsForEndpoint = new();
-                replacementDescriptorsForEndpoint.AddRange(AddJsonApiMetadataToAction(endpoint, endpointMetadataContainer.RequestMetadata));
-                replacementDescriptorsForEndpoint.AddRange(AddJsonApiMetadataToAction(endpoint, endpointMetadataContainer.ResponseMetadata));
+            List<ActionDescriptor> replacementDescriptorsForEndpoint = new();
+            replacementDescriptorsForEndpoint.AddRange(AddJsonApiMetadataToAction(endpoint, endpointMetadataContainer.RequestMetadata));
+            replacementDescriptorsForEndpoint.AddRange(AddJsonApiMetadataToAction(endpoint, endpointMetadataContainer.ResponseMetadata));
 
-                if (replacementDescriptorsForEndpoint.Any())
-                {
-                    newDescriptors.InsertRange(newDescriptors.IndexOf(endpoint) - 1, replacementDescriptorsForEndpoint);
-                    newDescriptors.Remove(endpoint);
-                }
+            if (replacementDescriptorsForEndpoint.Any())
+            {
+                newDescriptors.InsertRange(newDescriptors.IndexOf(endpoint) - 1, replacementDescriptorsForEndpoint);
+                newDescriptors.Remove(endpoint);
             }
-
-            int descriptorVersion = _defaultProvider.ActionDescriptors.Version;
-            return new ActionDescriptorCollection(newDescriptors.AsReadOnly(), descriptorVersion);
         }
 
-        private static bool IsVisibleJsonApiEndpoint(ActionDescriptor descriptor)
-        {
-            // Only if in a convention ApiExplorer.IsVisible was set to false, the ApiDescriptionActionData will not be present.
-            return descriptor is ControllerActionDescriptor controllerAction && controllerAction.Properties.ContainsKey(typeof(ApiDescriptionActionData));
-        }
+        int descriptorVersion = _defaultProvider.ActionDescriptors.Version;
+        return new ActionDescriptorCollection(newDescriptors.AsReadOnly(), descriptorVersion);
+    }
 
-        private static IEnumerable<ActionDescriptor> AddJsonApiMetadataToAction(ActionDescriptor endpoint, IJsonApiEndpointMetadata? jsonApiEndpointMetadata)
+    private static bool IsVisibleJsonApiEndpoint(ActionDescriptor descriptor)
+    {
+        // Only if in a convention ApiExplorer.IsVisible was set to false, the ApiDescriptionActionData will not be present.
+        return descriptor is ControllerActionDescriptor controllerAction && controllerAction.Properties.ContainsKey(typeof(ApiDescriptionActionData));
+    }
+
+    private static IEnumerable<ActionDescriptor> AddJsonApiMetadataToAction(ActionDescriptor endpoint, IJsonApiEndpointMetadata? jsonApiEndpointMetadata)
+    {
+        switch (jsonApiEndpointMetadata)
         {
-            switch (jsonApiEndpointMetadata)
+            case PrimaryResponseMetadata primaryMetadata:
+            {
+                UpdateProducesResponseTypeAttribute(endpoint, primaryMetadata.DocumentType);
+                return Array.Empty<ActionDescriptor>();
+            }
+            case PrimaryRequestMetadata primaryMetadata:
+            {
+                UpdateBodyParameterDescriptor(endpoint, primaryMetadata.DocumentType);
+                return Array.Empty<ActionDescriptor>();
+            }
+            case NonPrimaryEndpointMetadata nonPrimaryEndpointMetadata and (RelationshipResponseMetadata or SecondaryResponseMetadata):
+            {
+                return Expand(endpoint, nonPrimaryEndpointMetadata,
+                    (expandedEndpoint, documentType, _) => UpdateProducesResponseTypeAttribute(expandedEndpoint, documentType));
+            }
+            case NonPrimaryEndpointMetadata nonPrimaryEndpointMetadata and RelationshipRequestMetadata:
             {
-                case PrimaryResponseMetadata primaryMetadata:
-                {
-                    UpdateProducesResponseTypeAttribute(endpoint, primaryMetadata.DocumentType);
-                    return Array.Empty<ActionDescriptor>();
-                }
-                case PrimaryRequestMetadata primaryMetadata:
-                {
-                    UpdateBodyParameterDescriptor(endpoint, primaryMetadata.DocumentType);
-                    return Array.Empty<ActionDescriptor>();
-                }
-                case NonPrimaryEndpointMetadata nonPrimaryEndpointMetadata and (RelationshipResponseMetadata or SecondaryResponseMetadata):
-                {
-                    return Expand(endpoint, nonPrimaryEndpointMetadata,
-                        (expandedEndpoint, documentType, _) => UpdateProducesResponseTypeAttribute(expandedEndpoint, documentType));
-                }
-                case NonPrimaryEndpointMetadata nonPrimaryEndpointMetadata and RelationshipRequestMetadata:
-                {
-                    return Expand(endpoint, nonPrimaryEndpointMetadata, UpdateBodyParameterDescriptor);
-                }
-                default:
-                {
-                    return Array.Empty<ActionDescriptor>();
-                }
+                return Expand(endpoint, nonPrimaryEndpointMetadata, UpdateBodyParameterDescriptor);
+            }
+            default:
+            {
+                return Array.Empty<ActionDescriptor>();
             }
         }
+    }
 
-        private static void UpdateProducesResponseTypeAttribute(ActionDescriptor endpoint, Type responseDocumentType)
+    private static void UpdateProducesResponseTypeAttribute(ActionDescriptor endpoint, Type responseDocumentType)
+    {
+        if (ProducesJsonApiResponseDocument(endpoint))
         {
-            if (ProducesJsonApiResponseDocument(endpoint))
-            {
-                var producesResponse = endpoint.GetFilterMetadata<ProducesResponseTypeAttribute>();
+            var producesResponse = endpoint.GetFilterMetadata<ProducesResponseTypeAttribute>();
 
-                if (producesResponse != null)
-                {
-                    producesResponse.Type = responseDocumentType;
-                    return;
-                }
+            if (producesResponse != null)
+            {
+                producesResponse.Type = responseDocumentType;
+                return;
             }
-
-            throw new UnreachableCodeException();
         }
 
-        private static bool ProducesJsonApiResponseDocument(ActionDescriptor endpoint)
-        {
-            var produces = endpoint.GetFilterMetadata<ProducesAttribute>();
+        throw new UnreachableCodeException();
+    }
 
-            return produces != null && produces.ContentTypes.Any(contentType => contentType == HeaderConstants.MediaType);
-        }
+    private static bool ProducesJsonApiResponseDocument(ActionDescriptor endpoint)
+    {
+        var produces = endpoint.GetFilterMetadata<ProducesAttribute>();
 
-        private static IEnumerable<ActionDescriptor> Expand(ActionDescriptor genericEndpoint, NonPrimaryEndpointMetadata metadata,
-            Action<ActionDescriptor, Type, string> expansionCallback)
-        {
-            var expansion = new List<ActionDescriptor>();
+        return produces != null && produces.ContentTypes.Any(contentType => contentType == HeaderConstants.MediaType);
+    }
 
-            foreach ((string relationshipName, Type documentType) in metadata.DocumentTypesByRelationshipName)
-            {
-                if (genericEndpoint.AttributeRouteInfo == null)
-                {
-                    throw new NotSupportedException("Only attribute routing is supported for JsonApiDotNetCore endpoints.");
-                }
+    private static IEnumerable<ActionDescriptor> Expand(ActionDescriptor genericEndpoint, NonPrimaryEndpointMetadata metadata,
+        Action<ActionDescriptor, Type, string> expansionCallback)
+    {
+        var expansion = new List<ActionDescriptor>();
 
-                ActionDescriptor expandedEndpoint = Clone(genericEndpoint);
+        foreach ((string relationshipName, Type documentType) in metadata.DocumentTypesByRelationshipName)
+        {
+            if (genericEndpoint.AttributeRouteInfo == null)
+            {
+                throw new NotSupportedException("Only attribute routing is supported for JsonApiDotNetCore endpoints.");
+            }
 
-                RemovePathParameter(expandedEndpoint.Parameters, JsonApiPathParameter.RelationshipName);
+            ActionDescriptor expandedEndpoint = Clone(genericEndpoint);
 
-                ExpandTemplate(expandedEndpoint.AttributeRouteInfo!, relationshipName);
+            RemovePathParameter(expandedEndpoint.Parameters, JsonApiPathParameter.RelationshipName);
 
-                expansionCallback(expandedEndpoint, documentType, relationshipName);
+            ExpandTemplate(expandedEndpoint.AttributeRouteInfo!, relationshipName);
 
-                expansion.Add(expandedEndpoint);
-            }
+            expansionCallback(expandedEndpoint, documentType, relationshipName);
 
-            return expansion;
+            expansion.Add(expandedEndpoint);
         }
 
-        private static void UpdateBodyParameterDescriptor(ActionDescriptor endpoint, Type documentType, string? parameterName = null)
-        {
-            ControllerParameterDescriptor? requestBodyDescriptor = endpoint.GetBodyParameterDescriptor();
+        return expansion;
+    }
 
-            if (requestBodyDescriptor == null)
-            {
-                // ASP.NET model binding picks up on [FromBody] in base classes, so even when it is left out in an override, this should not be reachable.
-                throw new UnreachableCodeException();
-            }
+    private static void UpdateBodyParameterDescriptor(ActionDescriptor endpoint, Type documentType, string? parameterName = null)
+    {
+        ControllerParameterDescriptor? requestBodyDescriptor = endpoint.GetBodyParameterDescriptor();
 
-            requestBodyDescriptor.ParameterType = documentType;
-            ParameterInfo replacementParameterInfo = requestBodyDescriptor.ParameterInfo.WithParameterType(documentType);
+        if (requestBodyDescriptor == null)
+        {
+            // ASP.NET model binding picks up on [FromBody] in base classes, so even when it is left out in an override, this should not be reachable.
+            throw new UnreachableCodeException();
+        }
 
-            if (parameterName != null)
-            {
-                replacementParameterInfo = replacementParameterInfo.WithName(parameterName);
-            }
+        requestBodyDescriptor.ParameterType = documentType;
+        ParameterInfo replacementParameterInfo = requestBodyDescriptor.ParameterInfo.WithParameterType(documentType);
 
-            requestBodyDescriptor.ParameterInfo = replacementParameterInfo;
+        if (parameterName != null)
+        {
+            replacementParameterInfo = replacementParameterInfo.WithName(parameterName);
         }
 
-        private static ActionDescriptor Clone(ActionDescriptor descriptor)
-        {
-            var clonedDescriptor = (ActionDescriptor)descriptor.MemberwiseClone();
+        requestBodyDescriptor.ParameterInfo = replacementParameterInfo;
+    }
 
-            clonedDescriptor.AttributeRouteInfo = (AttributeRouteInfo)descriptor.AttributeRouteInfo!.MemberwiseClone();
+    private static ActionDescriptor Clone(ActionDescriptor descriptor)
+    {
+        var clonedDescriptor = (ActionDescriptor)descriptor.MemberwiseClone();
 
-            clonedDescriptor.FilterDescriptors = new List<FilterDescriptor>();
+        clonedDescriptor.AttributeRouteInfo = (AttributeRouteInfo)descriptor.AttributeRouteInfo!.MemberwiseClone();
 
-            foreach (FilterDescriptor filter in descriptor.FilterDescriptors)
-            {
-                clonedDescriptor.FilterDescriptors.Add(Clone(filter));
-            }
+        clonedDescriptor.FilterDescriptors = new List<FilterDescriptor>();
 
-            clonedDescriptor.Parameters = new List<ParameterDescriptor>();
+        foreach (FilterDescriptor filter in descriptor.FilterDescriptors)
+        {
+            clonedDescriptor.FilterDescriptors.Add(Clone(filter));
+        }
 
-            foreach (ParameterDescriptor parameter in descriptor.Parameters)
-            {
-                clonedDescriptor.Parameters.Add((ParameterDescriptor)parameter.MemberwiseClone());
-            }
+        clonedDescriptor.Parameters = new List<ParameterDescriptor>();
 
-            return clonedDescriptor;
+        foreach (ParameterDescriptor parameter in descriptor.Parameters)
+        {
+            clonedDescriptor.Parameters.Add((ParameterDescriptor)parameter.MemberwiseClone());
         }
 
-        private static FilterDescriptor Clone(FilterDescriptor descriptor)
-        {
-            var clonedFilter = (IFilterMetadata)descriptor.Filter.MemberwiseClone();
+        return clonedDescriptor;
+    }
 
-            return new FilterDescriptor(clonedFilter, descriptor.Scope)
-            {
-                Order = descriptor.Order
-            };
-        }
+    private static FilterDescriptor Clone(FilterDescriptor descriptor)
+    {
+        var clonedFilter = (IFilterMetadata)descriptor.Filter.MemberwiseClone();
 
-        private static void RemovePathParameter(ICollection<ParameterDescriptor> parameters, string parameterName)
+        return new FilterDescriptor(clonedFilter, descriptor.Scope)
         {
-            ParameterDescriptor relationshipName = parameters.Single(parameterDescriptor => parameterDescriptor.Name == parameterName);
+            Order = descriptor.Order
+        };
+    }
 
-            parameters.Remove(relationshipName);
-        }
+    private static void RemovePathParameter(ICollection<ParameterDescriptor> parameters, string parameterName)
+    {
+        ParameterDescriptor relationshipName = parameters.Single(parameterDescriptor => parameterDescriptor.Name == parameterName);
 
-        private static void ExpandTemplate(AttributeRouteInfo route, string expansionParameter)
-        {
-            route.Template = route.Template!.Replace(JsonApiRoutingTemplate.RelationshipNameUrlPlaceholder, expansionParameter);
-        }
+        parameters.Remove(relationshipName);
+    }
+
+    private static void ExpandTemplate(AttributeRouteInfo route, string expansionParameter)
+    {
+        route.Template = route.Template!.Replace(JsonApiRoutingTemplate.RelationshipNameUrlPlaceholder, expansionParameter);
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj b/src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj
index ab4a38c537..f3575b9189 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiDotNetCore.OpenApi.csproj
@@ -1,22 +1,32 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
+    <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net;openapi;swagger;swaggerui;swashbuckle</PackageTags>
+    <VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
+    <PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net;rest;web-api;openapi;swagger;swaggerui;swashbuckle</PackageTags>
     <Description>A Swashbuckle integration that enables you to describe a JsonApiDotNetCore API with an OpenAPI specification.</Description>
     <Authors>json-api-dotnet</Authors>
     <PackageProjectUrl>https://www.jsonapi.net/</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageReleaseNotes>See https://github.com/json-api-dotnet/JsonApiDotNetCore/releases.</PackageReleaseNotes>
+    <PackageIcon>logo.png</PackageIcon>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\..\logo.png" Visible="false">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
   </ItemGroup>
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiEndpoint.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiEndpoint.cs
index c3ac0cbb95..6a1ad46d13 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiEndpoint.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiEndpoint.cs
@@ -1,18 +1,17 @@
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal enum JsonApiEndpoint
 {
-    internal enum JsonApiEndpoint
-    {
-        GetCollection,
-        GetSingle,
-        GetSecondary,
-        GetRelationship,
-        Post,
-        PostRelationship,
-        Patch,
-        PatchRelationship,
+    GetCollection,
+    GetSingle,
+    GetSecondary,
+    GetRelationship,
+    Post,
+    PostRelationship,
+    Patch,
+    PatchRelationship,
 #pragma warning disable AV1711 // Name members and local functions similarly to members of .NET Framework classes
-        Delete,
+    Delete,
 #pragma warning restore AV1711 // Name members and local functions similarly to members of .NET Framework classes
-        DeleteRelationship
-    }
+    DeleteRelationship
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/EndpointResolver.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/EndpointResolver.cs
index 08368a797c..bbe2e35ba0 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/EndpointResolver.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/EndpointResolver.cs
@@ -1,70 +1,68 @@
-using System.Linq;
 using System.Reflection;
 using JsonApiDotNetCore.Controllers;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Routing;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
+namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+
+internal sealed class EndpointResolver
 {
-    internal sealed class EndpointResolver
+    public JsonApiEndpoint? Get(MethodInfo controllerAction)
     {
-        public JsonApiEndpoint? Get(MethodInfo controllerAction)
-        {
-            ArgumentGuard.NotNull(controllerAction, nameof(controllerAction));
+        ArgumentGuard.NotNull(controllerAction, nameof(controllerAction));
 
-            // This is a temporary work-around to prevent the JsonApiDotNetCoreExample project from crashing upon startup.
-            if (!IsJsonApiController(controllerAction) || IsOperationsController(controllerAction))
-            {
-                return null;
-            }
+        // This is a temporary work-around to prevent the JsonApiDotNetCoreExample project from crashing upon startup.
+        if (!IsJsonApiController(controllerAction) || IsOperationsController(controllerAction))
+        {
+            return null;
+        }
 
-            HttpMethodAttribute? method = controllerAction.GetCustomAttributes(true).OfType<HttpMethodAttribute>().FirstOrDefault();
+        HttpMethodAttribute? method = controllerAction.GetCustomAttributes(true).OfType<HttpMethodAttribute>().FirstOrDefault();
 
-            return ResolveJsonApiEndpoint(method);
-        }
+        return ResolveJsonApiEndpoint(method);
+    }
 
-        private static bool IsJsonApiController(MethodInfo controllerAction)
-        {
-            return typeof(CoreJsonApiController).IsAssignableFrom(controllerAction.ReflectedType);
-        }
+    private static bool IsJsonApiController(MethodInfo controllerAction)
+    {
+        return typeof(CoreJsonApiController).IsAssignableFrom(controllerAction.ReflectedType);
+    }
 
-        private static bool IsOperationsController(MethodInfo controllerAction)
-        {
-            return typeof(BaseJsonApiOperationsController).IsAssignableFrom(controllerAction.ReflectedType);
-        }
+    private static bool IsOperationsController(MethodInfo controllerAction)
+    {
+        return typeof(BaseJsonApiOperationsController).IsAssignableFrom(controllerAction.ReflectedType);
+    }
 
-        private static JsonApiEndpoint? ResolveJsonApiEndpoint(HttpMethodAttribute? httpMethod)
+    private static JsonApiEndpoint? ResolveJsonApiEndpoint(HttpMethodAttribute? httpMethod)
+    {
+        return httpMethod switch
         {
-            return httpMethod switch
+            HttpGetAttribute attr => attr.Template switch
             {
-                HttpGetAttribute attr => attr.Template switch
-                {
-                    null => JsonApiEndpoint.GetCollection,
-                    JsonApiRoutingTemplate.PrimaryEndpoint => JsonApiEndpoint.GetSingle,
-                    JsonApiRoutingTemplate.SecondaryEndpoint => JsonApiEndpoint.GetSecondary,
-                    JsonApiRoutingTemplate.RelationshipEndpoint => JsonApiEndpoint.GetRelationship,
-                    _ => null
-                },
-                HttpPostAttribute attr => attr.Template switch
-                {
-                    null => JsonApiEndpoint.Post,
-                    JsonApiRoutingTemplate.RelationshipEndpoint => JsonApiEndpoint.PostRelationship,
-                    _ => null
-                },
-                HttpPatchAttribute attr => attr.Template switch
-                {
-                    JsonApiRoutingTemplate.PrimaryEndpoint => JsonApiEndpoint.Patch,
-                    JsonApiRoutingTemplate.RelationshipEndpoint => JsonApiEndpoint.PatchRelationship,
-                    _ => null
-                },
-                HttpDeleteAttribute attr => attr.Template switch
-                {
-                    JsonApiRoutingTemplate.PrimaryEndpoint => JsonApiEndpoint.Delete,
-                    JsonApiRoutingTemplate.RelationshipEndpoint => JsonApiEndpoint.DeleteRelationship,
-                    _ => null
-                },
+                null => JsonApiEndpoint.GetCollection,
+                JsonApiRoutingTemplate.PrimaryEndpoint => JsonApiEndpoint.GetSingle,
+                JsonApiRoutingTemplate.SecondaryEndpoint => JsonApiEndpoint.GetSecondary,
+                JsonApiRoutingTemplate.RelationshipEndpoint => JsonApiEndpoint.GetRelationship,
                 _ => null
-            };
-        }
+            },
+            HttpPostAttribute attr => attr.Template switch
+            {
+                null => JsonApiEndpoint.Post,
+                JsonApiRoutingTemplate.RelationshipEndpoint => JsonApiEndpoint.PostRelationship,
+                _ => null
+            },
+            HttpPatchAttribute attr => attr.Template switch
+            {
+                JsonApiRoutingTemplate.PrimaryEndpoint => JsonApiEndpoint.Patch,
+                JsonApiRoutingTemplate.RelationshipEndpoint => JsonApiEndpoint.PatchRelationship,
+                _ => null
+            },
+            HttpDeleteAttribute attr => attr.Template switch
+            {
+                JsonApiRoutingTemplate.PrimaryEndpoint => JsonApiEndpoint.Delete,
+                JsonApiRoutingTemplate.RelationshipEndpoint => JsonApiEndpoint.DeleteRelationship,
+                _ => null
+            },
+            _ => null
+        };
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiEndpointMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiEndpointMetadata.cs
index a12943366f..3bc7791967 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiEndpointMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiEndpointMetadata.cs
@@ -1,6 +1,5 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
+namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+
+internal interface IJsonApiEndpointMetadata
 {
-    internal interface IJsonApiEndpointMetadata
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiRequestMetadata.cs
index 31a5c397be..e4c36c4915 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiRequestMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiRequestMetadata.cs
@@ -1,6 +1,5 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
+namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+
+internal interface IJsonApiRequestMetadata : IJsonApiEndpointMetadata
 {
-    internal interface IJsonApiRequestMetadata : IJsonApiEndpointMetadata
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiResponseMetadata.cs
index 1572daab59..378f2c242f 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiResponseMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/IJsonApiResponseMetadata.cs
@@ -1,6 +1,5 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
+namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+
+internal interface IJsonApiResponseMetadata : IJsonApiEndpointMetadata
 {
-    internal interface IJsonApiResponseMetadata : IJsonApiEndpointMetadata
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs
index fad7c32158..5c26efa317 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataContainer.cs
@@ -1,18 +1,17 @@
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
+namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+
+/// <summary>
+/// Metadata available at runtime about a JsonApiDotNetCore endpoint.
+/// </summary>
+internal sealed class JsonApiEndpointMetadataContainer
 {
-    /// <summary>
-    /// Metadata available at runtime about a JsonApiDotNetCore endpoint.
-    /// </summary>
-    internal sealed class JsonApiEndpointMetadataContainer
-    {
-        public IJsonApiRequestMetadata? RequestMetadata { get; }
+    public IJsonApiRequestMetadata? RequestMetadata { get; }
 
-        public IJsonApiResponseMetadata? ResponseMetadata { get; }
+    public IJsonApiResponseMetadata? ResponseMetadata { get; }
 
-        public JsonApiEndpointMetadataContainer(IJsonApiRequestMetadata? requestMetadata, IJsonApiResponseMetadata? responseMetadata)
-        {
-            RequestMetadata = requestMetadata;
-            ResponseMetadata = responseMetadata;
-        }
+    public JsonApiEndpointMetadataContainer(IJsonApiRequestMetadata? requestMetadata, IJsonApiResponseMetadata? responseMetadata)
+    {
+        RequestMetadata = requestMetadata;
+        ResponseMetadata = responseMetadata;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
index 0c31c43852..bc23d3e0ec 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/JsonApiEndpointMetadataProvider.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -8,145 +5,143 @@
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
+namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
+
+/// <summary>
+/// Provides JsonApiDotNetCore related metadata for an ASP.NET controller action that can only be computed from the <see cref="ResourceGraph" /> at
+/// runtime.
+/// </summary>
+internal sealed class JsonApiEndpointMetadataProvider
 {
-    /// <summary>
-    /// Provides JsonApiDotNetCore related metadata for an ASP.NET controller action that can only be computed from the <see cref="ResourceGraph" /> at
-    /// runtime.
-    /// </summary>
-    internal sealed class JsonApiEndpointMetadataProvider
+    private readonly IControllerResourceMapping _controllerResourceMapping;
+    private readonly EndpointResolver _endpointResolver = new();
+
+    public JsonApiEndpointMetadataProvider(IControllerResourceMapping controllerResourceMapping)
     {
-        private readonly IControllerResourceMapping _controllerResourceMapping;
-        private readonly EndpointResolver _endpointResolver = new();
+        ArgumentGuard.NotNull(controllerResourceMapping, nameof(controllerResourceMapping));
 
-        public JsonApiEndpointMetadataProvider(IControllerResourceMapping controllerResourceMapping)
-        {
-            ArgumentGuard.NotNull(controllerResourceMapping, nameof(controllerResourceMapping));
+        _controllerResourceMapping = controllerResourceMapping;
+    }
+
+    public JsonApiEndpointMetadataContainer Get(MethodInfo controllerAction)
+    {
+        ArgumentGuard.NotNull(controllerAction, nameof(controllerAction));
+
+        JsonApiEndpoint? endpoint = _endpointResolver.Get(controllerAction);
 
-            _controllerResourceMapping = controllerResourceMapping;
+        if (endpoint == null)
+        {
+            throw new NotSupportedException($"Unable to provide metadata for non-JsonApiDotNetCore endpoint '{controllerAction.ReflectedType!.FullName}'.");
         }
 
-        public JsonApiEndpointMetadataContainer Get(MethodInfo controllerAction)
+        ResourceType? primaryResourceType = _controllerResourceMapping.GetResourceTypeForController(controllerAction.ReflectedType);
+
+        if (primaryResourceType == null)
         {
-            ArgumentGuard.NotNull(controllerAction, nameof(controllerAction));
+            throw new UnreachableCodeException();
+        }
 
-            JsonApiEndpoint? endpoint = _endpointResolver.Get(controllerAction);
+        IJsonApiRequestMetadata? requestMetadata = GetRequestMetadata(endpoint.Value, primaryResourceType);
+        IJsonApiResponseMetadata? responseMetadata = GetResponseMetadata(endpoint.Value, primaryResourceType);
+        return new JsonApiEndpointMetadataContainer(requestMetadata, responseMetadata);
+    }
 
-            if (endpoint == null)
+    private IJsonApiRequestMetadata? GetRequestMetadata(JsonApiEndpoint endpoint, ResourceType primaryResourceType)
+    {
+        switch (endpoint)
+        {
+            case JsonApiEndpoint.Post:
             {
-                throw new NotSupportedException($"Unable to provide metadata for non-JsonApiDotNetCore endpoint '{controllerAction.ReflectedType!.FullName}'.");
+                return GetPostRequestMetadata(primaryResourceType.ClrType);
             }
-
-            ResourceType? primaryResourceType = _controllerResourceMapping.GetResourceTypeForController(controllerAction.ReflectedType);
-
-            if (primaryResourceType == null)
+            case JsonApiEndpoint.Patch:
             {
-                throw new UnreachableCodeException();
+                return GetPatchRequestMetadata(primaryResourceType.ClrType);
             }
-
-            IJsonApiRequestMetadata? requestMetadata = GetRequestMetadata(endpoint.Value, primaryResourceType);
-            IJsonApiResponseMetadata? responseMetadata = GetResponseMetadata(endpoint.Value, primaryResourceType);
-            return new JsonApiEndpointMetadataContainer(requestMetadata, responseMetadata);
-        }
-
-        private IJsonApiRequestMetadata? GetRequestMetadata(JsonApiEndpoint endpoint, ResourceType primaryResourceType)
-        {
-            switch (endpoint)
+            case JsonApiEndpoint.PostRelationship:
+            case JsonApiEndpoint.PatchRelationship:
+            case JsonApiEndpoint.DeleteRelationship:
+            {
+                return GetRelationshipRequestMetadata(primaryResourceType.Relationships, endpoint != JsonApiEndpoint.PatchRelationship);
+            }
+            default:
             {
-                case JsonApiEndpoint.Post:
-                {
-                    return GetPostRequestMetadata(primaryResourceType.ClrType);
-                }
-                case JsonApiEndpoint.Patch:
-                {
-                    return GetPatchRequestMetadata(primaryResourceType.ClrType);
-                }
-                case JsonApiEndpoint.PostRelationship:
-                case JsonApiEndpoint.PatchRelationship:
-                case JsonApiEndpoint.DeleteRelationship:
-                {
-                    return GetRelationshipRequestMetadata(primaryResourceType.Relationships, endpoint != JsonApiEndpoint.PatchRelationship);
-                }
-                default:
-                {
-                    return null;
-                }
+                return null;
             }
         }
+    }
 
-        private static PrimaryRequestMetadata GetPostRequestMetadata(Type resourceClrType)
-        {
-            Type documentType = typeof(ResourcePostRequestDocument<>).MakeGenericType(resourceClrType);
+    private static PrimaryRequestMetadata GetPostRequestMetadata(Type resourceClrType)
+    {
+        Type documentType = typeof(ResourcePostRequestDocument<>).MakeGenericType(resourceClrType);
 
-            return new PrimaryRequestMetadata(documentType);
-        }
+        return new PrimaryRequestMetadata(documentType);
+    }
 
-        private static PrimaryRequestMetadata GetPatchRequestMetadata(Type resourceClrType)
-        {
-            Type documentType = typeof(ResourcePatchRequestDocument<>).MakeGenericType(resourceClrType);
+    private static PrimaryRequestMetadata GetPatchRequestMetadata(Type resourceClrType)
+    {
+        Type documentType = typeof(ResourcePatchRequestDocument<>).MakeGenericType(resourceClrType);
 
-            return new PrimaryRequestMetadata(documentType);
-        }
+        return new PrimaryRequestMetadata(documentType);
+    }
 
-        private static RelationshipRequestMetadata GetRelationshipRequestMetadata(IEnumerable<RelationshipAttribute> relationships,
-            bool ignoreHasOneRelationships)
-        {
-            IEnumerable<RelationshipAttribute> relationshipsOfEndpoint = ignoreHasOneRelationships ? relationships.OfType<HasManyAttribute>() : relationships;
+    private static RelationshipRequestMetadata GetRelationshipRequestMetadata(IEnumerable<RelationshipAttribute> relationships, bool ignoreHasOneRelationships)
+    {
+        IEnumerable<RelationshipAttribute> relationshipsOfEndpoint = ignoreHasOneRelationships ? relationships.OfType<HasManyAttribute>() : relationships;
 
-            IDictionary<string, Type> requestDocumentTypesByRelationshipName = relationshipsOfEndpoint.ToDictionary(relationship => relationship.PublicName,
-                NonPrimaryDocumentTypeFactory.Instance.GetForRelationshipRequest);
+        IDictionary<string, Type> requestDocumentTypesByRelationshipName = relationshipsOfEndpoint.ToDictionary(relationship => relationship.PublicName,
+            NonPrimaryDocumentTypeFactory.Instance.GetForRelationshipRequest);
 
-            return new RelationshipRequestMetadata(requestDocumentTypesByRelationshipName);
-        }
+        return new RelationshipRequestMetadata(requestDocumentTypesByRelationshipName);
+    }
 
-        private IJsonApiResponseMetadata? GetResponseMetadata(JsonApiEndpoint endpoint, ResourceType primaryResourceType)
+    private IJsonApiResponseMetadata? GetResponseMetadata(JsonApiEndpoint endpoint, ResourceType primaryResourceType)
+    {
+        switch (endpoint)
         {
-            switch (endpoint)
+            case JsonApiEndpoint.GetCollection:
+            case JsonApiEndpoint.GetSingle:
+            case JsonApiEndpoint.Post:
+            case JsonApiEndpoint.Patch:
+            {
+                return GetPrimaryResponseMetadata(primaryResourceType.ClrType, endpoint == JsonApiEndpoint.GetCollection);
+            }
+            case JsonApiEndpoint.GetSecondary:
+            {
+                return GetSecondaryResponseMetadata(primaryResourceType.Relationships);
+            }
+            case JsonApiEndpoint.GetRelationship:
+            {
+                return GetRelationshipResponseMetadata(primaryResourceType.Relationships);
+            }
+            default:
             {
-                case JsonApiEndpoint.GetCollection:
-                case JsonApiEndpoint.GetSingle:
-                case JsonApiEndpoint.Post:
-                case JsonApiEndpoint.Patch:
-                {
-                    return GetPrimaryResponseMetadata(primaryResourceType.ClrType, endpoint == JsonApiEndpoint.GetCollection);
-                }
-                case JsonApiEndpoint.GetSecondary:
-                {
-                    return GetSecondaryResponseMetadata(primaryResourceType.Relationships);
-                }
-                case JsonApiEndpoint.GetRelationship:
-                {
-                    return GetRelationshipResponseMetadata(primaryResourceType.Relationships);
-                }
-                default:
-                {
-                    return null;
-                }
+                return null;
             }
         }
+    }
 
-        private static PrimaryResponseMetadata GetPrimaryResponseMetadata(Type resourceClrType, bool endpointReturnsCollection)
-        {
-            Type documentOpenType = endpointReturnsCollection ? typeof(ResourceCollectionResponseDocument<>) : typeof(PrimaryResourceResponseDocument<>);
-            Type documentType = documentOpenType.MakeGenericType(resourceClrType);
+    private static PrimaryResponseMetadata GetPrimaryResponseMetadata(Type resourceClrType, bool endpointReturnsCollection)
+    {
+        Type documentOpenType = endpointReturnsCollection ? typeof(ResourceCollectionResponseDocument<>) : typeof(PrimaryResourceResponseDocument<>);
+        Type documentType = documentOpenType.MakeGenericType(resourceClrType);
 
-            return new PrimaryResponseMetadata(documentType);
-        }
+        return new PrimaryResponseMetadata(documentType);
+    }
 
-        private static SecondaryResponseMetadata GetSecondaryResponseMetadata(IEnumerable<RelationshipAttribute> relationships)
-        {
-            IDictionary<string, Type> responseDocumentTypesByRelationshipName = relationships.ToDictionary(relationship => relationship.PublicName,
-                NonPrimaryDocumentTypeFactory.Instance.GetForSecondaryResponse);
+    private static SecondaryResponseMetadata GetSecondaryResponseMetadata(IEnumerable<RelationshipAttribute> relationships)
+    {
+        IDictionary<string, Type> responseDocumentTypesByRelationshipName = relationships.ToDictionary(relationship => relationship.PublicName,
+            NonPrimaryDocumentTypeFactory.Instance.GetForSecondaryResponse);
 
-            return new SecondaryResponseMetadata(responseDocumentTypesByRelationshipName);
-        }
+        return new SecondaryResponseMetadata(responseDocumentTypesByRelationshipName);
+    }
 
-        private static RelationshipResponseMetadata GetRelationshipResponseMetadata(IEnumerable<RelationshipAttribute> relationships)
-        {
-            IDictionary<string, Type> responseDocumentTypesByRelationshipName = relationships.ToDictionary(relationship => relationship.PublicName,
-                NonPrimaryDocumentTypeFactory.Instance.GetForRelationshipResponse);
+    private static RelationshipResponseMetadata GetRelationshipResponseMetadata(IEnumerable<RelationshipAttribute> relationships)
+    {
+        IDictionary<string, Type> responseDocumentTypesByRelationshipName = relationships.ToDictionary(relationship => relationship.PublicName,
+            NonPrimaryDocumentTypeFactory.Instance.GetForRelationshipResponse);
 
-            return new RelationshipResponseMetadata(responseDocumentTypesByRelationshipName);
-        }
+        return new RelationshipResponseMetadata(responseDocumentTypesByRelationshipName);
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/NonPrimaryEndpointMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/NonPrimaryEndpointMetadata.cs
index b0bd5b275c..650108b9f9 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/NonPrimaryEndpointMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/NonPrimaryEndpointMetadata.cs
@@ -1,17 +1,13 @@
-using System;
-using System.Collections.Generic;
+namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
+internal abstract class NonPrimaryEndpointMetadata
 {
-    internal abstract class NonPrimaryEndpointMetadata
-    {
-        public IDictionary<string, Type> DocumentTypesByRelationshipName { get; }
+    public IDictionary<string, Type> DocumentTypesByRelationshipName { get; }
 
-        protected NonPrimaryEndpointMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
-        {
-            ArgumentGuard.NotNull(documentTypesByRelationshipName, nameof(documentTypesByRelationshipName));
+    protected NonPrimaryEndpointMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
+    {
+        ArgumentGuard.NotNull(documentTypesByRelationshipName, nameof(documentTypesByRelationshipName));
 
-            DocumentTypesByRelationshipName = documentTypesByRelationshipName;
-        }
+        DocumentTypesByRelationshipName = documentTypesByRelationshipName;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryRequestMetadata.cs
index 876e04b913..8497de020a 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryRequestMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryRequestMetadata.cs
@@ -1,16 +1,13 @@
-using System;
+namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
+internal sealed class PrimaryRequestMetadata : IJsonApiRequestMetadata
 {
-    internal sealed class PrimaryRequestMetadata : IJsonApiRequestMetadata
-    {
-        public Type DocumentType { get; }
+    public Type DocumentType { get; }
 
-        public PrimaryRequestMetadata(Type documentType)
-        {
-            ArgumentGuard.NotNull(documentType, nameof(documentType));
+    public PrimaryRequestMetadata(Type documentType)
+    {
+        ArgumentGuard.NotNull(documentType, nameof(documentType));
 
-            DocumentType = documentType;
-        }
+        DocumentType = documentType;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryResponseMetadata.cs
index 81c7127c6f..dc02f69f7b 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryResponseMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/PrimaryResponseMetadata.cs
@@ -1,16 +1,13 @@
-using System;
+namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
+internal sealed class PrimaryResponseMetadata : IJsonApiResponseMetadata
 {
-    internal sealed class PrimaryResponseMetadata : IJsonApiResponseMetadata
-    {
-        public Type DocumentType { get; }
+    public Type DocumentType { get; }
 
-        public PrimaryResponseMetadata(Type documentType)
-        {
-            ArgumentGuard.NotNull(documentType, nameof(documentType));
+    public PrimaryResponseMetadata(Type documentType)
+    {
+        ArgumentGuard.NotNull(documentType, nameof(documentType));
 
-            DocumentType = documentType;
-        }
+        DocumentType = documentType;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipRequestMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipRequestMetadata.cs
index 7b39b848e0..4f8d5c097d 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipRequestMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipRequestMetadata.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
+namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
+internal sealed class RelationshipRequestMetadata : NonPrimaryEndpointMetadata, IJsonApiRequestMetadata
 {
-    internal sealed class RelationshipRequestMetadata : NonPrimaryEndpointMetadata, IJsonApiRequestMetadata
+    public RelationshipRequestMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
+        : base(documentTypesByRelationshipName)
     {
-        public RelationshipRequestMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
-            : base(documentTypesByRelationshipName)
-        {
-        }
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipResponseMetadata.cs
index 0acca50617..e9f08c26e7 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipResponseMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/RelationshipResponseMetadata.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
+namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
+internal sealed class RelationshipResponseMetadata : NonPrimaryEndpointMetadata, IJsonApiResponseMetadata
 {
-    internal sealed class RelationshipResponseMetadata : NonPrimaryEndpointMetadata, IJsonApiResponseMetadata
+    public RelationshipResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
+        : base(documentTypesByRelationshipName)
     {
-        public RelationshipResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
-            : base(documentTypesByRelationshipName)
-        {
-        }
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/SecondaryResponseMetadata.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/SecondaryResponseMetadata.cs
index c72661e594..c452871a86 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/SecondaryResponseMetadata.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiMetadata/SecondaryResponseMetadata.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
+namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiMetadata
+internal sealed class SecondaryResponseMetadata : NonPrimaryEndpointMetadata, IJsonApiResponseMetadata
 {
-    internal sealed class SecondaryResponseMetadata : NonPrimaryEndpointMetadata, IJsonApiResponseMetadata
+    public SecondaryResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
+        : base(documentTypesByRelationshipName)
     {
-        public SecondaryResponseMetadata(IDictionary<string, Type> documentTypesByRelationshipName)
-            : base(documentTypesByRelationshipName)
-        {
-        }
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjectPropertyName.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjectPropertyName.cs
index 342999f8a4..dd6248eadd 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjectPropertyName.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjectPropertyName.cs
@@ -1,15 +1,14 @@
 #pragma warning disable AV1008 // Class should not be static
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal static class JsonApiObjectPropertyName
 {
-    internal static class JsonApiObjectPropertyName
-    {
-        public const string Type = "type";
-        public const string Id = "id";
-        public const string Data = "data";
-        public const string AttributesObject = "attributes";
-        public const string RelationshipsObject = "relationships";
-        public const string MetaObject = "meta";
-        public const string LinksObject = "links";
-    }
+    public const string Type = "type";
+    public const string Id = "id";
+    public const string Data = "data";
+    public const string AttributesObject = "attributes";
+    public const string RelationshipsObject = "relationships";
+    public const string MetaObject = "meta";
+    public const string LinksObject = "links";
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableResourceIdentifierResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableResourceIdentifierResponseDocument.cs
index 7f2673bf97..2eb2bff44d 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableResourceIdentifierResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableResourceIdentifierResponseDocument.cs
@@ -1,21 +1,19 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class NullableResourceIdentifierResponseDocument<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class NullableResourceIdentifierResponseDocument<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>
-        where TResource : IIdentifiable
-    {
-        public IDictionary<string, object> Meta { get; set; } = null!;
+    public IDictionary<string, object> Meta { get; set; } = null!;
 
-        public JsonapiObject Jsonapi { get; set; } = null!;
+    public JsonapiObject Jsonapi { get; set; } = null!;
 
-        [Required]
-        public LinksInResourceIdentifierDocument Links { get; set; } = null!;
-    }
+    [Required]
+    public LinksInResourceIdentifierDocument Links { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableSecondaryResourceResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableSecondaryResourceResponseDocument.cs
index b1cfe45062..383e8301e9 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableSecondaryResourceResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/NullableSecondaryResourceResponseDocument.cs
@@ -1,21 +1,19 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class NullableSecondaryResourceResponseDocument<TResource> : NullableSingleData<ResourceObjectInResponse<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class NullableSecondaryResourceResponseDocument<TResource> : NullableSingleData<ResourceObjectInResponse<TResource>>
-        where TResource : IIdentifiable
-    {
-        public IDictionary<string, object> Meta { get; set; } = null!;
+    public IDictionary<string, object> Meta { get; set; } = null!;
 
-        public JsonapiObject Jsonapi { get; set; } = null!;
+    public JsonapiObject Jsonapi { get; set; } = null!;
 
-        [Required]
-        public LinksInResourceDocument Links { get; set; } = null!;
-    }
+    [Required]
+    public LinksInResourceDocument Links { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/PrimaryResourceResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/PrimaryResourceResponseDocument.cs
index 76b47786d2..f708972a94 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/PrimaryResourceResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/PrimaryResourceResponseDocument.cs
@@ -1,23 +1,21 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+
+// Types in the current namespace are never touched by ASP.NET ModelState validation, therefore using a non-nullable reference type for a property does not
+// imply this property is required. Instead, we use [Required] explicitly, because this is how Swashbuckle is instructed to mark properties as required.
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class PrimaryResourceResponseDocument<TResource> : SingleData<ResourceObjectInResponse<TResource>>
+    where TResource : IIdentifiable
 {
-    // Types in the current namespace are never touched by ASP.NET ModelState validation, therefore using a non-nullable reference type for a property does not
-    // imply this property is required. Instead, we use [Required] explicitly, because this is how Swashbuckle is instructed to mark properties as required.
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class PrimaryResourceResponseDocument<TResource> : SingleData<ResourceObjectInResponse<TResource>>
-        where TResource : IIdentifiable
-    {
-        public IDictionary<string, object> Meta { get; set; } = null!;
+    public IDictionary<string, object> Meta { get; set; } = null!;
 
-        public JsonapiObject Jsonapi { get; set; } = null!;
+    public JsonapiObject Jsonapi { get; set; } = null!;
 
-        [Required]
-        public LinksInResourceDocument Links { get; set; } = null!;
-    }
+    [Required]
+    public LinksInResourceDocument Links { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceCollectionResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceCollectionResponseDocument.cs
index 97d35c0156..92bbc88803 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceCollectionResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceCollectionResponseDocument.cs
@@ -1,21 +1,19 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class ResourceCollectionResponseDocument<TResource> : ManyData<ResourceObjectInResponse<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ResourceCollectionResponseDocument<TResource> : ManyData<ResourceObjectInResponse<TResource>>
-        where TResource : IIdentifiable
-    {
-        public IDictionary<string, object> Meta { get; set; } = null!;
+    public IDictionary<string, object> Meta { get; set; } = null!;
 
-        public JsonapiObject Jsonapi { get; set; } = null!;
+    public JsonapiObject Jsonapi { get; set; } = null!;
 
-        [Required]
-        public LinksInResourceCollectionDocument Links { get; set; } = null!;
-    }
+    [Required]
+    public LinksInResourceCollectionDocument Links { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierCollectionResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierCollectionResponseDocument.cs
index 669609a3d5..1efa833988 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierCollectionResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierCollectionResponseDocument.cs
@@ -1,21 +1,19 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class ResourceIdentifierCollectionResponseDocument<TResource> : ManyData<ResourceIdentifierObject<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ResourceIdentifierCollectionResponseDocument<TResource> : ManyData<ResourceIdentifierObject<TResource>>
-        where TResource : IIdentifiable
-    {
-        public IDictionary<string, object> Meta { get; set; } = null!;
+    public IDictionary<string, object> Meta { get; set; } = null!;
 
-        public JsonapiObject Jsonapi { get; set; } = null!;
+    public JsonapiObject Jsonapi { get; set; } = null!;
 
-        [Required]
-        public LinksInResourceIdentifierCollectionDocument Links { get; set; } = null!;
-    }
+    [Required]
+    public LinksInResourceIdentifierCollectionDocument Links { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierResponseDocument.cs
index bc6d6d0de1..bf87717555 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourceIdentifierResponseDocument.cs
@@ -1,21 +1,19 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class ResourceIdentifierResponseDocument<TResource> : SingleData<ResourceIdentifierObject<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ResourceIdentifierResponseDocument<TResource> : SingleData<ResourceIdentifierObject<TResource>>
-        where TResource : IIdentifiable
-    {
-        public IDictionary<string, object> Meta { get; set; } = null!;
+    public IDictionary<string, object> Meta { get; set; } = null!;
 
-        public JsonapiObject Jsonapi { get; set; } = null!;
+    public JsonapiObject Jsonapi { get; set; } = null!;
 
-        [Required]
-        public LinksInResourceIdentifierDocument Links { get; set; } = null!;
-    }
+    [Required]
+    public LinksInResourceIdentifierDocument Links { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourcePatchRequestDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourcePatchRequestDocument.cs
index 6a5e7615c5..e1653b3006 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourcePatchRequestDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourcePatchRequestDocument.cs
@@ -2,11 +2,10 @@
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class ResourcePatchRequestDocument<TResource> : SingleData<ResourceObjectInPatchRequest<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ResourcePatchRequestDocument<TResource> : SingleData<ResourceObjectInPatchRequest<TResource>>
-        where TResource : IIdentifiable
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourcePostRequestDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourcePostRequestDocument.cs
index 2459cef0eb..47d2386ff4 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourcePostRequestDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/ResourcePostRequestDocument.cs
@@ -2,11 +2,10 @@
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class ResourcePostRequestDocument<TResource> : SingleData<ResourceObjectInPostRequest<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ResourcePostRequestDocument<TResource> : SingleData<ResourceObjectInPostRequest<TResource>>
-        where TResource : IIdentifiable
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/SecondaryResourceResponseDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/SecondaryResourceResponseDocument.cs
index 73698b6351..1cb601c87d 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/SecondaryResourceResponseDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Documents/SecondaryResourceResponseDocument.cs
@@ -1,21 +1,19 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class SecondaryResourceResponseDocument<TResource> : SingleData<ResourceObjectInResponse<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class SecondaryResourceResponseDocument<TResource> : SingleData<ResourceObjectInResponse<TResource>>
-        where TResource : IIdentifiable
-    {
-        public IDictionary<string, object> Meta { get; set; } = null!;
+    public IDictionary<string, object> Meta { get; set; } = null!;
 
-        public JsonapiObject Jsonapi { get; set; } = null!;
+    public JsonapiObject Jsonapi { get; set; } = null!;
 
-        [Required]
-        public LinksInResourceDocument Links { get; set; } = null!;
-    }
+    [Required]
+    public LinksInResourceDocument Links { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/JsonapiObject.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/JsonapiObject.cs
index 2b4d8a43e5..1c7b497cb2 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/JsonapiObject.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/JsonapiObject.cs
@@ -1,17 +1,15 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class JsonapiObject
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class JsonapiObject
-    {
-        public string Version { get; set; } = null!;
+    public string Version { get; set; } = null!;
 
-        public ICollection<string> Ext { get; set; } = null!;
+    public ICollection<string> Ext { get; set; } = null!;
 
-        public ICollection<string> Profile { get; set; } = null!;
+    public ICollection<string> Profile { get; set; } = null!;
 
-        public IDictionary<string, object> Meta { get; set; } = null!;
-    }
+    public IDictionary<string, object> Meta { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInRelationshipObject.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInRelationshipObject.cs
index 37ad37342b..db689900b3 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInRelationshipObject.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInRelationshipObject.cs
@@ -1,15 +1,14 @@
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class LinksInRelationshipObject
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class LinksInRelationshipObject
-    {
-        [Required]
-        public string Self { get; set; } = null!;
+    [Required]
+    public string Self { get; set; } = null!;
 
-        [Required]
-        public string Related { get; set; } = null!;
-    }
+    [Required]
+    public string Related { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceCollectionDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceCollectionDocument.cs
index 7dacca5b49..e2a96ef8e4 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceCollectionDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceCollectionDocument.cs
@@ -1,23 +1,22 @@
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class LinksInResourceCollectionDocument
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class LinksInResourceCollectionDocument
-    {
-        [Required]
-        public string Self { get; set; } = null!;
+    [Required]
+    public string Self { get; set; } = null!;
 
-        public string Describedby { get; set; } = null!;
+    public string Describedby { get; set; } = null!;
 
-        [Required]
-        public string First { get; set; } = null!;
+    [Required]
+    public string First { get; set; } = null!;
 
-        public string Last { get; set; } = null!;
+    public string Last { get; set; } = null!;
 
-        public string Prev { get; set; } = null!;
+    public string Prev { get; set; } = null!;
 
-        public string Next { get; set; } = null!;
-    }
+    public string Next { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceDocument.cs
index 2eea7e1bc6..e22ce258bc 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceDocument.cs
@@ -1,14 +1,13 @@
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class LinksInResourceDocument
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class LinksInResourceDocument
-    {
-        [Required]
-        public string Self { get; set; } = null!;
+    [Required]
+    public string Self { get; set; } = null!;
 
-        public string Describedby { get; set; } = null!;
-    }
+    public string Describedby { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceIdentifierCollectionDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceIdentifierCollectionDocument.cs
index f8dc978a2a..f440b118fd 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceIdentifierCollectionDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceIdentifierCollectionDocument.cs
@@ -1,26 +1,25 @@
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class LinksInResourceIdentifierCollectionDocument
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class LinksInResourceIdentifierCollectionDocument
-    {
-        [Required]
-        public string Self { get; set; } = null!;
+    [Required]
+    public string Self { get; set; } = null!;
 
-        public string Describedby { get; set; } = null!;
+    public string Describedby { get; set; } = null!;
 
-        [Required]
-        public string Related { get; set; } = null!;
+    [Required]
+    public string Related { get; set; } = null!;
 
-        [Required]
-        public string First { get; set; } = null!;
+    [Required]
+    public string First { get; set; } = null!;
 
-        public string Last { get; set; } = null!;
+    public string Last { get; set; } = null!;
 
-        public string Prev { get; set; } = null!;
+    public string Prev { get; set; } = null!;
 
-        public string Next { get; set; } = null!;
-    }
+    public string Next { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceIdentifierDocument.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceIdentifierDocument.cs
index 550cac6b76..1fcca155cf 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceIdentifierDocument.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceIdentifierDocument.cs
@@ -1,17 +1,16 @@
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class LinksInResourceIdentifierDocument
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class LinksInResourceIdentifierDocument
-    {
-        [Required]
-        public string Self { get; set; } = null!;
+    [Required]
+    public string Self { get; set; } = null!;
 
-        public string Describedby { get; set; } = null!;
+    public string Describedby { get; set; } = null!;
 
-        [Required]
-        public string Related { get; set; } = null!;
-    }
+    [Required]
+    public string Related { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceObject.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceObject.cs
index 1ee227cfcc..f8f7de61f2 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceObject.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Links/LinksInResourceObject.cs
@@ -1,12 +1,11 @@
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class LinksInResourceObject
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class LinksInResourceObject
-    {
-        [Required]
-        public string Self { get; set; } = null!;
-    }
+    [Required]
+    public string Self { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ManyData.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ManyData.cs
index 071d1d0bcb..6d345efe5f 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ManyData.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ManyData.cs
@@ -1,15 +1,13 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal abstract class ManyData<TData>
+    where TData : ResourceIdentifierObject
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal abstract class ManyData<TData>
-        where TData : ResourceIdentifierObject
-    {
-        [Required]
-        public ICollection<TData> Data { get; set; } = null!;
-    }
+    [Required]
+    public ICollection<TData> Data { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/NonPrimaryDocumentTypeFactory.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/NonPrimaryDocumentTypeFactory.cs
index 9b213ca336..6ec4dbce2a 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/NonPrimaryDocumentTypeFactory.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/NonPrimaryDocumentTypeFactory.cs
@@ -1,79 +1,77 @@
-using System;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects;
+
+internal sealed class NonPrimaryDocumentTypeFactory
 {
-    internal sealed class NonPrimaryDocumentTypeFactory
-    {
-        private static readonly DocumentOpenTypes SecondaryResponseDocumentOpenTypes = new(typeof(ResourceCollectionResponseDocument<>),
-            typeof(NullableSecondaryResourceResponseDocument<>), typeof(SecondaryResourceResponseDocument<>));
+    private static readonly DocumentOpenTypes SecondaryResponseDocumentOpenTypes = new(typeof(ResourceCollectionResponseDocument<>),
+        typeof(NullableSecondaryResourceResponseDocument<>), typeof(SecondaryResourceResponseDocument<>));
 
-        private static readonly DocumentOpenTypes RelationshipRequestDocumentOpenTypes = new(typeof(ToManyRelationshipInRequest<>),
-            typeof(NullableToOneRelationshipInRequest<>), typeof(ToOneRelationshipInRequest<>));
+    private static readonly DocumentOpenTypes RelationshipRequestDocumentOpenTypes = new(typeof(ToManyRelationshipInRequest<>),
+        typeof(NullableToOneRelationshipInRequest<>), typeof(ToOneRelationshipInRequest<>));
 
-        private static readonly DocumentOpenTypes RelationshipResponseDocumentOpenTypes = new(typeof(ResourceIdentifierCollectionResponseDocument<>),
-            typeof(NullableResourceIdentifierResponseDocument<>), typeof(ResourceIdentifierResponseDocument<>));
+    private static readonly DocumentOpenTypes RelationshipResponseDocumentOpenTypes = new(typeof(ResourceIdentifierCollectionResponseDocument<>),
+        typeof(NullableResourceIdentifierResponseDocument<>), typeof(ResourceIdentifierResponseDocument<>));
 
-        public static NonPrimaryDocumentTypeFactory Instance { get; } = new();
+    public static NonPrimaryDocumentTypeFactory Instance { get; } = new();
 
-        private NonPrimaryDocumentTypeFactory()
-        {
-        }
+    private NonPrimaryDocumentTypeFactory()
+    {
+    }
 
-        public Type GetForSecondaryResponse(RelationshipAttribute relationship)
-        {
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
+    public Type GetForSecondaryResponse(RelationshipAttribute relationship)
+    {
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
 
-            return Get(relationship, SecondaryResponseDocumentOpenTypes);
-        }
+        return Get(relationship, SecondaryResponseDocumentOpenTypes);
+    }
 
-        public Type GetForRelationshipRequest(RelationshipAttribute relationship)
-        {
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
+    public Type GetForRelationshipRequest(RelationshipAttribute relationship)
+    {
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
 
-            return Get(relationship, RelationshipRequestDocumentOpenTypes);
-        }
+        return Get(relationship, RelationshipRequestDocumentOpenTypes);
+    }
 
-        public Type GetForRelationshipResponse(RelationshipAttribute relationship)
-        {
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
+    public Type GetForRelationshipResponse(RelationshipAttribute relationship)
+    {
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
 
-            return Get(relationship, RelationshipResponseDocumentOpenTypes);
-        }
+        return Get(relationship, RelationshipResponseDocumentOpenTypes);
+    }
 
-        private static Type Get(RelationshipAttribute relationship, DocumentOpenTypes types)
-        {
-            // @formatter:nested_ternary_style expanded
+    private static Type Get(RelationshipAttribute relationship, DocumentOpenTypes types)
+    {
+        // @formatter:nested_ternary_style expanded
 
-            Type documentOpenType = relationship is HasManyAttribute
-                ? types.ManyDataOpenType
-                : relationship.IsNullable()
-                    ? types.NullableSingleDataOpenType
-                    : types.SingleDataOpenType;
+        Type documentOpenType = relationship is HasManyAttribute
+            ? types.ManyDataOpenType
+            : relationship.IsNullable()
+                ? types.NullableSingleDataOpenType
+                : types.SingleDataOpenType;
 
-            // @formatter:nested_ternary_style restore
+        // @formatter:nested_ternary_style restore
 
-            return documentOpenType.MakeGenericType(relationship.RightType.ClrType);
-        }
+        return documentOpenType.MakeGenericType(relationship.RightType.ClrType);
+    }
 
-        private sealed class DocumentOpenTypes
+    private sealed class DocumentOpenTypes
+    {
+        public Type ManyDataOpenType { get; }
+        public Type NullableSingleDataOpenType { get; }
+        public Type SingleDataOpenType { get; }
+
+        public DocumentOpenTypes(Type manyDataOpenType, Type nullableSingleDataOpenType, Type singleDataOpenType)
         {
-            public Type ManyDataOpenType { get; }
-            public Type NullableSingleDataOpenType { get; }
-            public Type SingleDataOpenType { get; }
-
-            public DocumentOpenTypes(Type manyDataOpenType, Type nullableSingleDataOpenType, Type singleDataOpenType)
-            {
-                ArgumentGuard.NotNull(manyDataOpenType, nameof(manyDataOpenType));
-                ArgumentGuard.NotNull(nullableSingleDataOpenType, nameof(nullableSingleDataOpenType));
-                ArgumentGuard.NotNull(singleDataOpenType, nameof(singleDataOpenType));
-
-                ManyDataOpenType = manyDataOpenType;
-                NullableSingleDataOpenType = nullableSingleDataOpenType;
-                SingleDataOpenType = singleDataOpenType;
-            }
+            ArgumentGuard.NotNull(manyDataOpenType, nameof(manyDataOpenType));
+            ArgumentGuard.NotNull(nullableSingleDataOpenType, nameof(nullableSingleDataOpenType));
+            ArgumentGuard.NotNull(singleDataOpenType, nameof(singleDataOpenType));
+
+            ManyDataOpenType = manyDataOpenType;
+            NullableSingleDataOpenType = nullableSingleDataOpenType;
+            SingleDataOpenType = singleDataOpenType;
         }
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/NullableSingleData.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/NullableSingleData.cs
index 685ca9eb72..600bdf43b9 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/NullableSingleData.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/NullableSingleData.cs
@@ -2,13 +2,12 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal abstract class NullableSingleData<TData>
+    where TData : ResourceIdentifierObject
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal abstract class NullableSingleData<TData>
-        where TData : ResourceIdentifierObject
-    {
-        [Required]
-        public TData? Data { get; set; }
-    }
+    [Required]
+    public TData? Data { get; set; }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/RelationshipTypeFactory.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/RelationshipTypeFactory.cs
index 4a2dc2775d..28bb85d83e 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/RelationshipTypeFactory.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/RelationshipTypeFactory.cs
@@ -1,39 +1,37 @@
-using System;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects;
+
+internal sealed class RelationshipTypeFactory
 {
-    internal sealed class RelationshipTypeFactory
-    {
-        public static RelationshipTypeFactory Instance { get; } = new();
+    public static RelationshipTypeFactory Instance { get; } = new();
 
-        private RelationshipTypeFactory()
-        {
-        }
+    private RelationshipTypeFactory()
+    {
+    }
 
-        public Type GetForRequest(RelationshipAttribute relationship)
-        {
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
+    public Type GetForRequest(RelationshipAttribute relationship)
+    {
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
 
-            return NonPrimaryDocumentTypeFactory.Instance.GetForRelationshipRequest(relationship);
-        }
+        return NonPrimaryDocumentTypeFactory.Instance.GetForRelationshipRequest(relationship);
+    }
 
-        public Type GetForResponse(RelationshipAttribute relationship)
-        {
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
+    public Type GetForResponse(RelationshipAttribute relationship)
+    {
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
 
-            // @formatter:nested_ternary_style expanded
+        // @formatter:nested_ternary_style expanded
 
-            Type relationshipDataOpenType = relationship is HasManyAttribute
-                ? typeof(ToManyRelationshipInResponse<>)
-                : relationship.IsNullable()
-                    ? typeof(NullableToOneRelationshipInResponse<>)
-                    : typeof(ToOneRelationshipInResponse<>);
+        Type relationshipDataOpenType = relationship is HasManyAttribute
+            ? typeof(ToManyRelationshipInResponse<>)
+            : relationship.IsNullable()
+                ? typeof(NullableToOneRelationshipInResponse<>)
+                : typeof(ToOneRelationshipInResponse<>);
 
-            // @formatter:nested_ternary_style restore
+        // @formatter:nested_ternary_style restore
 
-            return relationshipDataOpenType.MakeGenericType(relationship.RightType.ClrType);
-        }
+        return relationshipDataOpenType.MakeGenericType(relationship.RightType.ClrType);
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs
index 7c21bee5d8..db8e12ab4f 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInRequest.cs
@@ -2,11 +2,10 @@
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class NullableToOneRelationshipInRequest<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class NullableToOneRelationshipInRequest<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>
-        where TResource : IIdentifiable
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs
index 795d5a503b..ed0cbd22fd 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/NullableToOneRelationshipInResponse.cs
@@ -1,19 +1,17 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class NullableToOneRelationshipInResponse<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class NullableToOneRelationshipInResponse<TResource> : NullableSingleData<ResourceIdentifierObject<TResource>>
-        where TResource : IIdentifiable
-    {
-        [Required]
-        public LinksInRelationshipObject Links { get; set; } = null!;
+    [Required]
+    public LinksInRelationshipObject Links { get; set; } = null!;
 
-        public IDictionary<string, object> Meta { get; set; } = null!;
-    }
+    public IDictionary<string, object> Meta { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs
index 51570a56f4..fd9bdcf32c 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInRequest.cs
@@ -2,11 +2,10 @@
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class ToManyRelationshipInRequest<TResource> : ManyData<ResourceIdentifierObject<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ToManyRelationshipInRequest<TResource> : ManyData<ResourceIdentifierObject<TResource>>
-        where TResource : IIdentifiable
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs
index 90e88d334e..381e484f0b 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToManyRelationshipInResponse.cs
@@ -1,19 +1,17 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class ToManyRelationshipInResponse<TResource> : ManyData<ResourceIdentifierObject<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ToManyRelationshipInResponse<TResource> : ManyData<ResourceIdentifierObject<TResource>>
-        where TResource : IIdentifiable
-    {
-        [Required]
-        public LinksInRelationshipObject Links { get; set; } = null!;
+    [Required]
+    public LinksInRelationshipObject Links { get; set; } = null!;
 
-        public IDictionary<string, object> Meta { get; set; } = null!;
-    }
+    public IDictionary<string, object> Meta { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs
index 0d95b0efb2..15121d794e 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInRequest.cs
@@ -2,11 +2,10 @@
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class ToOneRelationshipInRequest<TResource> : SingleData<ResourceIdentifierObject<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ToOneRelationshipInRequest<TResource> : SingleData<ResourceIdentifierObject<TResource>>
-        where TResource : IIdentifiable
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs
index 491c42740e..962091a469 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/Relationships/ToOneRelationshipInResponse.cs
@@ -1,19 +1,17 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class ToOneRelationshipInResponse<TResource> : SingleData<ResourceIdentifierObject<TResource>>
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ToOneRelationshipInResponse<TResource> : SingleData<ResourceIdentifierObject<TResource>>
-        where TResource : IIdentifiable
-    {
-        [Required]
-        public LinksInRelationshipObject Links { get; set; } = null!;
+    [Required]
+    public LinksInRelationshipObject Links { get; set; } = null!;
 
-        public IDictionary<string, object> Meta { get; set; } = null!;
-    }
+    public IDictionary<string, object> Meta { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInPatchRequest.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInPatchRequest.cs
index 84e4c3cc5b..23a17c7f88 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInPatchRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInPatchRequest.cs
@@ -1,10 +1,9 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+
+// ReSharper disable once UnusedTypeParameter
+internal sealed class AttributesInPatchRequest<TResource>
+    where TResource : IIdentifiable
 {
-    // ReSharper disable once UnusedTypeParameter
-    internal sealed class AttributesInPatchRequest<TResource>
-        where TResource : IIdentifiable
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInPostRequest.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInPostRequest.cs
index 798ccfd30b..01a4e7fa98 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInPostRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInPostRequest.cs
@@ -1,10 +1,9 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+
+// ReSharper disable once UnusedTypeParameter
+internal sealed class AttributesInPostRequest<TResource>
+    where TResource : IIdentifiable
 {
-    // ReSharper disable once UnusedTypeParameter
-    internal sealed class AttributesInPostRequest<TResource>
-        where TResource : IIdentifiable
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInResponse.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInResponse.cs
index 65af8f7423..abb171b6eb 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/AttributesInResponse.cs
@@ -1,10 +1,9 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+
+// ReSharper disable once UnusedTypeParameter
+internal sealed class AttributesInResponse<TResource>
+    where TResource : IIdentifiable
 {
-    // ReSharper disable once UnusedTypeParameter
-    internal sealed class AttributesInResponse<TResource>
-        where TResource : IIdentifiable
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInPatchRequest.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInPatchRequest.cs
index da648ecb05..07d1353f8a 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInPatchRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInPatchRequest.cs
@@ -1,10 +1,9 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+
+// ReSharper disable once UnusedTypeParameter
+internal sealed class RelationshipsInPatchRequest<TResource>
+    where TResource : IIdentifiable
 {
-    // ReSharper disable once UnusedTypeParameter
-    internal sealed class RelationshipsInPatchRequest<TResource>
-        where TResource : IIdentifiable
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInPostRequest.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInPostRequest.cs
index 2ac99e1970..d599261c7e 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInPostRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInPostRequest.cs
@@ -1,10 +1,9 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+
+// ReSharper disable once UnusedTypeParameter
+internal sealed class RelationshipsInPostRequest<TResource>
+    where TResource : IIdentifiable
 {
-    // ReSharper disable once UnusedTypeParameter
-    internal sealed class RelationshipsInPostRequest<TResource>
-        where TResource : IIdentifiable
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInResponse.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInResponse.cs
index 75bff02ac1..aa1cf0b7be 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/RelationshipsInResponse.cs
@@ -1,10 +1,9 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+
+// ReSharper disable once UnusedTypeParameter
+internal sealed class RelationshipsInResponse<TResource>
+    where TResource : IIdentifiable
 {
-    // ReSharper disable once UnusedTypeParameter
-    internal sealed class RelationshipsInResponse<TResource>
-        where TResource : IIdentifiable
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceIdentifierObject.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceIdentifierObject.cs
index 7471acabd6..5024c3ed44 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceIdentifierObject.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceIdentifierObject.cs
@@ -2,21 +2,20 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+
+// ReSharper disable once UnusedTypeParameter
+internal sealed class ResourceIdentifierObject<TResource> : ResourceIdentifierObject
+    where TResource : IIdentifiable
 {
-    // ReSharper disable once UnusedTypeParameter
-    internal sealed class ResourceIdentifierObject<TResource> : ResourceIdentifierObject
-        where TResource : IIdentifiable
-    {
-    }
+}
 
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal class ResourceIdentifierObject
-    {
-        [Required]
-        public string Type { get; set; } = null!;
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal class ResourceIdentifierObject
+{
+    [Required]
+    public string Type { get; set; } = null!;
 
-        [Required]
-        public string Id { get; set; } = null!;
-    }
+    [Required]
+    public string Id { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceObjectInPatchRequest.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceObjectInPatchRequest.cs
index dc785579a1..fadb20969e 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceObjectInPatchRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceObjectInPatchRequest.cs
@@ -1,14 +1,13 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class ResourceObjectInPatchRequest<TResource> : ResourceIdentifierObject
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ResourceObjectInPatchRequest<TResource> : ResourceIdentifierObject
-        where TResource : IIdentifiable
-    {
-        public AttributesInPatchRequest<TResource> Attributes { get; set; } = null!;
+    public AttributesInPatchRequest<TResource> Attributes { get; set; } = null!;
 
-        public RelationshipsInPatchRequest<TResource> Relationships { get; set; } = null!;
-    }
+    public RelationshipsInPatchRequest<TResource> Relationships { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceObjectInPostRequest.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceObjectInPostRequest.cs
index 873c12d9c4..71ad0f34c9 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceObjectInPostRequest.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceObjectInPostRequest.cs
@@ -1,14 +1,13 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class ResourceObjectInPostRequest<TResource> : ResourceIdentifierObject
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ResourceObjectInPostRequest<TResource> : ResourceIdentifierObject
-        where TResource : IIdentifiable
-    {
-        public AttributesInPostRequest<TResource> Attributes { get; set; } = null!;
+    public AttributesInPostRequest<TResource> Attributes { get; set; } = null!;
 
-        public RelationshipsInPostRequest<TResource> Relationships { get; set; } = null!;
-    }
+    public RelationshipsInPostRequest<TResource> Relationships { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceObjectInResponse.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceObjectInResponse.cs
index 07e5f42f88..30bf3d0ff6 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceObjectInResponse.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/ResourceObjects/ResourceObjectInResponse.cs
@@ -1,22 +1,20 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Links;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class ResourceObjectInResponse<TResource> : ResourceIdentifierObject
+    where TResource : IIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class ResourceObjectInResponse<TResource> : ResourceIdentifierObject
-        where TResource : IIdentifiable
-    {
-        public AttributesInResponse<TResource> Attributes { get; set; } = null!;
+    public AttributesInResponse<TResource> Attributes { get; set; } = null!;
 
-        public RelationshipsInResponse<TResource> Relationships { get; set; } = null!;
+    public RelationshipsInResponse<TResource> Relationships { get; set; } = null!;
 
-        [Required]
-        public LinksInResourceObject Links { get; set; } = null!;
+    [Required]
+    public LinksInResourceObject Links { get; set; } = null!;
 
-        public IDictionary<string, object> Meta { get; set; } = null!;
-    }
+    public IDictionary<string, object> Meta { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/SingleData.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/SingleData.cs
index 0e447e256a..9ba0cd4416 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/SingleData.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiObjects/SingleData.cs
@@ -2,13 +2,12 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 
-namespace JsonApiDotNetCore.OpenApi.JsonApiObjects
+namespace JsonApiDotNetCore.OpenApi.JsonApiObjects;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal abstract class SingleData<TData>
+    where TData : ResourceIdentifierObject
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal abstract class SingleData<TData>
-        where TData : ResourceIdentifierObject
-    {
-        [Required]
-        public TData Data { get; set; } = null!;
-    }
+    [Required]
+    public TData Data { get; set; } = null!;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiOperationIdSelector.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiOperationIdSelector.cs
index e73c23e822..7e3e2572a5 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiOperationIdSelector.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiOperationIdSelector.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.Json;
 using Humanizer;
 using JsonApiDotNetCore.Configuration;
@@ -11,124 +8,127 @@
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Controllers;
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal sealed class JsonApiOperationIdSelector
 {
-    internal sealed class JsonApiOperationIdSelector
+    private const string ResourceOperationIdTemplate = "[Method] [PrimaryResourceName]";
+    private const string ResourceCollectionOperationIdTemplate = ResourceOperationIdTemplate + " Collection";
+    private const string SecondaryOperationIdTemplate = ResourceOperationIdTemplate + " [RelationshipName]";
+    private const string RelationshipOperationIdTemplate = SecondaryOperationIdTemplate + " Relationship";
+
+    private static readonly IDictionary<Type, string> DocumentOpenTypeToOperationIdTemplateMap = new Dictionary<Type, string>
+    {
+        [typeof(ResourceCollectionResponseDocument<>)] = ResourceCollectionOperationIdTemplate,
+        [typeof(PrimaryResourceResponseDocument<>)] = ResourceOperationIdTemplate,
+        [typeof(ResourcePostRequestDocument<>)] = ResourceOperationIdTemplate,
+        [typeof(ResourcePatchRequestDocument<>)] = ResourceOperationIdTemplate,
+        [typeof(void)] = ResourceOperationIdTemplate,
+        [typeof(SecondaryResourceResponseDocument<>)] = SecondaryOperationIdTemplate,
+        [typeof(NullableSecondaryResourceResponseDocument<>)] = SecondaryOperationIdTemplate,
+        [typeof(ResourceIdentifierCollectionResponseDocument<>)] = RelationshipOperationIdTemplate,
+        [typeof(ResourceIdentifierResponseDocument<>)] = RelationshipOperationIdTemplate,
+        [typeof(NullableResourceIdentifierResponseDocument<>)] = RelationshipOperationIdTemplate,
+        [typeof(ToOneRelationshipInRequest<>)] = RelationshipOperationIdTemplate,
+        [typeof(NullableToOneRelationshipInRequest<>)] = RelationshipOperationIdTemplate,
+        [typeof(ToManyRelationshipInRequest<>)] = RelationshipOperationIdTemplate
+    };
+
+    private readonly IControllerResourceMapping _controllerResourceMapping;
+    private readonly JsonNamingPolicy? _namingPolicy;
+    private readonly ResourceNameFormatter _formatter;
+
+    public JsonApiOperationIdSelector(IControllerResourceMapping controllerResourceMapping, JsonNamingPolicy? namingPolicy)
     {
-        private const string ResourceOperationIdTemplate = "[Method] [PrimaryResourceName]";
-        private const string ResourceCollectionOperationIdTemplate = ResourceOperationIdTemplate + " Collection";
-        private const string SecondaryOperationIdTemplate = ResourceOperationIdTemplate + " [RelationshipName]";
-        private const string RelationshipOperationIdTemplate = SecondaryOperationIdTemplate + " Relationship";
+        ArgumentGuard.NotNull(controllerResourceMapping, nameof(controllerResourceMapping));
 
-        private static readonly IDictionary<Type, string> DocumentOpenTypeToOperationIdTemplateMap = new Dictionary<Type, string>
-        {
-            [typeof(ResourceCollectionResponseDocument<>)] = ResourceCollectionOperationIdTemplate,
-            [typeof(PrimaryResourceResponseDocument<>)] = ResourceOperationIdTemplate,
-            [typeof(ResourcePostRequestDocument<>)] = ResourceOperationIdTemplate,
-            [typeof(ResourcePatchRequestDocument<>)] = ResourceOperationIdTemplate,
-            [typeof(void)] = ResourceOperationIdTemplate,
-            [typeof(SecondaryResourceResponseDocument<>)] = SecondaryOperationIdTemplate,
-            [typeof(NullableSecondaryResourceResponseDocument<>)] = SecondaryOperationIdTemplate,
-            [typeof(ResourceIdentifierCollectionResponseDocument<>)] = RelationshipOperationIdTemplate,
-            [typeof(ResourceIdentifierResponseDocument<>)] = RelationshipOperationIdTemplate,
-            [typeof(NullableResourceIdentifierResponseDocument<>)] = RelationshipOperationIdTemplate,
-            [typeof(ToOneRelationshipInRequest<>)] = RelationshipOperationIdTemplate,
-            [typeof(NullableToOneRelationshipInRequest<>)] = RelationshipOperationIdTemplate,
-            [typeof(ToManyRelationshipInRequest<>)] = RelationshipOperationIdTemplate
-        };
-
-        private readonly IControllerResourceMapping _controllerResourceMapping;
-        private readonly JsonNamingPolicy? _namingPolicy;
-        private readonly ResourceNameFormatter _formatter;
-
-        public JsonApiOperationIdSelector(IControllerResourceMapping controllerResourceMapping, JsonNamingPolicy? namingPolicy)
-        {
-            ArgumentGuard.NotNull(controllerResourceMapping, nameof(controllerResourceMapping));
+        _controllerResourceMapping = controllerResourceMapping;
+        _namingPolicy = namingPolicy;
+        _formatter = new ResourceNameFormatter(namingPolicy);
+    }
 
-            _controllerResourceMapping = controllerResourceMapping;
-            _namingPolicy = namingPolicy;
-            _formatter = new ResourceNameFormatter(namingPolicy);
-        }
+    public string GetOperationId(ApiDescription endpoint)
+    {
+        ArgumentGuard.NotNull(endpoint, nameof(endpoint));
 
-        public string GetOperationId(ApiDescription endpoint)
-        {
-            ArgumentGuard.NotNull(endpoint, nameof(endpoint));
+        ResourceType? primaryResourceType = _controllerResourceMapping.GetResourceTypeForController(endpoint.ActionDescriptor.GetActionMethod().ReflectedType);
 
-            ResourceType? primaryResourceType =
-                _controllerResourceMapping.GetResourceTypeForController(endpoint.ActionDescriptor.GetActionMethod().ReflectedType);
+        if (primaryResourceType == null)
+        {
+            throw new UnreachableCodeException();
+        }
 
-            if (primaryResourceType == null)
-            {
-                throw new UnreachableCodeException();
-            }
+        string template = GetTemplate(primaryResourceType.ClrType, endpoint);
 
-            string template = GetTemplate(primaryResourceType.ClrType, endpoint);
+        return ApplyTemplate(template, primaryResourceType.ClrType, endpoint);
+    }
 
-            return ApplyTemplate(template, primaryResourceType.ClrType, endpoint);
-        }
+    private static string GetTemplate(Type resourceClrType, ApiDescription endpoint)
+    {
+        Type requestDocumentType = GetDocumentType(resourceClrType, endpoint);
 
-        private static string GetTemplate(Type resourceClrType, ApiDescription endpoint)
+        if (!DocumentOpenTypeToOperationIdTemplateMap.TryGetValue(requestDocumentType, out string? template))
         {
-            Type requestDocumentType = GetDocumentType(resourceClrType, endpoint);
+            throw new UnreachableCodeException();
+        }
 
-            if (!DocumentOpenTypeToOperationIdTemplateMap.TryGetValue(requestDocumentType, out string? template))
-            {
-                throw new UnreachableCodeException();
-            }
+        return template;
+    }
 
-            return template;
-        }
+    private static Type GetDocumentType(Type primaryResourceClrType, ApiDescription endpoint)
+    {
+        var producesResponseTypeAttribute = endpoint.ActionDescriptor.GetFilterMetadata<ProducesResponseTypeAttribute>();
 
-        private static Type GetDocumentType(Type primaryResourceClrType, ApiDescription endpoint)
+        if (producesResponseTypeAttribute == null)
         {
-            var producesResponseTypeAttribute = endpoint.ActionDescriptor.GetFilterMetadata<ProducesResponseTypeAttribute>();
+            throw new UnreachableCodeException();
+        }
 
-            if (producesResponseTypeAttribute == null)
-            {
-                throw new UnreachableCodeException();
-            }
+        ControllerParameterDescriptor? requestBodyDescriptor = endpoint.ActionDescriptor.GetBodyParameterDescriptor();
 
-            ControllerParameterDescriptor? requestBodyDescriptor = endpoint.ActionDescriptor.GetBodyParameterDescriptor();
+        Type documentType = requestBodyDescriptor?.ParameterType.GetGenericTypeDefinition() ??
+            GetGenericTypeDefinition(producesResponseTypeAttribute.Type) ?? producesResponseTypeAttribute.Type;
 
-            Type documentType = requestBodyDescriptor?.ParameterType.GetGenericTypeDefinition() ??
-                GetGenericTypeDefinition(producesResponseTypeAttribute.Type) ?? producesResponseTypeAttribute.Type;
+        if (documentType == typeof(ResourceCollectionResponseDocument<>))
+        {
+            Type documentResourceType = producesResponseTypeAttribute.Type.GetGenericArguments()[0];
 
-            if (documentType == typeof(ResourceCollectionResponseDocument<>))
+            if (documentResourceType != primaryResourceClrType)
             {
-                Type documentResourceType = producesResponseTypeAttribute.Type.GetGenericArguments()[0];
-
-                if (documentResourceType != primaryResourceClrType)
-                {
-                    documentType = typeof(SecondaryResourceResponseDocument<>);
-                }
+                documentType = typeof(SecondaryResourceResponseDocument<>);
             }
-
-            return documentType;
         }
 
-        private static Type? GetGenericTypeDefinition(Type type)
+        return documentType;
+    }
+
+    private static Type? GetGenericTypeDefinition(Type type)
+    {
+        return type.IsConstructedGenericType ? type.GetGenericTypeDefinition() : null;
+    }
+
+    private string ApplyTemplate(string operationIdTemplate, Type resourceClrType, ApiDescription endpoint)
+    {
+        if (endpoint.RelativePath == null || endpoint.HttpMethod == null)
         {
-            return type.IsConstructedGenericType ? type.GetGenericTypeDefinition() : null;
+            throw new UnreachableCodeException();
         }
 
-        private string ApplyTemplate(string operationIdTemplate, Type resourceClrType, ApiDescription endpoint)
-        {
-            string method = endpoint.HttpMethod!.ToLowerInvariant();
-            string primaryResourceName = _formatter.FormatResourceName(resourceClrType).Singularize();
-            string relationshipName = operationIdTemplate.Contains("[RelationshipName]") ? endpoint.RelativePath.Split("/").Last() : string.Empty;
+        string method = endpoint.HttpMethod.ToLowerInvariant();
+        string primaryResourceName = _formatter.FormatResourceName(resourceClrType).Singularize();
+        string relationshipName = operationIdTemplate.Contains("[RelationshipName]") ? endpoint.RelativePath.Split("/").Last() : string.Empty;
 
-            // @formatter:wrap_chained_method_calls chop_always
-            // @formatter:keep_existing_linebreaks true
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
 
-            string pascalCaseId = operationIdTemplate
-                .Replace("[Method]", method)
-                .Replace("[PrimaryResourceName]", primaryResourceName)
-                .Replace("[RelationshipName]", relationshipName);
+        string pascalCaseId = operationIdTemplate
+            .Replace("[Method]", method)
+            .Replace("[PrimaryResourceName]", primaryResourceName)
+            .Replace("[RelationshipName]", relationshipName);
 
-            // @formatter:keep_existing_linebreaks restore
-            // @formatter:wrap_chained_method_calls restore
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
 
-            return _namingPolicy != null ? _namingPolicy.ConvertName(pascalCaseId) : pascalCaseId;
-        }
+        return _namingPolicy != null ? _namingPolicy.ConvertName(pascalCaseId) : pascalCaseId;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiPathParameter.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiPathParameter.cs
index 497ba9faa7..00038fb942 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiPathParameter.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiPathParameter.cs
@@ -1,9 +1,8 @@
 #pragma warning disable AV1008 // Class should not be static
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal static class JsonApiPathParameter
 {
-    internal static class JsonApiPathParameter
-    {
-        public const string RelationshipName = "relationshipName";
-    }
+    public const string RelationshipName = "relationshipName";
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiRequestFormatMetadataProvider.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiRequestFormatMetadataProvider.cs
index 738c90e043..26dcac4c48 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiRequestFormatMetadataProvider.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiRequestFormatMetadataProvider.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
@@ -9,47 +5,46 @@
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Net.Http.Headers;
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal sealed class JsonApiRequestFormatMetadataProvider : IInputFormatter, IApiRequestFormatMetadataProvider
 {
-    internal sealed class JsonApiRequestFormatMetadataProvider : IInputFormatter, IApiRequestFormatMetadataProvider
+    private static readonly Type[] JsonApiRequestObjectOpenType =
     {
-        private static readonly Type[] JsonApiRequestObjectOpenType =
-        {
-            typeof(ToManyRelationshipInRequest<>),
-            typeof(ToOneRelationshipInRequest<>),
-            typeof(NullableToOneRelationshipInRequest<>),
-            typeof(ResourcePostRequestDocument<>),
-            typeof(ResourcePatchRequestDocument<>)
-        };
+        typeof(ToManyRelationshipInRequest<>),
+        typeof(ToOneRelationshipInRequest<>),
+        typeof(NullableToOneRelationshipInRequest<>),
+        typeof(ResourcePostRequestDocument<>),
+        typeof(ResourcePatchRequestDocument<>)
+    };
 
-        /// <inheritdoc />
-        public bool CanRead(InputFormatterContext context)
-        {
-            return false;
-        }
+    /// <inheritdoc />
+    public bool CanRead(InputFormatterContext context)
+    {
+        return false;
+    }
 
-        /// <inheritdoc />
-        public Task<InputFormatterResult> ReadAsync(InputFormatterContext context)
-        {
-            throw new UnreachableCodeException();
-        }
+    /// <inheritdoc />
+    public Task<InputFormatterResult> ReadAsync(InputFormatterContext context)
+    {
+        throw new UnreachableCodeException();
+    }
 
-        /// <inheritdoc />
-        public IReadOnlyList<string> GetSupportedContentTypes(string contentType, Type objectType)
-        {
-            ArgumentGuard.NotNullNorEmpty(contentType, nameof(contentType));
-            ArgumentGuard.NotNull(objectType, nameof(objectType));
+    /// <inheritdoc />
+    public IReadOnlyList<string> GetSupportedContentTypes(string contentType, Type objectType)
+    {
+        ArgumentGuard.NotNullNorEmpty(contentType, nameof(contentType));
+        ArgumentGuard.NotNull(objectType, nameof(objectType));
 
-            if (contentType == HeaderConstants.MediaType && objectType.IsGenericType &&
-                JsonApiRequestObjectOpenType.Contains(objectType.GetGenericTypeDefinition()))
+        if (contentType == HeaderConstants.MediaType && objectType.IsGenericType &&
+            JsonApiRequestObjectOpenType.Contains(objectType.GetGenericTypeDefinition()))
+        {
+            return new MediaTypeCollection
             {
-                return new MediaTypeCollection
-                {
-                    new MediaTypeHeaderValue(HeaderConstants.MediaType)
-                };
-            }
-
-            return new MediaTypeCollection();
+                new MediaTypeHeaderValue(HeaderConstants.MediaType)
+            };
         }
+
+        return new MediaTypeCollection();
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiRoutingTemplate.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiRoutingTemplate.cs
index aff8ed85a8..73d5c5eaed 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiRoutingTemplate.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiRoutingTemplate.cs
@@ -1,13 +1,12 @@
 #pragma warning disable AV1008 // Class should not be static
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal static class JsonApiRoutingTemplate
 {
-    internal static class JsonApiRoutingTemplate
-    {
-        public const string RelationshipNameUrlPlaceholder = "{" + JsonApiPathParameter.RelationshipName + "}";
-        public const string RelationshipsPart = "relationships";
-        public const string PrimaryEndpoint = "{id}";
-        public const string SecondaryEndpoint = "{id}/" + RelationshipNameUrlPlaceholder;
-        public const string RelationshipEndpoint = "{id}/" + RelationshipsPart + "/" + RelationshipNameUrlPlaceholder;
-    }
+    public const string RelationshipNameUrlPlaceholder = "{" + JsonApiPathParameter.RelationshipName + "}";
+    public const string RelationshipsPart = "relationships";
+    public const string PrimaryEndpoint = "{id}";
+    public const string SecondaryEndpoint = "{id}/" + RelationshipNameUrlPlaceholder;
+    public const string RelationshipEndpoint = "{id}/" + RelationshipsPart + "/" + RelationshipNameUrlPlaceholder;
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs b/src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs
index a4c9f5575d..6c1dcf1920 100644
--- a/src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs
+++ b/src/JsonApiDotNetCore.OpenApi/JsonApiSchemaIdSelector.cs
@@ -1,79 +1,75 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Humanizer;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Documents;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal sealed class JsonApiSchemaIdSelector
 {
-    internal sealed class JsonApiSchemaIdSelector
+    private static readonly IDictionary<Type, string> OpenTypeToSchemaTemplateMap = new Dictionary<Type, string>
     {
-        private static readonly IDictionary<Type, string> OpenTypeToSchemaTemplateMap = new Dictionary<Type, string>
-        {
-            [typeof(ResourcePostRequestDocument<>)] = "###-post-request-document",
-            [typeof(ResourcePatchRequestDocument<>)] = "###-patch-request-document",
-            [typeof(ResourceObjectInPostRequest<>)] = "###-data-in-post-request",
-            [typeof(AttributesInPostRequest<>)] = "###-attributes-in-post-request",
-            [typeof(RelationshipsInPostRequest<>)] = "###-relationships-in-post-request",
-            [typeof(ResourceObjectInPatchRequest<>)] = "###-data-in-patch-request",
-            [typeof(AttributesInPatchRequest<>)] = "###-attributes-in-patch-request",
-            [typeof(RelationshipsInPatchRequest<>)] = "###-relationships-in-patch-request",
-            [typeof(ToOneRelationshipInRequest<>)] = "to-one-###-in-request",
-            [typeof(NullableToOneRelationshipInRequest<>)] = "nullable-to-one-###-in-request",
-            [typeof(ToManyRelationshipInRequest<>)] = "to-many-###-in-request",
-            [typeof(PrimaryResourceResponseDocument<>)] = "###-primary-response-document",
-            [typeof(SecondaryResourceResponseDocument<>)] = "###-secondary-response-document",
-            [typeof(NullableSecondaryResourceResponseDocument<>)] = "nullable-###-secondary-response-document",
-            [typeof(ResourceCollectionResponseDocument<>)] = "###-collection-response-document",
-            [typeof(ResourceIdentifierResponseDocument<>)] = "###-identifier-response-document",
-            [typeof(NullableResourceIdentifierResponseDocument<>)] = "nullable-###-identifier-response-document",
-            [typeof(ResourceIdentifierCollectionResponseDocument<>)] = "###-identifier-collection-response-document",
-            [typeof(ToOneRelationshipInResponse<>)] = "to-one-###-in-response",
-            [typeof(NullableToOneRelationshipInResponse<>)] = "nullable-to-one-###-in-response",
-            [typeof(ToManyRelationshipInResponse<>)] = "to-many-###-in-response",
-            [typeof(ResourceObjectInResponse<>)] = "###-data-in-response",
-            [typeof(AttributesInResponse<>)] = "###-attributes-in-response",
-            [typeof(RelationshipsInResponse<>)] = "###-relationships-in-response",
-            [typeof(ResourceIdentifierObject<>)] = "###-identifier"
-        };
+        [typeof(ResourcePostRequestDocument<>)] = "###-post-request-document",
+        [typeof(ResourcePatchRequestDocument<>)] = "###-patch-request-document",
+        [typeof(ResourceObjectInPostRequest<>)] = "###-data-in-post-request",
+        [typeof(AttributesInPostRequest<>)] = "###-attributes-in-post-request",
+        [typeof(RelationshipsInPostRequest<>)] = "###-relationships-in-post-request",
+        [typeof(ResourceObjectInPatchRequest<>)] = "###-data-in-patch-request",
+        [typeof(AttributesInPatchRequest<>)] = "###-attributes-in-patch-request",
+        [typeof(RelationshipsInPatchRequest<>)] = "###-relationships-in-patch-request",
+        [typeof(ToOneRelationshipInRequest<>)] = "to-one-###-in-request",
+        [typeof(NullableToOneRelationshipInRequest<>)] = "nullable-to-one-###-in-request",
+        [typeof(ToManyRelationshipInRequest<>)] = "to-many-###-in-request",
+        [typeof(PrimaryResourceResponseDocument<>)] = "###-primary-response-document",
+        [typeof(SecondaryResourceResponseDocument<>)] = "###-secondary-response-document",
+        [typeof(NullableSecondaryResourceResponseDocument<>)] = "nullable-###-secondary-response-document",
+        [typeof(ResourceCollectionResponseDocument<>)] = "###-collection-response-document",
+        [typeof(ResourceIdentifierResponseDocument<>)] = "###-identifier-response-document",
+        [typeof(NullableResourceIdentifierResponseDocument<>)] = "nullable-###-identifier-response-document",
+        [typeof(ResourceIdentifierCollectionResponseDocument<>)] = "###-identifier-collection-response-document",
+        [typeof(ToOneRelationshipInResponse<>)] = "to-one-###-in-response",
+        [typeof(NullableToOneRelationshipInResponse<>)] = "nullable-to-one-###-in-response",
+        [typeof(ToManyRelationshipInResponse<>)] = "to-many-###-in-response",
+        [typeof(ResourceObjectInResponse<>)] = "###-data-in-response",
+        [typeof(AttributesInResponse<>)] = "###-attributes-in-response",
+        [typeof(RelationshipsInResponse<>)] = "###-relationships-in-response",
+        [typeof(ResourceIdentifierObject<>)] = "###-identifier"
+    };
 
-        private readonly ResourceNameFormatter _formatter;
-        private readonly IResourceGraph _resourceGraph;
-
-        public JsonApiSchemaIdSelector(ResourceNameFormatter formatter, IResourceGraph resourceGraph)
-        {
-            ArgumentGuard.NotNull(formatter, nameof(formatter));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+    private readonly ResourceNameFormatter _formatter;
+    private readonly IResourceGraph _resourceGraph;
 
-            _formatter = formatter;
-            _resourceGraph = resourceGraph;
-        }
+    public JsonApiSchemaIdSelector(ResourceNameFormatter formatter, IResourceGraph resourceGraph)
+    {
+        ArgumentGuard.NotNull(formatter, nameof(formatter));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
 
-        public string GetSchemaId(Type type)
-        {
-            ArgumentGuard.NotNull(type, nameof(type));
+        _formatter = formatter;
+        _resourceGraph = resourceGraph;
+    }
 
-            ResourceType? resourceType = _resourceGraph.FindResourceType(type);
+    public string GetSchemaId(Type type)
+    {
+        ArgumentGuard.NotNull(type, nameof(type));
 
-            if (resourceType != null)
-            {
-                return resourceType.PublicName.Singularize();
-            }
+        ResourceType? resourceType = _resourceGraph.FindResourceType(type);
 
-            if (type.IsConstructedGenericType && OpenTypeToSchemaTemplateMap.ContainsKey(type.GetGenericTypeDefinition()))
-            {
-                Type resourceClrType = type.GetGenericArguments().First();
-                string resourceName = _formatter.FormatResourceName(resourceClrType).Singularize();
+        if (resourceType != null)
+        {
+            return resourceType.PublicName.Singularize();
+        }
 
-                string template = OpenTypeToSchemaTemplateMap[type.GetGenericTypeDefinition()];
-                return template.Replace("###", resourceName);
-            }
+        if (type.IsConstructedGenericType && OpenTypeToSchemaTemplateMap.ContainsKey(type.GetGenericTypeDefinition()))
+        {
+            Type resourceClrType = type.GetGenericArguments().First();
+            string resourceName = _formatter.FormatResourceName(resourceClrType).Singularize();
 
-            // Used for a fixed set of types, such as jsonapi-object, links-in-many-resource-document etc.
-            return _formatter.FormatResourceName(type).Singularize();
+            string template = OpenTypeToSchemaTemplateMap[type.GetGenericTypeDefinition()];
+            return template.Replace("###", resourceName);
         }
+
+        // Used for a fixed set of types, such as jsonapi-object, links-in-many-resource-document etc.
+        return _formatter.FormatResourceName(type).Singularize();
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/MemberInfoExtensions.cs b/src/JsonApiDotNetCore.OpenApi/MemberInfoExtensions.cs
index 27342725a9..a6f46ccb9d 100644
--- a/src/JsonApiDotNetCore.OpenApi/MemberInfoExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi/MemberInfoExtensions.cs
@@ -1,38 +1,36 @@
-using System;
 using System.Reflection;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal static class MemberInfoExtensions
 {
-    internal static class MemberInfoExtensions
+    public static TypeCategory GetTypeCategory(this MemberInfo source)
     {
-        public static TypeCategory GetTypeCategory(this MemberInfo source)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
-
-            Type memberType;
+        ArgumentGuard.NotNull(source, nameof(source));
 
-            if (source.MemberType.HasFlag(MemberTypes.Field))
-            {
-                memberType = ((FieldInfo)source).FieldType;
-            }
-            else if (source.MemberType.HasFlag(MemberTypes.Property))
-            {
-                memberType = ((PropertyInfo)source).PropertyType;
-            }
-            else
-            {
-                throw new NotSupportedException($"Member type '{source.MemberType}' must be a property or field.");
-            }
+        Type memberType;
 
-            if (memberType.IsValueType)
-            {
-                return Nullable.GetUnderlyingType(memberType) != null ? TypeCategory.NullableValueType : TypeCategory.ValueType;
-            }
+        if (source.MemberType.HasFlag(MemberTypes.Field))
+        {
+            memberType = ((FieldInfo)source).FieldType;
+        }
+        else if (source.MemberType.HasFlag(MemberTypes.Property))
+        {
+            memberType = ((PropertyInfo)source).PropertyType;
+        }
+        else
+        {
+            throw new NotSupportedException($"Member type '{source.MemberType}' must be a property or field.");
+        }
 
-            // Once we switch to .NET 6, we should rely instead on the built-in reflection APIs for nullability information.
-            // See https://devblogs.microsoft.com/dotnet/announcing-net-6-preview-7/#libraries-reflection-apis-for-nullability-information.
-            return source.IsNonNullableReferenceType() ? TypeCategory.NonNullableReferenceType : TypeCategory.NullableReferenceType;
+        if (memberType.IsValueType)
+        {
+            return Nullable.GetUnderlyingType(memberType) != null ? TypeCategory.NullableValueType : TypeCategory.ValueType;
         }
+
+        // Once we switch to .NET 6, we should rely instead on the built-in reflection APIs for nullability information.
+        // See https://devblogs.microsoft.com/dotnet/announcing-net-6-preview-7/#libraries-reflection-apis-for-nullability-information.
+        return source.IsNonNullableReferenceType() ? TypeCategory.NonNullableReferenceType : TypeCategory.NullableReferenceType;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/ObjectExtensions.cs b/src/JsonApiDotNetCore.OpenApi/ObjectExtensions.cs
index b881574127..2047b11f96 100644
--- a/src/JsonApiDotNetCore.OpenApi/ObjectExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi/ObjectExtensions.cs
@@ -1,20 +1,17 @@
-using System;
 using System.Reflection;
-using System.Threading;
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal static class ObjectExtensions
 {
-    internal static class ObjectExtensions
-    {
-        private static readonly Lazy<MethodInfo> MemberwiseCloneMethod =
-            new(() => typeof(object).GetMethod(nameof(MemberwiseClone), BindingFlags.Instance | BindingFlags.NonPublic)!,
-                LazyThreadSafetyMode.ExecutionAndPublication);
+    private static readonly Lazy<MethodInfo> MemberwiseCloneMethod =
+        new(() => typeof(object).GetMethod(nameof(MemberwiseClone), BindingFlags.Instance | BindingFlags.NonPublic)!,
+            LazyThreadSafetyMode.ExecutionAndPublication);
 
-        public static object MemberwiseClone(this object source)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
+    public static object MemberwiseClone(this object source)
+    {
+        ArgumentGuard.NotNull(source, nameof(source));
 
-            return MemberwiseCloneMethod.Value.Invoke(source, null)!;
-        }
+        return MemberwiseCloneMethod.Value.Invoke(source, null)!;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/OpenApiEndpointConvention.cs b/src/JsonApiDotNetCore.OpenApi/OpenApiEndpointConvention.cs
index c4c5dfb7e9..6f175b71d5 100644
--- a/src/JsonApiDotNetCore.OpenApi/OpenApiEndpointConvention.cs
+++ b/src/JsonApiDotNetCore.OpenApi/OpenApiEndpointConvention.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.OpenApi.JsonApiMetadata;
@@ -9,162 +6,161 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 
-namespace JsonApiDotNetCore.OpenApi
-{
-    /// <summary>
-    /// Sets metadata on controllers for OpenAPI documentation generation by Swagger. Only targets JsonApiDotNetCore controllers.
-    /// </summary>
-    internal sealed class OpenApiEndpointConvention : IActionModelConvention
-    {
-        private readonly IControllerResourceMapping _controllerResourceMapping;
-        private readonly EndpointResolver _endpointResolver = new();
+namespace JsonApiDotNetCore.OpenApi;
 
-        public OpenApiEndpointConvention(IControllerResourceMapping controllerResourceMapping)
-        {
-            ArgumentGuard.NotNull(controllerResourceMapping, nameof(controllerResourceMapping));
-
-            _controllerResourceMapping = controllerResourceMapping;
-        }
-
-        public void Apply(ActionModel action)
-        {
-            ArgumentGuard.NotNull(action, nameof(action));
-
-            JsonApiEndpoint? endpoint = _endpointResolver.Get(action.ActionMethod);
+/// <summary>
+/// Sets metadata on controllers for OpenAPI documentation generation by Swagger. Only targets JsonApiDotNetCore controllers.
+/// </summary>
+internal sealed class OpenApiEndpointConvention : IActionModelConvention
+{
+    private readonly IControllerResourceMapping _controllerResourceMapping;
+    private readonly EndpointResolver _endpointResolver = new();
 
-            if (endpoint == null || ShouldSuppressEndpoint(endpoint.Value, action.Controller.ControllerType))
-            {
-                action.ApiExplorer.IsVisible = false;
+    public OpenApiEndpointConvention(IControllerResourceMapping controllerResourceMapping)
+    {
+        ArgumentGuard.NotNull(controllerResourceMapping, nameof(controllerResourceMapping));
 
-                return;
-            }
+        _controllerResourceMapping = controllerResourceMapping;
+    }
 
-            SetResponseMetadata(action, endpoint.Value);
+    public void Apply(ActionModel action)
+    {
+        ArgumentGuard.NotNull(action, nameof(action));
 
-            SetRequestMetadata(action, endpoint.Value);
-        }
+        JsonApiEndpoint? endpoint = _endpointResolver.Get(action.ActionMethod);
 
-        private bool ShouldSuppressEndpoint(JsonApiEndpoint endpoint, Type controllerType)
+        if (endpoint == null || ShouldSuppressEndpoint(endpoint.Value, action.Controller.ControllerType))
         {
-            if (IsSecondaryOrRelationshipEndpoint(endpoint))
-            {
-                IReadOnlyCollection<RelationshipAttribute> relationships = GetRelationshipsOfPrimaryResource(controllerType);
+            action.ApiExplorer.IsVisible = false;
 
-                if (!relationships.Any())
-                {
-                    return true;
-                }
+            return;
+        }
 
-                if (endpoint == JsonApiEndpoint.DeleteRelationship || endpoint == JsonApiEndpoint.PostRelationship)
-                {
-                    return !relationships.OfType<HasManyAttribute>().Any();
-                }
-            }
+        SetResponseMetadata(action, endpoint.Value);
 
-            return false;
-        }
+        SetRequestMetadata(action, endpoint.Value);
+    }
 
-        private IReadOnlyCollection<RelationshipAttribute> GetRelationshipsOfPrimaryResource(Type controllerType)
+    private bool ShouldSuppressEndpoint(JsonApiEndpoint endpoint, Type controllerType)
+    {
+        if (IsSecondaryOrRelationshipEndpoint(endpoint))
         {
-            ResourceType? primaryResourceType = _controllerResourceMapping.GetResourceTypeForController(controllerType);
+            IReadOnlyCollection<RelationshipAttribute> relationships = GetRelationshipsOfPrimaryResource(controllerType);
 
-            if (primaryResourceType == null)
+            if (!relationships.Any())
             {
-                throw new UnreachableCodeException();
+                return true;
             }
 
-            return primaryResourceType.Relationships;
+            if (endpoint is JsonApiEndpoint.DeleteRelationship or JsonApiEndpoint.PostRelationship)
+            {
+                return !relationships.OfType<HasManyAttribute>().Any();
+            }
         }
 
-        private static bool IsSecondaryOrRelationshipEndpoint(JsonApiEndpoint endpoint)
+        return false;
+    }
+
+    private IReadOnlyCollection<RelationshipAttribute> GetRelationshipsOfPrimaryResource(Type controllerType)
+    {
+        ResourceType? primaryResourceType = _controllerResourceMapping.GetResourceTypeForController(controllerType);
+
+        if (primaryResourceType == null)
         {
-            return endpoint == JsonApiEndpoint.GetSecondary || endpoint == JsonApiEndpoint.GetRelationship || endpoint == JsonApiEndpoint.PostRelationship ||
-                endpoint == JsonApiEndpoint.PatchRelationship || endpoint == JsonApiEndpoint.DeleteRelationship;
+            throw new UnreachableCodeException();
         }
 
-        private void SetResponseMetadata(ActionModel action, JsonApiEndpoint endpoint)
+        return primaryResourceType.Relationships;
+    }
+
+    private static bool IsSecondaryOrRelationshipEndpoint(JsonApiEndpoint endpoint)
+    {
+        return endpoint is JsonApiEndpoint.GetSecondary or JsonApiEndpoint.GetRelationship or JsonApiEndpoint.PostRelationship
+            or JsonApiEndpoint.PatchRelationship or JsonApiEndpoint.DeleteRelationship;
+    }
+
+    private void SetResponseMetadata(ActionModel action, JsonApiEndpoint endpoint)
+    {
+        IList<int> statusCodes = GetStatusCodesForEndpoint(endpoint);
+
+        foreach (int statusCode in statusCodes)
         {
-            IList<int> statusCodes = GetStatusCodesForEndpoint(endpoint);
+            action.Filters.Add(new ProducesResponseTypeAttribute(statusCode));
 
-            foreach (int statusCode in statusCodes)
+            switch (endpoint)
             {
-                action.Filters.Add(new ProducesResponseTypeAttribute(statusCode));
-
-                switch (endpoint)
+                case JsonApiEndpoint.GetCollection when statusCode == StatusCodes.Status200OK:
+                case JsonApiEndpoint.Post when statusCode == StatusCodes.Status201Created:
+                case JsonApiEndpoint.Patch when statusCode == StatusCodes.Status200OK:
+                case JsonApiEndpoint.GetSingle when statusCode == StatusCodes.Status200OK:
+                case JsonApiEndpoint.GetSecondary when statusCode == StatusCodes.Status200OK:
+                case JsonApiEndpoint.GetRelationship when statusCode == StatusCodes.Status200OK:
                 {
-                    case JsonApiEndpoint.GetCollection when statusCode == StatusCodes.Status200OK:
-                    case JsonApiEndpoint.Post when statusCode == StatusCodes.Status201Created:
-                    case JsonApiEndpoint.Patch when statusCode == StatusCodes.Status200OK:
-                    case JsonApiEndpoint.GetSingle when statusCode == StatusCodes.Status200OK:
-                    case JsonApiEndpoint.GetSecondary when statusCode == StatusCodes.Status200OK:
-                    case JsonApiEndpoint.GetRelationship when statusCode == StatusCodes.Status200OK:
-                    {
-                        action.Filters.Add(new ProducesAttribute(HeaderConstants.MediaType));
-                        break;
-                    }
+                    action.Filters.Add(new ProducesAttribute(HeaderConstants.MediaType));
+                    break;
                 }
             }
         }
+    }
 
-        private static IList<int> GetStatusCodesForEndpoint(JsonApiEndpoint endpoint)
+    private static IList<int> GetStatusCodesForEndpoint(JsonApiEndpoint endpoint)
+    {
+        switch (endpoint)
         {
-            switch (endpoint)
+            case JsonApiEndpoint.GetCollection:
+            case JsonApiEndpoint.GetSingle:
+            case JsonApiEndpoint.GetSecondary:
+            case JsonApiEndpoint.GetRelationship:
             {
-                case JsonApiEndpoint.GetCollection:
-                case JsonApiEndpoint.GetSingle:
-                case JsonApiEndpoint.GetSecondary:
-                case JsonApiEndpoint.GetRelationship:
-                {
-                    return new[]
-                    {
-                        StatusCodes.Status200OK
-                    };
-                }
-                case JsonApiEndpoint.Post:
+                return new[]
                 {
-                    return new[]
-                    {
-                        StatusCodes.Status201Created,
-                        StatusCodes.Status204NoContent
-                    };
-                }
-                case JsonApiEndpoint.Patch:
+                    StatusCodes.Status200OK
+                };
+            }
+            case JsonApiEndpoint.Post:
+            {
+                return new[]
                 {
-                    return new[]
-                    {
-                        StatusCodes.Status200OK,
-                        StatusCodes.Status204NoContent
-                    };
-                }
-                case JsonApiEndpoint.Delete:
-                case JsonApiEndpoint.PostRelationship:
-                case JsonApiEndpoint.PatchRelationship:
-                case JsonApiEndpoint.DeleteRelationship:
+                    StatusCodes.Status201Created,
+                    StatusCodes.Status204NoContent
+                };
+            }
+            case JsonApiEndpoint.Patch:
+            {
+                return new[]
                 {
-                    return new[]
-                    {
-                        StatusCodes.Status204NoContent
-                    };
-                }
-                default:
+                    StatusCodes.Status200OK,
+                    StatusCodes.Status204NoContent
+                };
+            }
+            case JsonApiEndpoint.Delete:
+            case JsonApiEndpoint.PostRelationship:
+            case JsonApiEndpoint.PatchRelationship:
+            case JsonApiEndpoint.DeleteRelationship:
+            {
+                return new[]
                 {
-                    throw new UnreachableCodeException();
-                }
+                    StatusCodes.Status204NoContent
+                };
             }
-        }
-
-        private static void SetRequestMetadata(ActionModel action, JsonApiEndpoint endpoint)
-        {
-            if (RequiresRequestBody(endpoint))
+            default:
             {
-                action.Filters.Add(new ConsumesAttribute(HeaderConstants.MediaType));
+                throw new UnreachableCodeException();
             }
         }
+    }
 
-        private static bool RequiresRequestBody(JsonApiEndpoint endpoint)
+    private static void SetRequestMetadata(ActionModel action, JsonApiEndpoint endpoint)
+    {
+        if (RequiresRequestBody(endpoint))
         {
-            return endpoint is JsonApiEndpoint.Post || endpoint is JsonApiEndpoint.Patch || endpoint is JsonApiEndpoint.PostRelationship ||
-                endpoint is JsonApiEndpoint.PatchRelationship || endpoint is JsonApiEndpoint.DeleteRelationship;
+            action.Filters.Add(new ConsumesAttribute(HeaderConstants.MediaType));
         }
     }
+
+    private static bool RequiresRequestBody(JsonApiEndpoint endpoint)
+    {
+        return endpoint is JsonApiEndpoint.Post or JsonApiEndpoint.Patch or JsonApiEndpoint.PostRelationship or JsonApiEndpoint.PatchRelationship
+            or JsonApiEndpoint.DeleteRelationship;
+    }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/ParameterInfoExtensions.cs b/src/JsonApiDotNetCore.OpenApi/ParameterInfoExtensions.cs
index 1a42d377b8..ea14dce0b8 100644
--- a/src/JsonApiDotNetCore.OpenApi/ParameterInfoExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi/ParameterInfoExtensions.cs
@@ -1,39 +1,34 @@
-using System;
 using System.Reflection;
-using System.Threading;
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal static class ParameterInfoExtensions
 {
-    internal static class ParameterInfoExtensions
-    {
-        private static readonly Lazy<FieldInfo> NameField =
-            new(() => typeof(ParameterInfo).GetField("NameImpl", BindingFlags.Instance | BindingFlags.NonPublic)!,
-                LazyThreadSafetyMode.ExecutionAndPublication);
+    private static readonly Lazy<FieldInfo> NameField = new(() => typeof(ParameterInfo).GetField("NameImpl", BindingFlags.Instance | BindingFlags.NonPublic)!,
+        LazyThreadSafetyMode.ExecutionAndPublication);
 
-        private static readonly Lazy<FieldInfo> ParameterTypeField =
-            new(() => typeof(ParameterInfo).GetField("ClassImpl", BindingFlags.Instance | BindingFlags.NonPublic)!,
-                LazyThreadSafetyMode.ExecutionAndPublication);
+    private static readonly Lazy<FieldInfo> ParameterTypeField =
+        new(() => typeof(ParameterInfo).GetField("ClassImpl", BindingFlags.Instance | BindingFlags.NonPublic)!, LazyThreadSafetyMode.ExecutionAndPublication);
 
-        public static ParameterInfo WithName(this ParameterInfo source, string name)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
-            ArgumentGuard.NotNullNorEmpty(name, nameof(name));
+    public static ParameterInfo WithName(this ParameterInfo source, string name)
+    {
+        ArgumentGuard.NotNull(source, nameof(source));
+        ArgumentGuard.NotNullNorEmpty(name, nameof(name));
 
-            var cloned = (ParameterInfo)source.MemberwiseClone();
-            NameField.Value.SetValue(cloned, name);
+        var cloned = (ParameterInfo)source.MemberwiseClone();
+        NameField.Value.SetValue(cloned, name);
 
-            return cloned;
-        }
+        return cloned;
+    }
 
-        public static ParameterInfo WithParameterType(this ParameterInfo source, Type parameterType)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
-            ArgumentGuard.NotNull(parameterType, nameof(parameterType));
+    public static ParameterInfo WithParameterType(this ParameterInfo source, Type parameterType)
+    {
+        ArgumentGuard.NotNull(source, nameof(source));
+        ArgumentGuard.NotNull(parameterType, nameof(parameterType));
 
-            var cloned = (ParameterInfo)source.MemberwiseClone();
-            ParameterTypeField.Value.SetValue(cloned, parameterType);
+        var cloned = (ParameterInfo)source.MemberwiseClone();
+        ParameterTypeField.Value.SetValue(cloned, parameterType);
 
-            return cloned;
-        }
+        return cloned;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/ResourceFieldAttributeExtensions.cs b/src/JsonApiDotNetCore.OpenApi/ResourceFieldAttributeExtensions.cs
index d59b3a891e..32bf9f5187 100644
--- a/src/JsonApiDotNetCore.OpenApi/ResourceFieldAttributeExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi/ResourceFieldAttributeExtensions.cs
@@ -2,21 +2,20 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal static class ResourceFieldAttributeExtensions
 {
-    internal static class ResourceFieldAttributeExtensions
+    public static bool IsNullable(this ResourceFieldAttribute source)
     {
-        public static bool IsNullable(this ResourceFieldAttribute source)
-        {
-            TypeCategory fieldTypeCategory = source.Property.GetTypeCategory();
-            bool hasRequiredAttribute = source.Property.HasAttribute<RequiredAttribute>();
+        TypeCategory fieldTypeCategory = source.Property.GetTypeCategory();
+        bool hasRequiredAttribute = source.Property.HasAttribute<RequiredAttribute>();
 
-            return fieldTypeCategory switch
-            {
-                TypeCategory.NonNullableReferenceType or TypeCategory.ValueType => false,
-                TypeCategory.NullableReferenceType or TypeCategory.NullableValueType => !hasRequiredAttribute,
-                _ => throw new UnreachableCodeException()
-            };
-        }
+        return fieldTypeCategory switch
+        {
+            TypeCategory.NonNullableReferenceType or TypeCategory.ValueType => false,
+            TypeCategory.NullableReferenceType or TypeCategory.NullableValueType => !hasRequiredAttribute,
+            _ => throw new UnreachableCodeException()
+        };
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/ServiceCollectionExtensions.cs b/src/JsonApiDotNetCore.OpenApi/ServiceCollectionExtensions.cs
index 8f2a781fbd..425617bdf8 100644
--- a/src/JsonApiDotNetCore.OpenApi/ServiceCollectionExtensions.cs
+++ b/src/JsonApiDotNetCore.OpenApi/ServiceCollectionExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Text.Json;
 using JsonApiDotNetCore.Configuration;
@@ -11,127 +9,124 @@
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+public static class ServiceCollectionExtensions
 {
-    public static class ServiceCollectionExtensions
+    /// <summary>
+    /// Adds the OpenAPI integration to JsonApiDotNetCore by configuring Swashbuckle.
+    /// </summary>
+    public static void AddOpenApi(this IServiceCollection services, IMvcCoreBuilder mvcBuilder, Action<SwaggerGenOptions>? setupSwaggerGenAction = null)
     {
-        /// <summary>
-        /// Adds the OpenAPI integration to JsonApiDotNetCore by configuring Swashbuckle.
-        /// </summary>
-        public static void AddOpenApi(this IServiceCollection services, IMvcCoreBuilder mvcBuilder, Action<SwaggerGenOptions>? setupSwaggerGenAction = null)
-        {
-            ArgumentGuard.NotNull(services, nameof(services));
-            ArgumentGuard.NotNull(mvcBuilder, nameof(mvcBuilder));
+        ArgumentGuard.NotNull(services, nameof(services));
+        ArgumentGuard.NotNull(mvcBuilder, nameof(mvcBuilder));
 
-            AddCustomApiExplorer(services, mvcBuilder);
+        AddCustomApiExplorer(services, mvcBuilder);
 
-            AddCustomSwaggerComponents(services);
+        AddCustomSwaggerComponents(services);
 
-            using ServiceProvider provider = services.BuildServiceProvider();
-            using IServiceScope scope = provider.CreateScope();
-            AddSwaggerGenerator(scope, services, setupSwaggerGenAction);
-            AddSwashbuckleCliCompatibility(scope, mvcBuilder);
-            AddOpenApiEndpointConvention(scope, mvcBuilder);
-        }
+        using ServiceProvider provider = services.BuildServiceProvider();
+        using IServiceScope scope = provider.CreateScope();
+        AddSwaggerGenerator(scope, services, setupSwaggerGenAction);
+        AddSwashbuckleCliCompatibility(scope, mvcBuilder);
+        AddOpenApiEndpointConvention(scope, mvcBuilder);
+    }
 
-        private static void AddCustomApiExplorer(IServiceCollection services, IMvcCoreBuilder mvcBuilder)
+    private static void AddCustomApiExplorer(IServiceCollection services, IMvcCoreBuilder mvcBuilder)
+    {
+        services.AddSingleton<IApiDescriptionGroupCollectionProvider>(provider =>
         {
-            services.AddSingleton<IApiDescriptionGroupCollectionProvider>(provider =>
-            {
-                var controllerResourceMapping = provider.GetRequiredService<IControllerResourceMapping>();
-                var actionDescriptorCollectionProvider = provider.GetRequiredService<IActionDescriptorCollectionProvider>();
-                var apiDescriptionProviders = provider.GetRequiredService<IEnumerable<IApiDescriptionProvider>>();
+            var controllerResourceMapping = provider.GetRequiredService<IControllerResourceMapping>();
+            var actionDescriptorCollectionProvider = provider.GetRequiredService<IActionDescriptorCollectionProvider>();
+            var apiDescriptionProviders = provider.GetRequiredService<IEnumerable<IApiDescriptionProvider>>();
 
-                JsonApiActionDescriptorCollectionProvider descriptorCollectionProviderWrapper =
-                    new(controllerResourceMapping, actionDescriptorCollectionProvider);
+            JsonApiActionDescriptorCollectionProvider descriptorCollectionProviderWrapper = new(controllerResourceMapping, actionDescriptorCollectionProvider);
+            return new ApiDescriptionGroupCollectionProvider(descriptorCollectionProviderWrapper, apiDescriptionProviders);
+        });
 
-                return new ApiDescriptionGroupCollectionProvider(descriptorCollectionProviderWrapper, apiDescriptionProviders);
-            });
+        mvcBuilder.AddApiExplorer();
 
-            mvcBuilder.AddApiExplorer();
+        mvcBuilder.AddMvcOptions(options => options.InputFormatters.Add(new JsonApiRequestFormatMetadataProvider()));
+    }
 
-            mvcBuilder.AddMvcOptions(options => options.InputFormatters.Add(new JsonApiRequestFormatMetadataProvider()));
-        }
+    private static void AddSwaggerGenerator(IServiceScope scope, IServiceCollection services, Action<SwaggerGenOptions>? setupSwaggerGenAction)
+    {
+        var controllerResourceMapping = scope.ServiceProvider.GetRequiredService<IControllerResourceMapping>();
+        var resourceGraph = scope.ServiceProvider.GetRequiredService<IResourceGraph>();
+        var jsonApiOptions = scope.ServiceProvider.GetRequiredService<IJsonApiOptions>();
+        JsonNamingPolicy? namingPolicy = jsonApiOptions.SerializerOptions.PropertyNamingPolicy;
+        ResourceNameFormatter resourceNameFormatter = new(namingPolicy);
 
-        private static void AddSwaggerGenerator(IServiceScope scope, IServiceCollection services, Action<SwaggerGenOptions>? setupSwaggerGenAction)
-        {
-            var controllerResourceMapping = scope.ServiceProvider.GetRequiredService<IControllerResourceMapping>();
-            var resourceGraph = scope.ServiceProvider.GetRequiredService<IResourceGraph>();
-            var jsonApiOptions = scope.ServiceProvider.GetRequiredService<IJsonApiOptions>();
-            JsonNamingPolicy? namingPolicy = jsonApiOptions.SerializerOptions.PropertyNamingPolicy;
-            ResourceNameFormatter resourceNameFormatter = new(namingPolicy);
-
-            AddSchemaGenerator(services);
-
-            services.AddSwaggerGen(swaggerGenOptions =>
-            {
-                swaggerGenOptions.SupportNonNullableReferenceTypes();
-                SetOperationInfo(swaggerGenOptions, controllerResourceMapping, namingPolicy);
-                SetSchemaIdSelector(swaggerGenOptions, resourceGraph, resourceNameFormatter);
-                swaggerGenOptions.DocumentFilter<EndpointOrderingFilter>();
-
-                setupSwaggerGenAction?.Invoke(swaggerGenOptions);
-            });
-        }
+        AddSchemaGenerator(services);
 
-        private static void AddSchemaGenerator(IServiceCollection services)
+        services.AddSwaggerGen(swaggerGenOptions =>
         {
-            services.AddSingleton<SchemaGenerator>();
-            services.AddSingleton<ISchemaGenerator, JsonApiSchemaGenerator>();
-        }
+            swaggerGenOptions.SupportNonNullableReferenceTypes();
+            SetOperationInfo(swaggerGenOptions, controllerResourceMapping, namingPolicy);
+            SetSchemaIdSelector(swaggerGenOptions, resourceGraph, resourceNameFormatter);
+            swaggerGenOptions.DocumentFilter<EndpointOrderingFilter>();
 
-        private static void SetOperationInfo(SwaggerGenOptions swaggerGenOptions, IControllerResourceMapping controllerResourceMapping,
-            JsonNamingPolicy? namingPolicy)
-        {
-            swaggerGenOptions.TagActionsBy(description => GetOperationTags(description, controllerResourceMapping));
+            setupSwaggerGenAction?.Invoke(swaggerGenOptions);
+        });
+    }
 
-            JsonApiOperationIdSelector jsonApiOperationIdSelector = new(controllerResourceMapping, namingPolicy);
-            swaggerGenOptions.CustomOperationIds(jsonApiOperationIdSelector.GetOperationId);
-        }
+    private static void AddSchemaGenerator(IServiceCollection services)
+    {
+        services.AddSingleton<SchemaGenerator>();
+        services.AddSingleton<ISchemaGenerator, JsonApiSchemaGenerator>();
+    }
+
+    private static void SetOperationInfo(SwaggerGenOptions swaggerGenOptions, IControllerResourceMapping controllerResourceMapping,
+        JsonNamingPolicy? namingPolicy)
+    {
+        swaggerGenOptions.TagActionsBy(description => GetOperationTags(description, controllerResourceMapping));
+
+        JsonApiOperationIdSelector jsonApiOperationIdSelector = new(controllerResourceMapping, namingPolicy);
+        swaggerGenOptions.CustomOperationIds(jsonApiOperationIdSelector.GetOperationId);
+    }
+
+    private static IList<string> GetOperationTags(ApiDescription description, IControllerResourceMapping controllerResourceMapping)
+    {
+        MethodInfo actionMethod = description.ActionDescriptor.GetActionMethod();
+        ResourceType? resourceType = controllerResourceMapping.GetResourceTypeForController(actionMethod.ReflectedType);
 
-        private static IList<string> GetOperationTags(ApiDescription description, IControllerResourceMapping controllerResourceMapping)
+        if (resourceType == null)
         {
-            MethodInfo actionMethod = description.ActionDescriptor.GetActionMethod();
-            ResourceType? resourceType = controllerResourceMapping.GetResourceTypeForController(actionMethod.ReflectedType);
-
-            if (resourceType == null)
-            {
-                throw new NotSupportedException("Only JsonApiDotNetCore endpoints are supported.");
-            }
-
-            return new[]
-            {
-                resourceType.PublicName
-            };
+            throw new NotSupportedException("Only JsonApiDotNetCore endpoints are supported.");
         }
 
-        private static void SetSchemaIdSelector(SwaggerGenOptions swaggerGenOptions, IResourceGraph resourceGraph, ResourceNameFormatter resourceNameFormatter)
+        return new[]
         {
-            JsonApiSchemaIdSelector jsonApiObjectSchemaSelector = new(resourceNameFormatter, resourceGraph);
+            resourceType.PublicName
+        };
+    }
 
-            swaggerGenOptions.CustomSchemaIds(type => jsonApiObjectSchemaSelector.GetSchemaId(type));
-        }
+    private static void SetSchemaIdSelector(SwaggerGenOptions swaggerGenOptions, IResourceGraph resourceGraph, ResourceNameFormatter resourceNameFormatter)
+    {
+        JsonApiSchemaIdSelector jsonApiObjectSchemaSelector = new(resourceNameFormatter, resourceGraph);
 
-        private static void AddCustomSwaggerComponents(IServiceCollection services)
-        {
-            services.AddSingleton<SwaggerGenerator>();
-            services.AddSingleton<ISwaggerProvider, CachingSwaggerGenerator>();
+        swaggerGenOptions.CustomSchemaIds(type => jsonApiObjectSchemaSelector.GetSchemaId(type));
+    }
 
-            services.AddSingleton<ISerializerDataContractResolver, JsonApiDataContractResolver>();
-        }
+    private static void AddCustomSwaggerComponents(IServiceCollection services)
+    {
+        services.AddSingleton<SwaggerGenerator>();
+        services.AddSingleton<ISwaggerProvider, CachingSwaggerGenerator>();
 
-        private static void AddSwashbuckleCliCompatibility(IServiceScope scope, IMvcCoreBuilder mvcBuilder)
-        {
-            // See https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/1957 for why this is needed.
-            var routingConvention = scope.ServiceProvider.GetRequiredService<IJsonApiRoutingConvention>();
-            mvcBuilder.AddMvcOptions(options => options.Conventions.Insert(0, routingConvention));
-        }
+        services.AddSingleton<ISerializerDataContractResolver, JsonApiDataContractResolver>();
+    }
 
-        private static void AddOpenApiEndpointConvention(IServiceScope scope, IMvcCoreBuilder mvcBuilder)
-        {
-            var controllerResourceMapping = scope.ServiceProvider.GetRequiredService<IControllerResourceMapping>();
+    private static void AddSwashbuckleCliCompatibility(IServiceScope scope, IMvcCoreBuilder mvcBuilder)
+    {
+        // See https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/1957 for why this is needed.
+        var routingConvention = scope.ServiceProvider.GetRequiredService<IJsonApiRoutingConvention>();
+        mvcBuilder.AddMvcOptions(options => options.Conventions.Insert(0, routingConvention));
+    }
 
-            mvcBuilder.AddMvcOptions(options => options.Conventions.Add(new OpenApiEndpointConvention(controllerResourceMapping)));
-        }
+    private static void AddOpenApiEndpointConvention(IServiceScope scope, IMvcCoreBuilder mvcBuilder)
+    {
+        var controllerResourceMapping = scope.ServiceProvider.GetRequiredService<IControllerResourceMapping>();
+
+        mvcBuilder.AddMvcOptions(options => options.Conventions.Add(new OpenApiEndpointConvention(controllerResourceMapping)));
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/CachingSwaggerGenerator.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/CachingSwaggerGenerator.cs
index f36f7f9b58..eded09c490 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/CachingSwaggerGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/CachingSwaggerGenerator.cs
@@ -1,41 +1,38 @@
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.Swagger;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents
+namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+
+/// <summary>
+/// The default <see cref="ISwaggerProvider" /> implementation re-renders the OpenApiDocument every time it is requested, which is redundant in our case.
+/// This implementation provides a very basic caching layer.
+/// </summary>
+internal sealed class CachingSwaggerGenerator : ISwaggerProvider
 {
-    /// <summary>
-    /// The default <see cref="ISwaggerProvider" /> implementation re-renders the OpenApiDocument every time it is requested, which is redundant in our case.
-    /// This implementation provides a very basic caching layer.
-    /// </summary>
-    internal sealed class CachingSwaggerGenerator : ISwaggerProvider
-    {
-        private readonly SwaggerGenerator _defaultSwaggerGenerator;
-        private readonly ConcurrentDictionary<string, OpenApiDocument> _openApiDocumentCache = new();
+    private readonly SwaggerGenerator _defaultSwaggerGenerator;
+    private readonly ConcurrentDictionary<string, OpenApiDocument> _openApiDocumentCache = new();
 
-        public CachingSwaggerGenerator(SwaggerGenerator defaultSwaggerGenerator)
-        {
-            ArgumentGuard.NotNull(defaultSwaggerGenerator, nameof(defaultSwaggerGenerator));
-            _defaultSwaggerGenerator = defaultSwaggerGenerator;
-        }
+    public CachingSwaggerGenerator(SwaggerGenerator defaultSwaggerGenerator)
+    {
+        ArgumentGuard.NotNull(defaultSwaggerGenerator, nameof(defaultSwaggerGenerator));
+        _defaultSwaggerGenerator = defaultSwaggerGenerator;
+    }
 
-        public OpenApiDocument GetSwagger(string documentName, string? host = null, string? basePath = null)
-        {
-            ArgumentGuard.NotNullNorEmpty(documentName, nameof(documentName));
+    public OpenApiDocument GetSwagger(string documentName, string? host = null, string? basePath = null)
+    {
+        ArgumentGuard.NotNullNorEmpty(documentName, nameof(documentName));
 
-            string cacheKey = $"{documentName}#{host}#{basePath}";
+        string cacheKey = $"{documentName}#{host}#{basePath}";
 
-            return _openApiDocumentCache.GetOrAdd(cacheKey, _ =>
-            {
-                OpenApiDocument document = _defaultSwaggerGenerator.GetSwagger(documentName, host, basePath);
+        return _openApiDocumentCache.GetOrAdd(cacheKey, _ =>
+        {
+            OpenApiDocument document = _defaultSwaggerGenerator.GetSwagger(documentName, host, basePath);
 
-                // Remove once https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2283 is addressed.
-                document.Components.Schemas = new SortedDictionary<string, OpenApiSchema>(document.Components.Schemas, StringComparer.Ordinal);
-                return document;
-            });
-        }
+            // Remove once https://github.com/domaindrivendev/Swashbuckle.AspNetCore/issues/2283 is addressed.
+            document.Components.Schemas = new SortedDictionary<string, OpenApiSchema>(document.Components.Schemas, StringComparer.Ordinal);
+            return document;
+        });
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/EndpointOrderingFilter.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/EndpointOrderingFilter.cs
index 2d9a1ba39f..62a6224c4c 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/EndpointOrderingFilter.cs
+++ b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/EndpointOrderingFilter.cs
@@ -1,49 +1,46 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.RegularExpressions;
 using JetBrains.Annotations;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents
+namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+internal sealed class EndpointOrderingFilter : IDocumentFilter
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    internal sealed class EndpointOrderingFilter : IDocumentFilter
-    {
-        private static readonly Regex RelationshipNameInUrlPattern =
-            new($".*{JsonApiRoutingTemplate.PrimaryEndpoint}/(?>{JsonApiRoutingTemplate.RelationshipsPart}\\/)?(\\w+)", RegexOptions.Compiled);
+    private static readonly Regex RelationshipNameInUrlPattern =
+        new($".*{JsonApiRoutingTemplate.PrimaryEndpoint}/(?>{JsonApiRoutingTemplate.RelationshipsPart}\\/)?(\\w+)", RegexOptions.Compiled);
 
-        public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
-        {
-            ArgumentGuard.NotNull(swaggerDoc, nameof(swaggerDoc));
-            ArgumentGuard.NotNull(context, nameof(context));
+    public void Apply(OpenApiDocument swaggerDoc, DocumentFilterContext context)
+    {
+        ArgumentGuard.NotNull(swaggerDoc, nameof(swaggerDoc));
+        ArgumentGuard.NotNull(context, nameof(context));
 
-            List<KeyValuePair<string, OpenApiPathItem>> orderedEndpoints = swaggerDoc.Paths.OrderBy(GetPrimaryResourcePublicName)
-                .ThenBy(GetRelationshipName).ThenBy(IsSecondaryEndpoint).ToList();
+        List<KeyValuePair<string, OpenApiPathItem>> orderedEndpoints = swaggerDoc.Paths.OrderBy(GetPrimaryResourcePublicName)
+            .ThenBy(GetRelationshipName).ThenBy(IsSecondaryEndpoint).ToList();
 
-            swaggerDoc.Paths.Clear();
+        swaggerDoc.Paths.Clear();
 
-            foreach ((string url, OpenApiPathItem path) in orderedEndpoints)
-            {
-                swaggerDoc.Paths.Add(url, path);
-            }
-        }
-
-        private static string GetPrimaryResourcePublicName(KeyValuePair<string, OpenApiPathItem> entry)
+        foreach ((string url, OpenApiPathItem path) in orderedEndpoints)
         {
-            return entry.Value.Operations.First().Value.Tags.First().Name;
+            swaggerDoc.Paths.Add(url, path);
         }
+    }
 
-        private static bool IsSecondaryEndpoint(KeyValuePair<string, OpenApiPathItem> entry)
-        {
-            return entry.Key.Contains("/" + JsonApiRoutingTemplate.RelationshipsPart);
-        }
+    private static string GetPrimaryResourcePublicName(KeyValuePair<string, OpenApiPathItem> entry)
+    {
+        return entry.Value.Operations.First().Value.Tags.First().Name;
+    }
 
-        private static string GetRelationshipName(KeyValuePair<string, OpenApiPathItem> entry)
-        {
-            Match match = RelationshipNameInUrlPattern.Match(entry.Key);
+    private static bool IsSecondaryEndpoint(KeyValuePair<string, OpenApiPathItem> entry)
+    {
+        return entry.Key.Contains("/" + JsonApiRoutingTemplate.RelationshipsPart);
+    }
 
-            return match.Success ? match.Groups[1].Value : string.Empty;
-        }
+    private static string GetRelationshipName(KeyValuePair<string, OpenApiPathItem> entry)
+    {
+        Match match = RelationshipNameInUrlPattern.Match(entry.Key);
+
+        return match.Success ? match.Groups[1].Value : string.Empty;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ISchemaRepositoryAccessor.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ISchemaRepositoryAccessor.cs
index a3e40d79c4..5c627bbcf1 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ISchemaRepositoryAccessor.cs
+++ b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ISchemaRepositoryAccessor.cs
@@ -1,9 +1,8 @@
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents
+namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+
+internal interface ISchemaRepositoryAccessor
 {
-    internal interface ISchemaRepositoryAccessor
-    {
-        SchemaRepository Current { get; }
-    }
+    SchemaRepository Current { get; }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiDataContractResolver.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiDataContractResolver.cs
index a158f6e9e2..2fc7257478 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiDataContractResolver.cs
+++ b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiDataContractResolver.cs
@@ -1,103 +1,99 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents
+namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+
+/// <summary>
+/// For schema generation, we rely on <see cref="JsonSerializerDataContractResolver" /> from Swashbuckle for all but our own JSON:API types.
+/// </summary>
+internal sealed class JsonApiDataContractResolver : ISerializerDataContractResolver
 {
-    /// <summary>
-    /// For schema generation, we rely on <see cref="JsonSerializerDataContractResolver" /> from Swashbuckle for all but our own JSON:API types.
-    /// </summary>
-    internal sealed class JsonApiDataContractResolver : ISerializerDataContractResolver
+    private readonly JsonSerializerDataContractResolver _dataContractResolver;
+    private readonly IResourceGraph _resourceGraph;
+
+    public JsonApiDataContractResolver(IResourceGraph resourceGraph, IJsonApiOptions options)
     {
-        private readonly JsonSerializerDataContractResolver _dataContractResolver;
-        private readonly IResourceGraph _resourceGraph;
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        ArgumentGuard.NotNull(options, nameof(options));
 
-        public JsonApiDataContractResolver(IResourceGraph resourceGraph, IJsonApiOptions options)
-        {
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-            ArgumentGuard.NotNull(options, nameof(options));
+        _resourceGraph = resourceGraph;
+        _dataContractResolver = new JsonSerializerDataContractResolver(options.SerializerOptions);
+    }
 
-            _resourceGraph = resourceGraph;
-            _dataContractResolver = new JsonSerializerDataContractResolver(options.SerializerOptions);
-        }
+    public DataContract GetDataContractForType(Type type)
+    {
+        ArgumentGuard.NotNull(type, nameof(type));
 
-        public DataContract GetDataContractForType(Type type)
+        if (type == typeof(IIdentifiable))
         {
-            ArgumentGuard.NotNull(type, nameof(type));
-
-            if (type == typeof(IIdentifiable))
-            {
-                // We have no way of telling Swashbuckle to opt out on this type, the closest we can get is return a contract with type Unknown.
-                return DataContract.ForDynamic(typeof(object));
-            }
-
-            DataContract dataContract = _dataContractResolver.GetDataContractForType(type);
+            // We have no way of telling Swashbuckle to opt out on this type, the closest we can get is return a contract with type Unknown.
+            return DataContract.ForDynamic(typeof(object));
+        }
 
-            IList<DataProperty>? replacementProperties = null;
+        DataContract dataContract = _dataContractResolver.GetDataContractForType(type);
 
-            if (type.IsAssignableTo(typeof(IIdentifiable)))
-            {
-                replacementProperties = GetDataPropertiesThatExistInResourceClrType(type, dataContract);
-            }
+        IList<DataProperty>? replacementProperties = null;
 
-            if (replacementProperties != null)
-            {
-                dataContract = ReplacePropertiesInDataContract(dataContract, replacementProperties);
-            }
-
-            return dataContract;
+        if (type.IsAssignableTo(typeof(IIdentifiable)))
+        {
+            replacementProperties = GetDataPropertiesThatExistInResourceClrType(type, dataContract);
         }
 
-        private static DataContract ReplacePropertiesInDataContract(DataContract dataContract, IEnumerable<DataProperty> dataProperties)
+        if (replacementProperties != null)
         {
-            return DataContract.ForObject(dataContract.UnderlyingType, dataProperties, dataContract.ObjectExtensionDataType,
-                dataContract.ObjectTypeNameProperty, dataContract.ObjectTypeNameValue);
+            dataContract = ReplacePropertiesInDataContract(dataContract, replacementProperties);
         }
 
-        private IList<DataProperty> GetDataPropertiesThatExistInResourceClrType(Type resourceClrType, DataContract dataContract)
-        {
-            ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
-            var dataProperties = new List<DataProperty>();
+        return dataContract;
+    }
 
-            foreach (DataProperty property in dataContract.ObjectProperties)
+    private static DataContract ReplacePropertiesInDataContract(DataContract dataContract, IEnumerable<DataProperty> dataProperties)
+    {
+        return DataContract.ForObject(dataContract.UnderlyingType, dataProperties, dataContract.ObjectExtensionDataType, dataContract.ObjectTypeNameProperty,
+            dataContract.ObjectTypeNameValue);
+    }
+
+    private IList<DataProperty> GetDataPropertiesThatExistInResourceClrType(Type resourceClrType, DataContract dataContract)
+    {
+        ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
+        var dataProperties = new List<DataProperty>();
+
+        foreach (DataProperty property in dataContract.ObjectProperties)
+        {
+            if (property.MemberInfo.Name == nameof(Identifiable<object>.Id))
             {
-                if (property.MemberInfo.Name == nameof(Identifiable<object>.Id))
-                {
-                    // Schemas of JsonApiDotNetCore resources will obtain an Id property through inheritance of a resource identifier type.
-                    continue;
-                }
-
-                ResourceFieldAttribute? matchingField = resourceType.Fields.SingleOrDefault(field =>
-                    IsPropertyCompatibleWithMember(field.Property, property.MemberInfo));
-
-                if (matchingField != null)
-                {
-                    DataProperty matchingProperty = matchingField.PublicName != property.Name
-                        ? ChangeDataPropertyName(property, matchingField.PublicName)
-                        : property;
-
-                    dataProperties.Add(matchingProperty);
-                }
+                // Schemas of JsonApiDotNetCore resources will obtain an Id property through inheritance of a resource identifier type.
+                continue;
             }
 
-            return dataProperties;
-        }
+            ResourceFieldAttribute? matchingField = resourceType.Fields.SingleOrDefault(field =>
+                IsPropertyCompatibleWithMember(field.Property, property.MemberInfo));
 
-        private static DataProperty ChangeDataPropertyName(DataProperty property, string name)
-        {
-            return new DataProperty(name, property.MemberType, property.IsRequired, property.IsNullable, property.IsReadOnly, property.IsWriteOnly,
-                property.MemberInfo);
-        }
+            if (matchingField != null)
+            {
+                DataProperty matchingProperty = matchingField.PublicName != property.Name
+                    ? ChangeDataPropertyName(property, matchingField.PublicName)
+                    : property;
 
-        private static bool IsPropertyCompatibleWithMember(PropertyInfo property, MemberInfo member)
-        {
-            // In JsonApiDotNetCore the PropertyInfo for Id stored in AttrAttribute is that of the ReflectedType, whereas Newtonsoft uses the DeclaringType.
-            return property == member || property.DeclaringType?.GetProperty(property.Name) == member;
+                dataProperties.Add(matchingProperty);
+            }
         }
+
+        return dataProperties;
+    }
+
+    private static DataProperty ChangeDataPropertyName(DataProperty property, string name)
+    {
+        return new DataProperty(name, property.MemberType, property.IsRequired, property.IsNullable, property.IsReadOnly, property.IsWriteOnly,
+            property.MemberInfo);
+    }
+
+    private static bool IsPropertyCompatibleWithMember(PropertyInfo property, MemberInfo member)
+    {
+        // In JsonApiDotNetCore the PropertyInfo for Id stored in AttrAttribute is that of the ReflectedType, whereas Newtonsoft uses the DeclaringType.
+        return property == member || property.DeclaringType?.GetProperty(property.Name) == member;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiSchemaGenerator.cs
index 7d47d180d5..4f85affcfd 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/JsonApiSchemaGenerator.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using System.Reflection;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects;
@@ -8,126 +6,125 @@
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents
+namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+
+internal sealed class JsonApiSchemaGenerator : ISchemaGenerator
 {
-    internal sealed class JsonApiSchemaGenerator : ISchemaGenerator
+    private static readonly Type[] JsonApiDocumentOpenTypes =
     {
-        private static readonly Type[] JsonApiDocumentOpenTypes =
-        {
-            typeof(ResourceCollectionResponseDocument<>),
-            typeof(PrimaryResourceResponseDocument<>),
-            typeof(SecondaryResourceResponseDocument<>),
-            typeof(NullableSecondaryResourceResponseDocument<>),
-            typeof(ResourcePostRequestDocument<>),
-            typeof(ResourcePatchRequestDocument<>),
-            typeof(ResourceIdentifierCollectionResponseDocument<>),
-            typeof(ResourceIdentifierResponseDocument<>),
-            typeof(NullableResourceIdentifierResponseDocument<>),
-            typeof(ToManyRelationshipInRequest<>),
-            typeof(ToOneRelationshipInRequest<>),
-            typeof(NullableToOneRelationshipInRequest<>)
-        };
+        typeof(ResourceCollectionResponseDocument<>),
+        typeof(PrimaryResourceResponseDocument<>),
+        typeof(SecondaryResourceResponseDocument<>),
+        typeof(NullableSecondaryResourceResponseDocument<>),
+        typeof(ResourcePostRequestDocument<>),
+        typeof(ResourcePatchRequestDocument<>),
+        typeof(ResourceIdentifierCollectionResponseDocument<>),
+        typeof(ResourceIdentifierResponseDocument<>),
+        typeof(NullableResourceIdentifierResponseDocument<>),
+        typeof(ToManyRelationshipInRequest<>),
+        typeof(ToOneRelationshipInRequest<>),
+        typeof(NullableToOneRelationshipInRequest<>)
+    };
+
+    private readonly ISchemaGenerator _defaultSchemaGenerator;
+    private readonly ResourceObjectSchemaGenerator _resourceObjectSchemaGenerator;
+    private readonly NullableReferenceSchemaGenerator _nullableReferenceSchemaGenerator;
+    private readonly SchemaRepositoryAccessor _schemaRepositoryAccessor = new();
+
+    public JsonApiSchemaGenerator(SchemaGenerator defaultSchemaGenerator, IResourceGraph resourceGraph, IJsonApiOptions options)
+    {
+        ArgumentGuard.NotNull(defaultSchemaGenerator, nameof(defaultSchemaGenerator));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        ArgumentGuard.NotNull(options, nameof(options));
 
-        private readonly ISchemaGenerator _defaultSchemaGenerator;
-        private readonly ResourceObjectSchemaGenerator _resourceObjectSchemaGenerator;
-        private readonly NullableReferenceSchemaGenerator _nullableReferenceSchemaGenerator;
-        private readonly SchemaRepositoryAccessor _schemaRepositoryAccessor = new();
+        _defaultSchemaGenerator = defaultSchemaGenerator;
+        _nullableReferenceSchemaGenerator = new NullableReferenceSchemaGenerator(_schemaRepositoryAccessor);
+        _resourceObjectSchemaGenerator = new ResourceObjectSchemaGenerator(defaultSchemaGenerator, resourceGraph, options, _schemaRepositoryAccessor);
+    }
 
-        public JsonApiSchemaGenerator(SchemaGenerator defaultSchemaGenerator, IResourceGraph resourceGraph, IJsonApiOptions options)
-        {
-            ArgumentGuard.NotNull(defaultSchemaGenerator, nameof(defaultSchemaGenerator));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-            ArgumentGuard.NotNull(options, nameof(options));
+    public OpenApiSchema GenerateSchema(Type type, SchemaRepository schemaRepository, MemberInfo? memberInfo = null, ParameterInfo? parameterInfo = null)
+    {
+        ArgumentGuard.NotNull(type, nameof(type));
+        ArgumentGuard.NotNull(schemaRepository, nameof(schemaRepository));
 
-            _defaultSchemaGenerator = defaultSchemaGenerator;
-            _nullableReferenceSchemaGenerator = new NullableReferenceSchemaGenerator(_schemaRepositoryAccessor);
-            _resourceObjectSchemaGenerator = new ResourceObjectSchemaGenerator(defaultSchemaGenerator, resourceGraph, options, _schemaRepositoryAccessor);
-        }
+        _schemaRepositoryAccessor.Current = schemaRepository;
 
-        public OpenApiSchema GenerateSchema(Type type, SchemaRepository schemaRepository, MemberInfo? memberInfo = null, ParameterInfo? parameterInfo = null)
+        if (schemaRepository.TryLookupByType(type, out OpenApiSchema jsonApiDocumentSchema))
         {
-            ArgumentGuard.NotNull(type, nameof(type));
-            ArgumentGuard.NotNull(schemaRepository, nameof(schemaRepository));
+            return jsonApiDocumentSchema;
+        }
 
-            _schemaRepositoryAccessor.Current = schemaRepository;
+        if (IsJsonApiDocument(type))
+        {
+            OpenApiSchema schema = GenerateJsonApiDocumentSchema(type);
 
-            if (schemaRepository.TryLookupByType(type, out OpenApiSchema jsonApiDocumentSchema))
+            if (IsDataPropertyNullable(type))
             {
-                return jsonApiDocumentSchema;
+                SetDataObjectSchemaToNullable(schema);
             }
+        }
 
-            if (IsJsonApiDocument(type))
-            {
-                OpenApiSchema schema = GenerateJsonApiDocumentSchema(type);
+        return _defaultSchemaGenerator.GenerateSchema(type, schemaRepository, memberInfo, parameterInfo);
+    }
 
-                if (IsDataPropertyNullable(type))
-                {
-                    SetDataObjectSchemaToNullable(schema);
-                }
-            }
+    private static bool IsJsonApiDocument(Type type)
+    {
+        return type.IsConstructedGenericType && JsonApiDocumentOpenTypes.Contains(type.GetGenericTypeDefinition());
+    }
 
-            return _defaultSchemaGenerator.GenerateSchema(type, schemaRepository, memberInfo, parameterInfo);
-        }
+    private OpenApiSchema GenerateJsonApiDocumentSchema(Type documentType)
+    {
+        Type resourceObjectType = documentType.BaseType!.GenericTypeArguments[0];
 
-        private static bool IsJsonApiDocument(Type type)
+        if (!_schemaRepositoryAccessor.Current.TryLookupByType(resourceObjectType, out OpenApiSchema referenceSchemaForResourceObject))
         {
-            return type.IsConstructedGenericType && JsonApiDocumentOpenTypes.Contains(type.GetGenericTypeDefinition());
+            referenceSchemaForResourceObject = _resourceObjectSchemaGenerator.GenerateSchema(resourceObjectType);
         }
 
-        private OpenApiSchema GenerateJsonApiDocumentSchema(Type documentType)
-        {
-            Type resourceObjectType = documentType.BaseType!.GenericTypeArguments[0];
+        OpenApiSchema referenceSchemaForDocument = _defaultSchemaGenerator.GenerateSchema(documentType, _schemaRepositoryAccessor.Current);
+        OpenApiSchema fullSchemaForDocument = _schemaRepositoryAccessor.Current.Schemas[referenceSchemaForDocument.Reference.Id];
 
-            if (!_schemaRepositoryAccessor.Current.TryLookupByType(resourceObjectType, out OpenApiSchema referenceSchemaForResourceObject))
-            {
-                referenceSchemaForResourceObject = _resourceObjectSchemaGenerator.GenerateSchema(resourceObjectType);
-            }
+        OpenApiSchema referenceSchemaForDataObject = IsManyDataDocument(documentType)
+            ? CreateArrayTypeDataSchema(referenceSchemaForResourceObject)
+            : referenceSchemaForResourceObject;
 
-            OpenApiSchema referenceSchemaForDocument = _defaultSchemaGenerator.GenerateSchema(documentType, _schemaRepositoryAccessor.Current);
-            OpenApiSchema fullSchemaForDocument = _schemaRepositoryAccessor.Current.Schemas[referenceSchemaForDocument.Reference.Id];
+        fullSchemaForDocument.Properties[JsonApiObjectPropertyName.Data] = referenceSchemaForDataObject;
 
-            OpenApiSchema referenceSchemaForDataObject = IsManyDataDocument(documentType)
-                ? CreateArrayTypeDataSchema(referenceSchemaForResourceObject)
-                : referenceSchemaForResourceObject;
+        return referenceSchemaForDocument;
+    }
 
-            fullSchemaForDocument.Properties[JsonApiObjectPropertyName.Data] = referenceSchemaForDataObject;
+    private static bool IsManyDataDocument(Type documentType)
+    {
+        return documentType.BaseType!.GetGenericTypeDefinition() == typeof(ManyData<>);
+    }
 
-            return referenceSchemaForDocument;
-        }
+    private static bool IsDataPropertyNullable(Type type)
+    {
+        PropertyInfo? dataProperty = type.GetProperty(nameof(JsonApiObjectPropertyName.Data));
 
-        private static bool IsManyDataDocument(Type documentType)
+        if (dataProperty == null)
         {
-            return documentType.BaseType!.GetGenericTypeDefinition() == typeof(ManyData<>);
+            throw new UnreachableCodeException();
         }
 
-        private static bool IsDataPropertyNullable(Type type)
-        {
-            PropertyInfo? dataProperty = type.GetProperty(nameof(JsonApiObjectPropertyName.Data));
-
-            if (dataProperty == null)
-            {
-                throw new UnreachableCodeException();
-            }
-
-            TypeCategory typeCategory = dataProperty.GetTypeCategory();
+        TypeCategory typeCategory = dataProperty.GetTypeCategory();
 
-            return typeCategory == TypeCategory.NullableReferenceType;
-        }
+        return typeCategory == TypeCategory.NullableReferenceType;
+    }
 
-        private void SetDataObjectSchemaToNullable(OpenApiSchema referenceSchemaForDocument)
-        {
-            OpenApiSchema fullSchemaForDocument = _schemaRepositoryAccessor.Current.Schemas[referenceSchemaForDocument.Reference.Id];
-            OpenApiSchema referenceSchemaForData = fullSchemaForDocument.Properties[JsonApiObjectPropertyName.Data];
-            fullSchemaForDocument.Properties[JsonApiObjectPropertyName.Data] = _nullableReferenceSchemaGenerator.GenerateSchema(referenceSchemaForData);
-        }
+    private void SetDataObjectSchemaToNullable(OpenApiSchema referenceSchemaForDocument)
+    {
+        OpenApiSchema fullSchemaForDocument = _schemaRepositoryAccessor.Current.Schemas[referenceSchemaForDocument.Reference.Id];
+        OpenApiSchema referenceSchemaForData = fullSchemaForDocument.Properties[JsonApiObjectPropertyName.Data];
+        fullSchemaForDocument.Properties[JsonApiObjectPropertyName.Data] = _nullableReferenceSchemaGenerator.GenerateSchema(referenceSchemaForData);
+    }
 
-        private static OpenApiSchema CreateArrayTypeDataSchema(OpenApiSchema referenceSchemaForResourceObject)
+    private static OpenApiSchema CreateArrayTypeDataSchema(OpenApiSchema referenceSchemaForResourceObject)
+    {
+        return new OpenApiSchema
         {
-            return new OpenApiSchema
-            {
-                Items = referenceSchemaForResourceObject,
-                Type = "array"
-            };
-        }
+            Items = referenceSchemaForResourceObject,
+            Type = "array"
+        };
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/NullableReferenceSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/NullableReferenceSchemaGenerator.cs
index f14e585bb8..c8e0fe79db 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/NullableReferenceSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/NullableReferenceSchemaGenerator.cs
@@ -1,97 +1,94 @@
-using System;
-using System.Collections.Generic;
 using Microsoft.OpenApi.Models;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents
+namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+
+internal sealed class NullableReferenceSchemaGenerator
 {
-    internal sealed class NullableReferenceSchemaGenerator
-    {
-        private static readonly NullableReferenceSchemaStrategy NullableReferenceStrategy =
-            Enum.Parse<NullableReferenceSchemaStrategy>(NullableReferenceSchemaStrategy.Implicit.ToString());
+    private static readonly NullableReferenceSchemaStrategy NullableReferenceStrategy =
+        Enum.Parse<NullableReferenceSchemaStrategy>(NullableReferenceSchemaStrategy.Implicit.ToString());
 
-        private static OpenApiSchema? _referenceSchemaForNullValue;
-        private readonly ISchemaRepositoryAccessor _schemaRepositoryAccessor;
+    private static OpenApiSchema? _referenceSchemaForNullValue;
+    private readonly ISchemaRepositoryAccessor _schemaRepositoryAccessor;
 
-        public NullableReferenceSchemaGenerator(ISchemaRepositoryAccessor schemaRepositoryAccessor)
-        {
-            ArgumentGuard.NotNull(schemaRepositoryAccessor, nameof(schemaRepositoryAccessor));
+    public NullableReferenceSchemaGenerator(ISchemaRepositoryAccessor schemaRepositoryAccessor)
+    {
+        ArgumentGuard.NotNull(schemaRepositoryAccessor, nameof(schemaRepositoryAccessor));
 
-            _schemaRepositoryAccessor = schemaRepositoryAccessor;
-        }
+        _schemaRepositoryAccessor = schemaRepositoryAccessor;
+    }
 
-        public OpenApiSchema GenerateSchema(OpenApiSchema referenceSchema)
-        {
-            ArgumentGuard.NotNull(referenceSchema, nameof(referenceSchema));
+    public OpenApiSchema GenerateSchema(OpenApiSchema referenceSchema)
+    {
+        ArgumentGuard.NotNull(referenceSchema, nameof(referenceSchema));
 
-            return new OpenApiSchema
+        return new OpenApiSchema
+        {
+            OneOf = new List<OpenApiSchema>
             {
-                OneOf = new List<OpenApiSchema>
-                {
-                    referenceSchema,
-                    GetNullableReferenceSchema()
-                }
-            };
-        }
+                referenceSchema,
+                GetNullableReferenceSchema()
+            }
+        };
+    }
 
-        private OpenApiSchema GetNullableReferenceSchema()
+    private OpenApiSchema GetNullableReferenceSchema()
+    {
+        return NullableReferenceStrategy == NullableReferenceSchemaStrategy.Explicit
+            ? GetNullableReferenceSchemaUsingExplicitNullType()
+            : GetNullableReferenceSchemaUsingImplicitNullType();
+    }
+
+    // This approach is supported in OAS starting from v3.1. See https://github.com/OAI/OpenAPI-Specification/issues/1368#issuecomment-580103688
+    private static OpenApiSchema GetNullableReferenceSchemaUsingExplicitNullType()
+    {
+        return new OpenApiSchema
         {
-            return NullableReferenceStrategy == NullableReferenceSchemaStrategy.Explicit
-                ? GetNullableReferenceSchemaUsingExplicitNullType()
-                : GetNullableReferenceSchemaUsingImplicitNullType();
-        }
+            Type = "null"
+        };
+    }
 
-        // This approach is supported in OAS starting from v3.1. See https://github.com/OAI/OpenAPI-Specification/issues/1368#issuecomment-580103688
-        private static OpenApiSchema GetNullableReferenceSchemaUsingExplicitNullType()
+    // This approach is supported starting from OAS v3.0. See https://github.com/OAI/OpenAPI-Specification/issues/1368#issuecomment-487314681
+    private OpenApiSchema GetNullableReferenceSchemaUsingImplicitNullType()
+    {
+        if (_referenceSchemaForNullValue != null)
         {
-            return new OpenApiSchema
-            {
-                Type = "null"
-            };
+            return _referenceSchemaForNullValue;
         }
 
-        // This approach is supported starting from OAS v3.0. See https://github.com/OAI/OpenAPI-Specification/issues/1368#issuecomment-487314681
-        private OpenApiSchema GetNullableReferenceSchemaUsingImplicitNullType()
+        var fullSchemaForNullValue = new OpenApiSchema
         {
-            if (_referenceSchemaForNullValue != null)
+            Nullable = true,
+            Not = new OpenApiSchema
             {
-                return _referenceSchemaForNullValue;
-            }
-
-            var fullSchemaForNullValue = new OpenApiSchema
-            {
-                Nullable = true,
-                Not = new OpenApiSchema
+                AnyOf = new List<OpenApiSchema>
                 {
-                    AnyOf = new List<OpenApiSchema>
+                    new()
+                    {
+                        Type = "string"
+                    },
+                    new()
                     {
-                        new()
-                        {
-                            Type = "string"
-                        },
-                        new()
-                        {
-                            Type = "number"
-                        },
-                        new()
-                        {
-                            Type = "boolean"
-                        },
-                        new()
-                        {
-                            Type = "object"
-                        },
-                        new()
-                        {
-                            Type = "array"
-                        }
+                        Type = "number"
                     },
-                    Items = new OpenApiSchema()
-                }
-            };
+                    new()
+                    {
+                        Type = "boolean"
+                    },
+                    new()
+                    {
+                        Type = "object"
+                    },
+                    new()
+                    {
+                        Type = "array"
+                    }
+                },
+                Items = new OpenApiSchema()
+            }
+        };
 
-            _referenceSchemaForNullValue = _schemaRepositoryAccessor.Current.AddDefinition("null-value", fullSchemaForNullValue);
+        _referenceSchemaForNullValue = _schemaRepositoryAccessor.Current.AddDefinition("null-value", fullSchemaForNullValue);
 
-            return _referenceSchemaForNullValue;
-        }
+        return _referenceSchemaForNullValue;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/NullableReferenceSchemaStrategy.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/NullableReferenceSchemaStrategy.cs
index 5580f776ee..282b4a282b 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/NullableReferenceSchemaStrategy.cs
+++ b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/NullableReferenceSchemaStrategy.cs
@@ -1,8 +1,7 @@
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents
+namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+
+internal enum NullableReferenceSchemaStrategy
 {
-    internal enum NullableReferenceSchemaStrategy
-    {
-        Implicit,
-        Explicit
-    }
+    Implicit,
+    Explicit
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldObjectSchemaBuilder.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldObjectSchemaBuilder.cs
index 620409d5ab..50d56c0965 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldObjectSchemaBuilder.cs
+++ b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceFieldObjectSchemaBuilder.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
 using System.Reflection;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.Relationships;
@@ -10,224 +7,223 @@
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents
-{
-    internal sealed class ResourceFieldObjectSchemaBuilder
-    {
-        private static readonly SchemaRepository ResourceSchemaRepository = new();
+namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
 
-        private static readonly Type[] RelationshipInResponseOpenTypes =
-        {
-            typeof(ToOneRelationshipInResponse<>),
-            typeof(ToManyRelationshipInResponse<>),
-            typeof(NullableToOneRelationshipInResponse<>)
-        };
+internal sealed class ResourceFieldObjectSchemaBuilder
+{
+    private static readonly SchemaRepository ResourceSchemaRepository = new();
 
-        private readonly ResourceTypeInfo _resourceTypeInfo;
-        private readonly ISchemaRepositoryAccessor _schemaRepositoryAccessor;
-        private readonly SchemaGenerator _defaultSchemaGenerator;
-        private readonly ResourceTypeSchemaGenerator _resourceTypeSchemaGenerator;
-        private readonly NullableReferenceSchemaGenerator _nullableReferenceSchemaGenerator;
-        private readonly IDictionary<string, OpenApiSchema> _schemasForResourceFields;
+    private static readonly Type[] RelationshipInResponseOpenTypes =
+    {
+        typeof(ToOneRelationshipInResponse<>),
+        typeof(ToManyRelationshipInResponse<>),
+        typeof(NullableToOneRelationshipInResponse<>)
+    };
+
+    private readonly ResourceTypeInfo _resourceTypeInfo;
+    private readonly ISchemaRepositoryAccessor _schemaRepositoryAccessor;
+    private readonly SchemaGenerator _defaultSchemaGenerator;
+    private readonly ResourceTypeSchemaGenerator _resourceTypeSchemaGenerator;
+    private readonly NullableReferenceSchemaGenerator _nullableReferenceSchemaGenerator;
+    private readonly IDictionary<string, OpenApiSchema> _schemasForResourceFields;
+
+    public ResourceFieldObjectSchemaBuilder(ResourceTypeInfo resourceTypeInfo, ISchemaRepositoryAccessor schemaRepositoryAccessor,
+        SchemaGenerator defaultSchemaGenerator, ResourceTypeSchemaGenerator resourceTypeSchemaGenerator)
+    {
+        ArgumentGuard.NotNull(resourceTypeInfo, nameof(resourceTypeInfo));
+        ArgumentGuard.NotNull(schemaRepositoryAccessor, nameof(schemaRepositoryAccessor));
+        ArgumentGuard.NotNull(defaultSchemaGenerator, nameof(defaultSchemaGenerator));
+        ArgumentGuard.NotNull(resourceTypeSchemaGenerator, nameof(resourceTypeSchemaGenerator));
+
+        _resourceTypeInfo = resourceTypeInfo;
+        _schemaRepositoryAccessor = schemaRepositoryAccessor;
+        _defaultSchemaGenerator = defaultSchemaGenerator;
+        _resourceTypeSchemaGenerator = resourceTypeSchemaGenerator;
+
+        _nullableReferenceSchemaGenerator = new NullableReferenceSchemaGenerator(schemaRepositoryAccessor);
+        _schemasForResourceFields = GetFieldSchemas();
+    }
 
-        public ResourceFieldObjectSchemaBuilder(ResourceTypeInfo resourceTypeInfo, ISchemaRepositoryAccessor schemaRepositoryAccessor,
-            SchemaGenerator defaultSchemaGenerator, ResourceTypeSchemaGenerator resourceTypeSchemaGenerator)
+    private IDictionary<string, OpenApiSchema> GetFieldSchemas()
+    {
+        if (!ResourceSchemaRepository.TryLookupByType(_resourceTypeInfo.ResourceType.ClrType, out OpenApiSchema referenceSchemaForResource))
         {
-            ArgumentGuard.NotNull(resourceTypeInfo, nameof(resourceTypeInfo));
-            ArgumentGuard.NotNull(schemaRepositoryAccessor, nameof(schemaRepositoryAccessor));
-            ArgumentGuard.NotNull(defaultSchemaGenerator, nameof(defaultSchemaGenerator));
-            ArgumentGuard.NotNull(resourceTypeSchemaGenerator, nameof(resourceTypeSchemaGenerator));
-
-            _resourceTypeInfo = resourceTypeInfo;
-            _schemaRepositoryAccessor = schemaRepositoryAccessor;
-            _defaultSchemaGenerator = defaultSchemaGenerator;
-            _resourceTypeSchemaGenerator = resourceTypeSchemaGenerator;
-
-            _nullableReferenceSchemaGenerator = new NullableReferenceSchemaGenerator(schemaRepositoryAccessor);
-            _schemasForResourceFields = GetFieldSchemas();
+            referenceSchemaForResource = _defaultSchemaGenerator.GenerateSchema(_resourceTypeInfo.ResourceType.ClrType, ResourceSchemaRepository);
         }
 
-        private IDictionary<string, OpenApiSchema> GetFieldSchemas()
-        {
-            if (!ResourceSchemaRepository.TryLookupByType(_resourceTypeInfo.ResourceType.ClrType, out OpenApiSchema referenceSchemaForResource))
-            {
-                referenceSchemaForResource = _defaultSchemaGenerator.GenerateSchema(_resourceTypeInfo.ResourceType.ClrType, ResourceSchemaRepository);
-            }
+        OpenApiSchema fullSchemaForResource = ResourceSchemaRepository.Schemas[referenceSchemaForResource.Reference.Id];
+        return fullSchemaForResource.Properties;
+    }
 
-            OpenApiSchema fullSchemaForResource = ResourceSchemaRepository.Schemas[referenceSchemaForResource.Reference.Id];
-            return fullSchemaForResource.Properties;
-        }
+    public void SetMembersOfAttributesObject(OpenApiSchema fullSchemaForAttributesObject)
+    {
+        AttrCapabilities requiredCapability = GetRequiredCapabilityForAttributes(_resourceTypeInfo.ResourceObjectOpenType);
 
-        public void SetMembersOfAttributesObject(OpenApiSchema fullSchemaForAttributesObject)
+        foreach ((string fieldName, OpenApiSchema resourceFieldSchema) in _schemasForResourceFields)
         {
-            AttrCapabilities requiredCapability = GetRequiredCapabilityForAttributes(_resourceTypeInfo.ResourceObjectOpenType);
+            AttrAttribute? matchingAttribute = _resourceTypeInfo.ResourceType.FindAttributeByPublicName(fieldName);
 
-            foreach ((string fieldName, OpenApiSchema resourceFieldSchema) in _schemasForResourceFields)
+            if (matchingAttribute != null && matchingAttribute.Capabilities.HasFlag(requiredCapability))
             {
-                AttrAttribute? matchingAttribute = _resourceTypeInfo.ResourceType.FindAttributeByPublicName(fieldName);
+                AddAttributeSchemaToResourceObject(matchingAttribute, fullSchemaForAttributesObject, resourceFieldSchema);
 
-                if (matchingAttribute != null && matchingAttribute.Capabilities.HasFlag(requiredCapability))
-                {
-                    AddAttributeSchemaToResourceObject(matchingAttribute, fullSchemaForAttributesObject, resourceFieldSchema);
-
-                    resourceFieldSchema.Nullable = matchingAttribute.IsNullable();
+                resourceFieldSchema.Nullable = matchingAttribute.IsNullable();
 
-                    if (IsFieldRequired(matchingAttribute))
-                    {
-                        fullSchemaForAttributesObject.Required.Add(matchingAttribute.PublicName);
-                    }
+                if (IsFieldRequired(matchingAttribute))
+                {
+                    fullSchemaForAttributesObject.Required.Add(matchingAttribute.PublicName);
                 }
             }
         }
+    }
 
-        private static AttrCapabilities GetRequiredCapabilityForAttributes(Type resourceObjectOpenType)
+    private static AttrCapabilities GetRequiredCapabilityForAttributes(Type resourceObjectOpenType)
+    {
+        return resourceObjectOpenType == typeof(ResourceObjectInResponse<>) ? AttrCapabilities.AllowView :
+            resourceObjectOpenType == typeof(ResourceObjectInPostRequest<>) ? AttrCapabilities.AllowCreate :
+            resourceObjectOpenType == typeof(ResourceObjectInPatchRequest<>) ? AttrCapabilities.AllowChange : throw new UnreachableCodeException();
+    }
+
+    private void AddAttributeSchemaToResourceObject(AttrAttribute attribute, OpenApiSchema attributesObjectSchema, OpenApiSchema resourceAttributeSchema)
+    {
+        if (resourceAttributeSchema.Reference != null && !_schemaRepositoryAccessor.Current.TryLookupByType(attribute.Property.PropertyType, out _))
         {
-            return resourceObjectOpenType == typeof(ResourceObjectInResponse<>) ? AttrCapabilities.AllowView :
-                resourceObjectOpenType == typeof(ResourceObjectInPostRequest<>) ? AttrCapabilities.AllowCreate :
-                resourceObjectOpenType == typeof(ResourceObjectInPatchRequest<>) ? AttrCapabilities.AllowChange : throw new UnreachableCodeException();
+            ExposeSchema(resourceAttributeSchema.Reference, attribute.Property.PropertyType);
         }
 
-        private void AddAttributeSchemaToResourceObject(AttrAttribute attribute, OpenApiSchema attributesObjectSchema, OpenApiSchema resourceAttributeSchema)
-        {
-            if (resourceAttributeSchema.Reference != null && !_schemaRepositoryAccessor.Current.TryLookupByType(attribute.Property.PropertyType, out _))
-            {
-                ExposeSchema(resourceAttributeSchema.Reference, attribute.Property.PropertyType);
-            }
+        attributesObjectSchema.Properties.Add(attribute.PublicName, resourceAttributeSchema);
+    }
 
-            attributesObjectSchema.Properties.Add(attribute.PublicName, resourceAttributeSchema);
-        }
+    private void ExposeSchema(OpenApiReference openApiReference, Type typeRepresentedBySchema)
+    {
+        OpenApiSchema fullSchema = ResourceSchemaRepository.Schemas[openApiReference.Id];
+        _schemaRepositoryAccessor.Current.AddDefinition(openApiReference.Id, fullSchema);
+        _schemaRepositoryAccessor.Current.RegisterType(typeRepresentedBySchema, openApiReference.Id);
+    }
 
-        private void ExposeSchema(OpenApiReference openApiReference, Type typeRepresentedBySchema)
+    private bool IsFieldRequired(ResourceFieldAttribute field)
+    {
+        if (field is HasManyAttribute || _resourceTypeInfo.ResourceObjectOpenType != typeof(ResourceObjectInPostRequest<>))
         {
-            OpenApiSchema fullSchema = ResourceSchemaRepository.Schemas[openApiReference.Id];
-            _schemaRepositoryAccessor.Current.AddDefinition(openApiReference.Id, fullSchema);
-            _schemaRepositoryAccessor.Current.RegisterType(typeRepresentedBySchema, openApiReference.Id);
+            return false;
         }
 
-        private bool IsFieldRequired(ResourceFieldAttribute field)
-        {
-            if (field is HasManyAttribute || _resourceTypeInfo.ResourceObjectOpenType != typeof(ResourceObjectInPostRequest<>))
-            {
-                return false;
-            }
-
-            TypeCategory fieldTypeCategory = field.Property.GetTypeCategory();
-            bool hasRequiredAttribute = field.Property.HasAttribute<RequiredAttribute>();
-
-            return fieldTypeCategory switch
-            {
-                TypeCategory.NonNullableReferenceType => true,
-                TypeCategory.ValueType => hasRequiredAttribute,
-                TypeCategory.NullableReferenceType or TypeCategory.NullableValueType => hasRequiredAttribute,
-                _ => throw new UnreachableCodeException()
-            };
-        }
+        TypeCategory fieldTypeCategory = field.Property.GetTypeCategory();
+        bool hasRequiredAttribute = field.Property.HasAttribute<RequiredAttribute>();
 
-        public void SetMembersOfRelationshipsObject(OpenApiSchema fullSchemaForRelationshipsObject)
+        return fieldTypeCategory switch
         {
-            foreach (string fieldName in _schemasForResourceFields.Keys)
-            {
-                RelationshipAttribute? matchingRelationship = _resourceTypeInfo.ResourceType.FindRelationshipByPublicName(fieldName);
-
-                if (matchingRelationship != null)
-                {
-                    EnsureResourceIdentifierObjectSchemaExists(matchingRelationship);
-                    AddRelationshipSchemaToResourceObject(matchingRelationship, fullSchemaForRelationshipsObject);
-                }
-            }
-        }
+            TypeCategory.NonNullableReferenceType => true,
+            TypeCategory.ValueType => hasRequiredAttribute,
+            TypeCategory.NullableReferenceType or TypeCategory.NullableValueType => hasRequiredAttribute,
+            _ => throw new UnreachableCodeException()
+        };
+    }
 
-        private void EnsureResourceIdentifierObjectSchemaExists(RelationshipAttribute relationship)
+    public void SetMembersOfRelationshipsObject(OpenApiSchema fullSchemaForRelationshipsObject)
+    {
+        foreach (string fieldName in _schemasForResourceFields.Keys)
         {
-            Type resourceIdentifierObjectType = typeof(ResourceIdentifierObject<>).MakeGenericType(relationship.RightType.ClrType);
+            RelationshipAttribute? matchingRelationship = _resourceTypeInfo.ResourceType.FindRelationshipByPublicName(fieldName);
 
-            if (!ResourceIdentifierObjectSchemaExists(resourceIdentifierObjectType))
+            if (matchingRelationship != null)
             {
-                GenerateResourceIdentifierObjectSchema(resourceIdentifierObjectType);
+                EnsureResourceIdentifierObjectSchemaExists(matchingRelationship);
+                AddRelationshipSchemaToResourceObject(matchingRelationship, fullSchemaForRelationshipsObject);
             }
         }
+    }
 
-        private bool ResourceIdentifierObjectSchemaExists(Type resourceIdentifierObjectType)
-        {
-            return _schemaRepositoryAccessor.Current.TryLookupByType(resourceIdentifierObjectType, out _);
-        }
+    private void EnsureResourceIdentifierObjectSchemaExists(RelationshipAttribute relationship)
+    {
+        Type resourceIdentifierObjectType = typeof(ResourceIdentifierObject<>).MakeGenericType(relationship.RightType.ClrType);
 
-        private void GenerateResourceIdentifierObjectSchema(Type resourceIdentifierObjectType)
+        if (!ResourceIdentifierObjectSchemaExists(resourceIdentifierObjectType))
         {
-            OpenApiSchema referenceSchemaForResourceIdentifierObject =
-                _defaultSchemaGenerator.GenerateSchema(resourceIdentifierObjectType, _schemaRepositoryAccessor.Current);
+            GenerateResourceIdentifierObjectSchema(resourceIdentifierObjectType);
+        }
+    }
 
-            OpenApiSchema fullSchemaForResourceIdentifierObject =
-                _schemaRepositoryAccessor.Current.Schemas[referenceSchemaForResourceIdentifierObject.Reference.Id];
+    private bool ResourceIdentifierObjectSchemaExists(Type resourceIdentifierObjectType)
+    {
+        return _schemaRepositoryAccessor.Current.TryLookupByType(resourceIdentifierObjectType, out _);
+    }
 
-            Type resourceType = resourceIdentifierObjectType.GetGenericArguments()[0];
-            fullSchemaForResourceIdentifierObject.Properties[JsonApiObjectPropertyName.Type] = _resourceTypeSchemaGenerator.Get(resourceType);
-        }
+    private void GenerateResourceIdentifierObjectSchema(Type resourceIdentifierObjectType)
+    {
+        OpenApiSchema referenceSchemaForResourceIdentifierObject =
+            _defaultSchemaGenerator.GenerateSchema(resourceIdentifierObjectType, _schemaRepositoryAccessor.Current);
 
-        private void AddRelationshipSchemaToResourceObject(RelationshipAttribute relationship, OpenApiSchema fullSchemaForRelationshipsObject)
-        {
-            Type relationshipSchemaType = GetRelationshipSchemaType(relationship, _resourceTypeInfo.ResourceObjectOpenType);
+        OpenApiSchema fullSchemaForResourceIdentifierObject =
+            _schemaRepositoryAccessor.Current.Schemas[referenceSchemaForResourceIdentifierObject.Reference.Id];
 
-            OpenApiSchema relationshipSchema = GetReferenceSchemaForRelationship(relationshipSchemaType) ?? CreateRelationshipSchema(relationshipSchemaType);
+        Type resourceType = resourceIdentifierObjectType.GetGenericArguments()[0];
+        fullSchemaForResourceIdentifierObject.Properties[JsonApiObjectPropertyName.Type] = _resourceTypeSchemaGenerator.Get(resourceType);
+    }
 
-            fullSchemaForRelationshipsObject.Properties.Add(relationship.PublicName, relationshipSchema);
+    private void AddRelationshipSchemaToResourceObject(RelationshipAttribute relationship, OpenApiSchema fullSchemaForRelationshipsObject)
+    {
+        Type relationshipSchemaType = GetRelationshipSchemaType(relationship, _resourceTypeInfo.ResourceObjectOpenType);
 
-            if (IsFieldRequired(relationship))
-            {
-                fullSchemaForRelationshipsObject.Required.Add(relationship.PublicName);
-            }
-        }
+        OpenApiSchema relationshipSchema = GetReferenceSchemaForRelationship(relationshipSchemaType) ?? CreateRelationshipSchema(relationshipSchemaType);
 
-        private static Type GetRelationshipSchemaType(RelationshipAttribute relationship, Type resourceObjectType)
-        {
-            return resourceObjectType.GetGenericTypeDefinition().IsAssignableTo(typeof(ResourceObjectInResponse<>))
-                ? RelationshipTypeFactory.Instance.GetForResponse(relationship)
-                : RelationshipTypeFactory.Instance.GetForRequest(relationship);
-        }
+        fullSchemaForRelationshipsObject.Properties.Add(relationship.PublicName, relationshipSchema);
 
-        private OpenApiSchema? GetReferenceSchemaForRelationship(Type relationshipSchemaType)
+        if (IsFieldRequired(relationship))
         {
-            _schemaRepositoryAccessor.Current.TryLookupByType(relationshipSchemaType, out OpenApiSchema? referenceSchema);
-            return referenceSchema;
+            fullSchemaForRelationshipsObject.Required.Add(relationship.PublicName);
         }
+    }
 
-        private OpenApiSchema CreateRelationshipSchema(Type relationshipSchemaType)
-        {
-            OpenApiSchema referenceSchema = _defaultSchemaGenerator.GenerateSchema(relationshipSchemaType, _schemaRepositoryAccessor.Current);
+    private static Type GetRelationshipSchemaType(RelationshipAttribute relationship, Type resourceObjectType)
+    {
+        return resourceObjectType.GetGenericTypeDefinition().IsAssignableTo(typeof(ResourceObjectInResponse<>))
+            ? RelationshipTypeFactory.Instance.GetForResponse(relationship)
+            : RelationshipTypeFactory.Instance.GetForRequest(relationship);
+    }
 
-            OpenApiSchema fullSchema = _schemaRepositoryAccessor.Current.Schemas[referenceSchema.Reference.Id];
+    private OpenApiSchema? GetReferenceSchemaForRelationship(Type relationshipSchemaType)
+    {
+        _schemaRepositoryAccessor.Current.TryLookupByType(relationshipSchemaType, out OpenApiSchema? referenceSchema);
+        return referenceSchema;
+    }
 
-            if (IsDataPropertyNullable(relationshipSchemaType))
-            {
-                fullSchema.Properties[JsonApiObjectPropertyName.Data] =
-                    _nullableReferenceSchemaGenerator.GenerateSchema(fullSchema.Properties[JsonApiObjectPropertyName.Data]);
-            }
+    private OpenApiSchema CreateRelationshipSchema(Type relationshipSchemaType)
+    {
+        OpenApiSchema referenceSchema = _defaultSchemaGenerator.GenerateSchema(relationshipSchemaType, _schemaRepositoryAccessor.Current);
 
-            if (IsRelationshipInResponseType(relationshipSchemaType))
-            {
-                fullSchema.Required.Remove(JsonApiObjectPropertyName.Data);
-            }
+        OpenApiSchema fullSchema = _schemaRepositoryAccessor.Current.Schemas[referenceSchema.Reference.Id];
 
-            return referenceSchema;
+        if (IsDataPropertyNullable(relationshipSchemaType))
+        {
+            fullSchema.Properties[JsonApiObjectPropertyName.Data] =
+                _nullableReferenceSchemaGenerator.GenerateSchema(fullSchema.Properties[JsonApiObjectPropertyName.Data]);
         }
 
-        private static bool IsRelationshipInResponseType(Type relationshipSchemaType)
+        if (IsRelationshipInResponseType(relationshipSchemaType))
         {
-            Type relationshipSchemaOpenType = relationshipSchemaType.GetGenericTypeDefinition();
-
-            return RelationshipInResponseOpenTypes.Contains(relationshipSchemaOpenType);
+            fullSchema.Required.Remove(JsonApiObjectPropertyName.Data);
         }
 
-        private static bool IsDataPropertyNullable(Type type)
-        {
-            PropertyInfo? dataProperty = type.GetProperty(nameof(JsonApiObjectPropertyName.Data));
+        return referenceSchema;
+    }
 
-            if (dataProperty == null)
-            {
-                throw new UnreachableCodeException();
-            }
+    private static bool IsRelationshipInResponseType(Type relationshipSchemaType)
+    {
+        Type relationshipSchemaOpenType = relationshipSchemaType.GetGenericTypeDefinition();
 
-            return dataProperty.GetTypeCategory() == TypeCategory.NullableReferenceType;
+        return RelationshipInResponseOpenTypes.Contains(relationshipSchemaOpenType);
+    }
+
+    private static bool IsDataPropertyNullable(Type type)
+    {
+        PropertyInfo? dataProperty = type.GetProperty(nameof(JsonApiObjectPropertyName.Data));
+
+        if (dataProperty == null)
+        {
+            throw new UnreachableCodeException();
         }
+
+        return dataProperty.GetTypeCategory() == TypeCategory.NullableReferenceType;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceObjectSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceObjectSchemaGenerator.cs
index 1db417f7e5..540517b59c 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceObjectSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceObjectSchemaGenerator.cs
@@ -1,146 +1,142 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.OpenApi.JsonApiObjects.ResourceObjects;
 using Microsoft.OpenApi.Models;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents
+namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+
+internal sealed class ResourceObjectSchemaGenerator
 {
-    internal sealed class ResourceObjectSchemaGenerator
+    private readonly SchemaGenerator _defaultSchemaGenerator;
+    private readonly IResourceGraph _resourceGraph;
+    private readonly ISchemaRepositoryAccessor _schemaRepositoryAccessor;
+    private readonly ResourceTypeSchemaGenerator _resourceTypeSchemaGenerator;
+    private readonly bool _allowClientGeneratedIds;
+    private readonly Func<ResourceTypeInfo, ResourceFieldObjectSchemaBuilder> _resourceFieldObjectSchemaBuilderFactory;
+
+    public ResourceObjectSchemaGenerator(SchemaGenerator defaultSchemaGenerator, IResourceGraph resourceGraph, IJsonApiOptions options,
+        ISchemaRepositoryAccessor schemaRepositoryAccessor)
     {
-        private readonly SchemaGenerator _defaultSchemaGenerator;
-        private readonly IResourceGraph _resourceGraph;
-        private readonly ISchemaRepositoryAccessor _schemaRepositoryAccessor;
-        private readonly ResourceTypeSchemaGenerator _resourceTypeSchemaGenerator;
-        private readonly bool _allowClientGeneratedIds;
-        private readonly Func<ResourceTypeInfo, ResourceFieldObjectSchemaBuilder> _resourceFieldObjectSchemaBuilderFactory;
-
-        public ResourceObjectSchemaGenerator(SchemaGenerator defaultSchemaGenerator, IResourceGraph resourceGraph, IJsonApiOptions options,
-            ISchemaRepositoryAccessor schemaRepositoryAccessor)
-        {
-            ArgumentGuard.NotNull(defaultSchemaGenerator, nameof(defaultSchemaGenerator));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(schemaRepositoryAccessor, nameof(schemaRepositoryAccessor));
+        ArgumentGuard.NotNull(defaultSchemaGenerator, nameof(defaultSchemaGenerator));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(schemaRepositoryAccessor, nameof(schemaRepositoryAccessor));
 
-            _defaultSchemaGenerator = defaultSchemaGenerator;
-            _resourceGraph = resourceGraph;
-            _schemaRepositoryAccessor = schemaRepositoryAccessor;
+        _defaultSchemaGenerator = defaultSchemaGenerator;
+        _resourceGraph = resourceGraph;
+        _schemaRepositoryAccessor = schemaRepositoryAccessor;
 
-            _resourceTypeSchemaGenerator = new ResourceTypeSchemaGenerator(schemaRepositoryAccessor, resourceGraph);
-            _allowClientGeneratedIds = options.AllowClientGeneratedIds;
+        _resourceTypeSchemaGenerator = new ResourceTypeSchemaGenerator(schemaRepositoryAccessor, resourceGraph);
+        _allowClientGeneratedIds = options.AllowClientGeneratedIds;
 
-            _resourceFieldObjectSchemaBuilderFactory = resourceTypeInfo => new ResourceFieldObjectSchemaBuilder(resourceTypeInfo, schemaRepositoryAccessor,
-                defaultSchemaGenerator, _resourceTypeSchemaGenerator);
-        }
+        _resourceFieldObjectSchemaBuilderFactory = resourceTypeInfo => new ResourceFieldObjectSchemaBuilder(resourceTypeInfo, schemaRepositoryAccessor,
+            defaultSchemaGenerator, _resourceTypeSchemaGenerator);
+    }
 
-        public OpenApiSchema GenerateSchema(Type resourceObjectType)
-        {
-            ArgumentGuard.NotNull(resourceObjectType, nameof(resourceObjectType));
+    public OpenApiSchema GenerateSchema(Type resourceObjectType)
+    {
+        ArgumentGuard.NotNull(resourceObjectType, nameof(resourceObjectType));
 
-            (OpenApiSchema fullSchemaForResourceObject, OpenApiSchema referenceSchemaForResourceObject) = EnsureSchemasExist(resourceObjectType);
+        (OpenApiSchema fullSchemaForResourceObject, OpenApiSchema referenceSchemaForResourceObject) = EnsureSchemasExist(resourceObjectType);
 
-            var resourceTypeInfo = ResourceTypeInfo.Create(resourceObjectType, _resourceGraph);
-            ResourceFieldObjectSchemaBuilder fieldObjectBuilder = _resourceFieldObjectSchemaBuilderFactory(resourceTypeInfo);
+        var resourceTypeInfo = ResourceTypeInfo.Create(resourceObjectType, _resourceGraph);
+        ResourceFieldObjectSchemaBuilder fieldObjectBuilder = _resourceFieldObjectSchemaBuilderFactory(resourceTypeInfo);
 
-            RemoveResourceIdIfPostResourceObject(resourceTypeInfo.ResourceObjectOpenType, fullSchemaForResourceObject);
+        RemoveResourceIdIfPostResourceObject(resourceTypeInfo.ResourceObjectOpenType, fullSchemaForResourceObject);
 
-            SetResourceType(fullSchemaForResourceObject, resourceTypeInfo.ResourceType.ClrType);
+        SetResourceType(fullSchemaForResourceObject, resourceTypeInfo.ResourceType.ClrType);
 
-            SetResourceAttributes(fullSchemaForResourceObject, fieldObjectBuilder);
+        SetResourceAttributes(fullSchemaForResourceObject, fieldObjectBuilder);
 
-            SetResourceRelationships(fullSchemaForResourceObject, fieldObjectBuilder);
+        SetResourceRelationships(fullSchemaForResourceObject, fieldObjectBuilder);
 
-            ReorderMembers(fullSchemaForResourceObject, new[]
-            {
-                JsonApiObjectPropertyName.Type,
-                JsonApiObjectPropertyName.Id,
-                JsonApiObjectPropertyName.AttributesObject,
-                JsonApiObjectPropertyName.RelationshipsObject,
-                JsonApiObjectPropertyName.LinksObject,
-                JsonApiObjectPropertyName.MetaObject
-            });
-
-            return referenceSchemaForResourceObject;
-        }
+        ReorderMembers(fullSchemaForResourceObject, new[]
+        {
+            JsonApiObjectPropertyName.Type,
+            JsonApiObjectPropertyName.Id,
+            JsonApiObjectPropertyName.AttributesObject,
+            JsonApiObjectPropertyName.RelationshipsObject,
+            JsonApiObjectPropertyName.LinksObject,
+            JsonApiObjectPropertyName.MetaObject
+        });
+
+        return referenceSchemaForResourceObject;
+    }
 
-        private (OpenApiSchema fullSchema, OpenApiSchema referenceSchema) EnsureSchemasExist(Type resourceObjectType)
+    private (OpenApiSchema fullSchema, OpenApiSchema referenceSchema) EnsureSchemasExist(Type resourceObjectType)
+    {
+        if (!_schemaRepositoryAccessor.Current.TryLookupByType(resourceObjectType, out OpenApiSchema referenceSchema))
         {
-            if (!_schemaRepositoryAccessor.Current.TryLookupByType(resourceObjectType, out OpenApiSchema referenceSchema))
-            {
-                referenceSchema = _defaultSchemaGenerator.GenerateSchema(resourceObjectType, _schemaRepositoryAccessor.Current);
-            }
+            referenceSchema = _defaultSchemaGenerator.GenerateSchema(resourceObjectType, _schemaRepositoryAccessor.Current);
+        }
 
-            OpenApiSchema fullSchema = _schemaRepositoryAccessor.Current.Schemas[referenceSchema.Reference.Id];
+        OpenApiSchema fullSchema = _schemaRepositoryAccessor.Current.Schemas[referenceSchema.Reference.Id];
 
-            return (fullSchema, referenceSchema);
-        }
+        return (fullSchema, referenceSchema);
+    }
 
-        private void RemoveResourceIdIfPostResourceObject(Type resourceObjectOpenType, OpenApiSchema fullSchemaForResourceObject)
+    private void RemoveResourceIdIfPostResourceObject(Type resourceObjectOpenType, OpenApiSchema fullSchemaForResourceObject)
+    {
+        if (resourceObjectOpenType == typeof(ResourceObjectInPostRequest<>) && !_allowClientGeneratedIds)
         {
-            if (resourceObjectOpenType == typeof(ResourceObjectInPostRequest<>) && !_allowClientGeneratedIds)
-            {
-                fullSchemaForResourceObject.Required.Remove(JsonApiObjectPropertyName.Id);
-                fullSchemaForResourceObject.Properties.Remove(JsonApiObjectPropertyName.Id);
-            }
+            fullSchemaForResourceObject.Required.Remove(JsonApiObjectPropertyName.Id);
+            fullSchemaForResourceObject.Properties.Remove(JsonApiObjectPropertyName.Id);
         }
+    }
 
-        private void SetResourceType(OpenApiSchema fullSchemaForResourceObject, Type resourceType)
-        {
-            fullSchemaForResourceObject.Properties[JsonApiObjectPropertyName.Type] = _resourceTypeSchemaGenerator.Get(resourceType);
-        }
+    private void SetResourceType(OpenApiSchema fullSchemaForResourceObject, Type resourceType)
+    {
+        fullSchemaForResourceObject.Properties[JsonApiObjectPropertyName.Type] = _resourceTypeSchemaGenerator.Get(resourceType);
+    }
 
-        private void SetResourceAttributes(OpenApiSchema fullSchemaForResourceObject, ResourceFieldObjectSchemaBuilder builder)
-        {
-            OpenApiSchema referenceSchemaForAttributesObject = fullSchemaForResourceObject.Properties[JsonApiObjectPropertyName.AttributesObject];
-            OpenApiSchema fullSchemaForAttributesObject = _schemaRepositoryAccessor.Current.Schemas[referenceSchemaForAttributesObject.Reference.Id];
+    private void SetResourceAttributes(OpenApiSchema fullSchemaForResourceObject, ResourceFieldObjectSchemaBuilder builder)
+    {
+        OpenApiSchema referenceSchemaForAttributesObject = fullSchemaForResourceObject.Properties[JsonApiObjectPropertyName.AttributesObject];
+        OpenApiSchema fullSchemaForAttributesObject = _schemaRepositoryAccessor.Current.Schemas[referenceSchemaForAttributesObject.Reference.Id];
 
-            builder.SetMembersOfAttributesObject(fullSchemaForAttributesObject);
+        builder.SetMembersOfAttributesObject(fullSchemaForAttributesObject);
 
-            if (!fullSchemaForAttributesObject.Properties.Any())
-            {
-                fullSchemaForResourceObject.Properties.Remove(JsonApiObjectPropertyName.AttributesObject);
-                _schemaRepositoryAccessor.Current.Schemas.Remove(referenceSchemaForAttributesObject.Reference.Id);
-            }
-            else
-            {
-                fullSchemaForAttributesObject.AdditionalPropertiesAllowed = false;
-            }
+        if (!fullSchemaForAttributesObject.Properties.Any())
+        {
+            fullSchemaForResourceObject.Properties.Remove(JsonApiObjectPropertyName.AttributesObject);
+            _schemaRepositoryAccessor.Current.Schemas.Remove(referenceSchemaForAttributesObject.Reference.Id);
         }
-
-        private void SetResourceRelationships(OpenApiSchema fullSchemaForResourceObject, ResourceFieldObjectSchemaBuilder builder)
+        else
         {
-            OpenApiSchema referenceSchemaForRelationshipsObject = fullSchemaForResourceObject.Properties[JsonApiObjectPropertyName.RelationshipsObject];
-            OpenApiSchema fullSchemaForRelationshipsObject = _schemaRepositoryAccessor.Current.Schemas[referenceSchemaForRelationshipsObject.Reference.Id];
+            fullSchemaForAttributesObject.AdditionalPropertiesAllowed = false;
+        }
+    }
 
-            builder.SetMembersOfRelationshipsObject(fullSchemaForRelationshipsObject);
+    private void SetResourceRelationships(OpenApiSchema fullSchemaForResourceObject, ResourceFieldObjectSchemaBuilder builder)
+    {
+        OpenApiSchema referenceSchemaForRelationshipsObject = fullSchemaForResourceObject.Properties[JsonApiObjectPropertyName.RelationshipsObject];
+        OpenApiSchema fullSchemaForRelationshipsObject = _schemaRepositoryAccessor.Current.Schemas[referenceSchemaForRelationshipsObject.Reference.Id];
 
-            if (!fullSchemaForRelationshipsObject.Properties.Any())
-            {
-                fullSchemaForResourceObject.Properties.Remove(JsonApiObjectPropertyName.RelationshipsObject);
-                _schemaRepositoryAccessor.Current.Schemas.Remove(referenceSchemaForRelationshipsObject.Reference.Id);
-            }
-            else
-            {
-                fullSchemaForRelationshipsObject.AdditionalPropertiesAllowed = false;
-            }
-        }
+        builder.SetMembersOfRelationshipsObject(fullSchemaForRelationshipsObject);
 
-        private static void ReorderMembers(OpenApiSchema fullSchemaForResourceObject, IEnumerable<string> orderedMembers)
+        if (!fullSchemaForRelationshipsObject.Properties.Any())
         {
-            var reorderedMembers = new Dictionary<string, OpenApiSchema>();
+            fullSchemaForResourceObject.Properties.Remove(JsonApiObjectPropertyName.RelationshipsObject);
+            _schemaRepositoryAccessor.Current.Schemas.Remove(referenceSchemaForRelationshipsObject.Reference.Id);
+        }
+        else
+        {
+            fullSchemaForRelationshipsObject.AdditionalPropertiesAllowed = false;
+        }
+    }
+
+    private static void ReorderMembers(OpenApiSchema fullSchemaForResourceObject, IEnumerable<string> orderedMembers)
+    {
+        var reorderedMembers = new Dictionary<string, OpenApiSchema>();
 
-            foreach (string member in orderedMembers)
+        foreach (string member in orderedMembers)
+        {
+            if (fullSchemaForResourceObject.Properties.ContainsKey(member))
             {
-                if (fullSchemaForResourceObject.Properties.ContainsKey(member))
-                {
-                    reorderedMembers[member] = fullSchemaForResourceObject.Properties[member];
-                }
+                reorderedMembers[member] = fullSchemaForResourceObject.Properties[member];
             }
-
-            fullSchemaForResourceObject.Properties = reorderedMembers;
         }
+
+        fullSchemaForResourceObject.Properties = reorderedMembers;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeInfo.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeInfo.cs
index 4bef12a5bb..43acb09a03 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeInfo.cs
+++ b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeInfo.cs
@@ -1,29 +1,27 @@
-using System;
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents
+namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+
+internal sealed class ResourceTypeInfo
 {
-    internal sealed class ResourceTypeInfo
-    {
-        public Type ResourceObjectOpenType { get; }
-        public ResourceType ResourceType { get; }
+    public Type ResourceObjectOpenType { get; }
+    public ResourceType ResourceType { get; }
 
-        private ResourceTypeInfo(Type resourceObjectOpenType, ResourceType resourceType)
-        {
-            ResourceObjectOpenType = resourceObjectOpenType;
-            ResourceType = resourceType;
-        }
+    private ResourceTypeInfo(Type resourceObjectOpenType, ResourceType resourceType)
+    {
+        ResourceObjectOpenType = resourceObjectOpenType;
+        ResourceType = resourceType;
+    }
 
-        public static ResourceTypeInfo Create(Type resourceObjectType, IResourceGraph resourceGraph)
-        {
-            ArgumentGuard.NotNull(resourceObjectType, nameof(resourceObjectType));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+    public static ResourceTypeInfo Create(Type resourceObjectType, IResourceGraph resourceGraph)
+    {
+        ArgumentGuard.NotNull(resourceObjectType, nameof(resourceObjectType));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
 
-            Type resourceObjectOpenType = resourceObjectType.GetGenericTypeDefinition();
-            Type resourceClrType = resourceObjectType.GenericTypeArguments[0];
-            ResourceType resourceType = resourceGraph.GetResourceType(resourceClrType);
+        Type resourceObjectOpenType = resourceObjectType.GetGenericTypeDefinition();
+        Type resourceClrType = resourceObjectType.GenericTypeArguments[0];
+        ResourceType resourceType = resourceGraph.GetResourceType(resourceClrType);
 
-            return new ResourceTypeInfo(resourceObjectOpenType, resourceType);
-        }
+        return new ResourceTypeInfo(resourceObjectOpenType, resourceType);
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeSchemaGenerator.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeSchemaGenerator.cs
index c3272f35a1..d110511880 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeSchemaGenerator.cs
+++ b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/ResourceTypeSchemaGenerator.cs
@@ -1,59 +1,56 @@
-using System;
-using System.Collections.Generic;
 using JsonApiDotNetCore.Configuration;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents
+namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+
+internal sealed class ResourceTypeSchemaGenerator
 {
-    internal sealed class ResourceTypeSchemaGenerator
+    private readonly ISchemaRepositoryAccessor _schemaRepositoryAccessor;
+    private readonly IResourceGraph _resourceGraph;
+    private readonly Dictionary<Type, OpenApiSchema> _resourceClrTypeSchemaCache = new();
+
+    public ResourceTypeSchemaGenerator(ISchemaRepositoryAccessor schemaRepositoryAccessor, IResourceGraph resourceGraph)
     {
-        private readonly ISchemaRepositoryAccessor _schemaRepositoryAccessor;
-        private readonly IResourceGraph _resourceGraph;
-        private readonly Dictionary<Type, OpenApiSchema> _resourceClrTypeSchemaCache = new();
+        ArgumentGuard.NotNull(schemaRepositoryAccessor, nameof(schemaRepositoryAccessor));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
 
-        public ResourceTypeSchemaGenerator(ISchemaRepositoryAccessor schemaRepositoryAccessor, IResourceGraph resourceGraph)
-        {
-            ArgumentGuard.NotNull(schemaRepositoryAccessor, nameof(schemaRepositoryAccessor));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        _schemaRepositoryAccessor = schemaRepositoryAccessor;
+        _resourceGraph = resourceGraph;
+    }
 
-            _schemaRepositoryAccessor = schemaRepositoryAccessor;
-            _resourceGraph = resourceGraph;
-        }
+    public OpenApiSchema Get(Type resourceClrType)
+    {
+        ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
 
-        public OpenApiSchema Get(Type resourceClrType)
+        if (_resourceClrTypeSchemaCache.TryGetValue(resourceClrType, out OpenApiSchema? referenceSchema))
         {
-            ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
+            return referenceSchema;
+        }
 
-            if (_resourceClrTypeSchemaCache.TryGetValue(resourceClrType, out OpenApiSchema? referenceSchema))
+        ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
+
+        var fullSchema = new OpenApiSchema
+        {
+            Type = "string",
+            Enum = new List<IOpenApiAny>
             {
-                return referenceSchema;
+                new OpenApiString(resourceType.PublicName)
             }
+        };
 
-            ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
-
-            var fullSchema = new OpenApiSchema
-            {
-                Type = "string",
-                Enum = new List<IOpenApiAny>
-                {
-                    new OpenApiString(resourceType.PublicName)
-                }
-            };
-
-            referenceSchema = new OpenApiSchema
+        referenceSchema = new OpenApiSchema
+        {
+            Reference = new OpenApiReference
             {
-                Reference = new OpenApiReference
-                {
-                    Id = $"{resourceType.PublicName}-resource-type",
-                    Type = ReferenceType.Schema
-                }
-            };
+                Id = $"{resourceType.PublicName}-resource-type",
+                Type = ReferenceType.Schema
+            }
+        };
 
-            _schemaRepositoryAccessor.Current.AddDefinition(referenceSchema.Reference.Id, fullSchema);
-            _resourceClrTypeSchemaCache.Add(resourceType.ClrType, referenceSchema);
+        _schemaRepositoryAccessor.Current.AddDefinition(referenceSchema.Reference.Id, fullSchema);
+        _resourceClrTypeSchemaCache.Add(resourceType.ClrType, referenceSchema);
 
-            return referenceSchema;
-        }
+        return referenceSchema;
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/SchemaRepositoryAccessor.cs b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/SchemaRepositoryAccessor.cs
index 3dcb43d5a1..6c2334fbf3 100644
--- a/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/SchemaRepositoryAccessor.cs
+++ b/src/JsonApiDotNetCore.OpenApi/SwaggerComponents/SchemaRepositoryAccessor.cs
@@ -1,29 +1,27 @@
-using System;
 using Swashbuckle.AspNetCore.SwaggerGen;
 
-namespace JsonApiDotNetCore.OpenApi.SwaggerComponents
+namespace JsonApiDotNetCore.OpenApi.SwaggerComponents;
+
+internal sealed class SchemaRepositoryAccessor : ISchemaRepositoryAccessor
 {
-    internal sealed class SchemaRepositoryAccessor : ISchemaRepositoryAccessor
-    {
-        private SchemaRepository? _schemaRepository;
+    private SchemaRepository? _schemaRepository;
 
-        public SchemaRepository Current
+    public SchemaRepository Current
+    {
+        get
         {
-            get
+            if (_schemaRepository == null)
             {
-                if (_schemaRepository == null)
-                {
-                    throw new InvalidOperationException("SchemaRepository unavailable.");
-                }
-
-                return _schemaRepository;
+                throw new InvalidOperationException("SchemaRepository unavailable.");
             }
-            set
-            {
-                ArgumentGuard.NotNull(value, nameof(Current));
 
-                _schemaRepository = value;
-            }
+            return _schemaRepository;
+        }
+        set
+        {
+            ArgumentGuard.NotNull(value, nameof(Current));
+
+            _schemaRepository = value;
         }
     }
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/TypeCategory.cs b/src/JsonApiDotNetCore.OpenApi/TypeCategory.cs
index bb8104d6fb..1641e31775 100644
--- a/src/JsonApiDotNetCore.OpenApi/TypeCategory.cs
+++ b/src/JsonApiDotNetCore.OpenApi/TypeCategory.cs
@@ -1,10 +1,9 @@
-namespace JsonApiDotNetCore.OpenApi
+namespace JsonApiDotNetCore.OpenApi;
+
+internal enum TypeCategory
 {
-    internal enum TypeCategory
-    {
-        NonNullableReferenceType,
-        NullableReferenceType,
-        ValueType,
-        NullableValueType
-    }
+    NonNullableReferenceType,
+    NullableReferenceType,
+    ValueType,
+    NullableValueType
 }
diff --git a/src/JsonApiDotNetCore.OpenApi/UnreachableCodeException.cs b/src/JsonApiDotNetCore.OpenApi/UnreachableCodeException.cs
index bdb05a7e86..2ce22604e6 100644
--- a/src/JsonApiDotNetCore.OpenApi/UnreachableCodeException.cs
+++ b/src/JsonApiDotNetCore.OpenApi/UnreachableCodeException.cs
@@ -1,12 +1,9 @@
-using System;
+namespace JsonApiDotNetCore.OpenApi;
 
-namespace JsonApiDotNetCore.OpenApi
+internal sealed class UnreachableCodeException : Exception
 {
-    internal sealed class UnreachableCodeException : Exception
+    public UnreachableCodeException()
+        : base("This code should not be reachable.")
     {
-        public UnreachableCodeException()
-            : base("This code should not be reachable.")
-        {
-        }
     }
 }
diff --git a/src/JsonApiDotNetCore.SourceGenerators/ControllerSourceGenerator.cs b/src/JsonApiDotNetCore.SourceGenerators/ControllerSourceGenerator.cs
new file mode 100644
index 0000000000..6728fd537c
--- /dev/null
+++ b/src/JsonApiDotNetCore.SourceGenerators/ControllerSourceGenerator.cs
@@ -0,0 +1,170 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Linq;
+using System.Text;
+using Humanizer;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Text;
+
+#pragma warning disable RS2008 // Enable analyzer release tracking
+
+namespace JsonApiDotNetCore.SourceGenerators
+{
+    [Generator(LanguageNames.CSharp)]
+    public sealed class ControllerSourceGenerator : ISourceGenerator
+    {
+        private const string Category = "JsonApiDotNetCore";
+
+        private static readonly DiagnosticDescriptor MissingInterfaceWarning = new DiagnosticDescriptor("JADNC001",
+            "Resource type does not implement IIdentifiable<TId>",
+            "Type '{0}' must implement IIdentifiable<TId> when using ResourceAttribute to auto-generate ASP.NET controllers", Category,
+            DiagnosticSeverity.Warning, true);
+
+        private static readonly DiagnosticDescriptor MissingIndentInTableError = new DiagnosticDescriptor("JADNC900",
+            "Internal error: Insufficient entries in IndentTable", "Internal error: Missing entry in IndentTable for depth {0}", Category,
+            DiagnosticSeverity.Warning, true);
+
+        // PERF: Heap-allocate the delegate only once, instead of per compilation.
+        private static readonly SyntaxReceiverCreator CreateSyntaxReceiver = () => new TypeWithAttributeSyntaxReceiver();
+
+        public void Initialize(GeneratorInitializationContext context)
+        {
+            context.RegisterForSyntaxNotifications(CreateSyntaxReceiver);
+        }
+
+        public void Execute(GeneratorExecutionContext context)
+        {
+            var receiver = (TypeWithAttributeSyntaxReceiver)context.SyntaxReceiver;
+
+            if (receiver == null)
+            {
+                return;
+            }
+
+            INamedTypeSymbol resourceAttributeType = context.Compilation.GetTypeByMetadataName("JsonApiDotNetCore.Resources.Annotations.ResourceAttribute");
+            INamedTypeSymbol identifiableOpenInterface = context.Compilation.GetTypeByMetadataName("JsonApiDotNetCore.Resources.IIdentifiable`1");
+            INamedTypeSymbol loggerFactoryInterface = context.Compilation.GetTypeByMetadataName("Microsoft.Extensions.Logging.ILoggerFactory");
+
+            if (resourceAttributeType == null || identifiableOpenInterface == null || loggerFactoryInterface == null)
+            {
+                return;
+            }
+
+            var controllerNamesInUse = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase);
+            var writer = new SourceCodeWriter(context, MissingIndentInTableError);
+
+            foreach (TypeDeclarationSyntax typeDeclarationSyntax in receiver.TypeDeclarations)
+            {
+                // PERF: Note that our code runs on every keystroke in the IDE, which makes it critical to provide near-realtime performance.
+                // This means keeping an eye on memory allocations and bailing out early when compilations are cancelled while the user is still typing.
+                context.CancellationToken.ThrowIfCancellationRequested();
+
+                SemanticModel semanticModel = context.Compilation.GetSemanticModel(typeDeclarationSyntax.SyntaxTree);
+                INamedTypeSymbol resourceType = semanticModel.GetDeclaredSymbol(typeDeclarationSyntax, context.CancellationToken);
+
+                if (resourceType == null)
+                {
+                    continue;
+                }
+
+                AttributeData resourceAttributeData = FirstOrDefault(resourceType.GetAttributes(), resourceAttributeType,
+                    (data, type) => SymbolEqualityComparer.Default.Equals(data.AttributeClass, type));
+
+                if (resourceAttributeData == null)
+                {
+                    continue;
+                }
+
+                TypedConstant endpointsArgument = resourceAttributeData.NamedArguments.FirstOrDefault(pair => pair.Key == "GenerateControllerEndpoints").Value;
+
+                if (endpointsArgument.Value != null && (JsonApiEndpointsCopy)endpointsArgument.Value == JsonApiEndpointsCopy.None)
+                {
+                    continue;
+                }
+
+                TypedConstant controllerNamespaceArgument =
+                    resourceAttributeData.NamedArguments.FirstOrDefault(pair => pair.Key == "ControllerNamespace").Value;
+
+                string controllerNamespace = GetControllerNamespace(controllerNamespaceArgument, resourceType);
+
+                INamedTypeSymbol identifiableClosedInterface = FirstOrDefault(resourceType.AllInterfaces, identifiableOpenInterface,
+                    (@interface, openInterface) => @interface.IsGenericType &&
+                        SymbolEqualityComparer.Default.Equals(@interface.ConstructedFrom, openInterface));
+
+                if (identifiableClosedInterface == null)
+                {
+                    var diagnostic = Diagnostic.Create(MissingInterfaceWarning, typeDeclarationSyntax.GetLocation(), resourceType.Name);
+                    context.ReportDiagnostic(diagnostic);
+                    continue;
+                }
+
+                ITypeSymbol idType = identifiableClosedInterface.TypeArguments[0];
+                string controllerName = $"{resourceType.Name.Pluralize()}Controller";
+                JsonApiEndpointsCopy endpointsToGenerate = (JsonApiEndpointsCopy?)(int?)endpointsArgument.Value ?? JsonApiEndpointsCopy.All;
+
+                string sourceCode = writer.Write(resourceType, idType, endpointsToGenerate, controllerNamespace, controllerName, loggerFactoryInterface);
+                SourceText sourceText = SourceText.From(sourceCode, Encoding.UTF8);
+
+                string fileName = GetUniqueFileName(controllerName, controllerNamesInUse);
+                context.AddSource(fileName, sourceText);
+            }
+        }
+
+        private static TElement FirstOrDefault<TElement, TContext>(ImmutableArray<TElement> source, TContext context, Func<TElement, TContext, bool> predicate)
+        {
+            // PERF: Using this method enables to avoid allocating a closure in the passed lambda expression.
+            // See https://www.jetbrains.com/help/resharper/2021.2/Fixing_Issues_Found_by_DPA.html#closures-in-lambda-expressions.
+
+            foreach (TElement element in source)
+            {
+                if (predicate(element, context))
+                {
+                    return element;
+                }
+            }
+
+            return default;
+        }
+
+        private static string GetControllerNamespace(TypedConstant controllerNamespaceArgument, INamedTypeSymbol resourceType)
+        {
+            if (!controllerNamespaceArgument.IsNull)
+            {
+                return (string)controllerNamespaceArgument.Value;
+            }
+
+            if (resourceType.ContainingNamespace.IsGlobalNamespace)
+            {
+                return null;
+            }
+
+            if (resourceType.ContainingNamespace.ContainingNamespace.IsGlobalNamespace)
+            {
+                return "Controllers";
+            }
+
+            return $"{resourceType.ContainingNamespace.ContainingNamespace}.Controllers";
+        }
+
+        private static string GetUniqueFileName(string controllerName, IDictionary<string, int> controllerNamesInUse)
+        {
+            // We emit unique file names to prevent a failure in the source generator, but also because our test suite
+            // may contain two resources with the same class name in different namespaces. That works, as long as only
+            // one of its controllers gets registered.
+
+            if (controllerNamesInUse.TryGetValue(controllerName, out int lastIndex))
+            {
+                lastIndex++;
+                controllerNamesInUse[controllerName] = lastIndex;
+
+                return $"{controllerName}{lastIndex}.g.cs";
+            }
+
+            controllerNamesInUse[controllerName] = 1;
+            return $"{controllerName}.g.cs";
+        }
+    }
+}
diff --git a/src/JsonApiDotNetCore.SourceGenerators/JsonApiDotNetCore.SourceGenerators.csproj b/src/JsonApiDotNetCore.SourceGenerators/JsonApiDotNetCore.SourceGenerators.csproj
new file mode 100644
index 0000000000..9f7c0b85dd
--- /dev/null
+++ b/src/JsonApiDotNetCore.SourceGenerators/JsonApiDotNetCore.SourceGenerators.csproj
@@ -0,0 +1,53 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <IsPackable>true</IsPackable>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IncludeBuildOutput>false</IncludeBuildOutput>
+    <NoWarn>$(NoWarn);NU5128</NoWarn>
+    <Nullable>disable</Nullable>
+    <ImplicitUsings>disable</ImplicitUsings>
+    <IsRoslynComponent>true</IsRoslynComponent>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
+    <PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net;rest;web-api</PackageTags>
+    <Description>Source generators for JsonApiDotNetCore, a framework for building JSON:API compliant REST APIs using ASP.NET and Entity Framework Core.</Description>
+    <Authors>json-api-dotnet</Authors>
+    <PackageProjectUrl>https://www.jsonapi.net/</PackageProjectUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
+    <PackageReleaseNotes>See https://github.com/json-api-dotnet/JsonApiDotNetCore/releases.</PackageReleaseNotes>
+    <PackageIcon>logo.png</PackageIcon>
+    <RepositoryUrl>https://github.com/json-api-dotnet/JsonApiDotNetCore</RepositoryUrl>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\..\logo.png" Visible="false">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    <None Include="$(PkgHumanizer_Core)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+  </ItemGroup>
+
+  <!-- https://github.com/dotnet/roslyn/discussions/47517 -->
+  <PropertyGroup>
+    <GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPaths</GetTargetPathDependsOn>
+  </PropertyGroup>
+
+  <Target Name="GetDependencyTargetPaths">
+    <ItemGroup>
+      <TargetPathWithTargetPlatformMoniker Include="$(PkgHumanizer_Core)\lib\netstandard2.0\*.dll" IncludeRuntimeDependency="false" />
+    </ItemGroup>
+  </Target>
+
+  <ItemGroup>
+    <PackageReference Include="Humanizer.Core" Version="$(HumanizerVersion)" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" PrivateAssets="all" />
+  </ItemGroup>
+</Project>
diff --git a/src/JsonApiDotNetCore.SourceGenerators/JsonApiEndpointsCopy.cs b/src/JsonApiDotNetCore.SourceGenerators/JsonApiEndpointsCopy.cs
new file mode 100644
index 0000000000..14134adcfd
--- /dev/null
+++ b/src/JsonApiDotNetCore.SourceGenerators/JsonApiEndpointsCopy.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace JsonApiDotNetCore.SourceGenerators
+{
+    // IMPORTANT: A copy of this type exists in the JsonApiDotNetCore project. Keep these in sync when making changes.
+    [Flags]
+    public enum JsonApiEndpointsCopy
+    {
+        None = 0,
+        GetCollection = 1,
+        GetSingle = 1 << 1,
+        GetSecondary = 1 << 2,
+        GetRelationship = 1 << 3,
+        Post = 1 << 4,
+        PostRelationship = 1 << 5,
+        Patch = 1 << 6,
+        PatchRelationship = 1 << 7,
+        Delete = 1 << 8,
+        DeleteRelationship = 1 << 9,
+
+        Query = GetCollection | GetSingle | GetSecondary | GetRelationship,
+        Command = Post | PostRelationship | Patch | PatchRelationship | Delete | DeleteRelationship,
+
+        All = Query | Command
+    }
+}
diff --git a/src/JsonApiDotNetCore.SourceGenerators/Properties/launchSettings.json b/src/JsonApiDotNetCore.SourceGenerators/Properties/launchSettings.json
new file mode 100644
index 0000000000..2679b059a9
--- /dev/null
+++ b/src/JsonApiDotNetCore.SourceGenerators/Properties/launchSettings.json
@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "JsonApiDotNetCore.SourceGenerators": {
+      "commandName": "DebugRoslynComponent",
+      "targetProject": "..\\..\\test\\SourceGeneratorDebugger\\SourceGeneratorDebugger.csproj"
+    }
+  }
+}
diff --git a/src/JsonApiDotNetCore.SourceGenerators/SourceCodeWriter.cs b/src/JsonApiDotNetCore.SourceGenerators/SourceCodeWriter.cs
new file mode 100644
index 0000000000..e03e3cbad2
--- /dev/null
+++ b/src/JsonApiDotNetCore.SourceGenerators/SourceCodeWriter.cs
@@ -0,0 +1,266 @@
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.CodeAnalysis;
+
+namespace JsonApiDotNetCore.SourceGenerators
+{
+    /// <summary>
+    /// Writes the source code for an ASP.NET controller for a JSON:API resource.
+    /// </summary>
+    internal sealed class SourceCodeWriter
+    {
+        private const int SpacesPerIndent = 4;
+
+        private static readonly IDictionary<int, string> IndentTable = new Dictionary<int, string>
+        {
+            [0] = string.Empty,
+            [1] = new string(' ', 1 * SpacesPerIndent),
+            [2] = new string(' ', 2 * SpacesPerIndent),
+            [3] = new string(' ', 3 * SpacesPerIndent)
+        };
+
+        private static readonly IDictionary<JsonApiEndpointsCopy, (string ServiceName, string ParameterName)> AggregateEndpointToServiceNameMap =
+            new Dictionary<JsonApiEndpointsCopy, (string, string)>
+            {
+                [JsonApiEndpointsCopy.All] = ("IResourceService", "resourceService"),
+                [JsonApiEndpointsCopy.Query] = ("IResourceQueryService", "queryService"),
+                [JsonApiEndpointsCopy.Command] = ("IResourceCommandService", "commandService")
+            };
+
+        private static readonly IDictionary<JsonApiEndpointsCopy, (string ServiceName, string ParameterName)> EndpointToServiceNameMap =
+            new Dictionary<JsonApiEndpointsCopy, (string, string)>
+            {
+                [JsonApiEndpointsCopy.GetCollection] = ("IGetAllService", "getAll"),
+                [JsonApiEndpointsCopy.GetSingle] = ("IGetByIdService", "getById"),
+                [JsonApiEndpointsCopy.GetSecondary] = ("IGetSecondaryService", "getSecondary"),
+                [JsonApiEndpointsCopy.GetRelationship] = ("IGetRelationshipService", "getRelationship"),
+                [JsonApiEndpointsCopy.Post] = ("ICreateService", "create"),
+                [JsonApiEndpointsCopy.PostRelationship] = ("IAddToRelationshipService", "addToRelationship"),
+                [JsonApiEndpointsCopy.Patch] = ("IUpdateService", "update"),
+                [JsonApiEndpointsCopy.PatchRelationship] = ("ISetRelationshipService", "setRelationship"),
+                [JsonApiEndpointsCopy.Delete] = ("IDeleteService", "delete"),
+                [JsonApiEndpointsCopy.DeleteRelationship] = ("IRemoveFromRelationshipService", "removeFromRelationship")
+            };
+
+        private readonly GeneratorExecutionContext _context;
+        private readonly DiagnosticDescriptor _missingIndentInTableErrorDescriptor;
+
+        private readonly StringBuilder _sourceBuilder = new StringBuilder();
+        private int _depth;
+
+        public SourceCodeWriter(GeneratorExecutionContext context, DiagnosticDescriptor missingIndentInTableErrorDescriptor)
+        {
+            _context = context;
+            _missingIndentInTableErrorDescriptor = missingIndentInTableErrorDescriptor;
+        }
+
+        public string Write(INamedTypeSymbol resourceType, ITypeSymbol idType, JsonApiEndpointsCopy endpointsToGenerate, string controllerNamespace,
+            string controllerName, INamedTypeSymbol loggerFactoryInterface)
+        {
+            _sourceBuilder.Clear();
+            _depth = 0;
+
+            if (idType.IsReferenceType && idType.NullableAnnotation == NullableAnnotation.Annotated)
+            {
+                WriteNullableEnable();
+            }
+
+            WriteNamespaceImports(loggerFactoryInterface, resourceType);
+
+            if (controllerNamespace != null)
+            {
+                WriteNamespaceDeclaration(controllerNamespace);
+            }
+
+            WriteOpenClassDeclaration(controllerName, endpointsToGenerate, resourceType, idType);
+            _depth++;
+
+            WriteConstructor(controllerName, loggerFactoryInterface, endpointsToGenerate, resourceType, idType);
+
+            _depth--;
+            WriteCloseCurly();
+
+            return _sourceBuilder.ToString();
+        }
+
+        private void WriteNullableEnable()
+        {
+            _sourceBuilder.AppendLine("#nullable enable");
+            _sourceBuilder.AppendLine();
+        }
+
+        private void WriteNamespaceImports(INamedTypeSymbol loggerFactoryInterface, INamedTypeSymbol resourceType)
+        {
+            _sourceBuilder.AppendLine($@"using {loggerFactoryInterface.ContainingNamespace};");
+
+            _sourceBuilder.AppendLine("using JsonApiDotNetCore.Configuration;");
+            _sourceBuilder.AppendLine("using JsonApiDotNetCore.Controllers;");
+            _sourceBuilder.AppendLine("using JsonApiDotNetCore.Services;");
+
+            if (!resourceType.ContainingNamespace.IsGlobalNamespace)
+            {
+                _sourceBuilder.AppendLine($"using {resourceType.ContainingNamespace};");
+            }
+
+            _sourceBuilder.AppendLine();
+        }
+
+        private void WriteNamespaceDeclaration(string controllerNamespace)
+        {
+            _sourceBuilder.AppendLine($"namespace {controllerNamespace};");
+            _sourceBuilder.AppendLine();
+        }
+
+        private void WriteOpenClassDeclaration(string controllerName, JsonApiEndpointsCopy endpointsToGenerate, INamedTypeSymbol resourceType,
+            ITypeSymbol idType)
+        {
+            string baseClassName = GetControllerBaseClassName(endpointsToGenerate);
+
+            WriteIndent();
+            _sourceBuilder.AppendLine($@"public sealed partial class {controllerName} : {baseClassName}<{resourceType.Name}, {idType}>");
+
+            WriteOpenCurly();
+        }
+
+        private static string GetControllerBaseClassName(JsonApiEndpointsCopy endpointsToGenerate)
+        {
+            switch (endpointsToGenerate)
+            {
+                case JsonApiEndpointsCopy.Query:
+                {
+                    return "JsonApiQueryController";
+                }
+                case JsonApiEndpointsCopy.Command:
+                {
+                    return "JsonApiCommandController";
+                }
+                default:
+                {
+                    return "JsonApiController";
+                }
+            }
+        }
+
+        private void WriteConstructor(string controllerName, INamedTypeSymbol loggerFactoryInterface, JsonApiEndpointsCopy endpointsToGenerate,
+            INamedTypeSymbol resourceType, ITypeSymbol idType)
+        {
+            string loggerName = loggerFactoryInterface.Name;
+
+            WriteIndent();
+            _sourceBuilder.AppendLine($"public {controllerName}(IJsonApiOptions options, IResourceGraph resourceGraph, {loggerName} loggerFactory,");
+
+            _depth++;
+
+            if (AggregateEndpointToServiceNameMap.TryGetValue(endpointsToGenerate, out (string ServiceName, string ParameterName) value))
+            {
+                WriteParameterListForShortConstructor(value.ServiceName, value.ParameterName, resourceType, idType);
+            }
+            else
+            {
+                WriteParameterListForLongConstructor(endpointsToGenerate, resourceType, idType);
+            }
+
+            _depth--;
+
+            WriteOpenCurly();
+            WriteCloseCurly();
+        }
+
+        private void WriteParameterListForShortConstructor(string serviceName, string parameterName, INamedTypeSymbol resourceType, ITypeSymbol idType)
+        {
+            WriteIndent();
+            _sourceBuilder.AppendLine($"{serviceName}<{resourceType.Name}, {idType}> {parameterName})");
+
+            WriteIndent();
+            _sourceBuilder.AppendLine($": base(options, resourceGraph, loggerFactory, {parameterName})");
+        }
+
+        private void WriteParameterListForLongConstructor(JsonApiEndpointsCopy endpointsToGenerate, INamedTypeSymbol resourceType, ITypeSymbol idType)
+        {
+            bool isFirstEntry = true;
+
+            foreach (KeyValuePair<JsonApiEndpointsCopy, (string ServiceName, string ParameterName)> entry in EndpointToServiceNameMap)
+            {
+                if ((endpointsToGenerate & entry.Key) == entry.Key)
+                {
+                    if (isFirstEntry)
+                    {
+                        isFirstEntry = false;
+                    }
+                    else
+                    {
+                        _sourceBuilder.AppendLine(Tokens.Comma);
+                    }
+
+                    WriteIndent();
+                    _sourceBuilder.Append($"{entry.Value.ServiceName}<{resourceType.Name}, {idType}> {entry.Value.ParameterName}");
+                }
+            }
+
+            _sourceBuilder.AppendLine(Tokens.CloseParen);
+
+            WriteIndent();
+            _sourceBuilder.AppendLine(": base(options, resourceGraph, loggerFactory,");
+
+            isFirstEntry = true;
+            _depth++;
+
+            foreach (KeyValuePair<JsonApiEndpointsCopy, (string ServiceName, string ParameterName)> entry in EndpointToServiceNameMap)
+            {
+                if ((endpointsToGenerate & entry.Key) == entry.Key)
+                {
+                    if (isFirstEntry)
+                    {
+                        isFirstEntry = false;
+                    }
+                    else
+                    {
+                        _sourceBuilder.AppendLine(Tokens.Comma);
+                    }
+
+                    WriteIndent();
+                    _sourceBuilder.Append($"{entry.Value.ParameterName}: {entry.Value.ParameterName}");
+                }
+            }
+
+            _sourceBuilder.AppendLine(Tokens.CloseParen);
+            _depth--;
+        }
+
+        private void WriteOpenCurly()
+        {
+            WriteIndent();
+            _sourceBuilder.AppendLine(Tokens.OpenCurly);
+        }
+
+        private void WriteCloseCurly()
+        {
+            WriteIndent();
+            _sourceBuilder.AppendLine(Tokens.CloseCurly);
+        }
+
+        private void WriteIndent()
+        {
+            // PERF: Reuse pre-calculated indents instead of allocating a new string each time.
+            if (!IndentTable.TryGetValue(_depth, out string indent))
+            {
+                var diagnostic = Diagnostic.Create(_missingIndentInTableErrorDescriptor, Location.None, _depth.ToString());
+                _context.ReportDiagnostic(diagnostic);
+
+                indent = new string(' ', _depth * SpacesPerIndent);
+            }
+
+            _sourceBuilder.Append(indent);
+        }
+
+#pragma warning disable AV1008 // Class should not be static
+        private static class Tokens
+        {
+            public const string OpenCurly = "{";
+            public const string CloseCurly = "}";
+            public const string CloseParen = ")";
+            public const string Comma = ",";
+        }
+#pragma warning restore AV1008 // Class should not be static
+    }
+}
diff --git a/src/JsonApiDotNetCore.SourceGenerators/TypeWithAttributeSyntaxReceiver.cs b/src/JsonApiDotNetCore.SourceGenerators/TypeWithAttributeSyntaxReceiver.cs
new file mode 100644
index 0000000000..0fbc18a758
--- /dev/null
+++ b/src/JsonApiDotNetCore.SourceGenerators/TypeWithAttributeSyntaxReceiver.cs
@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+
+namespace JsonApiDotNetCore.SourceGenerators
+{
+    /// <summary>
+    /// Collects type declarations in the project that have at least one attribute on them. Because this receiver operates at the syntax level, we cannot
+    /// check for the expected attribute. This must be done during semantic analysis, because source code may contain any of these:
+    /// <code><![CDATA[
+    /// using JsonApiDotNetCore.Resources.Annotations;
+    /// using AlternateNamespaceName = JsonApiDotNetCore.Resources;
+    /// using AlternateTypeName = JsonApiDotNetCore.Resources.Annotations.ResourceAttribute;
+    /// 
+    /// [Resource]
+    /// public class ExampleResource1 : Identifiable<int> { }
+    /// 
+    /// [ResourceAttribute]
+    /// public class ExampleResource2 : Identifiable<int> { }
+    /// 
+    /// [AlternateNamespaceName.Annotations.Resource]
+    /// public class ExampleResource3 : Identifiable<int> { }
+    /// 
+    /// [AlternateTypeName]
+    /// public class ExampleResource4 : Identifiable<int> { }
+    /// ]]>
+    /// </code>
+    /// </summary>
+    internal sealed class TypeWithAttributeSyntaxReceiver : ISyntaxReceiver
+    {
+        public readonly ISet<TypeDeclarationSyntax> TypeDeclarations = new HashSet<TypeDeclarationSyntax>();
+
+        public void OnVisitSyntaxNode(SyntaxNode syntaxNode)
+        {
+            if (syntaxNode is TypeDeclarationSyntax typeDeclarationSyntax && typeDeclarationSyntax.AttributeLists.Any())
+            {
+                TypeDeclarations.Add(typeDeclarationSyntax);
+            }
+        }
+    }
+}
diff --git a/src/JsonApiDotNetCore/ArgumentGuard.cs b/src/JsonApiDotNetCore/ArgumentGuard.cs
deleted file mode 100644
index 1877078df9..0000000000
--- a/src/JsonApiDotNetCore/ArgumentGuard.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using JetBrains.Annotations;
-using SysNotNull = System.Diagnostics.CodeAnalysis.NotNullAttribute;
-
-#pragma warning disable AV1008 // Class should not be static
-
-namespace JsonApiDotNetCore
-{
-    internal static class ArgumentGuard
-    {
-        [AssertionMethod]
-        public static void NotNull<T>([NoEnumeration] [SysNotNull] T? value, [InvokerParameterName] string name)
-            where T : class
-        {
-            if (value is null)
-            {
-                throw new ArgumentNullException(name);
-            }
-        }
-
-        [AssertionMethod]
-        public static void NotNullNorEmpty<T>([SysNotNull] IEnumerable<T>? value, [InvokerParameterName] string name, string? collectionName = null)
-        {
-            NotNull(value, name);
-
-            if (!value.Any())
-            {
-                throw new ArgumentException($"Must have one or more {collectionName ?? name}.", name);
-            }
-        }
-
-        [AssertionMethod]
-        public static void NotNullNorEmpty([SysNotNull] string? value, [InvokerParameterName] string name)
-        {
-            NotNull(value, name);
-
-            if (value == string.Empty)
-            {
-                throw new ArgumentException("String cannot be null or empty.", name);
-            }
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/ArrayFactory.cs b/src/JsonApiDotNetCore/ArrayFactory.cs
index a33102cbdd..2969f34d17 100644
--- a/src/JsonApiDotNetCore/ArrayFactory.cs
+++ b/src/JsonApiDotNetCore/ArrayFactory.cs
@@ -1,13 +1,12 @@
 #pragma warning disable AV1008 // Class should not be static
 #pragma warning disable AV1130 // Return type in method signature should be a collection interface instead of a concrete type
 
-namespace JsonApiDotNetCore
+namespace JsonApiDotNetCore;
+
+internal static class ArrayFactory
 {
-    internal static class ArrayFactory
+    public static T[] Create<T>(params T[] items)
     {
-        public static T[] Create<T>(params T[] items)
-        {
-            return items;
-        }
+        return items;
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/EntityFrameworkCoreTransaction.cs b/src/JsonApiDotNetCore/AtomicOperations/EntityFrameworkCoreTransaction.cs
index df87d1c546..be5125c414 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/EntityFrameworkCoreTransaction.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/EntityFrameworkCoreTransaction.cs
@@ -1,60 +1,57 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
 
-namespace JsonApiDotNetCore.AtomicOperations
+namespace JsonApiDotNetCore.AtomicOperations;
+
+/// <summary>
+/// Represents an Entity Framework Core transaction in an atomic:operations request.
+/// </summary>
+[PublicAPI]
+public sealed class EntityFrameworkCoreTransaction : IOperationsTransaction
 {
+    private readonly IDbContextTransaction _transaction;
+    private readonly DbContext _dbContext;
+
+    /// <inheritdoc />
+    public string TransactionId => _transaction.TransactionId.ToString();
+
+    public EntityFrameworkCoreTransaction(IDbContextTransaction transaction, DbContext dbContext)
+    {
+        ArgumentGuard.NotNull(transaction, nameof(transaction));
+        ArgumentGuard.NotNull(dbContext, nameof(dbContext));
+
+        _transaction = transaction;
+        _dbContext = dbContext;
+    }
+
+    /// <summary>
+    /// Detaches all entities from the Entity Framework Core change tracker.
+    /// </summary>
+    public Task BeforeProcessOperationAsync(CancellationToken cancellationToken)
+    {
+        _dbContext.ResetChangeTracker();
+        return Task.CompletedTask;
+    }
+
     /// <summary>
-    /// Represents an Entity Framework Core transaction in an atomic:operations request.
+    /// Does nothing.
     /// </summary>
-    [PublicAPI]
-    public sealed class EntityFrameworkCoreTransaction : IOperationsTransaction
+    public Task AfterProcessOperationAsync(CancellationToken cancellationToken)
+    {
+        return Task.CompletedTask;
+    }
+
+    /// <inheritdoc />
+    public Task CommitAsync(CancellationToken cancellationToken)
+    {
+        return _transaction.CommitAsync(cancellationToken);
+    }
+
+    /// <inheritdoc />
+    public ValueTask DisposeAsync()
     {
-        private readonly IDbContextTransaction _transaction;
-        private readonly DbContext _dbContext;
-
-        /// <inheritdoc />
-        public string TransactionId => _transaction.TransactionId.ToString();
-
-        public EntityFrameworkCoreTransaction(IDbContextTransaction transaction, DbContext dbContext)
-        {
-            ArgumentGuard.NotNull(transaction, nameof(transaction));
-            ArgumentGuard.NotNull(dbContext, nameof(dbContext));
-
-            _transaction = transaction;
-            _dbContext = dbContext;
-        }
-
-        /// <summary>
-        /// Detaches all entities from the Entity Framework Core change tracker.
-        /// </summary>
-        public Task BeforeProcessOperationAsync(CancellationToken cancellationToken)
-        {
-            _dbContext.ResetChangeTracker();
-            return Task.CompletedTask;
-        }
-
-        /// <summary>
-        /// Does nothing.
-        /// </summary>
-        public Task AfterProcessOperationAsync(CancellationToken cancellationToken)
-        {
-            return Task.CompletedTask;
-        }
-
-        /// <inheritdoc />
-        public Task CommitAsync(CancellationToken cancellationToken)
-        {
-            return _transaction.CommitAsync(cancellationToken);
-        }
-
-        /// <inheritdoc />
-        public ValueTask DisposeAsync()
-        {
-            return _transaction.DisposeAsync();
-        }
+        return _transaction.DisposeAsync();
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/EntityFrameworkCoreTransactionFactory.cs b/src/JsonApiDotNetCore/AtomicOperations/EntityFrameworkCoreTransactionFactory.cs
index 3d30ebe089..96c66e12ab 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/EntityFrameworkCoreTransactionFactory.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/EntityFrameworkCoreTransactionFactory.cs
@@ -1,39 +1,36 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Storage;
 
-namespace JsonApiDotNetCore.AtomicOperations
+namespace JsonApiDotNetCore.AtomicOperations;
+
+/// <summary>
+/// Provides transaction support for atomic:operation requests using Entity Framework Core.
+/// </summary>
+public sealed class EntityFrameworkCoreTransactionFactory : IOperationsTransactionFactory
 {
-    /// <summary>
-    /// Provides transaction support for atomic:operation requests using Entity Framework Core.
-    /// </summary>
-    public sealed class EntityFrameworkCoreTransactionFactory : IOperationsTransactionFactory
-    {
-        private readonly IDbContextResolver _dbContextResolver;
-        private readonly IJsonApiOptions _options;
+    private readonly IDbContextResolver _dbContextResolver;
+    private readonly IJsonApiOptions _options;
 
-        public EntityFrameworkCoreTransactionFactory(IDbContextResolver dbContextResolver, IJsonApiOptions options)
-        {
-            ArgumentGuard.NotNull(dbContextResolver, nameof(dbContextResolver));
-            ArgumentGuard.NotNull(options, nameof(options));
+    public EntityFrameworkCoreTransactionFactory(IDbContextResolver dbContextResolver, IJsonApiOptions options)
+    {
+        ArgumentGuard.NotNull(dbContextResolver, nameof(dbContextResolver));
+        ArgumentGuard.NotNull(options, nameof(options));
 
-            _dbContextResolver = dbContextResolver;
-            _options = options;
-        }
+        _dbContextResolver = dbContextResolver;
+        _options = options;
+    }
 
-        /// <inheritdoc />
-        public async Task<IOperationsTransaction> BeginTransactionAsync(CancellationToken cancellationToken)
-        {
-            DbContext dbContext = _dbContextResolver.GetContext();
+    /// <inheritdoc />
+    public async Task<IOperationsTransaction> BeginTransactionAsync(CancellationToken cancellationToken)
+    {
+        DbContext dbContext = _dbContextResolver.GetContext();
 
-            IDbContextTransaction transaction = _options.TransactionIsolationLevel != null
-                ? await dbContext.Database.BeginTransactionAsync(_options.TransactionIsolationLevel.Value, cancellationToken)
-                : await dbContext.Database.BeginTransactionAsync(cancellationToken);
+        IDbContextTransaction transaction = _options.TransactionIsolationLevel != null
+            ? await dbContext.Database.BeginTransactionAsync(_options.TransactionIsolationLevel.Value, cancellationToken)
+            : await dbContext.Database.BeginTransactionAsync(cancellationToken);
 
-            return new EntityFrameworkCoreTransaction(transaction, dbContext);
-        }
+        return new EntityFrameworkCoreTransaction(transaction, dbContext);
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/ILocalIdTracker.cs b/src/JsonApiDotNetCore/AtomicOperations/ILocalIdTracker.cs
index 1f6eda010d..c6311013af 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/ILocalIdTracker.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/ILocalIdTracker.cs
@@ -1,30 +1,29 @@
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCore.AtomicOperations
+namespace JsonApiDotNetCore.AtomicOperations;
+
+/// <summary>
+/// Used to track declarations, assignments and references to local IDs an in atomic:operations request.
+/// </summary>
+public interface ILocalIdTracker
 {
     /// <summary>
-    /// Used to track declarations, assignments and references to local IDs an in atomic:operations request.
+    /// Removes all declared and assigned values.
     /// </summary>
-    public interface ILocalIdTracker
-    {
-        /// <summary>
-        /// Removes all declared and assigned values.
-        /// </summary>
-        void Reset();
+    void Reset();
 
-        /// <summary>
-        /// Declares a local ID without assigning a server-generated value.
-        /// </summary>
-        void Declare(string localId, ResourceType resourceType);
+    /// <summary>
+    /// Declares a local ID without assigning a server-generated value.
+    /// </summary>
+    void Declare(string localId, ResourceType resourceType);
 
-        /// <summary>
-        /// Assigns a server-generated ID value to a previously declared local ID.
-        /// </summary>
-        void Assign(string localId, ResourceType resourceType, string stringId);
+    /// <summary>
+    /// Assigns a server-generated ID value to a previously declared local ID.
+    /// </summary>
+    void Assign(string localId, ResourceType resourceType, string stringId);
 
-        /// <summary>
-        /// Gets the server-assigned ID for the specified local ID.
-        /// </summary>
-        string GetValue(string localId, ResourceType resourceType);
-    }
+    /// <summary>
+    /// Gets the server-assigned ID for the specified local ID.
+    /// </summary>
+    string GetValue(string localId, ResourceType resourceType);
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/IOperationProcessorAccessor.cs b/src/JsonApiDotNetCore/AtomicOperations/IOperationProcessorAccessor.cs
index d35d6e6154..fec9039619 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/IOperationProcessorAccessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/IOperationProcessorAccessor.cs
@@ -1,18 +1,15 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.AtomicOperations.Processors;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.AtomicOperations
+namespace JsonApiDotNetCore.AtomicOperations;
+
+/// <summary>
+/// Retrieves an <see cref="IOperationProcessor" /> instance from the D/I container and invokes a method on it.
+/// </summary>
+public interface IOperationProcessorAccessor
 {
     /// <summary>
-    /// Retrieves an <see cref="IOperationProcessor" /> instance from the D/I container and invokes a method on it.
+    /// Invokes <see cref="IOperationProcessor.ProcessAsync" /> on a processor compatible with the operation kind.
     /// </summary>
-    public interface IOperationProcessorAccessor
-    {
-        /// <summary>
-        /// Invokes <see cref="IOperationProcessor.ProcessAsync" /> on a processor compatible with the operation kind.
-        /// </summary>
-        Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken);
-    }
+    Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/IOperationsProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/IOperationsProcessor.cs
index f6c736ee9d..74927f0147 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/IOperationsProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/IOperationsProcessor.cs
@@ -1,18 +1,14 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.AtomicOperations
+namespace JsonApiDotNetCore.AtomicOperations;
+
+/// <summary>
+/// Atomically processes a request that contains a list of operations.
+/// </summary>
+public interface IOperationsProcessor
 {
     /// <summary>
-    /// Atomically processes a request that contains a list of operations.
+    /// Processes the list of specified operations.
     /// </summary>
-    public interface IOperationsProcessor
-    {
-        /// <summary>
-        /// Processes the list of specified operations.
-        /// </summary>
-        Task<IList<OperationContainer?>> ProcessAsync(IList<OperationContainer> operations, CancellationToken cancellationToken);
-    }
+    Task<IList<OperationContainer?>> ProcessAsync(IList<OperationContainer> operations, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/IOperationsTransaction.cs b/src/JsonApiDotNetCore/AtomicOperations/IOperationsTransaction.cs
index 4eed23455d..d7e4ee4b2c 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/IOperationsTransaction.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/IOperationsTransaction.cs
@@ -1,34 +1,30 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.AtomicOperations
+namespace JsonApiDotNetCore.AtomicOperations;
+
+/// <summary>
+/// Represents the overarching transaction in an atomic:operations request.
+/// </summary>
+[PublicAPI]
+public interface IOperationsTransaction : IAsyncDisposable
 {
     /// <summary>
-    /// Represents the overarching transaction in an atomic:operations request.
+    /// Identifies the active transaction.
     /// </summary>
-    [PublicAPI]
-    public interface IOperationsTransaction : IAsyncDisposable
-    {
-        /// <summary>
-        /// Identifies the active transaction.
-        /// </summary>
-        string TransactionId { get; }
+    string TransactionId { get; }
 
-        /// <summary>
-        /// Enables to execute custom logic before processing of an operation starts.
-        /// </summary>
-        Task BeforeProcessOperationAsync(CancellationToken cancellationToken);
+    /// <summary>
+    /// Enables to execute custom logic before processing of an operation starts.
+    /// </summary>
+    Task BeforeProcessOperationAsync(CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Enables to execute custom logic after processing of an operation succeeds.
-        /// </summary>
-        Task AfterProcessOperationAsync(CancellationToken cancellationToken);
+    /// <summary>
+    /// Enables to execute custom logic after processing of an operation succeeds.
+    /// </summary>
+    Task AfterProcessOperationAsync(CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Commits all changes made to the underlying data store.
-        /// </summary>
-        Task CommitAsync(CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Commits all changes made to the underlying data store.
+    /// </summary>
+    Task CommitAsync(CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/IOperationsTransactionFactory.cs b/src/JsonApiDotNetCore/AtomicOperations/IOperationsTransactionFactory.cs
index f9b752381b..7f2da4675b 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/IOperationsTransactionFactory.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/IOperationsTransactionFactory.cs
@@ -1,16 +1,12 @@
-using System.Threading;
-using System.Threading.Tasks;
+namespace JsonApiDotNetCore.AtomicOperations;
 
-namespace JsonApiDotNetCore.AtomicOperations
+/// <summary>
+/// Provides a method to start the overarching transaction for an atomic:operations request.
+/// </summary>
+public interface IOperationsTransactionFactory
 {
     /// <summary>
-    /// Provides a method to start the overarching transaction for an atomic:operations request.
+    /// Starts a new transaction.
     /// </summary>
-    public interface IOperationsTransactionFactory
-    {
-        /// <summary>
-        /// Starts a new transaction.
-        /// </summary>
-        Task<IOperationsTransaction> BeginTransactionAsync(CancellationToken cancellationToken);
-    }
+    Task<IOperationsTransaction> BeginTransactionAsync(CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/LocalIdTracker.cs b/src/JsonApiDotNetCore/AtomicOperations/LocalIdTracker.cs
index 9b24ff4e18..b0a1b3ee2f 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/LocalIdTracker.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/LocalIdTracker.cs
@@ -1,106 +1,103 @@
-using System;
-using System.Collections.Generic;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Errors;
 
-namespace JsonApiDotNetCore.AtomicOperations
+namespace JsonApiDotNetCore.AtomicOperations;
+
+/// <inheritdoc />
+public sealed class LocalIdTracker : ILocalIdTracker
 {
+    private readonly IDictionary<string, LocalIdState> _idsTracked = new Dictionary<string, LocalIdState>();
+
     /// <inheritdoc />
-    public sealed class LocalIdTracker : ILocalIdTracker
+    public void Reset()
     {
-        private readonly IDictionary<string, LocalIdState> _idsTracked = new Dictionary<string, LocalIdState>();
-
-        /// <inheritdoc />
-        public void Reset()
-        {
-            _idsTracked.Clear();
-        }
+        _idsTracked.Clear();
+    }
 
-        /// <inheritdoc />
-        public void Declare(string localId, ResourceType resourceType)
-        {
-            ArgumentGuard.NotNullNorEmpty(localId, nameof(localId));
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+    /// <inheritdoc />
+    public void Declare(string localId, ResourceType resourceType)
+    {
+        ArgumentGuard.NotNullNorEmpty(localId, nameof(localId));
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            AssertIsNotDeclared(localId);
+        AssertIsNotDeclared(localId);
 
-            _idsTracked[localId] = new LocalIdState(resourceType);
-        }
+        _idsTracked[localId] = new LocalIdState(resourceType);
+    }
 
-        private void AssertIsNotDeclared(string localId)
+    private void AssertIsNotDeclared(string localId)
+    {
+        if (_idsTracked.ContainsKey(localId))
         {
-            if (_idsTracked.ContainsKey(localId))
-            {
-                throw new DuplicateLocalIdValueException(localId);
-            }
+            throw new DuplicateLocalIdValueException(localId);
         }
+    }
 
-        /// <inheritdoc />
-        public void Assign(string localId, ResourceType resourceType, string stringId)
-        {
-            ArgumentGuard.NotNullNorEmpty(localId, nameof(localId));
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
-            ArgumentGuard.NotNullNorEmpty(stringId, nameof(stringId));
-
-            AssertIsDeclared(localId);
+    /// <inheritdoc />
+    public void Assign(string localId, ResourceType resourceType, string stringId)
+    {
+        ArgumentGuard.NotNullNorEmpty(localId, nameof(localId));
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+        ArgumentGuard.NotNullNorEmpty(stringId, nameof(stringId));
 
-            LocalIdState item = _idsTracked[localId];
+        AssertIsDeclared(localId);
 
-            AssertSameResourceType(resourceType, item.ResourceType, localId);
+        LocalIdState item = _idsTracked[localId];
 
-            if (item.ServerId != null)
-            {
-                throw new InvalidOperationException($"Cannot reassign to existing local ID '{localId}'.");
-            }
+        AssertSameResourceType(resourceType, item.ResourceType, localId);
 
-            item.ServerId = stringId;
+        if (item.ServerId != null)
+        {
+            throw new InvalidOperationException($"Cannot reassign to existing local ID '{localId}'.");
         }
 
-        /// <inheritdoc />
-        public string GetValue(string localId, ResourceType resourceType)
-        {
-            ArgumentGuard.NotNullNorEmpty(localId, nameof(localId));
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+        item.ServerId = stringId;
+    }
 
-            AssertIsDeclared(localId);
+    /// <inheritdoc />
+    public string GetValue(string localId, ResourceType resourceType)
+    {
+        ArgumentGuard.NotNullNorEmpty(localId, nameof(localId));
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            LocalIdState item = _idsTracked[localId];
+        AssertIsDeclared(localId);
 
-            AssertSameResourceType(resourceType, item.ResourceType, localId);
+        LocalIdState item = _idsTracked[localId];
 
-            if (item.ServerId == null)
-            {
-                throw new LocalIdSingleOperationException(localId);
-            }
+        AssertSameResourceType(resourceType, item.ResourceType, localId);
 
-            return item.ServerId;
+        if (item.ServerId == null)
+        {
+            throw new LocalIdSingleOperationException(localId);
         }
 
-        private void AssertIsDeclared(string localId)
+        return item.ServerId;
+    }
+
+    private void AssertIsDeclared(string localId)
+    {
+        if (!_idsTracked.ContainsKey(localId))
         {
-            if (!_idsTracked.ContainsKey(localId))
-            {
-                throw new UnknownLocalIdValueException(localId);
-            }
+            throw new UnknownLocalIdValueException(localId);
         }
+    }
 
-        private static void AssertSameResourceType(ResourceType currentType, ResourceType declaredType, string localId)
+    private static void AssertSameResourceType(ResourceType currentType, ResourceType declaredType, string localId)
+    {
+        if (!declaredType.Equals(currentType))
         {
-            if (!declaredType.Equals(currentType))
-            {
-                throw new IncompatibleLocalIdTypeException(localId, declaredType.PublicName, currentType.PublicName);
-            }
+            throw new IncompatibleLocalIdTypeException(localId, declaredType.PublicName, currentType.PublicName);
         }
+    }
 
-        private sealed class LocalIdState
-        {
-            public ResourceType ResourceType { get; }
-            public string? ServerId { get; set; }
+    private sealed class LocalIdState
+    {
+        public ResourceType ResourceType { get; }
+        public string? ServerId { get; set; }
 
-            public LocalIdState(ResourceType resourceType)
-            {
-                ResourceType = resourceType;
-            }
+        public LocalIdState(ResourceType resourceType)
+        {
+            ResourceType = resourceType;
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/LocalIdValidator.cs b/src/JsonApiDotNetCore/AtomicOperations/LocalIdValidator.cs
index 670280e59b..cbbc702d0c 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/LocalIdValidator.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/LocalIdValidator.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Errors;
@@ -6,100 +5,99 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.AtomicOperations
+namespace JsonApiDotNetCore.AtomicOperations;
+
+/// <summary>
+/// Validates declaration, assignment and reference of local IDs within a list of operations.
+/// </summary>
+[PublicAPI]
+public sealed class LocalIdValidator
 {
-    /// <summary>
-    /// Validates declaration, assignment and reference of local IDs within a list of operations.
-    /// </summary>
-    [PublicAPI]
-    public sealed class LocalIdValidator
-    {
-        private readonly ILocalIdTracker _localIdTracker;
-        private readonly IResourceGraph _resourceGraph;
+    private readonly ILocalIdTracker _localIdTracker;
+    private readonly IResourceGraph _resourceGraph;
 
-        public LocalIdValidator(ILocalIdTracker localIdTracker, IResourceGraph resourceGraph)
-        {
-            ArgumentGuard.NotNull(localIdTracker, nameof(localIdTracker));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+    public LocalIdValidator(ILocalIdTracker localIdTracker, IResourceGraph resourceGraph)
+    {
+        ArgumentGuard.NotNull(localIdTracker, nameof(localIdTracker));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
 
-            _localIdTracker = localIdTracker;
-            _resourceGraph = resourceGraph;
-        }
+        _localIdTracker = localIdTracker;
+        _resourceGraph = resourceGraph;
+    }
 
-        public void Validate(IEnumerable<OperationContainer> operations)
-        {
-            ArgumentGuard.NotNull(operations, nameof(operations));
+    public void Validate(IEnumerable<OperationContainer> operations)
+    {
+        ArgumentGuard.NotNull(operations, nameof(operations));
 
-            _localIdTracker.Reset();
+        _localIdTracker.Reset();
 
-            int operationIndex = 0;
+        int operationIndex = 0;
 
-            try
+        try
+        {
+            foreach (OperationContainer operation in operations)
             {
-                foreach (OperationContainer operation in operations)
-                {
-                    ValidateOperation(operation);
+                ValidateOperation(operation);
 
-                    operationIndex++;
-                }
+                operationIndex++;
             }
-            catch (JsonApiException exception)
+        }
+        catch (JsonApiException exception)
+        {
+            foreach (ErrorObject error in exception.Errors)
             {
-                foreach (ErrorObject error in exception.Errors)
-                {
-                    error.Source ??= new ErrorSource();
-                    error.Source.Pointer = $"/atomic:operations[{operationIndex}]{error.Source.Pointer}";
-                }
-
-                throw;
+                error.Source ??= new ErrorSource();
+                error.Source.Pointer = $"/atomic:operations[{operationIndex}]{error.Source.Pointer}";
             }
+
+            throw;
         }
+    }
 
-        private void ValidateOperation(OperationContainer operation)
+    private void ValidateOperation(OperationContainer operation)
+    {
+        if (operation.Request.WriteOperation == WriteOperationKind.CreateResource)
         {
-            if (operation.Request.WriteOperation == WriteOperationKind.CreateResource)
-            {
-                DeclareLocalId(operation.Resource, operation.Request.PrimaryResourceType!);
-            }
-            else
-            {
-                AssertLocalIdIsAssigned(operation.Resource);
-            }
+            DeclareLocalId(operation.Resource, operation.Request.PrimaryResourceType!);
+        }
+        else
+        {
+            AssertLocalIdIsAssigned(operation.Resource);
+        }
 
-            foreach (IIdentifiable secondaryResource in operation.GetSecondaryResources())
-            {
-                AssertLocalIdIsAssigned(secondaryResource);
-            }
+        foreach (IIdentifiable secondaryResource in operation.GetSecondaryResources())
+        {
+            AssertLocalIdIsAssigned(secondaryResource);
+        }
 
-            if (operation.Request.WriteOperation == WriteOperationKind.CreateResource)
-            {
-                AssignLocalId(operation, operation.Request.PrimaryResourceType!);
-            }
+        if (operation.Request.WriteOperation == WriteOperationKind.CreateResource)
+        {
+            AssignLocalId(operation, operation.Request.PrimaryResourceType!);
         }
+    }
 
-        private void DeclareLocalId(IIdentifiable resource, ResourceType resourceType)
+    private void DeclareLocalId(IIdentifiable resource, ResourceType resourceType)
+    {
+        if (resource.LocalId != null)
         {
-            if (resource.LocalId != null)
-            {
-                _localIdTracker.Declare(resource.LocalId, resourceType);
-            }
+            _localIdTracker.Declare(resource.LocalId, resourceType);
         }
+    }
 
-        private void AssignLocalId(OperationContainer operation, ResourceType resourceType)
+    private void AssignLocalId(OperationContainer operation, ResourceType resourceType)
+    {
+        if (operation.Resource.LocalId != null)
         {
-            if (operation.Resource.LocalId != null)
-            {
-                _localIdTracker.Assign(operation.Resource.LocalId, resourceType, "placeholder");
-            }
+            _localIdTracker.Assign(operation.Resource.LocalId, resourceType, "placeholder");
         }
+    }
 
-        private void AssertLocalIdIsAssigned(IIdentifiable resource)
+    private void AssertLocalIdIsAssigned(IIdentifiable resource)
+    {
+        if (resource.LocalId != null)
         {
-            if (resource.LocalId != null)
-            {
-                ResourceType resourceType = _resourceGraph.GetResourceType(resource.GetType());
-                _localIdTracker.GetValue(resource.LocalId, resourceType);
-            }
+            ResourceType resourceType = _resourceGraph.GetResourceType(resource.GetType());
+            _localIdTracker.GetValue(resource.LocalId, resourceType);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/MissingTransactionFactory.cs b/src/JsonApiDotNetCore/AtomicOperations/MissingTransactionFactory.cs
index 75c327c0f2..450636481f 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/MissingTransactionFactory.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/MissingTransactionFactory.cs
@@ -1,20 +1,15 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
+namespace JsonApiDotNetCore.AtomicOperations;
 
-namespace JsonApiDotNetCore.AtomicOperations
+/// <summary>
+/// A transaction factory that throws when used in an atomic:operations request, because no transaction support is available.
+/// </summary>
+public sealed class MissingTransactionFactory : IOperationsTransactionFactory
 {
-    /// <summary>
-    /// A transaction factory that throws when used in an atomic:operations request, because no transaction support is available.
-    /// </summary>
-    public sealed class MissingTransactionFactory : IOperationsTransactionFactory
+    /// <inheritdoc />
+    public Task<IOperationsTransaction> BeginTransactionAsync(CancellationToken cancellationToken)
     {
-        /// <inheritdoc />
-        public Task<IOperationsTransaction> BeginTransactionAsync(CancellationToken cancellationToken)
-        {
-            // When using a data store other than Entity Framework Core, replace this type with your custom implementation
-            // by overwriting the IoC container registration.
-            throw new NotImplementedException("No transaction support is available.");
-        }
+        // When using a data store other than Entity Framework Core, replace this type with your custom implementation
+        // by overwriting the IoC container registration.
+        throw new NotImplementedException("No transaction support is available.");
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/OperationProcessorAccessor.cs b/src/JsonApiDotNetCore/AtomicOperations/OperationProcessorAccessor.cs
index 67596ee697..c032f78f8d 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/OperationProcessorAccessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/OperationProcessorAccessor.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.AtomicOperations.Processors;
 using JsonApiDotNetCore.Configuration;
@@ -8,71 +5,70 @@
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace JsonApiDotNetCore.AtomicOperations
+namespace JsonApiDotNetCore.AtomicOperations;
+
+/// <inheritdoc />
+[PublicAPI]
+public class OperationProcessorAccessor : IOperationProcessorAccessor
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public class OperationProcessorAccessor : IOperationProcessorAccessor
-    {
-        private readonly IServiceProvider _serviceProvider;
+    private readonly IServiceProvider _serviceProvider;
 
-        public OperationProcessorAccessor(IServiceProvider serviceProvider)
-        {
-            ArgumentGuard.NotNull(serviceProvider, nameof(serviceProvider));
+    public OperationProcessorAccessor(IServiceProvider serviceProvider)
+    {
+        ArgumentGuard.NotNull(serviceProvider, nameof(serviceProvider));
 
-            _serviceProvider = serviceProvider;
-        }
+        _serviceProvider = serviceProvider;
+    }
 
-        /// <inheritdoc />
-        public Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
-        {
-            ArgumentGuard.NotNull(operation, nameof(operation));
+    /// <inheritdoc />
+    public Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
+    {
+        ArgumentGuard.NotNull(operation, nameof(operation));
 
-            IOperationProcessor processor = ResolveProcessor(operation);
-            return processor.ProcessAsync(operation, cancellationToken);
-        }
+        IOperationProcessor processor = ResolveProcessor(operation);
+        return processor.ProcessAsync(operation, cancellationToken);
+    }
 
-        protected virtual IOperationProcessor ResolveProcessor(OperationContainer operation)
-        {
-            Type processorInterface = GetProcessorInterface(operation.Request.WriteOperation!.Value);
-            ResourceType resourceType = operation.Request.PrimaryResourceType!;
+    protected virtual IOperationProcessor ResolveProcessor(OperationContainer operation)
+    {
+        Type processorInterface = GetProcessorInterface(operation.Request.WriteOperation!.Value);
+        ResourceType resourceType = operation.Request.PrimaryResourceType!;
 
-            Type processorType = processorInterface.MakeGenericType(resourceType.ClrType, resourceType.IdentityClrType);
-            return (IOperationProcessor)_serviceProvider.GetRequiredService(processorType);
-        }
+        Type processorType = processorInterface.MakeGenericType(resourceType.ClrType, resourceType.IdentityClrType);
+        return (IOperationProcessor)_serviceProvider.GetRequiredService(processorType);
+    }
 
-        private static Type GetProcessorInterface(WriteOperationKind writeOperation)
+    private static Type GetProcessorInterface(WriteOperationKind writeOperation)
+    {
+        switch (writeOperation)
         {
-            switch (writeOperation)
+            case WriteOperationKind.CreateResource:
+            {
+                return typeof(ICreateProcessor<,>);
+            }
+            case WriteOperationKind.UpdateResource:
+            {
+                return typeof(IUpdateProcessor<,>);
+            }
+            case WriteOperationKind.DeleteResource:
+            {
+                return typeof(IDeleteProcessor<,>);
+            }
+            case WriteOperationKind.SetRelationship:
+            {
+                return typeof(ISetRelationshipProcessor<,>);
+            }
+            case WriteOperationKind.AddToRelationship:
+            {
+                return typeof(IAddToRelationshipProcessor<,>);
+            }
+            case WriteOperationKind.RemoveFromRelationship:
+            {
+                return typeof(IRemoveFromRelationshipProcessor<,>);
+            }
+            default:
             {
-                case WriteOperationKind.CreateResource:
-                {
-                    return typeof(ICreateProcessor<,>);
-                }
-                case WriteOperationKind.UpdateResource:
-                {
-                    return typeof(IUpdateProcessor<,>);
-                }
-                case WriteOperationKind.DeleteResource:
-                {
-                    return typeof(IDeleteProcessor<,>);
-                }
-                case WriteOperationKind.SetRelationship:
-                {
-                    return typeof(ISetRelationshipProcessor<,>);
-                }
-                case WriteOperationKind.AddToRelationship:
-                {
-                    return typeof(IAddToRelationshipProcessor<,>);
-                }
-                case WriteOperationKind.RemoveFromRelationship:
-                {
-                    return typeof(IRemoveFromRelationshipProcessor<,>);
-                }
-                default:
-                {
-                    throw new NotSupportedException($"Unknown write operation kind '{writeOperation}'.");
-                }
+                throw new NotSupportedException($"Unknown write operation kind '{writeOperation}'.");
             }
         }
     }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/OperationsProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/OperationsProcessor.cs
index ceca03ccdf..4a26e36710 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/OperationsProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/OperationsProcessor.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Errors;
@@ -10,143 +6,142 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.AtomicOperations
+namespace JsonApiDotNetCore.AtomicOperations;
+
+/// <inheritdoc />
+[PublicAPI]
+public class OperationsProcessor : IOperationsProcessor
 {
+    private readonly IOperationProcessorAccessor _operationProcessorAccessor;
+    private readonly IOperationsTransactionFactory _operationsTransactionFactory;
+    private readonly ILocalIdTracker _localIdTracker;
+    private readonly IResourceGraph _resourceGraph;
+    private readonly IJsonApiRequest _request;
+    private readonly ITargetedFields _targetedFields;
+    private readonly ISparseFieldSetCache _sparseFieldSetCache;
+    private readonly LocalIdValidator _localIdValidator;
+
+    public OperationsProcessor(IOperationProcessorAccessor operationProcessorAccessor, IOperationsTransactionFactory operationsTransactionFactory,
+        ILocalIdTracker localIdTracker, IResourceGraph resourceGraph, IJsonApiRequest request, ITargetedFields targetedFields,
+        ISparseFieldSetCache sparseFieldSetCache)
+    {
+        ArgumentGuard.NotNull(operationProcessorAccessor, nameof(operationProcessorAccessor));
+        ArgumentGuard.NotNull(operationsTransactionFactory, nameof(operationsTransactionFactory));
+        ArgumentGuard.NotNull(localIdTracker, nameof(localIdTracker));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        ArgumentGuard.NotNull(request, nameof(request));
+        ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
+        ArgumentGuard.NotNull(sparseFieldSetCache, nameof(sparseFieldSetCache));
+
+        _operationProcessorAccessor = operationProcessorAccessor;
+        _operationsTransactionFactory = operationsTransactionFactory;
+        _localIdTracker = localIdTracker;
+        _resourceGraph = resourceGraph;
+        _request = request;
+        _targetedFields = targetedFields;
+        _sparseFieldSetCache = sparseFieldSetCache;
+        _localIdValidator = new LocalIdValidator(_localIdTracker, _resourceGraph);
+    }
+
     /// <inheritdoc />
-    [PublicAPI]
-    public class OperationsProcessor : IOperationsProcessor
+    public virtual async Task<IList<OperationContainer?>> ProcessAsync(IList<OperationContainer> operations, CancellationToken cancellationToken)
     {
-        private readonly IOperationProcessorAccessor _operationProcessorAccessor;
-        private readonly IOperationsTransactionFactory _operationsTransactionFactory;
-        private readonly ILocalIdTracker _localIdTracker;
-        private readonly IResourceGraph _resourceGraph;
-        private readonly IJsonApiRequest _request;
-        private readonly ITargetedFields _targetedFields;
-        private readonly ISparseFieldSetCache _sparseFieldSetCache;
-        private readonly LocalIdValidator _localIdValidator;
-
-        public OperationsProcessor(IOperationProcessorAccessor operationProcessorAccessor, IOperationsTransactionFactory operationsTransactionFactory,
-            ILocalIdTracker localIdTracker, IResourceGraph resourceGraph, IJsonApiRequest request, ITargetedFields targetedFields,
-            ISparseFieldSetCache sparseFieldSetCache)
-        {
-            ArgumentGuard.NotNull(operationProcessorAccessor, nameof(operationProcessorAccessor));
-            ArgumentGuard.NotNull(operationsTransactionFactory, nameof(operationsTransactionFactory));
-            ArgumentGuard.NotNull(localIdTracker, nameof(localIdTracker));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-            ArgumentGuard.NotNull(request, nameof(request));
-            ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
-            ArgumentGuard.NotNull(sparseFieldSetCache, nameof(sparseFieldSetCache));
-
-            _operationProcessorAccessor = operationProcessorAccessor;
-            _operationsTransactionFactory = operationsTransactionFactory;
-            _localIdTracker = localIdTracker;
-            _resourceGraph = resourceGraph;
-            _request = request;
-            _targetedFields = targetedFields;
-            _sparseFieldSetCache = sparseFieldSetCache;
-            _localIdValidator = new LocalIdValidator(_localIdTracker, _resourceGraph);
-        }
+        ArgumentGuard.NotNull(operations, nameof(operations));
 
-        /// <inheritdoc />
-        public virtual async Task<IList<OperationContainer?>> ProcessAsync(IList<OperationContainer> operations, CancellationToken cancellationToken)
-        {
-            ArgumentGuard.NotNull(operations, nameof(operations));
+        _localIdValidator.Validate(operations);
+        _localIdTracker.Reset();
 
-            _localIdValidator.Validate(operations);
-            _localIdTracker.Reset();
+        var results = new List<OperationContainer?>();
 
-            var results = new List<OperationContainer?>();
+        await using IOperationsTransaction transaction = await _operationsTransactionFactory.BeginTransactionAsync(cancellationToken);
 
-            await using IOperationsTransaction transaction = await _operationsTransactionFactory.BeginTransactionAsync(cancellationToken);
+        try
+        {
+            using IDisposable _ = new RevertRequestStateOnDispose(_request, _targetedFields);
 
-            try
+            foreach (OperationContainer operation in operations)
             {
-                using IDisposable _ = new RevertRequestStateOnDispose(_request, _targetedFields);
-
-                foreach (OperationContainer operation in operations)
-                {
-                    operation.SetTransactionId(transaction.TransactionId);
+                operation.SetTransactionId(transaction.TransactionId);
 
-                    await transaction.BeforeProcessOperationAsync(cancellationToken);
+                await transaction.BeforeProcessOperationAsync(cancellationToken);
 
-                    OperationContainer? result = await ProcessOperationAsync(operation, cancellationToken);
-                    results.Add(result);
+                OperationContainer? result = await ProcessOperationAsync(operation, cancellationToken);
+                results.Add(result);
 
-                    await transaction.AfterProcessOperationAsync(cancellationToken);
+                await transaction.AfterProcessOperationAsync(cancellationToken);
 
-                    _sparseFieldSetCache.Reset();
-                }
-
-                await transaction.CommitAsync(cancellationToken);
+                _sparseFieldSetCache.Reset();
             }
-            catch (OperationCanceledException)
+
+            await transaction.CommitAsync(cancellationToken);
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+        catch (JsonApiException exception)
+        {
+            foreach (ErrorObject error in exception.Errors)
             {
-                throw;
+                error.Source ??= new ErrorSource();
+                error.Source.Pointer = $"/atomic:operations[{results.Count}]{error.Source.Pointer}";
             }
-            catch (JsonApiException exception)
-            {
-                foreach (ErrorObject error in exception.Errors)
-                {
-                    error.Source ??= new ErrorSource();
-                    error.Source.Pointer = $"/atomic:operations[{results.Count}]{error.Source.Pointer}";
-                }
 
-                throw;
-            }
+            throw;
+        }
 #pragma warning disable AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
-            catch (Exception exception)
+        catch (Exception exception)
 #pragma warning restore AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
-            {
-                throw new FailedOperationException(results.Count, exception);
-            }
-
-            return results;
+        {
+            throw new FailedOperationException(results.Count, exception);
         }
 
-        protected virtual async Task<OperationContainer?> ProcessOperationAsync(OperationContainer operation, CancellationToken cancellationToken)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
+        return results;
+    }
 
-            TrackLocalIdsForOperation(operation);
+    protected virtual async Task<OperationContainer?> ProcessOperationAsync(OperationContainer operation, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
 
-            _targetedFields.CopyFrom(operation.TargetedFields);
-            _request.CopyFrom(operation.Request);
+        TrackLocalIdsForOperation(operation);
 
-            return await _operationProcessorAccessor.ProcessAsync(operation, cancellationToken);
-        }
+        _targetedFields.CopyFrom(operation.TargetedFields);
+        _request.CopyFrom(operation.Request);
+
+        return await _operationProcessorAccessor.ProcessAsync(operation, cancellationToken);
+    }
 
-        protected void TrackLocalIdsForOperation(OperationContainer operation)
+    protected void TrackLocalIdsForOperation(OperationContainer operation)
+    {
+        if (operation.Request.WriteOperation == WriteOperationKind.CreateResource)
         {
-            if (operation.Request.WriteOperation == WriteOperationKind.CreateResource)
-            {
-                DeclareLocalId(operation.Resource, operation.Request.PrimaryResourceType!);
-            }
-            else
-            {
-                AssignStringId(operation.Resource);
-            }
+            DeclareLocalId(operation.Resource, operation.Request.PrimaryResourceType!);
+        }
+        else
+        {
+            AssignStringId(operation.Resource);
+        }
 
-            foreach (IIdentifiable secondaryResource in operation.GetSecondaryResources())
-            {
-                AssignStringId(secondaryResource);
-            }
+        foreach (IIdentifiable secondaryResource in operation.GetSecondaryResources())
+        {
+            AssignStringId(secondaryResource);
         }
+    }
 
-        private void DeclareLocalId(IIdentifiable resource, ResourceType resourceType)
+    private void DeclareLocalId(IIdentifiable resource, ResourceType resourceType)
+    {
+        if (resource.LocalId != null)
         {
-            if (resource.LocalId != null)
-            {
-                _localIdTracker.Declare(resource.LocalId, resourceType);
-            }
+            _localIdTracker.Declare(resource.LocalId, resourceType);
         }
+    }
 
-        private void AssignStringId(IIdentifiable resource)
+    private void AssignStringId(IIdentifiable resource)
+    {
+        if (resource.LocalId != null)
         {
-            if (resource.LocalId != null)
-            {
-                ResourceType resourceType = _resourceGraph.GetResourceType(resource.GetType());
-                resource.StringId = _localIdTracker.GetValue(resource.LocalId, resourceType);
-            }
+            ResourceType resourceType = _resourceGraph.GetResourceType(resource.GetType());
+            resource.StringId = _localIdTracker.GetValue(resource.LocalId, resourceType);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/AddToRelationshipProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/AddToRelationshipProcessor.cs
index 1b6025cf40..fc16847eec 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/AddToRelationshipProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/AddToRelationshipProcessor.cs
@@ -1,37 +1,33 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Services;
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
+
+/// <inheritdoc />
+[PublicAPI]
+public class AddToRelationshipProcessor<TResource, TId> : IAddToRelationshipProcessor<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public class AddToRelationshipProcessor<TResource, TId> : IAddToRelationshipProcessor<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        private readonly IAddToRelationshipService<TResource, TId> _service;
+    private readonly IAddToRelationshipService<TResource, TId> _service;
 
-        public AddToRelationshipProcessor(IAddToRelationshipService<TResource, TId> service)
-        {
-            ArgumentGuard.NotNull(service, nameof(service));
+    public AddToRelationshipProcessor(IAddToRelationshipService<TResource, TId> service)
+    {
+        ArgumentGuard.NotNull(service, nameof(service));
 
-            _service = service;
-        }
+        _service = service;
+    }
 
-        /// <inheritdoc />
-        public virtual async Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
-        {
-            ArgumentGuard.NotNull(operation, nameof(operation));
+    /// <inheritdoc />
+    public virtual async Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
+    {
+        ArgumentGuard.NotNull(operation, nameof(operation));
 
-            var leftId = (TId)operation.Resource.GetTypedId();
-            ISet<IIdentifiable> rightResourceIds = operation.GetSecondaryResources();
+        var leftId = (TId)operation.Resource.GetTypedId();
+        ISet<IIdentifiable> rightResourceIds = operation.GetSecondaryResources();
 
-            await _service.AddToToManyRelationshipAsync(leftId, operation.Request.Relationship!.PublicName, rightResourceIds, cancellationToken);
+        await _service.AddToToManyRelationshipAsync(leftId, operation.Request.Relationship!.PublicName, rightResourceIds, cancellationToken);
 
-            return null;
-        }
+        return null;
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/CreateProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/CreateProcessor.cs
index 06d9ae485a..b06ebd626e 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/CreateProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/CreateProcessor.cs
@@ -1,42 +1,39 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Services;
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
-{
-    /// <inheritdoc />
-    [PublicAPI]
-    public class CreateProcessor<TResource, TId> : ICreateProcessor<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        private readonly ICreateService<TResource, TId> _service;
-        private readonly ILocalIdTracker _localIdTracker;
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
 
-        public CreateProcessor(ICreateService<TResource, TId> service, ILocalIdTracker localIdTracker)
-        {
-            ArgumentGuard.NotNull(service, nameof(service));
-            ArgumentGuard.NotNull(localIdTracker, nameof(localIdTracker));
+/// <inheritdoc />
+[PublicAPI]
+public class CreateProcessor<TResource, TId> : ICreateProcessor<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
+{
+    private readonly ICreateService<TResource, TId> _service;
+    private readonly ILocalIdTracker _localIdTracker;
 
-            _service = service;
-            _localIdTracker = localIdTracker;
-        }
+    public CreateProcessor(ICreateService<TResource, TId> service, ILocalIdTracker localIdTracker)
+    {
+        ArgumentGuard.NotNull(service, nameof(service));
+        ArgumentGuard.NotNull(localIdTracker, nameof(localIdTracker));
 
-        /// <inheritdoc />
-        public virtual async Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
-        {
-            ArgumentGuard.NotNull(operation, nameof(operation));
+        _service = service;
+        _localIdTracker = localIdTracker;
+    }
 
-            TResource? newResource = await _service.CreateAsync((TResource)operation.Resource, cancellationToken);
+    /// <inheritdoc />
+    public virtual async Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
+    {
+        ArgumentGuard.NotNull(operation, nameof(operation));
 
-            if (operation.Resource.LocalId != null)
-            {
-                string serverId = newResource != null ? newResource.StringId! : operation.Resource.StringId!;
-                _localIdTracker.Assign(operation.Resource.LocalId, operation.Request.PrimaryResourceType!, serverId);
-            }
+        TResource? newResource = await _service.CreateAsync((TResource)operation.Resource, cancellationToken);
 
-            return newResource == null ? null : operation.WithResource(newResource);
+        if (operation.Resource.LocalId != null)
+        {
+            string serverId = newResource != null ? newResource.StringId! : operation.Resource.StringId!;
+            _localIdTracker.Assign(operation.Resource.LocalId, operation.Request.PrimaryResourceType!, serverId);
         }
+
+        return newResource == null ? null : operation.WithResource(newResource);
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/DeleteProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/DeleteProcessor.cs
index 29750b395b..e4001b75c1 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/DeleteProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/DeleteProcessor.cs
@@ -1,34 +1,31 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Services;
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
+
+/// <inheritdoc />
+[PublicAPI]
+public class DeleteProcessor<TResource, TId> : IDeleteProcessor<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public class DeleteProcessor<TResource, TId> : IDeleteProcessor<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        private readonly IDeleteService<TResource, TId> _service;
+    private readonly IDeleteService<TResource, TId> _service;
 
-        public DeleteProcessor(IDeleteService<TResource, TId> service)
-        {
-            ArgumentGuard.NotNull(service, nameof(service));
+    public DeleteProcessor(IDeleteService<TResource, TId> service)
+    {
+        ArgumentGuard.NotNull(service, nameof(service));
 
-            _service = service;
-        }
+        _service = service;
+    }
 
-        /// <inheritdoc />
-        public virtual async Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
-        {
-            ArgumentGuard.NotNull(operation, nameof(operation));
+    /// <inheritdoc />
+    public virtual async Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
+    {
+        ArgumentGuard.NotNull(operation, nameof(operation));
 
-            var id = (TId)operation.Resource.GetTypedId();
-            await _service.DeleteAsync(id, cancellationToken);
+        var id = (TId)operation.Resource.GetTypedId();
+        await _service.DeleteAsync(id, cancellationToken);
 
-            return null;
-        }
+        return null;
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/IAddToRelationshipProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/IAddToRelationshipProcessor.cs
index 2f7c10a3f7..8b9990342a 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/IAddToRelationshipProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/IAddToRelationshipProcessor.cs
@@ -3,20 +3,19 @@
 
 // ReSharper disable UnusedTypeParameter
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
+
+/// <summary>
+/// Processes a single operation to add resources to a to-many relationship.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+[PublicAPI]
+public interface IAddToRelationshipProcessor<TResource, TId> : IOperationProcessor
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Processes a single operation to add resources to a to-many relationship.
-    /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    [PublicAPI]
-    public interface IAddToRelationshipProcessor<TResource, TId> : IOperationProcessor
-        where TResource : class, IIdentifiable<TId>
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/ICreateProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/ICreateProcessor.cs
index 0f747a9dd0..9fd1de2186 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/ICreateProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/ICreateProcessor.cs
@@ -3,20 +3,19 @@
 
 // ReSharper disable UnusedTypeParameter
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
+
+/// <summary>
+/// Processes a single operation to create a new resource with attributes, relationships or both.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+[PublicAPI]
+public interface ICreateProcessor<TResource, TId> : IOperationProcessor
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Processes a single operation to create a new resource with attributes, relationships or both.
-    /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    [PublicAPI]
-    public interface ICreateProcessor<TResource, TId> : IOperationProcessor
-        where TResource : class, IIdentifiable<TId>
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/IDeleteProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/IDeleteProcessor.cs
index 4e5206054d..67627cd8c0 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/IDeleteProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/IDeleteProcessor.cs
@@ -3,20 +3,19 @@
 
 // ReSharper disable UnusedTypeParameter
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
+
+/// <summary>
+/// Processes a single operation to delete an existing resource.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+[PublicAPI]
+public interface IDeleteProcessor<TResource, TId> : IOperationProcessor
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Processes a single operation to delete an existing resource.
-    /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    [PublicAPI]
-    public interface IDeleteProcessor<TResource, TId> : IOperationProcessor
-        where TResource : class, IIdentifiable<TId>
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/IOperationProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/IOperationProcessor.cs
index 559bd4cbf4..4df297469e 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/IOperationProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/IOperationProcessor.cs
@@ -1,17 +1,14 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
+
+/// <summary>
+/// Processes a single entry in a list of operations.
+/// </summary>
+public interface IOperationProcessor
 {
     /// <summary>
-    /// Processes a single entry in a list of operations.
+    /// Processes the specified operation.
     /// </summary>
-    public interface IOperationProcessor
-    {
-        /// <summary>
-        /// Processes the specified operation.
-        /// </summary>
-        Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken);
-    }
+    Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/IRemoveFromRelationshipProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/IRemoveFromRelationshipProcessor.cs
index 02ce98d21d..6492c992f1 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/IRemoveFromRelationshipProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/IRemoveFromRelationshipProcessor.cs
@@ -3,16 +3,15 @@
 
 // ReSharper disable UnusedTypeParameter
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
+
+/// <summary>
+/// Processes a single operation to remove resources from a to-many relationship.
+/// </summary>
+/// <typeparam name="TResource"></typeparam>
+/// <typeparam name="TId"></typeparam>
+[PublicAPI]
+public interface IRemoveFromRelationshipProcessor<TResource, TId> : IOperationProcessor
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Processes a single operation to remove resources from a to-many relationship.
-    /// </summary>
-    /// <typeparam name="TResource"></typeparam>
-    /// <typeparam name="TId"></typeparam>
-    [PublicAPI]
-    public interface IRemoveFromRelationshipProcessor<TResource, TId> : IOperationProcessor
-        where TResource : class, IIdentifiable<TId>
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/ISetRelationshipProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/ISetRelationshipProcessor.cs
index 8dafc839a4..dd950d203d 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/ISetRelationshipProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/ISetRelationshipProcessor.cs
@@ -3,20 +3,19 @@
 
 // ReSharper disable UnusedTypeParameter
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
+
+/// <summary>
+/// Processes a single operation to perform a complete replacement of a relationship on an existing resource.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+[PublicAPI]
+public interface ISetRelationshipProcessor<TResource, TId> : IOperationProcessor
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Processes a single operation to perform a complete replacement of a relationship on an existing resource.
-    /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    [PublicAPI]
-    public interface ISetRelationshipProcessor<TResource, TId> : IOperationProcessor
-        where TResource : class, IIdentifiable<TId>
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/IUpdateProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/IUpdateProcessor.cs
index 48847f6ddb..6051837749 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/IUpdateProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/IUpdateProcessor.cs
@@ -3,21 +3,20 @@
 
 // ReSharper disable UnusedTypeParameter
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
+
+/// <summary>
+/// Processes a single operation to update the attributes and/or relationships of an existing resource. Only the values of sent attributes are replaced.
+/// And only the values of sent relationships are replaced.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+[PublicAPI]
+public interface IUpdateProcessor<TResource, TId> : IOperationProcessor
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Processes a single operation to update the attributes and/or relationships of an existing resource. Only the values of sent attributes are replaced.
-    /// And only the values of sent relationships are replaced.
-    /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    [PublicAPI]
-    public interface IUpdateProcessor<TResource, TId> : IOperationProcessor
-        where TResource : class, IIdentifiable<TId>
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/RemoveFromRelationshipProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/RemoveFromRelationshipProcessor.cs
index a186967cf0..493ed2066f 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/RemoveFromRelationshipProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/RemoveFromRelationshipProcessor.cs
@@ -1,37 +1,33 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Services;
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
+
+/// <inheritdoc />
+[PublicAPI]
+public class RemoveFromRelationshipProcessor<TResource, TId> : IRemoveFromRelationshipProcessor<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public class RemoveFromRelationshipProcessor<TResource, TId> : IRemoveFromRelationshipProcessor<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        private readonly IRemoveFromRelationshipService<TResource, TId> _service;
+    private readonly IRemoveFromRelationshipService<TResource, TId> _service;
 
-        public RemoveFromRelationshipProcessor(IRemoveFromRelationshipService<TResource, TId> service)
-        {
-            ArgumentGuard.NotNull(service, nameof(service));
+    public RemoveFromRelationshipProcessor(IRemoveFromRelationshipService<TResource, TId> service)
+    {
+        ArgumentGuard.NotNull(service, nameof(service));
 
-            _service = service;
-        }
+        _service = service;
+    }
 
-        /// <inheritdoc />
-        public virtual async Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
-        {
-            ArgumentGuard.NotNull(operation, nameof(operation));
+    /// <inheritdoc />
+    public virtual async Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
+    {
+        ArgumentGuard.NotNull(operation, nameof(operation));
 
-            var leftId = (TId)operation.Resource.GetTypedId();
-            ISet<IIdentifiable> rightResourceIds = operation.GetSecondaryResources();
+        var leftId = (TId)operation.Resource.GetTypedId();
+        ISet<IIdentifiable> rightResourceIds = operation.GetSecondaryResources();
 
-            await _service.RemoveFromToManyRelationshipAsync(leftId, operation.Request.Relationship!.PublicName, rightResourceIds, cancellationToken);
+        await _service.RemoveFromToManyRelationshipAsync(leftId, operation.Request.Relationship!.PublicName, rightResourceIds, cancellationToken);
 
-            return null;
-        }
+        return null;
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/SetRelationshipProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/SetRelationshipProcessor.cs
index bec2a47854..1f15ea293f 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/SetRelationshipProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/SetRelationshipProcessor.cs
@@ -1,54 +1,49 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Services;
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
+
+/// <inheritdoc />
+[PublicAPI]
+public class SetRelationshipProcessor<TResource, TId> : ISetRelationshipProcessor<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public class SetRelationshipProcessor<TResource, TId> : ISetRelationshipProcessor<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
+    private readonly CollectionConverter _collectionConverter = new();
+    private readonly ISetRelationshipService<TResource, TId> _service;
+
+    public SetRelationshipProcessor(ISetRelationshipService<TResource, TId> service)
     {
-        private readonly CollectionConverter _collectionConverter = new();
-        private readonly ISetRelationshipService<TResource, TId> _service;
+        ArgumentGuard.NotNull(service, nameof(service));
 
-        public SetRelationshipProcessor(ISetRelationshipService<TResource, TId> service)
-        {
-            ArgumentGuard.NotNull(service, nameof(service));
+        _service = service;
+    }
 
-            _service = service;
-        }
+    /// <inheritdoc />
+    public virtual async Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
+    {
+        ArgumentGuard.NotNull(operation, nameof(operation));
 
-        /// <inheritdoc />
-        public virtual async Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
-        {
-            ArgumentGuard.NotNull(operation, nameof(operation));
+        var leftId = (TId)operation.Resource.GetTypedId();
+        object? rightValue = GetRelationshipRightValue(operation);
 
-            var leftId = (TId)operation.Resource.GetTypedId();
-            object? rightValue = GetRelationshipRightValue(operation);
+        await _service.SetRelationshipAsync(leftId, operation.Request.Relationship!.PublicName, rightValue, cancellationToken);
 
-            await _service.SetRelationshipAsync(leftId, operation.Request.Relationship!.PublicName, rightValue, cancellationToken);
+        return null;
+    }
 
-            return null;
-        }
+    private object? GetRelationshipRightValue(OperationContainer operation)
+    {
+        RelationshipAttribute relationship = operation.Request.Relationship!;
+        object? rightValue = relationship.GetValue(operation.Resource);
 
-        private object? GetRelationshipRightValue(OperationContainer operation)
+        if (relationship is HasManyAttribute)
         {
-            RelationshipAttribute relationship = operation.Request.Relationship!;
-            object? rightValue = relationship.GetValue(operation.Resource);
-
-            if (relationship is HasManyAttribute)
-            {
-                ICollection<IIdentifiable> rightResources = _collectionConverter.ExtractResources(rightValue);
-                return rightResources.ToHashSet(IdentifiableComparer.Instance);
-            }
-
-            return rightValue;
+            ICollection<IIdentifiable> rightResources = _collectionConverter.ExtractResources(rightValue);
+            return rightResources.ToHashSet(IdentifiableComparer.Instance);
         }
+
+        return rightValue;
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/Processors/UpdateProcessor.cs b/src/JsonApiDotNetCore/AtomicOperations/Processors/UpdateProcessor.cs
index f88bf086df..a02ac2d3ff 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/Processors/UpdateProcessor.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/Processors/UpdateProcessor.cs
@@ -1,34 +1,31 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Services;
 
-namespace JsonApiDotNetCore.AtomicOperations.Processors
+namespace JsonApiDotNetCore.AtomicOperations.Processors;
+
+/// <inheritdoc />
+[PublicAPI]
+public class UpdateProcessor<TResource, TId> : IUpdateProcessor<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public class UpdateProcessor<TResource, TId> : IUpdateProcessor<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        private readonly IUpdateService<TResource, TId> _service;
+    private readonly IUpdateService<TResource, TId> _service;
 
-        public UpdateProcessor(IUpdateService<TResource, TId> service)
-        {
-            ArgumentGuard.NotNull(service, nameof(service));
+    public UpdateProcessor(IUpdateService<TResource, TId> service)
+    {
+        ArgumentGuard.NotNull(service, nameof(service));
 
-            _service = service;
-        }
+        _service = service;
+    }
 
-        /// <inheritdoc />
-        public virtual async Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
-        {
-            ArgumentGuard.NotNull(operation, nameof(operation));
+    /// <inheritdoc />
+    public virtual async Task<OperationContainer?> ProcessAsync(OperationContainer operation, CancellationToken cancellationToken)
+    {
+        ArgumentGuard.NotNull(operation, nameof(operation));
 
-            var resource = (TResource)operation.Resource;
-            TResource? updated = await _service.UpdateAsync(resource.Id, resource, cancellationToken);
+        var resource = (TResource)operation.Resource;
+        TResource? updated = await _service.UpdateAsync(resource.Id, resource, cancellationToken);
 
-            return updated == null ? null : operation.WithResource(updated);
-        }
+        return updated == null ? null : operation.WithResource(updated);
     }
 }
diff --git a/src/JsonApiDotNetCore/AtomicOperations/RevertRequestStateOnDispose.cs b/src/JsonApiDotNetCore/AtomicOperations/RevertRequestStateOnDispose.cs
index b2a1a8daa5..453f78f1f2 100644
--- a/src/JsonApiDotNetCore/AtomicOperations/RevertRequestStateOnDispose.cs
+++ b/src/JsonApiDotNetCore/AtomicOperations/RevertRequestStateOnDispose.cs
@@ -1,38 +1,36 @@
-using System;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.AtomicOperations
+namespace JsonApiDotNetCore.AtomicOperations;
+
+/// <summary>
+/// Copies the current request state into a backup, which is restored on dispose.
+/// </summary>
+internal sealed class RevertRequestStateOnDispose : IDisposable
 {
-    /// <summary>
-    /// Copies the current request state into a backup, which is restored on dispose.
-    /// </summary>
-    internal sealed class RevertRequestStateOnDispose : IDisposable
-    {
-        private readonly IJsonApiRequest _sourceRequest;
-        private readonly ITargetedFields? _sourceTargetedFields;
+    private readonly IJsonApiRequest _sourceRequest;
+    private readonly ITargetedFields? _sourceTargetedFields;
 
-        private readonly IJsonApiRequest _backupRequest = new JsonApiRequest();
-        private readonly ITargetedFields _backupTargetedFields = new TargetedFields();
+    private readonly IJsonApiRequest _backupRequest = new JsonApiRequest();
+    private readonly ITargetedFields _backupTargetedFields = new TargetedFields();
 
-        public RevertRequestStateOnDispose(IJsonApiRequest request, ITargetedFields? targetedFields)
-        {
-            ArgumentGuard.NotNull(request, nameof(request));
+    public RevertRequestStateOnDispose(IJsonApiRequest request, ITargetedFields? targetedFields)
+    {
+        ArgumentGuard.NotNull(request, nameof(request));
 
-            _sourceRequest = request;
-            _backupRequest.CopyFrom(request);
+        _sourceRequest = request;
+        _backupRequest.CopyFrom(request);
 
-            if (targetedFields != null)
-            {
-                _sourceTargetedFields = targetedFields;
-                _backupTargetedFields.CopyFrom(targetedFields);
-            }
-        }
-
-        public void Dispose()
+        if (targetedFields != null)
         {
-            _sourceRequest.CopyFrom(_backupRequest);
-            _sourceTargetedFields?.CopyFrom(_backupTargetedFields);
+            _sourceTargetedFields = targetedFields;
+            _backupTargetedFields.CopyFrom(targetedFields);
         }
     }
+
+    public void Dispose()
+    {
+        _sourceRequest.CopyFrom(_backupRequest);
+        _sourceTargetedFields?.CopyFrom(_backupTargetedFields);
+    }
 }
diff --git a/src/JsonApiDotNetCore/CollectionConverter.cs b/src/JsonApiDotNetCore/CollectionConverter.cs
deleted file mode 100644
index 1ab1768cb9..0000000000
--- a/src/JsonApiDotNetCore/CollectionConverter.cs
+++ /dev/null
@@ -1,128 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using JsonApiDotNetCore.Resources;
-
-namespace JsonApiDotNetCore
-{
-    internal sealed class CollectionConverter
-    {
-        private static readonly ISet<Type> HashSetCompatibleCollectionTypes = new HashSet<Type>
-        {
-            typeof(HashSet<>),
-            typeof(ISet<>),
-            typeof(IReadOnlySet<>),
-            typeof(ICollection<>),
-            typeof(IReadOnlyCollection<>),
-            typeof(IEnumerable<>)
-        };
-
-        /// <summary>
-        /// Creates a collection instance based on the specified collection type and copies the specified elements into it.
-        /// </summary>
-        /// <param name="source">
-        /// Source to copy from.
-        /// </param>
-        /// <param name="collectionType">
-        /// Target collection type, for example: typeof(List{Article}) or typeof(ISet{Person}).
-        /// </param>
-        public IEnumerable CopyToTypedCollection(IEnumerable source, Type collectionType)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
-            ArgumentGuard.NotNull(collectionType, nameof(collectionType));
-
-            Type concreteCollectionType = ToConcreteCollectionType(collectionType);
-            dynamic concreteCollectionInstance = Activator.CreateInstance(concreteCollectionType)!;
-
-            foreach (object item in source)
-            {
-                concreteCollectionInstance.Add((dynamic)item);
-            }
-
-            return concreteCollectionInstance;
-        }
-
-        /// <summary>
-        /// Returns a compatible collection type that can be instantiated, for example IList{Article} -> List{Article} or ISet{Article} -> HashSet{Article}
-        /// </summary>
-        private Type ToConcreteCollectionType(Type collectionType)
-        {
-            if (collectionType.IsInterface && collectionType.IsGenericType)
-            {
-                Type openCollectionType = collectionType.GetGenericTypeDefinition();
-
-                if (HashSetCompatibleCollectionTypes.Contains(openCollectionType))
-                {
-                    return typeof(HashSet<>).MakeGenericType(collectionType.GenericTypeArguments[0]);
-                }
-
-                if (openCollectionType == typeof(IList<>) || openCollectionType == typeof(IReadOnlyList<>))
-                {
-                    return typeof(List<>).MakeGenericType(collectionType.GenericTypeArguments[0]);
-                }
-            }
-
-            return collectionType;
-        }
-
-        /// <summary>
-        /// Returns a collection that contains zero, one or multiple resources, depending on the specified value.
-        /// </summary>
-        public ICollection<IIdentifiable> ExtractResources(object? value)
-        {
-            if (value is ICollection<IIdentifiable> resourceCollection)
-            {
-                return resourceCollection;
-            }
-
-            if (value is IEnumerable<IIdentifiable> resources)
-            {
-                return resources.ToList();
-            }
-
-            if (value is IIdentifiable resource)
-            {
-                return resource.AsArray();
-            }
-
-            return Array.Empty<IIdentifiable>();
-        }
-
-        /// <summary>
-        /// Returns the element type if the specified type is a generic collection, for example: IList{string} -> string or IList -> null.
-        /// </summary>
-        public Type? FindCollectionElementType(Type? type)
-        {
-            if (type != null)
-            {
-                if (type.IsGenericType && type.GenericTypeArguments.Length == 1)
-                {
-                    if (type.IsOrImplementsInterface<IEnumerable>())
-                    {
-                        return type.GenericTypeArguments[0];
-                    }
-                }
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Indicates whether a <see cref="HashSet{T}" /> instance can be assigned to the specified type, for example IList{Article} -> false or ISet{Article} ->
-        /// true.
-        /// </summary>
-        public bool TypeCanContainHashSet(Type collectionType)
-        {
-            ArgumentGuard.NotNull(collectionType, nameof(collectionType));
-
-            if (collectionType.IsGenericType)
-            {
-                Type openCollectionType = collectionType.GetGenericTypeDefinition();
-                return HashSetCompatibleCollectionTypes.Contains(openCollectionType);
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/CollectionExtensions.cs b/src/JsonApiDotNetCore/CollectionExtensions.cs
index ea3f0dd3a7..a7f5e72ab6 100644
--- a/src/JsonApiDotNetCore/CollectionExtensions.cs
+++ b/src/JsonApiDotNetCore/CollectionExtensions.cs
@@ -1,97 +1,93 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
-using System.Linq;
 
-namespace JsonApiDotNetCore
+namespace JsonApiDotNetCore;
+
+internal static class CollectionExtensions
 {
-    internal static class CollectionExtensions
+    [Pure]
+    public static bool IsNullOrEmpty<T>([NotNullWhen(false)] this IEnumerable<T>? source)
     {
-        [Pure]
-        public static bool IsNullOrEmpty<T>([NotNullWhen(false)] this IEnumerable<T>? source)
+        if (source == null)
         {
-            if (source == null)
-            {
-                return true;
-            }
-
-            return !source.Any();
+            return true;
         }
 
-        public static int FindIndex<T>(this IReadOnlyList<T> source, Predicate<T> match)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
-            ArgumentGuard.NotNull(match, nameof(match));
+        return !source.Any();
+    }
+
+    public static int FindIndex<T>(this IReadOnlyList<T> source, Predicate<T> match)
+    {
+        ArgumentGuard.NotNull(source, nameof(source));
+        ArgumentGuard.NotNull(match, nameof(match));
 
-            for (int index = 0; index < source.Count; index++)
+        for (int index = 0; index < source.Count; index++)
+        {
+            if (match(source[index]))
             {
-                if (match(source[index]))
-                {
-                    return index;
-                }
+                return index;
             }
+        }
 
-            return -1;
+        return -1;
+    }
+
+    public static bool DictionaryEqual<TKey, TValue>(this IReadOnlyDictionary<TKey, TValue>? first, IReadOnlyDictionary<TKey, TValue>? second,
+        IEqualityComparer<TValue>? valueComparer = null)
+    {
+        if (ReferenceEquals(first, second))
+        {
+            return true;
         }
 
-        public static bool DictionaryEqual<TKey, TValue>(this IReadOnlyDictionary<TKey, TValue>? first, IReadOnlyDictionary<TKey, TValue>? second,
-            IEqualityComparer<TValue>? valueComparer = null)
+        if (first == null || second == null)
         {
-            if (ReferenceEquals(first, second))
-            {
-                return true;
-            }
+            return false;
+        }
 
-            if (first == null || second == null)
-            {
-                return false;
-            }
+        if (first.Count != second.Count)
+        {
+            return false;
+        }
+
+        IEqualityComparer<TValue> effectiveValueComparer = valueComparer ?? EqualityComparer<TValue>.Default;
 
-            if (first.Count != second.Count)
+        foreach ((TKey firstKey, TValue firstValue) in first)
+        {
+            if (!second.TryGetValue(firstKey, out TValue? secondValue))
             {
                 return false;
             }
 
-            IEqualityComparer<TValue> effectiveValueComparer = valueComparer ?? EqualityComparer<TValue>.Default;
-
-            foreach ((TKey firstKey, TValue firstValue) in first)
+            if (!effectiveValueComparer.Equals(firstValue, secondValue))
             {
-                if (!second.TryGetValue(firstKey, out TValue? secondValue))
-                {
-                    return false;
-                }
-
-                if (!effectiveValueComparer.Equals(firstValue, secondValue))
-                {
-                    return false;
-                }
+                return false;
             }
-
-            return true;
         }
 
-        public static IEnumerable<T> EmptyIfNull<T>(this IEnumerable<T>? source)
-        {
-            return source ?? Enumerable.Empty<T>();
-        }
+        return true;
+    }
 
-        public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T?> source)
-        {
+    public static IEnumerable<T> EmptyIfNull<T>(this IEnumerable<T>? source)
+    {
+        return source ?? Enumerable.Empty<T>();
+    }
+
+    public static IEnumerable<T> WhereNotNull<T>(this IEnumerable<T?> source)
+    {
 #pragma warning disable AV1250 // Evaluate LINQ query before returning it
-            return source.Where(element => element is not null)!;
+        return source.Where(element => element is not null)!;
 #pragma warning restore AV1250 // Evaluate LINQ query before returning it
-        }
+    }
 
-        public static void AddRange<T>(this ICollection<T> source, IEnumerable<T> itemsToAdd)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
-            ArgumentGuard.NotNull(itemsToAdd, nameof(itemsToAdd));
+    public static void AddRange<T>(this ICollection<T> source, IEnumerable<T> itemsToAdd)
+    {
+        ArgumentGuard.NotNull(source, nameof(source));
+        ArgumentGuard.NotNull(itemsToAdd, nameof(itemsToAdd));
 
-            foreach (T item in itemsToAdd)
-            {
-                source.Add(item);
-            }
+        foreach (T item in itemsToAdd)
+        {
+            source.Add(item);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs b/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs
index 740cbdac0f..a941e27218 100644
--- a/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs
+++ b/src/JsonApiDotNetCore/Configuration/ApplicationBuilderExtensions.cs
@@ -2,47 +2,48 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+public static class ApplicationBuilderExtensions
 {
-    public static class ApplicationBuilderExtensions
+    /// <summary>
+    /// Registers the JsonApiDotNetCore middleware.
+    /// </summary>
+    /// <param name="builder">
+    /// The <see cref="IApplicationBuilder" /> to add the middleware to.
+    /// </param>
+    /// <example>
+    /// The code below is the minimal that is required for proper activation, which should be added to your Startup.Configure method.
+    /// <code><![CDATA[
+    /// app.UseRouting();
+    /// app.UseJsonApi();
+    /// app.UseEndpoints(endpoints => endpoints.MapControllers());
+    /// ]]></code>
+    /// </example>
+    public static void UseJsonApi(this IApplicationBuilder builder)
     {
-        /// <summary>
-        /// Registers the JsonApiDotNetCore middleware.
-        /// </summary>
-        /// <param name="builder">
-        /// The <see cref="IApplicationBuilder" /> to add the middleware to.
-        /// </param>
-        /// <example>
-        /// The code below is the minimal that is required for proper activation, which should be added to your Startup.Configure method.
-        /// <code><![CDATA[
-        /// app.UseRouting();
-        /// app.UseJsonApi();
-        /// app.UseEndpoints(endpoints => endpoints.MapControllers());
-        /// ]]></code>
-        /// </example>
-        public static void UseJsonApi(this IApplicationBuilder builder)
-        {
-            ArgumentGuard.NotNull(builder, nameof(builder));
+        ArgumentGuard.NotNull(builder, nameof(builder));
 
-            using IServiceScope scope = builder.ApplicationServices.GetRequiredService<IServiceScopeFactory>().CreateScope();
+        using (IServiceScope scope = builder.ApplicationServices.CreateScope())
+        {
             var inverseNavigationResolver = scope.ServiceProvider.GetRequiredService<IInverseNavigationResolver>();
             inverseNavigationResolver.Resolve();
+        }
 
-            var jsonApiApplicationBuilder = builder.ApplicationServices.GetRequiredService<IJsonApiApplicationBuilder>();
+        var jsonApiApplicationBuilder = builder.ApplicationServices.GetRequiredService<IJsonApiApplicationBuilder>();
 
-            jsonApiApplicationBuilder.ConfigureMvcOptions = options =>
-            {
-                var inputFormatter = builder.ApplicationServices.GetRequiredService<IJsonApiInputFormatter>();
-                options.InputFormatters.Insert(0, inputFormatter);
+        jsonApiApplicationBuilder.ConfigureMvcOptions = options =>
+        {
+            var inputFormatter = builder.ApplicationServices.GetRequiredService<IJsonApiInputFormatter>();
+            options.InputFormatters.Insert(0, inputFormatter);
 
-                var outputFormatter = builder.ApplicationServices.GetRequiredService<IJsonApiOutputFormatter>();
-                options.OutputFormatters.Insert(0, outputFormatter);
+            var outputFormatter = builder.ApplicationServices.GetRequiredService<IJsonApiOutputFormatter>();
+            options.OutputFormatters.Insert(0, outputFormatter);
 
-                var routingConvention = builder.ApplicationServices.GetRequiredService<IJsonApiRoutingConvention>();
-                options.Conventions.Insert(0, routingConvention);
-            };
+            var routingConvention = builder.ApplicationServices.GetRequiredService<IJsonApiRoutingConvention>();
+            options.Conventions.Insert(0, routingConvention);
+        };
 
-            builder.UseMiddleware<JsonApiMiddleware>();
-        }
+        builder.UseMiddleware<JsonApiMiddleware>();
     }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/IInverseNavigationResolver.cs b/src/JsonApiDotNetCore/Configuration/IInverseNavigationResolver.cs
index aa7c77d6e0..0146386313 100644
--- a/src/JsonApiDotNetCore/Configuration/IInverseNavigationResolver.cs
+++ b/src/JsonApiDotNetCore/Configuration/IInverseNavigationResolver.cs
@@ -1,19 +1,18 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Responsible for populating <see cref="RelationshipAttribute.InverseNavigationProperty" />. This service is instantiated in the configure phase of the
+/// application. When using a data access layer different from Entity Framework Core, you will need to implement and register this service, or set
+/// <see cref="RelationshipAttribute.InverseNavigationProperty" /> explicitly.
+/// </summary>
+[PublicAPI]
+public interface IInverseNavigationResolver
 {
     /// <summary>
-    /// Responsible for populating <see cref="RelationshipAttribute.InverseNavigationProperty" />. This service is instantiated in the configure phase of the
-    /// application. When using a data access layer different from Entity Framework Core, you will need to implement and register this service, or set
-    /// <see cref="RelationshipAttribute.InverseNavigationProperty" /> explicitly.
+    /// This method is called upon startup by JsonApiDotNetCore. It resolves inverse navigations.
     /// </summary>
-    [PublicAPI]
-    public interface IInverseNavigationResolver
-    {
-        /// <summary>
-        /// This method is called upon startup by JsonApiDotNetCore. It resolves inverse navigations.
-        /// </summary>
-        void Resolve();
-    }
+    void Resolve();
 }
diff --git a/src/JsonApiDotNetCore/Configuration/IJsonApiApplicationBuilder.cs b/src/JsonApiDotNetCore/Configuration/IJsonApiApplicationBuilder.cs
index b3f33a1b38..459e5be291 100644
--- a/src/JsonApiDotNetCore/Configuration/IJsonApiApplicationBuilder.cs
+++ b/src/JsonApiDotNetCore/Configuration/IJsonApiApplicationBuilder.cs
@@ -1,10 +1,8 @@
-using System;
 using Microsoft.AspNetCore.Mvc;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+internal interface IJsonApiApplicationBuilder
 {
-    internal interface IJsonApiApplicationBuilder
-    {
-        public Action<MvcOptions>? ConfigureMvcOptions { set; }
-    }
+    public Action<MvcOptions>? ConfigureMvcOptions { set; }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs b/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs
index 15f46e7e79..597d22294d 100644
--- a/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs
+++ b/src/JsonApiDotNetCore/Configuration/IJsonApiOptions.cs
@@ -1,170 +1,168 @@
-using System;
 using System.Data;
 using System.Text.Json;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Global options that configure the behavior of JsonApiDotNetCore.
+/// </summary>
+public interface IJsonApiOptions
 {
     /// <summary>
-    /// Global options that configure the behavior of JsonApiDotNetCore.
-    /// </summary>
-    public interface IJsonApiOptions
-    {
-        /// <summary>
-        /// The URL prefix to use for exposed endpoints.
-        /// </summary>
-        /// <example>
-        /// <code>options.Namespace = "api/v1";</code>
-        /// </example>
-        string? Namespace { get; }
-
-        /// <summary>
-        /// Specifies the default query string capabilities that can be used on exposed JSON:API attributes. Defaults to <see cref="AttrCapabilities.All" />.
-        /// </summary>
-        AttrCapabilities DefaultAttrCapabilities { get; }
-
-        /// <summary>
-        /// Indicates whether responses should contain a jsonapi object that contains the highest JSON:API version supported. False by default.
-        /// </summary>
-        bool IncludeJsonApiVersion { get; }
-
-        /// <summary>
-        /// Whether or not <see cref="Exception" /> stack traces should be included in <see cref="ErrorObject.Meta" />. False by default.
-        /// </summary>
-        bool IncludeExceptionStackTraceInErrors { get; }
-
-        /// <summary>
-        /// Whether or not the request body should be included in <see cref="Document.Meta" /> when it is invalid. False by default.
-        /// </summary>
-        bool IncludeRequestBodyInErrors { get; }
-
-        /// <summary>
-        /// Use relative links for all resources. False by default.
-        /// </summary>
-        /// <example>
-        /// <code>
-        /// options.UseRelativeLinks = true;
-        /// </code>
-        /// <code>
-        /// {
-        ///   "type": "articles",
-        ///   "id": "4309",
-        ///   "relationships": {
-        ///      "author": {
-        ///        "links": {
-        ///          "self": "/api/v1/articles/4309/relationships/author",
-        ///          "related": "/api/v1/articles/4309/author"
-        ///        }
-        ///      }
-        ///   }
-        /// }
-        /// </code>
-        /// </example>
-        bool UseRelativeLinks { get; }
-
-        /// <summary>
-        /// Configures which links to show in the <see cref="Serialization.Objects.TopLevelLinks" /> object. Defaults to <see cref="LinkTypes.All" />. This
-        /// setting can be overruled per resource type by adding <see cref="ResourceLinksAttribute" /> on the class definition of a resource.
-        /// </summary>
-        LinkTypes TopLevelLinks { get; }
-
-        /// <summary>
-        /// Configures which links to show in the <see cref="Serialization.Objects.ResourceLinks" /> object. Defaults to <see cref="LinkTypes.All" />. This
-        /// setting can be overruled per resource type by adding <see cref="ResourceLinksAttribute" /> on the class definition of a resource.
-        /// </summary>
-        LinkTypes ResourceLinks { get; }
-
-        /// <summary>
-        /// Configures which links to show in the <see cref="Serialization.Objects.RelationshipLinks" /> object. Defaults to <see cref="LinkTypes.All" />. This
-        /// setting can be overruled for all relationships per resource type by adding <see cref="ResourceLinksAttribute" /> on the class definition of a
-        /// resource. This can be further overruled per relationship by setting <see cref="RelationshipAttribute.Links" />.
-        /// </summary>
-        LinkTypes RelationshipLinks { get; }
-
-        /// <summary>
-        /// Whether or not the total resource count should be included in top-level meta objects. This requires an additional database query. False by default.
-        /// </summary>
-        bool IncludeTotalResourceCount { get; }
-
-        /// <summary>
-        /// The page size (10 by default) that is used when not specified in query string. Set to <c>null</c> to not use paging by default.
-        /// </summary>
-        PageSize? DefaultPageSize { get; }
-
-        /// <summary>
-        /// The maximum page size that can be used, or <c>null</c> for unconstrained (default).
-        /// </summary>
-        PageSize? MaximumPageSize { get; }
-
-        /// <summary>
-        /// The maximum page number that can be used, or <c>null</c> for unconstrained (default).
-        /// </summary>
-        PageNumber? MaximumPageNumber { get; }
-
-        /// <summary>
-        /// Whether or not to enable ASP.NET ModelState validation. True by default.
-        /// </summary>
-        bool ValidateModelState { get; }
-
-        /// <summary>
-        /// Whether or not clients can provide IDs when creating resources. When not allowed, a 403 Forbidden response is returned if a client attempts to create
-        /// a resource with a defined ID. False by default.
-        /// </summary>
-        bool AllowClientGeneratedIds { get; }
-
-        /// <summary>
-        /// Whether or not to produce an error on unknown query string parameters. False by default.
-        /// </summary>
-        bool AllowUnknownQueryStringParameters { get; }
-
-        /// <summary>
-        /// Whether or not to produce an error on unknown attribute and relationship keys in request bodies. False by default.
-        /// </summary>
-        bool AllowUnknownFieldsInRequestBody { get; }
-
-        /// <summary>
-        /// Determines whether legacy filter notation in query strings, such as =eq:, =like:, and =in: is enabled. False by default.
-        /// </summary>
-        bool EnableLegacyFilterNotation { get; }
-
-        /// <summary>
-        /// Controls how many levels deep includes are allowed to be nested. For example, MaximumIncludeDepth=1 would allow ?include=articles but not
-        /// ?include=articles.revisions. <c>null</c> by default, which means unconstrained.
-        /// </summary>
-        int? MaximumIncludeDepth { get; }
-
-        /// <summary>
-        /// Limits the maximum number of operations allowed per atomic:operations request. Defaults to 10. Set to <c>null</c> for unlimited.
-        /// </summary>
-        int? MaximumOperationsPerRequest { get; }
-
-        /// <summary>
-        /// Enables to override the default isolation level for database transactions, enabling to balance between consistency and performance. Defaults to
-        /// <c>null</c>, which leaves this up to Entity Framework Core to choose (and then it varies per database provider).
-        /// </summary>
-        IsolationLevel? TransactionIsolationLevel { get; }
-
-        /// <summary>
-        /// Enables to customize the settings that are used by the <see cref="JsonSerializer" />.
-        /// </summary>
-        /// <example>
-        /// The next example sets the naming convention to camel casing.
-        /// <code><![CDATA[
-        /// options.SerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
-        /// options.SerializerOptions.DictionaryKeyPolicy = JsonNamingPolicy.CamelCase;
-        /// ]]></code>
-        /// </example>
-        JsonSerializerOptions SerializerOptions { get; }
-
-        /// <summary>
-        /// Gets the settings used for deserializing request bodies. This value is based on <see cref="SerializerOptions" /> and is intended for internal use.
-        /// </summary>
-        JsonSerializerOptions SerializerReadOptions { get; }
-
-        /// <summary>
-        /// Gets the settings used for serializing response bodies. This value is based on <see cref="SerializerOptions" /> and is intended for internal use.
-        /// </summary>
-        JsonSerializerOptions SerializerWriteOptions { get; }
-    }
+    /// The URL prefix to use for exposed endpoints.
+    /// </summary>
+    /// <example>
+    /// <code>options.Namespace = "api/v1";</code>
+    /// </example>
+    string? Namespace { get; }
+
+    /// <summary>
+    /// Specifies the default query string capabilities that can be used on exposed JSON:API attributes. Defaults to <see cref="AttrCapabilities.All" />.
+    /// </summary>
+    AttrCapabilities DefaultAttrCapabilities { get; }
+
+    /// <summary>
+    /// Indicates whether responses should contain a jsonapi object that contains the highest JSON:API version supported. False by default.
+    /// </summary>
+    bool IncludeJsonApiVersion { get; }
+
+    /// <summary>
+    /// Whether or not <see cref="Exception" /> stack traces should be included in <see cref="ErrorObject.Meta" />. False by default.
+    /// </summary>
+    bool IncludeExceptionStackTraceInErrors { get; }
+
+    /// <summary>
+    /// Whether or not the request body should be included in <see cref="Document.Meta" /> when it is invalid. False by default.
+    /// </summary>
+    bool IncludeRequestBodyInErrors { get; }
+
+    /// <summary>
+    /// Use relative links for all resources. False by default.
+    /// </summary>
+    /// <example>
+    /// <code>
+    /// options.UseRelativeLinks = true;
+    /// </code>
+    /// <code>
+    /// {
+    ///   "type": "articles",
+    ///   "id": "4309",
+    ///   "relationships": {
+    ///      "author": {
+    ///        "links": {
+    ///          "self": "/api/v1/articles/4309/relationships/author",
+    ///          "related": "/api/v1/articles/4309/author"
+    ///        }
+    ///      }
+    ///   }
+    /// }
+    /// </code>
+    /// </example>
+    bool UseRelativeLinks { get; }
+
+    /// <summary>
+    /// Configures which links to write in the <see cref="Serialization.Objects.TopLevelLinks" /> object. Defaults to <see cref="LinkTypes.All" />. This
+    /// setting can be overruled per resource type by adding <see cref="ResourceLinksAttribute" /> on the class definition of a resource.
+    /// </summary>
+    LinkTypes TopLevelLinks { get; }
+
+    /// <summary>
+    /// Configures which links to write in the <see cref="Serialization.Objects.ResourceLinks" /> object. Defaults to <see cref="LinkTypes.All" />. This
+    /// setting can be overruled per resource type by adding <see cref="ResourceLinksAttribute" /> on the class definition of a resource.
+    /// </summary>
+    LinkTypes ResourceLinks { get; }
+
+    /// <summary>
+    /// Configures which links to write in the <see cref="Serialization.Objects.RelationshipLinks" /> object. Defaults to <see cref="LinkTypes.All" />. This
+    /// setting can be overruled for all relationships per resource type by adding <see cref="ResourceLinksAttribute" /> on the class definition of a
+    /// resource. This can be further overruled per relationship by setting <see cref="RelationshipAttribute.Links" />.
+    /// </summary>
+    LinkTypes RelationshipLinks { get; }
+
+    /// <summary>
+    /// Whether or not the total resource count should be included in top-level meta objects. This requires an additional database query. False by default.
+    /// </summary>
+    bool IncludeTotalResourceCount { get; }
+
+    /// <summary>
+    /// The page size (10 by default) that is used when not specified in query string. Set to <c>null</c> to not use paging by default.
+    /// </summary>
+    PageSize? DefaultPageSize { get; }
+
+    /// <summary>
+    /// The maximum page size that can be used, or <c>null</c> for unconstrained (default).
+    /// </summary>
+    PageSize? MaximumPageSize { get; }
+
+    /// <summary>
+    /// The maximum page number that can be used, or <c>null</c> for unconstrained (default).
+    /// </summary>
+    PageNumber? MaximumPageNumber { get; }
+
+    /// <summary>
+    /// Whether or not to enable ASP.NET ModelState validation. True by default.
+    /// </summary>
+    bool ValidateModelState { get; }
+
+    /// <summary>
+    /// Whether or not clients can provide IDs when creating resources. When not allowed, a 403 Forbidden response is returned if a client attempts to create
+    /// a resource with a defined ID. False by default.
+    /// </summary>
+    bool AllowClientGeneratedIds { get; }
+
+    /// <summary>
+    /// Whether or not to produce an error on unknown query string parameters. False by default.
+    /// </summary>
+    bool AllowUnknownQueryStringParameters { get; }
+
+    /// <summary>
+    /// Whether or not to produce an error on unknown attribute and relationship keys in request bodies. False by default.
+    /// </summary>
+    bool AllowUnknownFieldsInRequestBody { get; }
+
+    /// <summary>
+    /// Determines whether legacy filter notation in query strings, such as =eq:, =like:, and =in: is enabled. False by default.
+    /// </summary>
+    bool EnableLegacyFilterNotation { get; }
+
+    /// <summary>
+    /// Controls how many levels deep includes are allowed to be nested. For example, MaximumIncludeDepth=1 would allow ?include=articles but not
+    /// ?include=articles.revisions. <c>null</c> by default, which means unconstrained.
+    /// </summary>
+    int? MaximumIncludeDepth { get; }
+
+    /// <summary>
+    /// Limits the maximum number of operations allowed per atomic:operations request. Defaults to 10. Set to <c>null</c> for unlimited.
+    /// </summary>
+    int? MaximumOperationsPerRequest { get; }
+
+    /// <summary>
+    /// Enables to override the default isolation level for database transactions, enabling to balance between consistency and performance. Defaults to
+    /// <c>null</c>, which leaves this up to Entity Framework Core to choose (and then it varies per database provider).
+    /// </summary>
+    IsolationLevel? TransactionIsolationLevel { get; }
+
+    /// <summary>
+    /// Enables to customize the settings that are used by the <see cref="JsonSerializer" />.
+    /// </summary>
+    /// <example>
+    /// The next example sets the naming convention to camel casing.
+    /// <code><![CDATA[
+    /// options.SerializerOptions.PropertyNamingPolicy = JsonNamingPolicy.CamelCase;
+    /// options.SerializerOptions.DictionaryKeyPolicy = JsonNamingPolicy.CamelCase;
+    /// ]]></code>
+    /// </example>
+    JsonSerializerOptions SerializerOptions { get; }
+
+    /// <summary>
+    /// Gets the settings used for deserializing request bodies. This value is based on <see cref="SerializerOptions" /> and is intended for internal use.
+    /// </summary>
+    JsonSerializerOptions SerializerReadOptions { get; }
+
+    /// <summary>
+    /// Gets the settings used for serializing response bodies. This value is based on <see cref="SerializerOptions" /> and is intended for internal use.
+    /// </summary>
+    JsonSerializerOptions SerializerWriteOptions { get; }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/IResourceGraph.cs b/src/JsonApiDotNetCore/Configuration/IResourceGraph.cs
index 89684e5d86..9ccce6c60a 100644
--- a/src/JsonApiDotNetCore/Configuration/IResourceGraph.cs
+++ b/src/JsonApiDotNetCore/Configuration/IResourceGraph.cs
@@ -1,90 +1,87 @@
-using System;
-using System.Collections.Generic;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Metadata about the shape of JSON:API resources that your API serves and the relationships between them. The resource graph is built at application
+/// startup and is exposed as a singleton through Dependency Injection.
+/// </summary>
+[PublicAPI]
+public interface IResourceGraph
 {
     /// <summary>
-    /// Metadata about the shape of JSON:API resources that your API serves and the relationships between them. The resource graph is built at application
-    /// startup and is exposed as a singleton through Dependency Injection.
+    /// Gets the metadata for all registered resources.
     /// </summary>
-    [PublicAPI]
-    public interface IResourceGraph
-    {
-        /// <summary>
-        /// Gets the metadata for all registered resources.
-        /// </summary>
-        IReadOnlySet<ResourceType> GetResourceTypes();
+    IReadOnlySet<ResourceType> GetResourceTypes();
 
-        /// <summary>
-        /// Gets the metadata for the resource that is publicly exposed by the specified name. Throws an <see cref="InvalidOperationException" /> when not found.
-        /// </summary>
-        ResourceType GetResourceType(string publicName);
+    /// <summary>
+    /// Gets the metadata for the resource that is publicly exposed by the specified name. Throws an <see cref="InvalidOperationException" /> when not found.
+    /// </summary>
+    ResourceType GetResourceType(string publicName);
 
-        /// <summary>
-        /// Gets the metadata for the resource of the specified CLR type. Throws an <see cref="InvalidOperationException" /> when not found.
-        /// </summary>
-        ResourceType GetResourceType(Type resourceClrType);
+    /// <summary>
+    /// Gets the metadata for the resource of the specified CLR type. Throws an <see cref="InvalidOperationException" /> when not found.
+    /// </summary>
+    ResourceType GetResourceType(Type resourceClrType);
 
-        /// <summary>
-        /// Gets the metadata for the resource of the specified CLR type. Throws an <see cref="InvalidOperationException" /> when not found.
-        /// </summary>
-        ResourceType GetResourceType<TResource>()
-            where TResource : class, IIdentifiable;
+    /// <summary>
+    /// Gets the metadata for the resource of the specified CLR type. Throws an <see cref="InvalidOperationException" /> when not found.
+    /// </summary>
+    ResourceType GetResourceType<TResource>()
+        where TResource : class, IIdentifiable;
 
-        /// <summary>
-        /// Attempts to get the metadata for the resource that is publicly exposed by the specified name. Returns <c>null</c> when not found.
-        /// </summary>
-        ResourceType? FindResourceType(string publicName);
+    /// <summary>
+    /// Attempts to get the metadata for the resource that is publicly exposed by the specified name. Returns <c>null</c> when not found.
+    /// </summary>
+    ResourceType? FindResourceType(string publicName);
 
-        /// <summary>
-        /// Attempts to get metadata for the resource of the specified CLR type. Returns <c>null</c> when not found.
-        /// </summary>
-        ResourceType? FindResourceType(Type resourceClrType);
+    /// <summary>
+    /// Attempts to get metadata for the resource of the specified CLR type. Returns <c>null</c> when not found.
+    /// </summary>
+    ResourceType? FindResourceType(Type resourceClrType);
 
-        /// <summary>
-        /// Gets the fields (attributes and relationships) for <typeparamref name="TResource" /> that are targeted by the selector.
-        /// </summary>
-        /// <typeparam name="TResource">
-        /// The resource CLR type for which to retrieve fields.
-        /// </typeparam>
-        /// <param name="selector">
-        /// Should be of the form: <![CDATA[
-        /// (TResource resource) => new { resource.Attribute1, resource.Relationship2 }
-        /// ]]>
-        /// </param>
-        IReadOnlyCollection<ResourceFieldAttribute> GetFields<TResource>(Expression<Func<TResource, dynamic?>> selector)
-            where TResource : class, IIdentifiable;
+    /// <summary>
+    /// Gets the fields (attributes and relationships) for <typeparamref name="TResource" /> that are targeted by the selector.
+    /// </summary>
+    /// <typeparam name="TResource">
+    /// The resource CLR type for which to retrieve fields.
+    /// </typeparam>
+    /// <param name="selector">
+    /// Should be of the form: <![CDATA[
+    /// (TResource resource) => new { resource.Attribute1, resource.Relationship2 }
+    /// ]]>
+    /// </param>
+    IReadOnlyCollection<ResourceFieldAttribute> GetFields<TResource>(Expression<Func<TResource, dynamic?>> selector)
+        where TResource : class, IIdentifiable;
 
-        /// <summary>
-        /// Gets the attributes for <typeparamref name="TResource" /> that are targeted by the selector.
-        /// </summary>
-        /// <typeparam name="TResource">
-        /// The resource CLR type for which to retrieve attributes.
-        /// </typeparam>
-        /// <param name="selector">
-        /// Should be of the form: <![CDATA[
-        /// (TResource resource) => new { resource.attribute1, resource.Attribute2 }
-        /// ]]>
-        /// </param>
-        IReadOnlyCollection<AttrAttribute> GetAttributes<TResource>(Expression<Func<TResource, dynamic?>> selector)
-            where TResource : class, IIdentifiable;
+    /// <summary>
+    /// Gets the attributes for <typeparamref name="TResource" /> that are targeted by the selector.
+    /// </summary>
+    /// <typeparam name="TResource">
+    /// The resource CLR type for which to retrieve attributes.
+    /// </typeparam>
+    /// <param name="selector">
+    /// Should be of the form: <![CDATA[
+    /// (TResource resource) => new { resource.attribute1, resource.Attribute2 }
+    /// ]]>
+    /// </param>
+    IReadOnlyCollection<AttrAttribute> GetAttributes<TResource>(Expression<Func<TResource, dynamic?>> selector)
+        where TResource : class, IIdentifiable;
 
-        /// <summary>
-        /// Gets the relationships for <typeparamref name="TResource" /> that are targeted by the selector.
-        /// </summary>
-        /// <typeparam name="TResource">
-        /// The resource CLR type for which to retrieve relationships.
-        /// </typeparam>
-        /// <param name="selector">
-        /// Should be of the form: <![CDATA[
-        /// (TResource resource) => new { resource.Relationship1, resource.Relationship2 }
-        /// ]]>
-        /// </param>
-        IReadOnlyCollection<RelationshipAttribute> GetRelationships<TResource>(Expression<Func<TResource, dynamic?>> selector)
-            where TResource : class, IIdentifiable;
-    }
+    /// <summary>
+    /// Gets the relationships for <typeparamref name="TResource" /> that are targeted by the selector.
+    /// </summary>
+    /// <typeparam name="TResource">
+    /// The resource CLR type for which to retrieve relationships.
+    /// </typeparam>
+    /// <param name="selector">
+    /// Should be of the form: <![CDATA[
+    /// (TResource resource) => new { resource.Relationship1, resource.Relationship2 }
+    /// ]]>
+    /// </param>
+    IReadOnlyCollection<RelationshipAttribute> GetRelationships<TResource>(Expression<Func<TResource, dynamic?>> selector)
+        where TResource : class, IIdentifiable;
 }
diff --git a/src/JsonApiDotNetCore/Configuration/InverseNavigationResolver.cs b/src/JsonApiDotNetCore/Configuration/InverseNavigationResolver.cs
index 58d0919984..8e5f3f15a3 100644
--- a/src/JsonApiDotNetCore/Configuration/InverseNavigationResolver.cs
+++ b/src/JsonApiDotNetCore/Configuration/InverseNavigationResolver.cs
@@ -1,73 +1,70 @@
-using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Repositories;
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+/// <inheritdoc />
+[PublicAPI]
+public sealed class InverseNavigationResolver : IInverseNavigationResolver
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public sealed class InverseNavigationResolver : IInverseNavigationResolver
-    {
-        private readonly IResourceGraph _resourceGraph;
-        private readonly IEnumerable<IDbContextResolver> _dbContextResolvers;
+    private readonly IResourceGraph _resourceGraph;
+    private readonly IEnumerable<IDbContextResolver> _dbContextResolvers;
 
-        public InverseNavigationResolver(IResourceGraph resourceGraph, IEnumerable<IDbContextResolver> dbContextResolvers)
-        {
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-            ArgumentGuard.NotNull(dbContextResolvers, nameof(dbContextResolvers));
+    public InverseNavigationResolver(IResourceGraph resourceGraph, IEnumerable<IDbContextResolver> dbContextResolvers)
+    {
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        ArgumentGuard.NotNull(dbContextResolvers, nameof(dbContextResolvers));
 
-            _resourceGraph = resourceGraph;
-            _dbContextResolvers = dbContextResolvers;
-        }
+        _resourceGraph = resourceGraph;
+        _dbContextResolvers = dbContextResolvers;
+    }
 
-        /// <inheritdoc />
-        public void Resolve()
+    /// <inheritdoc />
+    public void Resolve()
+    {
+        foreach (IDbContextResolver dbContextResolver in _dbContextResolvers)
         {
-            foreach (IDbContextResolver dbContextResolver in _dbContextResolvers)
-            {
-                DbContext dbContext = dbContextResolver.GetContext();
-                Resolve(dbContext);
-            }
+            DbContext dbContext = dbContextResolver.GetContext();
+            Resolve(dbContext);
         }
+    }
 
-        private void Resolve(DbContext dbContext)
+    private void Resolve(DbContext dbContext)
+    {
+        foreach (ResourceType resourceType in _resourceGraph.GetResourceTypes().Where(resourceType => resourceType.Relationships.Any()))
         {
-            foreach (ResourceType resourceType in _resourceGraph.GetResourceTypes().Where(resourceType => resourceType.Relationships.Any()))
-            {
-                IEntityType? entityType = dbContext.Model.FindEntityType(resourceType.ClrType);
+            IEntityType? entityType = dbContext.Model.FindEntityType(resourceType.ClrType);
 
-                if (entityType != null)
-                {
-                    IDictionary<string, INavigationBase> navigationMap = GetNavigations(entityType);
-                    ResolveRelationships(resourceType.Relationships, navigationMap);
-                }
+            if (entityType != null)
+            {
+                IDictionary<string, INavigationBase> navigationMap = GetNavigations(entityType);
+                ResolveRelationships(resourceType.Relationships, navigationMap);
             }
         }
+    }
 
-        private static IDictionary<string, INavigationBase> GetNavigations(IEntityType entityType)
-        {
-            // @formatter:wrap_chained_method_calls chop_always
+    private static IDictionary<string, INavigationBase> GetNavigations(IEntityType entityType)
+    {
+        // @formatter:wrap_chained_method_calls chop_always
 
-            return entityType.GetNavigations()
-                .Cast<INavigationBase>()
-                .Concat(entityType.GetSkipNavigations())
-                .ToDictionary(navigation => navigation.Name);
+        return entityType.GetNavigations()
+            .Cast<INavigationBase>()
+            .Concat(entityType.GetSkipNavigations())
+            .ToDictionary(navigation => navigation.Name);
 
-            // @formatter:wrap_chained_method_calls restore
-        }
+        // @formatter:wrap_chained_method_calls restore
+    }
 
-        private void ResolveRelationships(IReadOnlyCollection<RelationshipAttribute> relationships, IDictionary<string, INavigationBase> navigationMap)
+    private void ResolveRelationships(IReadOnlyCollection<RelationshipAttribute> relationships, IDictionary<string, INavigationBase> navigationMap)
+    {
+        foreach (RelationshipAttribute relationship in relationships)
         {
-            foreach (RelationshipAttribute relationship in relationships)
+            if (navigationMap.TryGetValue(relationship.Property.Name, out INavigationBase? navigation))
             {
-                if (navigationMap.TryGetValue(relationship.Property.Name, out INavigationBase? navigation))
-                {
-                    relationship.InverseNavigationProperty = navigation.Inverse?.PropertyInfo;
-                }
+                relationship.InverseNavigationProperty = navigation.Inverse?.PropertyInfo;
             }
         }
     }
diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs b/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs
index 8bc921af78..7cd4307ad1 100644
--- a/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs
+++ b/src/JsonApiDotNetCore/Configuration/JsonApiApplicationBuilder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using JsonApiDotNetCore.AtomicOperations;
 using JsonApiDotNetCore.AtomicOperations.Processors;
 using JsonApiDotNetCore.Middleware;
@@ -23,266 +20,265 @@
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// A utility class that builds a JsonApi application. It registers all required services and allows the user to override parts of the startup
+/// configuration.
+/// </summary>
+internal sealed class JsonApiApplicationBuilder : IJsonApiApplicationBuilder, IDisposable
 {
-    /// <summary>
-    /// A utility class that builds a JsonApi application. It registers all required services and allows the user to override parts of the startup
-    /// configuration.
-    /// </summary>
-    internal sealed class JsonApiApplicationBuilder : IJsonApiApplicationBuilder, IDisposable
-    {
-        private readonly JsonApiOptions _options = new();
-        private readonly IServiceCollection _services;
-        private readonly IMvcCoreBuilder _mvcBuilder;
-        private readonly ResourceGraphBuilder _resourceGraphBuilder;
-        private readonly ServiceDiscoveryFacade _serviceDiscoveryFacade;
-        private readonly ServiceProvider _intermediateProvider;
+    private readonly JsonApiOptions _options = new();
+    private readonly IServiceCollection _services;
+    private readonly IMvcCoreBuilder _mvcBuilder;
+    private readonly ResourceGraphBuilder _resourceGraphBuilder;
+    private readonly ServiceDiscoveryFacade _serviceDiscoveryFacade;
+    private readonly ServiceProvider _intermediateProvider;
 
-        public Action<MvcOptions>? ConfigureMvcOptions { get; set; }
+    public Action<MvcOptions>? ConfigureMvcOptions { get; set; }
 
-        public JsonApiApplicationBuilder(IServiceCollection services, IMvcCoreBuilder mvcBuilder)
-        {
-            ArgumentGuard.NotNull(services, nameof(services));
-            ArgumentGuard.NotNull(mvcBuilder, nameof(mvcBuilder));
+    public JsonApiApplicationBuilder(IServiceCollection services, IMvcCoreBuilder mvcBuilder)
+    {
+        ArgumentGuard.NotNull(services, nameof(services));
+        ArgumentGuard.NotNull(mvcBuilder, nameof(mvcBuilder));
 
-            _services = services;
-            _mvcBuilder = mvcBuilder;
-            _intermediateProvider = services.BuildServiceProvider();
+        _services = services;
+        _mvcBuilder = mvcBuilder;
+        _intermediateProvider = services.BuildServiceProvider();
 
-            var loggerFactory = _intermediateProvider.GetRequiredService<ILoggerFactory>();
+        var loggerFactory = _intermediateProvider.GetRequiredService<ILoggerFactory>();
 
-            _resourceGraphBuilder = new ResourceGraphBuilder(_options, loggerFactory);
-            _serviceDiscoveryFacade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, loggerFactory);
-        }
+        _resourceGraphBuilder = new ResourceGraphBuilder(_options, loggerFactory);
+        _serviceDiscoveryFacade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, loggerFactory);
+    }
 
-        /// <summary>
-        /// Executes the action provided by the user to configure <see cref="JsonApiOptions" />.
-        /// </summary>
-        public void ConfigureJsonApiOptions(Action<JsonApiOptions>? configureOptions)
-        {
-            configureOptions?.Invoke(_options);
-        }
+    /// <summary>
+    /// Executes the action provided by the user to configure <see cref="JsonApiOptions" />.
+    /// </summary>
+    public void ConfigureJsonApiOptions(Action<JsonApiOptions>? configureOptions)
+    {
+        configureOptions?.Invoke(_options);
+    }
 
-        /// <summary>
-        /// Executes the action provided by the user to configure <see cref="ServiceDiscoveryFacade" />.
-        /// </summary>
-        public void ConfigureAutoDiscovery(Action<ServiceDiscoveryFacade>? configureAutoDiscovery)
-        {
-            configureAutoDiscovery?.Invoke(_serviceDiscoveryFacade);
-        }
+    /// <summary>
+    /// Executes the action provided by the user to configure <see cref="ServiceDiscoveryFacade" />.
+    /// </summary>
+    public void ConfigureAutoDiscovery(Action<ServiceDiscoveryFacade>? configureAutoDiscovery)
+    {
+        configureAutoDiscovery?.Invoke(_serviceDiscoveryFacade);
+    }
 
-        /// <summary>
-        /// Configures and builds the resource graph with resources from the provided sources and adds it to the DI container.
-        /// </summary>
-        public void ConfigureResourceGraph(ICollection<Type> dbContextTypes, Action<ResourceGraphBuilder>? configureResourceGraph)
-        {
-            ArgumentGuard.NotNull(dbContextTypes, nameof(dbContextTypes));
+    /// <summary>
+    /// Configures and builds the resource graph with resources from the provided sources and adds it to the DI container.
+    /// </summary>
+    public void ConfigureResourceGraph(ICollection<Type> dbContextTypes, Action<ResourceGraphBuilder>? configureResourceGraph)
+    {
+        ArgumentGuard.NotNull(dbContextTypes, nameof(dbContextTypes));
 
-            _serviceDiscoveryFacade.DiscoverResources();
+        _serviceDiscoveryFacade.DiscoverResources();
 
-            foreach (Type dbContextType in dbContextTypes)
-            {
-                var dbContext = (DbContext)_intermediateProvider.GetRequiredService(dbContextType);
-                _resourceGraphBuilder.Add(dbContext);
-            }
+        foreach (Type dbContextType in dbContextTypes)
+        {
+            var dbContext = (DbContext)_intermediateProvider.GetRequiredService(dbContextType);
+            _resourceGraphBuilder.Add(dbContext);
+        }
 
-            configureResourceGraph?.Invoke(_resourceGraphBuilder);
+        configureResourceGraph?.Invoke(_resourceGraphBuilder);
 
-            IResourceGraph resourceGraph = _resourceGraphBuilder.Build();
+        IResourceGraph resourceGraph = _resourceGraphBuilder.Build();
 
-            _options.SerializerOptions.Converters.Add(new ResourceObjectConverter(resourceGraph));
+        _options.SerializerOptions.Converters.Add(new ResourceObjectConverter(resourceGraph));
 
-            _services.AddSingleton(resourceGraph);
-        }
+        _services.AddSingleton(resourceGraph);
+    }
 
-        /// <summary>
-        /// Configures built-in ASP.NET MVC components. Most of this configuration can be adjusted for the developers' need.
-        /// </summary>
-        public void ConfigureMvc()
+    /// <summary>
+    /// Configures built-in ASP.NET MVC components. Most of this configuration can be adjusted for the developers' need.
+    /// </summary>
+    public void ConfigureMvc()
+    {
+        _mvcBuilder.AddMvcOptions(options =>
         {
-            _mvcBuilder.AddMvcOptions(options =>
-            {
-                options.EnableEndpointRouting = true;
-                options.Filters.AddService<IAsyncJsonApiExceptionFilter>();
-                options.Filters.AddService<IAsyncQueryStringActionFilter>();
-                options.Filters.AddService<IAsyncConvertEmptyActionResultFilter>();
-                ConfigureMvcOptions?.Invoke(options);
-            });
-
-            if (_options.ValidateModelState)
-            {
-                _mvcBuilder.AddDataAnnotations();
-                _services.AddSingleton<IModelMetadataProvider, JsonApiModelMetadataProvider>();
-            }
-        }
-
-        /// <summary>
-        /// Discovers DI registrable services in the assemblies marked for discovery.
-        /// </summary>
-        public void DiscoverInjectables()
+            options.EnableEndpointRouting = true;
+            options.Filters.AddService<IAsyncJsonApiExceptionFilter>();
+            options.Filters.AddService<IAsyncQueryStringActionFilter>();
+            options.Filters.AddService<IAsyncConvertEmptyActionResultFilter>();
+            ConfigureMvcOptions?.Invoke(options);
+        });
+
+        if (_options.ValidateModelState)
         {
-            _serviceDiscoveryFacade.DiscoverInjectables();
+            _mvcBuilder.AddDataAnnotations();
+            _services.AddSingleton<IModelMetadataProvider, JsonApiModelMetadataProvider>();
         }
+    }
 
-        /// <summary>
-        /// Registers the remaining internals.
-        /// </summary>
-        public void ConfigureServiceContainer(ICollection<Type> dbContextTypes)
-        {
-            ArgumentGuard.NotNull(dbContextTypes, nameof(dbContextTypes));
+    /// <summary>
+    /// Discovers DI registrable services in the assemblies marked for discovery.
+    /// </summary>
+    public void DiscoverInjectables()
+    {
+        _serviceDiscoveryFacade.DiscoverInjectables();
+    }
 
-            if (dbContextTypes.Any())
-            {
-                _services.AddScoped(typeof(DbContextResolver<>));
+    /// <summary>
+    /// Registers the remaining internals.
+    /// </summary>
+    public void ConfigureServiceContainer(ICollection<Type> dbContextTypes)
+    {
+        ArgumentGuard.NotNull(dbContextTypes, nameof(dbContextTypes));
 
-                foreach (Type dbContextType in dbContextTypes)
-                {
-                    Type dbContextResolverType = typeof(DbContextResolver<>).MakeGenericType(dbContextType);
-                    _services.AddScoped(typeof(IDbContextResolver), dbContextResolverType);
-                }
+        if (dbContextTypes.Any())
+        {
+            _services.AddScoped(typeof(DbContextResolver<>));
 
-                _services.AddScoped<IOperationsTransactionFactory, EntityFrameworkCoreTransactionFactory>();
-            }
-            else
+            foreach (Type dbContextType in dbContextTypes)
             {
-                _services.AddScoped<IOperationsTransactionFactory, MissingTransactionFactory>();
+                Type dbContextResolverClosedType = typeof(DbContextResolver<>).MakeGenericType(dbContextType);
+                _services.AddScoped(typeof(IDbContextResolver), dbContextResolverClosedType);
             }
 
-            AddResourceLayer();
-            AddRepositoryLayer();
-            AddServiceLayer();
-            AddMiddlewareLayer();
-            AddSerializationLayer();
-            AddQueryStringLayer();
-            AddOperationsLayer();
-
-            _services.AddScoped(typeof(IResourceChangeTracker<>), typeof(ResourceChangeTracker<>));
-            _services.AddScoped<IPaginationContext, PaginationContext>();
-            _services.AddScoped<IEvaluatedIncludeCache, EvaluatedIncludeCache>();
-            _services.AddScoped<ISparseFieldSetCache, SparseFieldSetCache>();
-            _services.AddScoped<IQueryLayerComposer, QueryLayerComposer>();
-            _services.AddScoped<IInverseNavigationResolver, InverseNavigationResolver>();
+            _services.AddScoped<IOperationsTransactionFactory, EntityFrameworkCoreTransactionFactory>();
         }
-
-        private void AddMiddlewareLayer()
+        else
         {
-            _services.AddSingleton<IJsonApiOptions>(_options);
-            _services.AddSingleton<IJsonApiApplicationBuilder>(this);
-            _services.AddSingleton<IExceptionHandler, ExceptionHandler>();
-            _services.AddScoped<IAsyncJsonApiExceptionFilter, AsyncJsonApiExceptionFilter>();
-            _services.AddScoped<IAsyncQueryStringActionFilter, AsyncQueryStringActionFilter>();
-            _services.AddScoped<IAsyncConvertEmptyActionResultFilter, AsyncConvertEmptyActionResultFilter>();
-            _services.AddSingleton<IJsonApiInputFormatter, JsonApiInputFormatter>();
-            _services.AddSingleton<IJsonApiOutputFormatter, JsonApiOutputFormatter>();
-            _services.AddSingleton<IJsonApiRoutingConvention, JsonApiRoutingConvention>();
-            _services.AddSingleton<IControllerResourceMapping>(sp => sp.GetRequiredService<IJsonApiRoutingConvention>());
-            _services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-            _services.AddScoped<IJsonApiRequest, JsonApiRequest>();
-            _services.AddScoped<IJsonApiWriter, JsonApiWriter>();
-            _services.AddScoped<IJsonApiReader, JsonApiReader>();
-            _services.AddScoped<ITargetedFields, TargetedFields>();
+            _services.AddScoped<IOperationsTransactionFactory, MissingTransactionFactory>();
         }
 
-        private void AddResourceLayer()
-        {
-            RegisterImplementationForOpenInterfaces(ServiceDiscoveryFacade.ResourceDefinitionInterfaces, typeof(JsonApiResourceDefinition<,>));
+        AddResourceLayer();
+        AddRepositoryLayer();
+        AddServiceLayer();
+        AddMiddlewareLayer();
+        AddSerializationLayer();
+        AddQueryStringLayer();
+        AddOperationsLayer();
+
+        _services.AddScoped(typeof(IResourceChangeTracker<>), typeof(ResourceChangeTracker<>));
+        _services.AddScoped<IPaginationContext, PaginationContext>();
+        _services.AddScoped<IEvaluatedIncludeCache, EvaluatedIncludeCache>();
+        _services.AddScoped<ISparseFieldSetCache, SparseFieldSetCache>();
+        _services.AddScoped<IQueryLayerComposer, QueryLayerComposer>();
+        _services.AddScoped<IInverseNavigationResolver, InverseNavigationResolver>();
+    }
 
-            _services.AddScoped<IResourceDefinitionAccessor, ResourceDefinitionAccessor>();
-            _services.AddScoped<IResourceFactory, ResourceFactory>();
-        }
+    private void AddMiddlewareLayer()
+    {
+        _services.AddSingleton<IJsonApiOptions>(_options);
+        _services.AddSingleton<IJsonApiApplicationBuilder>(this);
+        _services.AddSingleton<IExceptionHandler, ExceptionHandler>();
+        _services.AddScoped<IAsyncJsonApiExceptionFilter, AsyncJsonApiExceptionFilter>();
+        _services.AddScoped<IAsyncQueryStringActionFilter, AsyncQueryStringActionFilter>();
+        _services.AddScoped<IAsyncConvertEmptyActionResultFilter, AsyncConvertEmptyActionResultFilter>();
+        _services.AddSingleton<IJsonApiInputFormatter, JsonApiInputFormatter>();
+        _services.AddSingleton<IJsonApiOutputFormatter, JsonApiOutputFormatter>();
+        _services.AddSingleton<IJsonApiRoutingConvention, JsonApiRoutingConvention>();
+        _services.AddSingleton<IControllerResourceMapping>(sp => sp.GetRequiredService<IJsonApiRoutingConvention>());
+        _services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+        _services.AddScoped<IJsonApiRequest, JsonApiRequest>();
+        _services.AddScoped<IJsonApiWriter, JsonApiWriter>();
+        _services.AddScoped<IJsonApiReader, JsonApiReader>();
+        _services.AddScoped<ITargetedFields, TargetedFields>();
+    }
 
-        private void AddRepositoryLayer()
-        {
-            RegisterImplementationForOpenInterfaces(ServiceDiscoveryFacade.RepositoryInterfaces, typeof(EntityFrameworkCoreRepository<,>));
+    private void AddResourceLayer()
+    {
+        RegisterImplementationForInterfaces(ServiceDiscoveryFacade.ResourceDefinitionUnboundInterfaces, typeof(JsonApiResourceDefinition<,>));
 
-            _services.AddScoped<IResourceRepositoryAccessor, ResourceRepositoryAccessor>();
-        }
+        _services.AddScoped<IResourceDefinitionAccessor, ResourceDefinitionAccessor>();
+        _services.AddScoped<IResourceFactory, ResourceFactory>();
+    }
 
-        private void AddServiceLayer()
-        {
-            RegisterImplementationForOpenInterfaces(ServiceDiscoveryFacade.ServiceInterfaces, typeof(JsonApiResourceService<,>));
-        }
+    private void AddRepositoryLayer()
+    {
+        RegisterImplementationForInterfaces(ServiceDiscoveryFacade.RepositoryUnboundInterfaces, typeof(EntityFrameworkCoreRepository<,>));
 
-        private void RegisterImplementationForOpenInterfaces(HashSet<Type> openGenericInterfaces, Type implementationType)
-        {
-            foreach (Type openGenericInterface in openGenericInterfaces)
-            {
-                _services.TryAddScoped(openGenericInterface, implementationType);
-            }
-        }
+        _services.AddScoped<IResourceRepositoryAccessor, ResourceRepositoryAccessor>();
+    }
 
-        private void AddQueryStringLayer()
-        {
-            _services.AddScoped<IIncludeQueryStringParameterReader, IncludeQueryStringParameterReader>();
-            _services.AddScoped<IFilterQueryStringParameterReader, FilterQueryStringParameterReader>();
-            _services.AddScoped<ISortQueryStringParameterReader, SortQueryStringParameterReader>();
-            _services.AddScoped<ISparseFieldSetQueryStringParameterReader, SparseFieldSetQueryStringParameterReader>();
-            _services.AddScoped<IPaginationQueryStringParameterReader, PaginationQueryStringParameterReader>();
-            _services.AddScoped<IResourceDefinitionQueryableParameterReader, ResourceDefinitionQueryableParameterReader>();
-
-            RegisterDependentService<IQueryStringParameterReader, IIncludeQueryStringParameterReader>();
-            RegisterDependentService<IQueryStringParameterReader, IFilterQueryStringParameterReader>();
-            RegisterDependentService<IQueryStringParameterReader, ISortQueryStringParameterReader>();
-            RegisterDependentService<IQueryStringParameterReader, ISparseFieldSetQueryStringParameterReader>();
-            RegisterDependentService<IQueryStringParameterReader, IPaginationQueryStringParameterReader>();
-            RegisterDependentService<IQueryStringParameterReader, IResourceDefinitionQueryableParameterReader>();
-
-            RegisterDependentService<IQueryConstraintProvider, IIncludeQueryStringParameterReader>();
-            RegisterDependentService<IQueryConstraintProvider, IFilterQueryStringParameterReader>();
-            RegisterDependentService<IQueryConstraintProvider, ISortQueryStringParameterReader>();
-            RegisterDependentService<IQueryConstraintProvider, ISparseFieldSetQueryStringParameterReader>();
-            RegisterDependentService<IQueryConstraintProvider, IPaginationQueryStringParameterReader>();
-            RegisterDependentService<IQueryConstraintProvider, IResourceDefinitionQueryableParameterReader>();
-
-            _services.AddScoped<IQueryStringReader, QueryStringReader>();
-            _services.AddSingleton<IRequestQueryStringAccessor, RequestQueryStringAccessor>();
-        }
+    private void AddServiceLayer()
+    {
+        RegisterImplementationForInterfaces(ServiceDiscoveryFacade.ServiceUnboundInterfaces, typeof(JsonApiResourceService<,>));
+    }
 
-        private void RegisterDependentService<TCollectionElement, TElementToAdd>()
-            where TCollectionElement : class
-            where TElementToAdd : TCollectionElement
+    private void RegisterImplementationForInterfaces(HashSet<Type> unboundInterfaces, Type unboundImplementationType)
+    {
+        foreach (Type unboundInterface in unboundInterfaces)
         {
-            _services.AddScoped<TCollectionElement>(serviceProvider => serviceProvider.GetRequiredService<TElementToAdd>());
+            _services.TryAddScoped(unboundInterface, unboundImplementationType);
         }
+    }
 
-        private void AddSerializationLayer()
-        {
-            _services.AddScoped<IResourceIdentifierObjectAdapter, ResourceIdentifierObjectAdapter>();
-            _services.AddScoped<IRelationshipDataAdapter, RelationshipDataAdapter>();
-            _services.AddScoped<IResourceObjectAdapter, ResourceObjectAdapter>();
-            _services.AddScoped<IResourceDataAdapter, ResourceDataAdapter>();
-            _services.AddScoped<IAtomicReferenceAdapter, AtomicReferenceAdapter>();
-            _services.AddScoped<IResourceDataInOperationsRequestAdapter, ResourceDataInOperationsRequestAdapter>();
-            _services.AddScoped<IAtomicOperationObjectAdapter, AtomicOperationObjectAdapter>();
-            _services.AddScoped<IDocumentInResourceOrRelationshipRequestAdapter, DocumentInResourceOrRelationshipRequestAdapter>();
-            _services.AddScoped<IDocumentInOperationsRequestAdapter, DocumentInOperationsRequestAdapter>();
-            _services.AddScoped<IDocumentAdapter, DocumentAdapter>();
-
-            _services.AddScoped<ILinkBuilder, LinkBuilder>();
-            _services.AddScoped<IResponseMeta, EmptyResponseMeta>();
-            _services.AddScoped<IMetaBuilder, MetaBuilder>();
-            _services.AddSingleton<IFingerprintGenerator, FingerprintGenerator>();
-            _services.AddSingleton<IETagGenerator, ETagGenerator>();
-            _services.AddScoped<IResponseModelAdapter, ResponseModelAdapter>();
-        }
+    private void AddQueryStringLayer()
+    {
+        _services.AddScoped<IIncludeQueryStringParameterReader, IncludeQueryStringParameterReader>();
+        _services.AddScoped<IFilterQueryStringParameterReader, FilterQueryStringParameterReader>();
+        _services.AddScoped<ISortQueryStringParameterReader, SortQueryStringParameterReader>();
+        _services.AddScoped<ISparseFieldSetQueryStringParameterReader, SparseFieldSetQueryStringParameterReader>();
+        _services.AddScoped<IPaginationQueryStringParameterReader, PaginationQueryStringParameterReader>();
+        _services.AddScoped<IResourceDefinitionQueryableParameterReader, ResourceDefinitionQueryableParameterReader>();
+
+        RegisterDependentService<IQueryStringParameterReader, IIncludeQueryStringParameterReader>();
+        RegisterDependentService<IQueryStringParameterReader, IFilterQueryStringParameterReader>();
+        RegisterDependentService<IQueryStringParameterReader, ISortQueryStringParameterReader>();
+        RegisterDependentService<IQueryStringParameterReader, ISparseFieldSetQueryStringParameterReader>();
+        RegisterDependentService<IQueryStringParameterReader, IPaginationQueryStringParameterReader>();
+        RegisterDependentService<IQueryStringParameterReader, IResourceDefinitionQueryableParameterReader>();
+
+        RegisterDependentService<IQueryConstraintProvider, IIncludeQueryStringParameterReader>();
+        RegisterDependentService<IQueryConstraintProvider, IFilterQueryStringParameterReader>();
+        RegisterDependentService<IQueryConstraintProvider, ISortQueryStringParameterReader>();
+        RegisterDependentService<IQueryConstraintProvider, ISparseFieldSetQueryStringParameterReader>();
+        RegisterDependentService<IQueryConstraintProvider, IPaginationQueryStringParameterReader>();
+        RegisterDependentService<IQueryConstraintProvider, IResourceDefinitionQueryableParameterReader>();
+
+        _services.AddScoped<IQueryStringReader, QueryStringReader>();
+        _services.AddSingleton<IRequestQueryStringAccessor, RequestQueryStringAccessor>();
+    }
 
-        private void AddOperationsLayer()
-        {
-            _services.AddScoped(typeof(ICreateProcessor<,>), typeof(CreateProcessor<,>));
-            _services.AddScoped(typeof(IUpdateProcessor<,>), typeof(UpdateProcessor<,>));
-            _services.AddScoped(typeof(IDeleteProcessor<,>), typeof(DeleteProcessor<,>));
-            _services.AddScoped(typeof(IAddToRelationshipProcessor<,>), typeof(AddToRelationshipProcessor<,>));
-            _services.AddScoped(typeof(ISetRelationshipProcessor<,>), typeof(SetRelationshipProcessor<,>));
-            _services.AddScoped(typeof(IRemoveFromRelationshipProcessor<,>), typeof(RemoveFromRelationshipProcessor<,>));
-
-            _services.AddScoped<IOperationsProcessor, OperationsProcessor>();
-            _services.AddScoped<IOperationProcessorAccessor, OperationProcessorAccessor>();
-            _services.AddScoped<ILocalIdTracker, LocalIdTracker>();
-        }
+    private void RegisterDependentService<TCollectionElement, TElementToAdd>()
+        where TCollectionElement : class
+        where TElementToAdd : TCollectionElement
+    {
+        _services.AddScoped<TCollectionElement>(serviceProvider => serviceProvider.GetRequiredService<TElementToAdd>());
+    }
 
-        public void Dispose()
-        {
-            _intermediateProvider.Dispose();
-        }
+    private void AddSerializationLayer()
+    {
+        _services.AddScoped<IResourceIdentifierObjectAdapter, ResourceIdentifierObjectAdapter>();
+        _services.AddScoped<IRelationshipDataAdapter, RelationshipDataAdapter>();
+        _services.AddScoped<IResourceObjectAdapter, ResourceObjectAdapter>();
+        _services.AddScoped<IResourceDataAdapter, ResourceDataAdapter>();
+        _services.AddScoped<IAtomicReferenceAdapter, AtomicReferenceAdapter>();
+        _services.AddScoped<IResourceDataInOperationsRequestAdapter, ResourceDataInOperationsRequestAdapter>();
+        _services.AddScoped<IAtomicOperationObjectAdapter, AtomicOperationObjectAdapter>();
+        _services.AddScoped<IDocumentInResourceOrRelationshipRequestAdapter, DocumentInResourceOrRelationshipRequestAdapter>();
+        _services.AddScoped<IDocumentInOperationsRequestAdapter, DocumentInOperationsRequestAdapter>();
+        _services.AddScoped<IDocumentAdapter, DocumentAdapter>();
+
+        _services.AddScoped<ILinkBuilder, LinkBuilder>();
+        _services.AddScoped<IResponseMeta, EmptyResponseMeta>();
+        _services.AddScoped<IMetaBuilder, MetaBuilder>();
+        _services.AddSingleton<IFingerprintGenerator, FingerprintGenerator>();
+        _services.AddSingleton<IETagGenerator, ETagGenerator>();
+        _services.AddScoped<IResponseModelAdapter, ResponseModelAdapter>();
+    }
+
+    private void AddOperationsLayer()
+    {
+        _services.AddScoped(typeof(ICreateProcessor<,>), typeof(CreateProcessor<,>));
+        _services.AddScoped(typeof(IUpdateProcessor<,>), typeof(UpdateProcessor<,>));
+        _services.AddScoped(typeof(IDeleteProcessor<,>), typeof(DeleteProcessor<,>));
+        _services.AddScoped(typeof(IAddToRelationshipProcessor<,>), typeof(AddToRelationshipProcessor<,>));
+        _services.AddScoped(typeof(ISetRelationshipProcessor<,>), typeof(SetRelationshipProcessor<,>));
+        _services.AddScoped(typeof(IRemoveFromRelationshipProcessor<,>), typeof(RemoveFromRelationshipProcessor<,>));
+
+        _services.AddScoped<IOperationsProcessor, OperationsProcessor>();
+        _services.AddScoped<IOperationProcessorAccessor, OperationProcessorAccessor>();
+        _services.AddScoped<ILocalIdTracker, LocalIdTracker>();
+    }
+
+    public void Dispose()
+    {
+        _intermediateProvider.Dispose();
     }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiModelMetadataProvider.cs b/src/JsonApiDotNetCore/Configuration/JsonApiModelMetadataProvider.cs
index 07f15db8a6..9ffe2f7641 100644
--- a/src/JsonApiDotNetCore/Configuration/JsonApiModelMetadataProvider.cs
+++ b/src/JsonApiDotNetCore/Configuration/JsonApiModelMetadataProvider.cs
@@ -4,41 +4,40 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding.Metadata;
 using Microsoft.Extensions.Options;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Custom implementation of <see cref="IModelMetadataProvider" /> to support JSON:API partial patching.
+/// </summary>
+internal sealed class JsonApiModelMetadataProvider : DefaultModelMetadataProvider
 {
-    /// <summary>
-    /// Custom implementation of <see cref="IModelMetadataProvider" /> to support JSON:API partial patching.
-    /// </summary>
-    internal sealed class JsonApiModelMetadataProvider : DefaultModelMetadataProvider
+    private readonly JsonApiValidationFilter _jsonApiValidationFilter;
+
+    /// <inheritdoc />
+    public JsonApiModelMetadataProvider(ICompositeMetadataDetailsProvider detailsProvider, IHttpContextAccessor httpContextAccessor)
+        : base(detailsProvider)
     {
-        private readonly JsonApiValidationFilter _jsonApiValidationFilter;
+        _jsonApiValidationFilter = new JsonApiValidationFilter(httpContextAccessor);
+    }
 
-        /// <inheritdoc />
-        public JsonApiModelMetadataProvider(ICompositeMetadataDetailsProvider detailsProvider, IHttpContextAccessor httpContextAccessor)
-            : base(detailsProvider)
-        {
-            _jsonApiValidationFilter = new JsonApiValidationFilter(httpContextAccessor);
-        }
+    /// <inheritdoc />
+    public JsonApiModelMetadataProvider(ICompositeMetadataDetailsProvider detailsProvider, IOptions<MvcOptions> optionsAccessor,
+        IHttpContextAccessor httpContextAccessor)
+        : base(detailsProvider, optionsAccessor)
+    {
+        _jsonApiValidationFilter = new JsonApiValidationFilter(httpContextAccessor);
+    }
 
-        /// <inheritdoc />
-        public JsonApiModelMetadataProvider(ICompositeMetadataDetailsProvider detailsProvider, IOptions<MvcOptions> optionsAccessor,
-            IHttpContextAccessor httpContextAccessor)
-            : base(detailsProvider, optionsAccessor)
-        {
-            _jsonApiValidationFilter = new JsonApiValidationFilter(httpContextAccessor);
-        }
+    /// <inheritdoc />
+    protected override ModelMetadata CreateModelMetadata(DefaultMetadataDetails entry)
+    {
+        var metadata = (DefaultModelMetadata)base.CreateModelMetadata(entry);
 
-        /// <inheritdoc />
-        protected override ModelMetadata CreateModelMetadata(DefaultMetadataDetails entry)
+        if (metadata.ValidationMetadata.IsRequired == true)
         {
-            var metadata = (DefaultModelMetadata)base.CreateModelMetadata(entry);
-
-            if (metadata.ValidationMetadata.IsRequired == true)
-            {
-                metadata.ValidationMetadata.PropertyValidationFilter = _jsonApiValidationFilter;
-            }
-
-            return metadata;
+            metadata.ValidationMetadata.PropertyValidationFilter = _jsonApiValidationFilter;
         }
+
+        return metadata;
     }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs b/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs
index 39a5e197f2..aa7ed0d434 100644
--- a/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs
+++ b/src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs
@@ -1,126 +1,118 @@
-using System;
 using System.Data;
 using System.Text.Encodings.Web;
 using System.Text.Json;
-using System.Threading;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.JsonConverters;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+/// <inheritdoc />
+[PublicAPI]
+public sealed class JsonApiOptions : IJsonApiOptions
 {
+    private Lazy<JsonSerializerOptions> _lazySerializerWriteOptions;
+    private Lazy<JsonSerializerOptions> _lazySerializerReadOptions;
+
     /// <inheritdoc />
-    [PublicAPI]
-    public sealed class JsonApiOptions : IJsonApiOptions
-    {
-        private Lazy<JsonSerializerOptions> _lazySerializerWriteOptions;
-        private Lazy<JsonSerializerOptions> _lazySerializerReadOptions;
+    JsonSerializerOptions IJsonApiOptions.SerializerReadOptions => _lazySerializerReadOptions.Value;
 
-        /// <inheritdoc />
-        JsonSerializerOptions IJsonApiOptions.SerializerReadOptions => _lazySerializerReadOptions.Value;
+    /// <inheritdoc />
+    JsonSerializerOptions IJsonApiOptions.SerializerWriteOptions => _lazySerializerWriteOptions.Value;
 
-        /// <inheritdoc />
-        JsonSerializerOptions IJsonApiOptions.SerializerWriteOptions => _lazySerializerWriteOptions.Value;
+    /// <inheritdoc />
+    public string? Namespace { get; set; }
 
-        // Workaround for https://github.com/dotnet/efcore/issues/21026
-        internal bool DisableTopPagination { get; set; }
-        internal bool DisableChildrenPagination { get; set; }
+    /// <inheritdoc />
+    public AttrCapabilities DefaultAttrCapabilities { get; set; } = AttrCapabilities.All;
 
-        /// <inheritdoc />
-        public string? Namespace { get; set; }
+    /// <inheritdoc />
+    public bool IncludeJsonApiVersion { get; set; }
 
-        /// <inheritdoc />
-        public AttrCapabilities DefaultAttrCapabilities { get; set; } = AttrCapabilities.All;
+    /// <inheritdoc />
+    public bool IncludeExceptionStackTraceInErrors { get; set; }
 
-        /// <inheritdoc />
-        public bool IncludeJsonApiVersion { get; set; }
+    /// <inheritdoc />
+    public bool IncludeRequestBodyInErrors { get; set; }
 
-        /// <inheritdoc />
-        public bool IncludeExceptionStackTraceInErrors { get; set; }
+    /// <inheritdoc />
+    public bool UseRelativeLinks { get; set; }
 
-        /// <inheritdoc />
-        public bool IncludeRequestBodyInErrors { get; set; }
+    /// <inheritdoc />
+    public LinkTypes TopLevelLinks { get; set; } = LinkTypes.All;
 
-        /// <inheritdoc />
-        public bool UseRelativeLinks { get; set; }
+    /// <inheritdoc />
+    public LinkTypes ResourceLinks { get; set; } = LinkTypes.All;
 
-        /// <inheritdoc />
-        public LinkTypes TopLevelLinks { get; set; } = LinkTypes.All;
+    /// <inheritdoc />
+    public LinkTypes RelationshipLinks { get; set; } = LinkTypes.All;
 
-        /// <inheritdoc />
-        public LinkTypes ResourceLinks { get; set; } = LinkTypes.All;
+    /// <inheritdoc />
+    public bool IncludeTotalResourceCount { get; set; }
 
-        /// <inheritdoc />
-        public LinkTypes RelationshipLinks { get; set; } = LinkTypes.All;
+    /// <inheritdoc />
+    public PageSize? DefaultPageSize { get; set; } = new(10);
 
-        /// <inheritdoc />
-        public bool IncludeTotalResourceCount { get; set; }
+    /// <inheritdoc />
+    public PageSize? MaximumPageSize { get; set; }
 
-        /// <inheritdoc />
-        public PageSize? DefaultPageSize { get; set; } = new(10);
+    /// <inheritdoc />
+    public PageNumber? MaximumPageNumber { get; set; }
 
-        /// <inheritdoc />
-        public PageSize? MaximumPageSize { get; set; }
+    /// <inheritdoc />
+    public bool ValidateModelState { get; set; } = true;
 
-        /// <inheritdoc />
-        public PageNumber? MaximumPageNumber { get; set; }
+    /// <inheritdoc />
+    public bool AllowClientGeneratedIds { get; set; }
 
-        /// <inheritdoc />
-        public bool ValidateModelState { get; set; } = true;
+    /// <inheritdoc />
+    public bool AllowUnknownQueryStringParameters { get; set; }
 
-        /// <inheritdoc />
-        public bool AllowClientGeneratedIds { get; set; }
+    /// <inheritdoc />
+    public bool AllowUnknownFieldsInRequestBody { get; set; }
 
-        /// <inheritdoc />
-        public bool AllowUnknownQueryStringParameters { get; set; }
+    /// <inheritdoc />
+    public bool EnableLegacyFilterNotation { get; set; }
 
-        /// <inheritdoc />
-        public bool AllowUnknownFieldsInRequestBody { get; set; }
+    /// <inheritdoc />
+    public int? MaximumIncludeDepth { get; set; }
 
-        /// <inheritdoc />
-        public bool EnableLegacyFilterNotation { get; set; }
+    /// <inheritdoc />
+    public int? MaximumOperationsPerRequest { get; set; } = 10;
 
-        /// <inheritdoc />
-        public int? MaximumIncludeDepth { get; set; }
+    /// <inheritdoc />
+    public IsolationLevel? TransactionIsolationLevel { get; set; }
 
-        /// <inheritdoc />
-        public int? MaximumOperationsPerRequest { get; set; } = 10;
+    /// <inheritdoc />
+    public JsonSerializerOptions SerializerOptions { get; } = new()
+    {
+        // These are the options common to serialization and deserialization.
+        // At runtime, we actually use SerializerReadOptions and SerializerWriteOptions, which are customized copies of these settings,
+        // to overcome the limitation in System.Text.Json that the JsonPath is incorrect when using custom converters.
+        // Therefore we try to avoid using custom converters has much as possible.
+        // https://github.com/Tarmil/FSharp.SystemTextJson/issues/37
+        // https://github.com/dotnet/runtime/issues/50205#issuecomment-808401245
+
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+        DictionaryKeyPolicy = JsonNamingPolicy.CamelCase,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+        Converters =
+        {
+            new SingleOrManyDataConverterFactory()
+        }
+    };
 
-        /// <inheritdoc />
-        public IsolationLevel? TransactionIsolationLevel { get; set; }
+    public JsonApiOptions()
+    {
+        _lazySerializerReadOptions = new Lazy<JsonSerializerOptions>(() => new JsonSerializerOptions(SerializerOptions), LazyThreadSafetyMode.PublicationOnly);
 
-        /// <inheritdoc />
-        public JsonSerializerOptions SerializerOptions { get; } = new()
+        _lazySerializerWriteOptions = new Lazy<JsonSerializerOptions>(() => new JsonSerializerOptions(SerializerOptions)
         {
-            // These are the options common to serialization and deserialization.
-            // At runtime, we actually use SerializerReadOptions and SerializerWriteOptions, which are customized copies of these settings,
-            // to overcome the limitation in System.Text.Json that the JsonPath is incorrect when using custom converters.
-            // Therefore we try to avoid using custom converters has much as possible.
-            // https://github.com/Tarmil/FSharp.SystemTextJson/issues/37
-            // https://github.com/dotnet/runtime/issues/50205#issuecomment-808401245
-
-            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-            DictionaryKeyPolicy = JsonNamingPolicy.CamelCase,
-            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
             Converters =
             {
-                new SingleOrManyDataConverterFactory()
+                new WriteOnlyDocumentConverter(),
+                new WriteOnlyRelationshipObjectConverter()
             }
-        };
-
-        public JsonApiOptions()
-        {
-            _lazySerializerReadOptions =
-                new Lazy<JsonSerializerOptions>(() => new JsonSerializerOptions(SerializerOptions), LazyThreadSafetyMode.PublicationOnly);
-
-            _lazySerializerWriteOptions = new Lazy<JsonSerializerOptions>(() => new JsonSerializerOptions(SerializerOptions)
-            {
-                Converters =
-                {
-                    new WriteOnlyDocumentConverter(),
-                    new WriteOnlyRelationshipObjectConverter()
-                }
-            }, LazyThreadSafetyMode.PublicationOnly);
-        }
+        }, LazyThreadSafetyMode.PublicationOnly);
     }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/JsonApiValidationFilter.cs b/src/JsonApiDotNetCore/Configuration/JsonApiValidationFilter.cs
index beb978b137..6b193bdc6f 100644
--- a/src/JsonApiDotNetCore/Configuration/JsonApiValidationFilter.cs
+++ b/src/JsonApiDotNetCore/Configuration/JsonApiValidationFilter.cs
@@ -1,81 +1,78 @@
-using System;
-using System.Linq;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace JsonApiDotNetCore.Configuration
-{
-    /// <summary>
-    /// Validation filter that blocks ASP.NET ModelState validation on data according to the JSON:API spec.
-    /// </summary>
-    internal sealed class JsonApiValidationFilter : IPropertyValidationFilter
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
-
-        public JsonApiValidationFilter(IHttpContextAccessor httpContextAccessor)
-        {
-            ArgumentGuard.NotNull(httpContextAccessor, nameof(httpContextAccessor));
-
-            _httpContextAccessor = httpContextAccessor;
-        }
-
-        /// <inheritdoc />
-        public bool ShouldValidateEntry(ValidationEntry entry, ValidationEntry parentEntry)
-        {
-            IServiceProvider serviceProvider = GetScopedServiceProvider();
+namespace JsonApiDotNetCore.Configuration;
 
-            var request = serviceProvider.GetRequiredService<IJsonApiRequest>();
+/// <summary>
+/// Validation filter that blocks ASP.NET ModelState validation on data according to the JSON:API spec.
+/// </summary>
+internal sealed class JsonApiValidationFilter : IPropertyValidationFilter
+{
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-            if (IsId(entry.Key))
-            {
-                return true;
-            }
+    public JsonApiValidationFilter(IHttpContextAccessor httpContextAccessor)
+    {
+        ArgumentGuard.NotNull(httpContextAccessor, nameof(httpContextAccessor));
 
-            bool isTopResourceInPrimaryRequest = string.IsNullOrEmpty(parentEntry.Key) && IsAtPrimaryEndpoint(request);
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-            if (!isTopResourceInPrimaryRequest)
-            {
-                return false;
-            }
+    /// <inheritdoc />
+    public bool ShouldValidateEntry(ValidationEntry entry, ValidationEntry parentEntry)
+    {
+        IServiceProvider serviceProvider = GetScopedServiceProvider();
 
-            if (request.WriteOperation == WriteOperationKind.UpdateResource)
-            {
-                var targetedFields = serviceProvider.GetRequiredService<ITargetedFields>();
-                return IsFieldTargeted(entry, targetedFields);
-            }
+        var request = serviceProvider.GetRequiredService<IJsonApiRequest>();
 
+        if (IsId(entry.Key))
+        {
             return true;
         }
 
-        private IServiceProvider GetScopedServiceProvider()
-        {
-            HttpContext? httpContext = _httpContextAccessor.HttpContext;
-
-            if (httpContext == null)
-            {
-                throw new InvalidOperationException("Cannot resolve scoped services outside the context of an HTTP request.");
-            }
+        bool isTopResourceInPrimaryRequest = string.IsNullOrEmpty(parentEntry.Key) && IsAtPrimaryEndpoint(request);
 
-            return httpContext.RequestServices;
-        }
-
-        private static bool IsId(string key)
+        if (!isTopResourceInPrimaryRequest)
         {
-            return key == nameof(Identifiable<object>.Id) || key.EndsWith($".{nameof(Identifiable<object>.Id)}", StringComparison.Ordinal);
+            return false;
         }
 
-        private static bool IsAtPrimaryEndpoint(IJsonApiRequest request)
+        if (request.WriteOperation == WriteOperationKind.UpdateResource)
         {
-            return request.Kind is EndpointKind.Primary or EndpointKind.AtomicOperations;
+            var targetedFields = serviceProvider.GetRequiredService<ITargetedFields>();
+            return IsFieldTargeted(entry, targetedFields);
         }
 
-        private static bool IsFieldTargeted(ValidationEntry entry, ITargetedFields targetedFields)
+        return true;
+    }
+
+    private IServiceProvider GetScopedServiceProvider()
+    {
+        HttpContext? httpContext = _httpContextAccessor.HttpContext;
+
+        if (httpContext == null)
         {
-            return targetedFields.Attributes.Any(attribute => attribute.Property.Name == entry.Key) ||
-                targetedFields.Relationships.Any(relationship => relationship.Property.Name == entry.Key);
+            throw new InvalidOperationException("Cannot resolve scoped services outside the context of an HTTP request.");
         }
+
+        return httpContext.RequestServices;
+    }
+
+    private static bool IsId(string key)
+    {
+        return key == nameof(Identifiable<object>.Id) || key.EndsWith($".{nameof(Identifiable<object>.Id)}", StringComparison.Ordinal);
+    }
+
+    private static bool IsAtPrimaryEndpoint(IJsonApiRequest request)
+    {
+        return request.Kind is EndpointKind.Primary or EndpointKind.AtomicOperations;
+    }
+
+    private static bool IsFieldTargeted(ValidationEntry entry, ITargetedFields targetedFields)
+    {
+        return targetedFields.Attributes.Any(attribute => attribute.Property.Name == entry.Key) ||
+            targetedFields.Relationships.Any(relationship => relationship.Property.Name == entry.Key);
     }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/PageNumber.cs b/src/JsonApiDotNetCore/Configuration/PageNumber.cs
index 729000e6f1..a2d4c0cba0 100644
--- a/src/JsonApiDotNetCore/Configuration/PageNumber.cs
+++ b/src/JsonApiDotNetCore/Configuration/PageNumber.cs
@@ -1,53 +1,51 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+[PublicAPI]
+public sealed class PageNumber : IEquatable<PageNumber>
 {
-    [PublicAPI]
-    public sealed class PageNumber : IEquatable<PageNumber>
-    {
-        public static readonly PageNumber ValueOne = new(1);
+    public static readonly PageNumber ValueOne = new(1);
 
-        public int OneBasedValue { get; }
+    public int OneBasedValue { get; }
 
-        public PageNumber(int oneBasedValue)
+    public PageNumber(int oneBasedValue)
+    {
+        if (oneBasedValue < 1)
         {
-            if (oneBasedValue < 1)
-            {
-                throw new ArgumentOutOfRangeException(nameof(oneBasedValue));
-            }
-
-            OneBasedValue = oneBasedValue;
+            throw new ArgumentOutOfRangeException(nameof(oneBasedValue));
         }
 
-        public bool Equals(PageNumber? other)
-        {
-            if (ReferenceEquals(null, other))
-            {
-                return false;
-            }
-
-            if (ReferenceEquals(this, other))
-            {
-                return true;
-            }
-
-            return OneBasedValue == other.OneBasedValue;
-        }
+        OneBasedValue = oneBasedValue;
+    }
 
-        public override bool Equals(object? other)
+    public bool Equals(PageNumber? other)
+    {
+        if (ReferenceEquals(null, other))
         {
-            return Equals(other as PageNumber);
+            return false;
         }
 
-        public override int GetHashCode()
+        if (ReferenceEquals(this, other))
         {
-            return OneBasedValue.GetHashCode();
+            return true;
         }
 
-        public override string ToString()
-        {
-            return OneBasedValue.ToString();
-        }
+        return OneBasedValue == other.OneBasedValue;
+    }
+
+    public override bool Equals(object? other)
+    {
+        return Equals(other as PageNumber);
+    }
+
+    public override int GetHashCode()
+    {
+        return OneBasedValue.GetHashCode();
+    }
+
+    public override string ToString()
+    {
+        return OneBasedValue.ToString();
     }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/PageSize.cs b/src/JsonApiDotNetCore/Configuration/PageSize.cs
index 460658e064..7f926f519e 100644
--- a/src/JsonApiDotNetCore/Configuration/PageSize.cs
+++ b/src/JsonApiDotNetCore/Configuration/PageSize.cs
@@ -1,51 +1,49 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+[PublicAPI]
+public sealed class PageSize : IEquatable<PageSize>
 {
-    [PublicAPI]
-    public sealed class PageSize : IEquatable<PageSize>
-    {
-        public int Value { get; }
+    public int Value { get; }
 
-        public PageSize(int value)
+    public PageSize(int value)
+    {
+        if (value < 1)
         {
-            if (value < 1)
-            {
-                throw new ArgumentOutOfRangeException(nameof(value));
-            }
-
-            Value = value;
+            throw new ArgumentOutOfRangeException(nameof(value));
         }
 
-        public bool Equals(PageSize? other)
-        {
-            if (ReferenceEquals(null, other))
-            {
-                return false;
-            }
-
-            if (ReferenceEquals(this, other))
-            {
-                return true;
-            }
-
-            return Value == other.Value;
-        }
+        Value = value;
+    }
 
-        public override bool Equals(object? other)
+    public bool Equals(PageSize? other)
+    {
+        if (ReferenceEquals(null, other))
         {
-            return Equals(other as PageSize);
+            return false;
         }
 
-        public override int GetHashCode()
+        if (ReferenceEquals(this, other))
         {
-            return Value.GetHashCode();
+            return true;
         }
 
-        public override string ToString()
-        {
-            return Value.ToString();
-        }
+        return Value == other.Value;
+    }
+
+    public override bool Equals(object? other)
+    {
+        return Equals(other as PageSize);
+    }
+
+    public override int GetHashCode()
+    {
+        return Value.GetHashCode();
+    }
+
+    public override string ToString()
+    {
+        return Value.ToString();
     }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/ResourceDescriptor.cs b/src/JsonApiDotNetCore/Configuration/ResourceDescriptor.cs
index aaad96abb8..8747cdd18f 100644
--- a/src/JsonApiDotNetCore/Configuration/ResourceDescriptor.cs
+++ b/src/JsonApiDotNetCore/Configuration/ResourceDescriptor.cs
@@ -1,19 +1,16 @@
-using System;
+namespace JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCore.Configuration
+internal sealed class ResourceDescriptor
 {
-    internal sealed class ResourceDescriptor
-    {
-        public Type ResourceClrType { get; }
-        public Type IdClrType { get; }
+    public Type ResourceClrType { get; }
+    public Type IdClrType { get; }
 
-        public ResourceDescriptor(Type resourceClrType, Type idClrType)
-        {
-            ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
-            ArgumentGuard.NotNull(idClrType, nameof(idClrType));
+    public ResourceDescriptor(Type resourceClrType, Type idClrType)
+    {
+        ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
+        ArgumentGuard.NotNull(idClrType, nameof(idClrType));
 
-            ResourceClrType = resourceClrType;
-            IdClrType = idClrType;
-        }
+        ResourceClrType = resourceClrType;
+        IdClrType = idClrType;
     }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/ResourceDescriptorAssemblyCache.cs b/src/JsonApiDotNetCore/Configuration/ResourceDescriptorAssemblyCache.cs
index 67a0329f9f..e73b48ee3d 100644
--- a/src/JsonApiDotNetCore/Configuration/ResourceDescriptorAssemblyCache.cs
+++ b/src/JsonApiDotNetCore/Configuration/ResourceDescriptorAssemblyCache.cs
@@ -1,58 +1,54 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Used to scan assemblies for types and cache them, to facilitate resource auto-discovery.
+/// </summary>
+internal sealed class ResourceDescriptorAssemblyCache
 {
-    /// <summary>
-    /// Used to scan assemblies for types and cache them, to facilitate resource auto-discovery.
-    /// </summary>
-    internal sealed class ResourceDescriptorAssemblyCache
-    {
-        private readonly TypeLocator _typeLocator = new();
-        private readonly Dictionary<Assembly, IReadOnlyCollection<ResourceDescriptor>?> _resourceDescriptorsPerAssembly = new();
+    private readonly TypeLocator _typeLocator = new();
+    private readonly Dictionary<Assembly, IReadOnlyCollection<ResourceDescriptor>?> _resourceDescriptorsPerAssembly = new();
 
-        public void RegisterAssembly(Assembly assembly)
+    public void RegisterAssembly(Assembly assembly)
+    {
+        if (!_resourceDescriptorsPerAssembly.ContainsKey(assembly))
         {
-            if (!_resourceDescriptorsPerAssembly.ContainsKey(assembly))
-            {
-                _resourceDescriptorsPerAssembly[assembly] = null;
-            }
+            _resourceDescriptorsPerAssembly[assembly] = null;
         }
+    }
 
-        public IReadOnlyCollection<ResourceDescriptor> GetResourceDescriptors()
-        {
-            EnsureAssembliesScanned();
+    public IReadOnlyCollection<ResourceDescriptor> GetResourceDescriptors()
+    {
+        EnsureAssembliesScanned();
 
-            return _resourceDescriptorsPerAssembly.SelectMany(pair => pair.Value!).ToArray();
-        }
+        return _resourceDescriptorsPerAssembly.SelectMany(pair => pair.Value!).ToArray();
+    }
 
-        public IReadOnlyCollection<Assembly> GetAssemblies()
-        {
-            EnsureAssembliesScanned();
+    public IReadOnlyCollection<Assembly> GetAssemblies()
+    {
+        EnsureAssembliesScanned();
 
-            return _resourceDescriptorsPerAssembly.Keys;
-        }
+        return _resourceDescriptorsPerAssembly.Keys;
+    }
 
-        private void EnsureAssembliesScanned()
+    private void EnsureAssembliesScanned()
+    {
+        foreach (Assembly assemblyToScan in _resourceDescriptorsPerAssembly.Where(pair => pair.Value == null).Select(pair => pair.Key).ToArray())
         {
-            foreach (Assembly assemblyToScan in _resourceDescriptorsPerAssembly.Where(pair => pair.Value == null).Select(pair => pair.Key).ToArray())
-            {
-                _resourceDescriptorsPerAssembly[assemblyToScan] = ScanForResourceDescriptors(assemblyToScan).ToArray();
-            }
+            _resourceDescriptorsPerAssembly[assemblyToScan] = ScanForResourceDescriptors(assemblyToScan).ToArray();
         }
+    }
 
-        private IEnumerable<ResourceDescriptor> ScanForResourceDescriptors(Assembly assembly)
+    private IEnumerable<ResourceDescriptor> ScanForResourceDescriptors(Assembly assembly)
+    {
+        foreach (Type type in assembly.GetTypes())
         {
-            foreach (Type type in assembly.GetTypes())
-            {
-                ResourceDescriptor? resourceDescriptor = _typeLocator.ResolveResourceDescriptor(type);
+            ResourceDescriptor? resourceDescriptor = _typeLocator.ResolveResourceDescriptor(type);
 
-                if (resourceDescriptor != null)
-                {
-                    yield return resourceDescriptor;
-                }
+            if (resourceDescriptor != null)
+            {
+                yield return resourceDescriptor;
             }
         }
     }
diff --git a/src/JsonApiDotNetCore/Configuration/ResourceGraph.cs b/src/JsonApiDotNetCore/Configuration/ResourceGraph.cs
index 418c1ba0b7..d5acc8a1f9 100644
--- a/src/JsonApiDotNetCore/Configuration/ResourceGraph.cs
+++ b/src/JsonApiDotNetCore/Configuration/ResourceGraph.cs
@@ -1,206 +1,201 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+/// <inheritdoc />
+[PublicAPI]
+public sealed class ResourceGraph : IResourceGraph
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public sealed class ResourceGraph : IResourceGraph
+    private static readonly Type? ProxyTargetAccessorType = Type.GetType("Castle.DynamicProxy.IProxyTargetAccessor, Castle.Core");
+
+    private readonly IReadOnlySet<ResourceType> _resourceTypeSet;
+    private readonly Dictionary<Type, ResourceType> _resourceTypesByClrType = new();
+    private readonly Dictionary<string, ResourceType> _resourceTypesByPublicName = new();
+
+    public ResourceGraph(IReadOnlySet<ResourceType> resourceTypeSet)
     {
-        private static readonly Type? ProxyTargetAccessorType = Type.GetType("Castle.DynamicProxy.IProxyTargetAccessor, Castle.Core");
+        ArgumentGuard.NotNull(resourceTypeSet, nameof(resourceTypeSet));
 
-        private readonly IReadOnlySet<ResourceType> _resourceTypeSet;
-        private readonly Dictionary<Type, ResourceType> _resourceTypesByClrType = new();
-        private readonly Dictionary<string, ResourceType> _resourceTypesByPublicName = new();
+        _resourceTypeSet = resourceTypeSet;
 
-        public ResourceGraph(IReadOnlySet<ResourceType> resourceTypeSet)
+        foreach (ResourceType resourceType in resourceTypeSet)
         {
-            ArgumentGuard.NotNull(resourceTypeSet, nameof(resourceTypeSet));
+            _resourceTypesByClrType.Add(resourceType.ClrType, resourceType);
+            _resourceTypesByPublicName.Add(resourceType.PublicName, resourceType);
+        }
+    }
 
-            _resourceTypeSet = resourceTypeSet;
+    /// <inheritdoc />
+    public IReadOnlySet<ResourceType> GetResourceTypes()
+    {
+        return _resourceTypeSet;
+    }
 
-            foreach (ResourceType resourceType in resourceTypeSet)
-            {
-                _resourceTypesByClrType.Add(resourceType.ClrType, resourceType);
-                _resourceTypesByPublicName.Add(resourceType.PublicName, resourceType);
-            }
-        }
+    /// <inheritdoc />
+    public ResourceType GetResourceType(string publicName)
+    {
+        ResourceType? resourceType = FindResourceType(publicName);
 
-        /// <inheritdoc />
-        public IReadOnlySet<ResourceType> GetResourceTypes()
+        if (resourceType == null)
         {
-            return _resourceTypeSet;
+            throw new InvalidOperationException($"Resource type '{publicName}' does not exist.");
         }
 
-        /// <inheritdoc />
-        public ResourceType GetResourceType(string publicName)
-        {
-            ResourceType? resourceType = FindResourceType(publicName);
+        return resourceType;
+    }
 
-            if (resourceType == null)
-            {
-                throw new InvalidOperationException($"Resource type '{publicName}' does not exist.");
-            }
+    /// <inheritdoc />
+    public ResourceType? FindResourceType(string publicName)
+    {
+        ArgumentGuard.NotNull(publicName, nameof(publicName));
 
-            return resourceType;
-        }
+        return _resourceTypesByPublicName.TryGetValue(publicName, out ResourceType? resourceType) ? resourceType : null;
+    }
 
-        /// <inheritdoc />
-        public ResourceType? FindResourceType(string publicName)
-        {
-            ArgumentGuard.NotNull(publicName, nameof(publicName));
+    /// <inheritdoc />
+    public ResourceType GetResourceType(Type resourceClrType)
+    {
+        ResourceType? resourceType = FindResourceType(resourceClrType);
 
-            return _resourceTypesByPublicName.TryGetValue(publicName, out ResourceType? resourceType) ? resourceType : null;
+        if (resourceType == null)
+        {
+            throw new InvalidOperationException($"Resource of type '{resourceClrType.Name}' does not exist.");
         }
 
-        /// <inheritdoc />
-        public ResourceType GetResourceType(Type resourceClrType)
-        {
-            ResourceType? resourceType = FindResourceType(resourceClrType);
+        return resourceType;
+    }
 
-            if (resourceType == null)
-            {
-                throw new InvalidOperationException($"Resource of type '{resourceClrType.Name}' does not exist.");
-            }
+    /// <inheritdoc />
+    public ResourceType? FindResourceType(Type resourceClrType)
+    {
+        ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
 
-            return resourceType;
-        }
+        Type typeToFind = IsLazyLoadingProxyForResourceType(resourceClrType) ? resourceClrType.BaseType! : resourceClrType;
+        return _resourceTypesByClrType.TryGetValue(typeToFind, out ResourceType? resourceType) ? resourceType : null;
+    }
 
-        /// <inheritdoc />
-        public ResourceType? FindResourceType(Type resourceClrType)
-        {
-            ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
+    private bool IsLazyLoadingProxyForResourceType(Type resourceClrType)
+    {
+        return ProxyTargetAccessorType?.IsAssignableFrom(resourceClrType) ?? false;
+    }
 
-            Type typeToFind = IsLazyLoadingProxyForResourceType(resourceClrType) ? resourceClrType.BaseType! : resourceClrType;
-            return _resourceTypesByClrType.TryGetValue(typeToFind, out ResourceType? resourceType) ? resourceType : null;
-        }
+    /// <inheritdoc />
+    public ResourceType GetResourceType<TResource>()
+        where TResource : class, IIdentifiable
+    {
+        return GetResourceType(typeof(TResource));
+    }
 
-        private bool IsLazyLoadingProxyForResourceType(Type resourceClrType)
-        {
-            return ProxyTargetAccessorType?.IsAssignableFrom(resourceClrType) ?? false;
-        }
+    /// <inheritdoc />
+    public IReadOnlyCollection<ResourceFieldAttribute> GetFields<TResource>(Expression<Func<TResource, dynamic?>> selector)
+        where TResource : class, IIdentifiable
+    {
+        ArgumentGuard.NotNull(selector, nameof(selector));
 
-        /// <inheritdoc />
-        public ResourceType GetResourceType<TResource>()
-            where TResource : class, IIdentifiable
-        {
-            return GetResourceType(typeof(TResource));
-        }
+        return FilterFields<TResource, ResourceFieldAttribute>(selector);
+    }
 
-        /// <inheritdoc />
-        public IReadOnlyCollection<ResourceFieldAttribute> GetFields<TResource>(Expression<Func<TResource, dynamic?>> selector)
-            where TResource : class, IIdentifiable
-        {
-            ArgumentGuard.NotNull(selector, nameof(selector));
+    /// <inheritdoc />
+    public IReadOnlyCollection<AttrAttribute> GetAttributes<TResource>(Expression<Func<TResource, dynamic?>> selector)
+        where TResource : class, IIdentifiable
+    {
+        ArgumentGuard.NotNull(selector, nameof(selector));
 
-            return FilterFields<TResource, ResourceFieldAttribute>(selector);
-        }
+        return FilterFields<TResource, AttrAttribute>(selector);
+    }
 
-        /// <inheritdoc />
-        public IReadOnlyCollection<AttrAttribute> GetAttributes<TResource>(Expression<Func<TResource, dynamic?>> selector)
-            where TResource : class, IIdentifiable
+    /// <inheritdoc />
+    public IReadOnlyCollection<RelationshipAttribute> GetRelationships<TResource>(Expression<Func<TResource, dynamic?>> selector)
+        where TResource : class, IIdentifiable
+    {
+        ArgumentGuard.NotNull(selector, nameof(selector));
+
+        return FilterFields<TResource, RelationshipAttribute>(selector);
+    }
+
+    private IReadOnlyCollection<TField> FilterFields<TResource, TField>(Expression<Func<TResource, dynamic?>> selector)
+        where TResource : class, IIdentifiable
+        where TField : ResourceFieldAttribute
+    {
+        IReadOnlyCollection<TField> source = GetFieldsOfType<TResource, TField>();
+        var matches = new List<TField>();
+
+        foreach (string memberName in ToMemberNames(selector))
         {
-            ArgumentGuard.NotNull(selector, nameof(selector));
+            TField? matchingField = source.FirstOrDefault(field => field.Property.Name == memberName);
+
+            if (matchingField == null)
+            {
+                throw new ArgumentException($"Member '{memberName}' is not exposed as a JSON:API field.");
+            }
 
-            return FilterFields<TResource, AttrAttribute>(selector);
+            matches.Add(matchingField);
         }
 
-        /// <inheritdoc />
-        public IReadOnlyCollection<RelationshipAttribute> GetRelationships<TResource>(Expression<Func<TResource, dynamic?>> selector)
-            where TResource : class, IIdentifiable
-        {
-            ArgumentGuard.NotNull(selector, nameof(selector));
+        return matches;
+    }
 
-            return FilterFields<TResource, RelationshipAttribute>(selector);
+    private IReadOnlyCollection<TKind> GetFieldsOfType<TResource, TKind>()
+        where TKind : ResourceFieldAttribute
+    {
+        ResourceType resourceType = GetResourceType(typeof(TResource));
+
+        if (typeof(TKind) == typeof(AttrAttribute))
+        {
+            return (IReadOnlyCollection<TKind>)resourceType.Attributes;
         }
 
-        private IReadOnlyCollection<TField> FilterFields<TResource, TField>(Expression<Func<TResource, dynamic?>> selector)
-            where TResource : class, IIdentifiable
-            where TField : ResourceFieldAttribute
+        if (typeof(TKind) == typeof(RelationshipAttribute))
         {
-            IReadOnlyCollection<TField> source = GetFieldsOfType<TResource, TField>();
-            var matches = new List<TField>();
+            return (IReadOnlyCollection<TKind>)resourceType.Relationships;
+        }
 
-            foreach (string memberName in ToMemberNames(selector))
-            {
-                TField? matchingField = source.FirstOrDefault(field => field.Property.Name == memberName);
+        return (IReadOnlyCollection<TKind>)resourceType.Fields;
+    }
 
-                if (matchingField == null)
-                {
-                    throw new ArgumentException($"Member '{memberName}' is not exposed as a JSON:API field.");
-                }
+    private IEnumerable<string> ToMemberNames<TResource>(Expression<Func<TResource, dynamic?>> selector)
+    {
+        Expression selectorBody = RemoveConvert(selector.Body);
 
-                matches.Add(matchingField);
-            }
+        if (selectorBody is MemberExpression memberExpression)
+        {
+            // model => model.Field1
 
-            return matches;
+            yield return memberExpression.Member.Name;
         }
-
-        private IReadOnlyCollection<TKind> GetFieldsOfType<TResource, TKind>()
-            where TKind : ResourceFieldAttribute
+        else if (selectorBody is NewExpression newExpression)
         {
-            ResourceType resourceType = GetResourceType(typeof(TResource));
-
-            if (typeof(TKind) == typeof(AttrAttribute))
-            {
-                return (IReadOnlyCollection<TKind>)resourceType.Attributes;
-            }
+            // model => new { model.Field1, model.Field2 }
 
-            if (typeof(TKind) == typeof(RelationshipAttribute))
+            foreach (MemberInfo member in newExpression.Members ?? Enumerable.Empty<MemberInfo>())
             {
-                return (IReadOnlyCollection<TKind>)resourceType.Relationships;
+                yield return member.Name;
             }
-
-            return (IReadOnlyCollection<TKind>)resourceType.Fields;
         }
-
-        private IEnumerable<string> ToMemberNames<TResource>(Expression<Func<TResource, dynamic?>> selector)
+        else
         {
-            Expression selectorBody = RemoveConvert(selector.Body);
+            throw new ArgumentException($"The expression '{selector}' should select a single property or select multiple properties into an anonymous type. " +
+                "For example: 'article => article.Title' or 'article => new { article.Title, article.PageCount }'.");
+        }
+    }
 
-            if (selectorBody is MemberExpression memberExpression)
-            {
-                // model => model.Field1
+    private static Expression RemoveConvert(Expression expression)
+    {
+        Expression innerExpression = expression;
 
-                yield return memberExpression.Member.Name;
-            }
-            else if (selectorBody is NewExpression newExpression)
+        while (true)
+        {
+            if (innerExpression is UnaryExpression { NodeType: ExpressionType.Convert } unaryExpression)
             {
-                // model => new { model.Field1, model.Field2 }
-
-                foreach (MemberInfo member in newExpression.Members ?? Enumerable.Empty<MemberInfo>())
-                {
-                    yield return member.Name;
-                }
+                innerExpression = unaryExpression.Operand;
             }
             else
             {
-                throw new ArgumentException(
-                    $"The expression '{selector}' should select a single property or select multiple properties into an anonymous type. " +
-                    "For example: 'article => article.Title' or 'article => new { article.Title, article.PageCount }'.");
-            }
-        }
-
-        private static Expression RemoveConvert(Expression expression)
-        {
-            Expression innerExpression = expression;
-
-            while (true)
-            {
-                if (innerExpression is UnaryExpression { NodeType: ExpressionType.Convert } unaryExpression)
-                {
-                    innerExpression = unaryExpression.Operand;
-                }
-                else
-                {
-                    return innerExpression;
-                }
+                return innerExpression;
             }
         }
     }
diff --git a/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs b/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs
index 53e206cc0f..1352160f11 100644
--- a/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs
+++ b/src/JsonApiDotNetCore/Configuration/ResourceGraphBuilder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Errors;
@@ -8,349 +5,343 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Builds and configures the <see cref="ResourceGraph" />.
+/// </summary>
+[PublicAPI]
+public class ResourceGraphBuilder
 {
+    private readonly IJsonApiOptions _options;
+    private readonly ILogger<ResourceGraphBuilder> _logger;
+    private readonly Dictionary<Type, ResourceType> _resourceTypesByClrType = new();
+    private readonly TypeLocator _typeLocator = new();
+
+    public ResourceGraphBuilder(IJsonApiOptions options, ILoggerFactory loggerFactory)
+    {
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
+
+        _options = options;
+        _logger = loggerFactory.CreateLogger<ResourceGraphBuilder>();
+    }
+
     /// <summary>
-    /// Builds and configures the <see cref="ResourceGraph" />.
+    /// Constructs the <see cref="ResourceGraph" />.
     /// </summary>
-    [PublicAPI]
-    public class ResourceGraphBuilder
+    public IResourceGraph Build()
     {
-        private readonly IJsonApiOptions _options;
-        private readonly ILogger<ResourceGraphBuilder> _logger;
-        private readonly Dictionary<Type, ResourceType> _resourceTypesByClrType = new();
-        private readonly TypeLocator _typeLocator = new();
+        HashSet<ResourceType> resourceTypes = _resourceTypesByClrType.Values.ToHashSet();
 
-        public ResourceGraphBuilder(IJsonApiOptions options, ILoggerFactory loggerFactory)
+        if (!resourceTypes.Any())
         {
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
-
-            _options = options;
-            _logger = loggerFactory.CreateLogger<ResourceGraphBuilder>();
+            _logger.LogWarning("The resource graph is empty.");
         }
 
-        /// <summary>
-        /// Constructs the <see cref="ResourceGraph" />.
-        /// </summary>
-        public IResourceGraph Build()
+        var resourceGraph = new ResourceGraph(resourceTypes);
+
+        foreach (RelationshipAttribute relationship in resourceTypes.SelectMany(resourceType => resourceType.Relationships))
         {
-            HashSet<ResourceType> resourceTypes = _resourceTypesByClrType.Values.ToHashSet();
+            relationship.LeftType = resourceGraph.GetResourceType(relationship.LeftClrType!);
+            ResourceType? rightType = resourceGraph.FindResourceType(relationship.RightClrType!);
 
-            if (!resourceTypes.Any())
+            if (rightType == null)
             {
-                _logger.LogWarning("The resource graph is empty.");
+                throw new InvalidConfigurationException($"Resource type '{relationship.LeftClrType}' depends on " +
+                    $"'{relationship.RightClrType}', which was not added to the resource graph.");
             }
 
-            var resourceGraph = new ResourceGraph(resourceTypes);
+            relationship.RightType = rightType;
+        }
 
-            foreach (RelationshipAttribute relationship in resourceTypes.SelectMany(resourceType => resourceType.Relationships))
-            {
-                relationship.LeftType = resourceGraph.GetResourceType(relationship.LeftClrType!);
-                ResourceType? rightType = resourceGraph.FindResourceType(relationship.RightClrType!);
+        return resourceGraph;
+    }
 
-                if (rightType == null)
-                {
-                    throw new InvalidConfigurationException($"Resource type '{relationship.LeftClrType}' depends on " +
-                        $"'{relationship.RightClrType}', which was not added to the resource graph.");
-                }
+    public ResourceGraphBuilder Add(DbContext dbContext)
+    {
+        ArgumentGuard.NotNull(dbContext, nameof(dbContext));
 
-                relationship.RightType = rightType;
+        foreach (IEntityType entityType in dbContext.Model.GetEntityTypes())
+        {
+            if (!IsImplicitManyToManyJoinEntity(entityType))
+            {
+                Add(entityType.ClrType);
             }
-
-            return resourceGraph;
         }
 
-        public ResourceGraphBuilder Add(DbContext dbContext)
-        {
-            ArgumentGuard.NotNull(dbContext, nameof(dbContext));
+        return this;
+    }
 
-            foreach (IEntityType entityType in dbContext.Model.GetEntityTypes())
-            {
-                if (!IsImplicitManyToManyJoinEntity(entityType))
-                {
-                    Add(entityType.ClrType);
-                }
-            }
+    private static bool IsImplicitManyToManyJoinEntity(IEntityType entityType)
+    {
+        return entityType.IsPropertyBag && entityType.HasSharedClrType;
+    }
 
-            return this;
-        }
+    /// <summary>
+    /// Adds a JSON:API resource.
+    /// </summary>
+    /// <typeparam name="TResource">
+    /// The resource CLR type.
+    /// </typeparam>
+    /// <typeparam name="TId">
+    /// The resource identifier CLR type.
+    /// </typeparam>
+    /// <param name="publicName">
+    /// The name under which the resource is publicly exposed by the API. If nothing is specified, the naming convention is applied on the pluralized CLR
+    /// type name.
+    /// </param>
+    public ResourceGraphBuilder Add<TResource, TId>(string? publicName = null)
+        where TResource : class, IIdentifiable<TId>
+    {
+        return Add(typeof(TResource), typeof(TId), publicName);
+    }
 
-        private static bool IsImplicitManyToManyJoinEntity(IEntityType entityType)
-        {
-#pragma warning disable EF1001 // Internal Entity Framework Core API usage.
-            return entityType is EntityType { IsImplicitlyCreatedJoinEntityType: true };
-#pragma warning restore EF1001 // Internal Entity Framework Core API usage.
-        }
+    /// <summary>
+    /// Adds a JSON:API resource.
+    /// </summary>
+    /// <param name="resourceClrType">
+    /// The resource CLR type.
+    /// </param>
+    /// <param name="idClrType">
+    /// The resource identifier CLR type.
+    /// </param>
+    /// <param name="publicName">
+    /// The name under which the resource is publicly exposed by the API. If nothing is specified, the naming convention is applied on the pluralized CLR
+    /// type name.
+    /// </param>
+    public ResourceGraphBuilder Add(Type resourceClrType, Type? idClrType = null, string? publicName = null)
+    {
+        ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
 
-        /// <summary>
-        /// Adds a JSON:API resource.
-        /// </summary>
-        /// <typeparam name="TResource">
-        /// The resource CLR type.
-        /// </typeparam>
-        /// <typeparam name="TId">
-        /// The resource identifier CLR type.
-        /// </typeparam>
-        /// <param name="publicName">
-        /// The name under which the resource is publicly exposed by the API. If nothing is specified, the naming convention is applied on the pluralized CLR
-        /// type name.
-        /// </param>
-        public ResourceGraphBuilder Add<TResource, TId>(string? publicName = null)
-            where TResource : class, IIdentifiable<TId>
+        if (_resourceTypesByClrType.ContainsKey(resourceClrType))
         {
-            return Add(typeof(TResource), typeof(TId), publicName);
+            return this;
         }
 
-        /// <summary>
-        /// Adds a JSON:API resource.
-        /// </summary>
-        /// <param name="resourceClrType">
-        /// The resource CLR type.
-        /// </param>
-        /// <param name="idClrType">
-        /// The resource identifier CLR type.
-        /// </param>
-        /// <param name="publicName">
-        /// The name under which the resource is publicly exposed by the API. If nothing is specified, the naming convention is applied on the pluralized CLR
-        /// type name.
-        /// </param>
-        public ResourceGraphBuilder Add(Type resourceClrType, Type? idClrType = null, string? publicName = null)
+        if (resourceClrType.IsOrImplementsInterface<IIdentifiable>())
         {
-            ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
+            string effectivePublicName = publicName ?? FormatResourceName(resourceClrType);
+            Type? effectiveIdType = idClrType ?? _typeLocator.LookupIdType(resourceClrType);
 
-            if (_resourceTypesByClrType.ContainsKey(resourceClrType))
+            if (effectiveIdType == null)
             {
-                return this;
+                throw new InvalidConfigurationException($"Resource type '{resourceClrType}' implements 'IIdentifiable', but not 'IIdentifiable<TId>'.");
             }
 
-            if (resourceClrType.IsOrImplementsInterface<IIdentifiable>())
-            {
-                string effectivePublicName = publicName ?? FormatResourceName(resourceClrType);
-                Type? effectiveIdType = idClrType ?? _typeLocator.LookupIdType(resourceClrType);
-
-                if (effectiveIdType == null)
-                {
-                    throw new InvalidConfigurationException($"Resource type '{resourceClrType}' implements 'IIdentifiable', but not 'IIdentifiable<TId>'.");
-                }
-
-                ResourceType resourceType = CreateResourceType(effectivePublicName, resourceClrType, effectiveIdType);
+            ResourceType resourceType = CreateResourceType(effectivePublicName, resourceClrType, effectiveIdType);
 
-                AssertNoDuplicatePublicName(resourceType, effectivePublicName);
+            AssertNoDuplicatePublicName(resourceType, effectivePublicName);
 
-                _resourceTypesByClrType.Add(resourceClrType, resourceType);
-            }
-            else
+            _resourceTypesByClrType.Add(resourceClrType, resourceType);
+        }
+        else
+        {
+            if (resourceClrType.GetCustomAttribute<NoResourceAttribute>() == null)
             {
-                _logger.LogWarning($"Skipping: Type '{resourceClrType}' does not implement '{nameof(IIdentifiable)}'.");
+                _logger.LogWarning(
+                    $"Skipping: Type '{resourceClrType}' does not implement '{nameof(IIdentifiable)}'. Add [NoResource] to suppress this warning.");
             }
-
-            return this;
         }
 
-        private ResourceType CreateResourceType(string publicName, Type resourceClrType, Type idClrType)
-        {
-            IReadOnlyCollection<AttrAttribute> attributes = GetAttributes(resourceClrType);
-            IReadOnlyCollection<RelationshipAttribute> relationships = GetRelationships(resourceClrType);
-            IReadOnlyCollection<EagerLoadAttribute> eagerLoads = GetEagerLoads(resourceClrType);
+        return this;
+    }
 
-            AssertNoDuplicatePublicName(attributes, relationships);
+    private ResourceType CreateResourceType(string publicName, Type resourceClrType, Type idClrType)
+    {
+        IReadOnlyCollection<AttrAttribute> attributes = GetAttributes(resourceClrType);
+        IReadOnlyCollection<RelationshipAttribute> relationships = GetRelationships(resourceClrType);
+        IReadOnlyCollection<EagerLoadAttribute> eagerLoads = GetEagerLoads(resourceClrType);
 
-            var linksAttribute = (ResourceLinksAttribute?)resourceClrType.GetCustomAttribute(typeof(ResourceLinksAttribute));
+        AssertNoDuplicatePublicName(attributes, relationships);
 
-            return linksAttribute == null
-                ? new ResourceType(publicName, resourceClrType, idClrType, attributes, relationships, eagerLoads)
-                : new ResourceType(publicName, resourceClrType, idClrType, attributes, relationships, eagerLoads, linksAttribute.TopLevelLinks,
-                    linksAttribute.ResourceLinks, linksAttribute.RelationshipLinks);
-        }
+        var linksAttribute = resourceClrType.GetCustomAttribute<ResourceLinksAttribute>(true);
+
+        return linksAttribute == null
+            ? new ResourceType(publicName, resourceClrType, idClrType, attributes, relationships, eagerLoads)
+            : new ResourceType(publicName, resourceClrType, idClrType, attributes, relationships, eagerLoads, linksAttribute.TopLevelLinks,
+                linksAttribute.ResourceLinks, linksAttribute.RelationshipLinks);
+    }
 
-        private IReadOnlyCollection<AttrAttribute> GetAttributes(Type resourceClrType)
+    private IReadOnlyCollection<AttrAttribute> GetAttributes(Type resourceClrType)
+    {
+        var attributesByName = new Dictionary<string, AttrAttribute>();
+
+        foreach (PropertyInfo property in resourceClrType.GetProperties())
         {
-            var attributesByName = new Dictionary<string, AttrAttribute>();
+            var attribute = property.GetCustomAttribute<AttrAttribute>(true);
 
-            foreach (PropertyInfo property in resourceClrType.GetProperties())
+            if (attribute == null)
             {
-                // Although strictly not correct, 'id' is added to the list of attributes for convenience.
-                // For example, it enables to filter on ID, without the need to special-case existing logic.
-                // And when using sparse fields, it silently adds 'id' to the set of attributes to retrieve.
                 if (property.Name == nameof(Identifiable<object>.Id))
                 {
-                    var idAttr = new AttrAttribute
-                    {
-                        PublicName = FormatPropertyName(property),
-                        Property = property,
-                        Capabilities = _options.DefaultAttrCapabilities
-                    };
-
-                    IncludeField(attributesByName, idAttr);
-                    continue;
-                }
+                    // Although strictly not correct, 'id' is added to the list of attributes for convenience.
+                    // For example, it enables to filter on ID, without the need to special-case existing logic.
+                    // And when using sparse fieldsets, it silently adds 'id' to the set of attributes to retrieve.
 
-                var attribute = (AttrAttribute?)property.GetCustomAttribute(typeof(AttrAttribute));
-
-                if (attribute == null)
-                {
-                    continue;
+                    attribute = new AttrAttribute();
                 }
-
-                SetPublicName(attribute, property);
-                attribute.Property = property;
-
-                if (!attribute.HasExplicitCapabilities)
+                else
                 {
-                    attribute.Capabilities = _options.DefaultAttrCapabilities;
+                    continue;
                 }
-
-                IncludeField(attributesByName, attribute);
-            }
-
-            if (attributesByName.Count < 2)
-            {
-                _logger.LogWarning($"Type '{resourceClrType}' does not contain any attributes.");
             }
 
-            return attributesByName.Values;
-        }
-
-        private IReadOnlyCollection<RelationshipAttribute> GetRelationships(Type resourceClrType)
-        {
-            var relationshipsByName = new Dictionary<string, RelationshipAttribute>();
-            PropertyInfo[] properties = resourceClrType.GetProperties();
+            SetPublicName(attribute, property);
+            attribute.Property = property;
 
-            foreach (PropertyInfo property in properties)
+            if (!attribute.HasExplicitCapabilities)
             {
-                var relationship = (RelationshipAttribute?)property.GetCustomAttribute(typeof(RelationshipAttribute));
-
-                if (relationship != null)
-                {
-                    relationship.Property = property;
-                    SetPublicName(relationship, property);
-                    relationship.LeftClrType = resourceClrType;
-                    relationship.RightClrType = GetRelationshipType(relationship, property);
-
-                    IncludeField(relationshipsByName, relationship);
-                }
+                attribute.Capabilities = _options.DefaultAttrCapabilities;
             }
 
-            return relationshipsByName.Values;
+            IncludeField(attributesByName, attribute);
         }
 
-        private void SetPublicName(ResourceFieldAttribute field, PropertyInfo property)
+        if (attributesByName.Count < 2)
         {
-            // ReSharper disable once ConstantNullCoalescingCondition
-            field.PublicName ??= FormatPropertyName(property);
+            _logger.LogWarning($"Type '{resourceClrType}' does not contain any attributes.");
         }
 
-        private Type GetRelationshipType(RelationshipAttribute relationship, PropertyInfo property)
-        {
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
-            ArgumentGuard.NotNull(property, nameof(property));
+        return attributesByName.Values;
+    }
 
-            return relationship is HasOneAttribute ? property.PropertyType : property.PropertyType.GetGenericArguments()[0];
-        }
+    private IReadOnlyCollection<RelationshipAttribute> GetRelationships(Type resourceClrType)
+    {
+        var relationshipsByName = new Dictionary<string, RelationshipAttribute>();
+        PropertyInfo[] properties = resourceClrType.GetProperties();
 
-        private IReadOnlyCollection<EagerLoadAttribute> GetEagerLoads(Type resourceClrType, int recursionDepth = 0)
+        foreach (PropertyInfo property in properties)
         {
-            AssertNoInfiniteRecursion(recursionDepth);
+            var relationship = property.GetCustomAttribute<RelationshipAttribute>(true);
 
-            var attributes = new List<EagerLoadAttribute>();
-            PropertyInfo[] properties = resourceClrType.GetProperties();
-
-            foreach (PropertyInfo property in properties)
+            if (relationship != null)
             {
-                var eagerLoad = (EagerLoadAttribute?)property.GetCustomAttribute(typeof(EagerLoadAttribute));
+                relationship.Property = property;
+                SetPublicName(relationship, property);
+                relationship.LeftClrType = resourceClrType;
+                relationship.RightClrType = GetRelationshipType(relationship, property);
 
-                if (eagerLoad == null)
-                {
-                    continue;
-                }
+                IncludeField(relationshipsByName, relationship);
+            }
+        }
 
-                Type innerType = TypeOrElementType(property.PropertyType);
-                eagerLoad.Children = GetEagerLoads(innerType, recursionDepth + 1);
-                eagerLoad.Property = property;
+        return relationshipsByName.Values;
+    }
 
-                attributes.Add(eagerLoad);
-            }
+    private void SetPublicName(ResourceFieldAttribute field, PropertyInfo property)
+    {
+        // ReSharper disable once ConstantNullCoalescingCondition
+        field.PublicName ??= FormatPropertyName(property);
+    }
 
-            return attributes;
-        }
+    private Type GetRelationshipType(RelationshipAttribute relationship, PropertyInfo property)
+    {
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
+        ArgumentGuard.NotNull(property, nameof(property));
 
-        private static void IncludeField<TField>(Dictionary<string, TField> fieldsByName, TField field)
-            where TField : ResourceFieldAttribute
-        {
-            if (fieldsByName.TryGetValue(field.PublicName, out var existingField))
-            {
-                throw CreateExceptionForDuplicatePublicName(field.Property.DeclaringType!, existingField, field);
-            }
+        return relationship is HasOneAttribute ? property.PropertyType : property.PropertyType.GetGenericArguments()[0];
+    }
 
-            fieldsByName.Add(field.PublicName, field);
-        }
+    private IReadOnlyCollection<EagerLoadAttribute> GetEagerLoads(Type resourceClrType, int recursionDepth = 0)
+    {
+        AssertNoInfiniteRecursion(recursionDepth);
 
-        private void AssertNoDuplicatePublicName(ResourceType resourceType, string effectivePublicName)
+        var attributes = new List<EagerLoadAttribute>();
+        PropertyInfo[] properties = resourceClrType.GetProperties();
+
+        foreach (PropertyInfo property in properties)
         {
-            var (existingClrType, _) = _resourceTypesByClrType.FirstOrDefault(type => type.Value.PublicName == resourceType.PublicName);
+            var eagerLoad = property.GetCustomAttribute<EagerLoadAttribute>(true);
 
-            if (existingClrType != null)
+            if (eagerLoad == null)
             {
-                throw new InvalidConfigurationException(
-                    $"Resource '{existingClrType}' and '{resourceType.ClrType}' both use public name '{effectivePublicName}'.");
+                continue;
             }
-        }
 
-        private void AssertNoDuplicatePublicName(IReadOnlyCollection<AttrAttribute> attributes, IReadOnlyCollection<RelationshipAttribute> relationships)
-        {
-            IEnumerable<(AttrAttribute attribute, RelationshipAttribute relationship)> query =
-                from attribute in attributes
-                from relationship in relationships
-                where attribute.PublicName == relationship.PublicName
-                select (attribute, relationship);
-
-            (AttrAttribute? duplicateAttribute, RelationshipAttribute? duplicateRelationship) = query.FirstOrDefault();
+            Type innerType = TypeOrElementType(property.PropertyType);
+            eagerLoad.Children = GetEagerLoads(innerType, recursionDepth + 1);
+            eagerLoad.Property = property;
 
-            if (duplicateAttribute != null && duplicateRelationship != null)
-            {
-                throw CreateExceptionForDuplicatePublicName(duplicateAttribute.Property.DeclaringType!, duplicateAttribute, duplicateRelationship);
-            }
+            attributes.Add(eagerLoad);
         }
 
-        private static InvalidConfigurationException CreateExceptionForDuplicatePublicName(Type containingClrType, ResourceFieldAttribute existingField,
-            ResourceFieldAttribute field)
+        return attributes;
+    }
+
+    private static void IncludeField<TField>(Dictionary<string, TField> fieldsByName, TField field)
+        where TField : ResourceFieldAttribute
+    {
+        if (fieldsByName.TryGetValue(field.PublicName, out TField? existingField))
         {
-            return new InvalidConfigurationException(
-                $"Properties '{containingClrType}.{existingField.Property.Name}' and '{containingClrType}.{field.Property.Name}' both use public name '{field.PublicName}'.");
+            throw CreateExceptionForDuplicatePublicName(field.Property.DeclaringType!, existingField, field);
         }
 
-        [AssertionMethod]
-        private static void AssertNoInfiniteRecursion(int recursionDepth)
+        fieldsByName.Add(field.PublicName, field);
+    }
+
+    private void AssertNoDuplicatePublicName(ResourceType resourceType, string effectivePublicName)
+    {
+        (Type? existingClrType, _) = _resourceTypesByClrType.FirstOrDefault(type => type.Value.PublicName == resourceType.PublicName);
+
+        if (existingClrType != null)
         {
-            if (recursionDepth >= 500)
-            {
-                throw new InvalidOperationException("Infinite recursion detected in eager-load chain.");
-            }
+            throw new InvalidConfigurationException($"Resource '{existingClrType}' and '{resourceType.ClrType}' both use public name '{effectivePublicName}'.");
         }
+    }
 
-        private Type TypeOrElementType(Type type)
-        {
-            Type[] interfaces = type.GetInterfaces()
-                .Where(@interface => @interface.IsGenericType && @interface.GetGenericTypeDefinition() == typeof(IEnumerable<>)).ToArray();
+    private void AssertNoDuplicatePublicName(IReadOnlyCollection<AttrAttribute> attributes, IReadOnlyCollection<RelationshipAttribute> relationships)
+    {
+        IEnumerable<(AttrAttribute attribute, RelationshipAttribute relationship)> query =
+            from attribute in attributes
+            from relationship in relationships
+            where attribute.PublicName == relationship.PublicName
+            select (attribute, relationship);
 
-            return interfaces.Length == 1 ? interfaces.Single().GenericTypeArguments[0] : type;
-        }
+        (AttrAttribute? duplicateAttribute, RelationshipAttribute? duplicateRelationship) = query.FirstOrDefault();
 
-        private string FormatResourceName(Type resourceClrType)
+        if (duplicateAttribute != null && duplicateRelationship != null)
         {
-            var formatter = new ResourceNameFormatter(_options.SerializerOptions.PropertyNamingPolicy);
-            return formatter.FormatResourceName(resourceClrType);
+            throw CreateExceptionForDuplicatePublicName(duplicateAttribute.Property.DeclaringType!, duplicateAttribute, duplicateRelationship);
         }
+    }
+
+    private static InvalidConfigurationException CreateExceptionForDuplicatePublicName(Type containingClrType, ResourceFieldAttribute existingField,
+        ResourceFieldAttribute field)
+    {
+        return new InvalidConfigurationException(
+            $"Properties '{containingClrType}.{existingField.Property.Name}' and '{containingClrType}.{field.Property.Name}' both use public name '{field.PublicName}'.");
+    }
 
-        private string FormatPropertyName(PropertyInfo resourceProperty)
+    [AssertionMethod]
+    private static void AssertNoInfiniteRecursion(int recursionDepth)
+    {
+        if (recursionDepth >= 500)
         {
-            return _options.SerializerOptions.PropertyNamingPolicy == null
-                ? resourceProperty.Name
-                : _options.SerializerOptions.PropertyNamingPolicy.ConvertName(resourceProperty.Name);
+            throw new InvalidOperationException("Infinite recursion detected in eager-load chain.");
         }
     }
+
+    private Type TypeOrElementType(Type type)
+    {
+        Type[] interfaces = type.GetInterfaces().Where(@interface => @interface.IsGenericType && @interface.GetGenericTypeDefinition() == typeof(IEnumerable<>))
+            .ToArray();
+
+        return interfaces.Length == 1 ? interfaces.Single().GenericTypeArguments[0] : type;
+    }
+
+    private string FormatResourceName(Type resourceClrType)
+    {
+        var formatter = new ResourceNameFormatter(_options.SerializerOptions.PropertyNamingPolicy);
+        return formatter.FormatResourceName(resourceClrType);
+    }
+
+    private string FormatPropertyName(PropertyInfo resourceProperty)
+    {
+        return _options.SerializerOptions.PropertyNamingPolicy == null
+            ? resourceProperty.Name
+            : _options.SerializerOptions.PropertyNamingPolicy.ConvertName(resourceProperty.Name);
+    }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/ResourceNameFormatter.cs b/src/JsonApiDotNetCore/Configuration/ResourceNameFormatter.cs
index c6be029b1b..82a54ff010 100644
--- a/src/JsonApiDotNetCore/Configuration/ResourceNameFormatter.cs
+++ b/src/JsonApiDotNetCore/Configuration/ResourceNameFormatter.cs
@@ -1,34 +1,34 @@
-using System;
 using System.Reflection;
 using System.Text.Json;
 using Humanizer;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+internal sealed class ResourceNameFormatter
 {
-    internal sealed class ResourceNameFormatter
-    {
-        private readonly JsonNamingPolicy? _namingPolicy;
+    private readonly JsonNamingPolicy? _namingPolicy;
 
-        public ResourceNameFormatter(JsonNamingPolicy? namingPolicy)
-        {
-            _namingPolicy = namingPolicy;
-        }
+    public ResourceNameFormatter(JsonNamingPolicy? namingPolicy)
+    {
+        _namingPolicy = namingPolicy;
+    }
 
-        /// <summary>
-        /// Gets the publicly exposed resource name by applying the configured naming convention on the pluralized CLR type name.
-        /// </summary>
-        public string FormatResourceName(Type resourceClrType)
-        {
-            ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
+    /// <summary>
+    /// Gets the publicly exposed resource name by applying the configured naming convention on the pluralized CLR type name.
+    /// </summary>
+    public string FormatResourceName(Type resourceClrType)
+    {
+        ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
 
-            if (resourceClrType.GetCustomAttribute(typeof(ResourceAttribute)) is ResourceAttribute attribute)
-            {
-                return attribute.PublicName;
-            }
+        var resourceAttribute = resourceClrType.GetCustomAttribute<ResourceAttribute>(true);
 
-            string publicName = resourceClrType.Name.Pluralize();
-            return _namingPolicy != null ? _namingPolicy.ConvertName(publicName) : publicName;
+        if (resourceAttribute != null && !string.IsNullOrWhiteSpace(resourceAttribute.PublicName))
+        {
+            return resourceAttribute.PublicName;
         }
+
+        string publicName = resourceClrType.Name.Pluralize();
+        return _namingPolicy != null ? _namingPolicy.ConvertName(publicName) : publicName;
     }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/ResourceType.cs b/src/JsonApiDotNetCore/Configuration/ResourceType.cs
deleted file mode 100644
index 2f71fa5d2b..0000000000
--- a/src/JsonApiDotNetCore/Configuration/ResourceType.cs
+++ /dev/null
@@ -1,222 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using JetBrains.Annotations;
-using JsonApiDotNetCore.Resources.Annotations;
-
-namespace JsonApiDotNetCore.Configuration
-{
-    /// <summary>
-    /// Metadata about the shape of a JSON:API resource in the resource graph.
-    /// </summary>
-    [PublicAPI]
-    public sealed class ResourceType
-    {
-        private readonly Dictionary<string, ResourceFieldAttribute> _fieldsByPublicName = new();
-        private readonly Dictionary<string, ResourceFieldAttribute> _fieldsByPropertyName = new();
-
-        /// <summary>
-        /// The publicly exposed resource name.
-        /// </summary>
-        public string PublicName { get; }
-
-        /// <summary>
-        /// The CLR type of the resource.
-        /// </summary>
-        public Type ClrType { get; }
-
-        /// <summary>
-        /// The CLR type of the resource identity.
-        /// </summary>
-        public Type IdentityClrType { get; }
-
-        /// <summary>
-        /// Exposed resource attributes and relationships. See https://jsonapi.org/format/#document-resource-object-fields.
-        /// </summary>
-        public IReadOnlyCollection<ResourceFieldAttribute> Fields { get; }
-
-        /// <summary>
-        /// Exposed resource attributes. See https://jsonapi.org/format/#document-resource-object-attributes.
-        /// </summary>
-        public IReadOnlyCollection<AttrAttribute> Attributes { get; }
-
-        /// <summary>
-        /// Exposed resource relationships. See https://jsonapi.org/format/#document-resource-object-relationships.
-        /// </summary>
-        public IReadOnlyCollection<RelationshipAttribute> Relationships { get; }
-
-        /// <summary>
-        /// Related entities that are not exposed as resource relationships.
-        /// </summary>
-        public IReadOnlyCollection<EagerLoadAttribute> EagerLoads { get; }
-
-        /// <summary>
-        /// Configures which links to show in the <see cref="Serialization.Objects.TopLevelLinks" /> object for this resource type. Defaults to
-        /// <see cref="LinkTypes.NotConfigured" />, which falls back to <see cref="IJsonApiOptions.TopLevelLinks" />.
-        /// </summary>
-        /// <remarks>
-        /// In the process of building the resource graph, this value is set based on <see cref="ResourceLinksAttribute.TopLevelLinks" /> usage.
-        /// </remarks>
-        public LinkTypes TopLevelLinks { get; }
-
-        /// <summary>
-        /// Configures which links to show in the <see cref="Serialization.Objects.ResourceLinks" /> object for this resource type. Defaults to
-        /// <see cref="LinkTypes.NotConfigured" />, which falls back to <see cref="IJsonApiOptions.ResourceLinks" />.
-        /// </summary>
-        /// <remarks>
-        /// In the process of building the resource graph, this value is set based on <see cref="ResourceLinksAttribute.ResourceLinks" /> usage.
-        /// </remarks>
-        public LinkTypes ResourceLinks { get; }
-
-        /// <summary>
-        /// Configures which links to show in the <see cref="Serialization.Objects.RelationshipLinks" /> object for all relationships of this resource type.
-        /// Defaults to <see cref="LinkTypes.NotConfigured" />, which falls back to <see cref="IJsonApiOptions.RelationshipLinks" />. This can be overruled per
-        /// relationship by setting <see cref="RelationshipAttribute.Links" />.
-        /// </summary>
-        /// <remarks>
-        /// In the process of building the resource graph, this value is set based on <see cref="ResourceLinksAttribute.RelationshipLinks" /> usage.
-        /// </remarks>
-        public LinkTypes RelationshipLinks { get; }
-
-        public ResourceType(string publicName, Type clrType, Type identityClrType, IReadOnlyCollection<AttrAttribute>? attributes = null,
-            IReadOnlyCollection<RelationshipAttribute>? relationships = null, IReadOnlyCollection<EagerLoadAttribute>? eagerLoads = null,
-            LinkTypes topLevelLinks = LinkTypes.NotConfigured, LinkTypes resourceLinks = LinkTypes.NotConfigured,
-            LinkTypes relationshipLinks = LinkTypes.NotConfigured)
-        {
-            ArgumentGuard.NotNullNorEmpty(publicName, nameof(publicName));
-            ArgumentGuard.NotNull(clrType, nameof(clrType));
-            ArgumentGuard.NotNull(identityClrType, nameof(identityClrType));
-
-            PublicName = publicName;
-            ClrType = clrType;
-            IdentityClrType = identityClrType;
-            Attributes = attributes ?? Array.Empty<AttrAttribute>();
-            Relationships = relationships ?? Array.Empty<RelationshipAttribute>();
-            EagerLoads = eagerLoads ?? Array.Empty<EagerLoadAttribute>();
-            TopLevelLinks = topLevelLinks;
-            ResourceLinks = resourceLinks;
-            RelationshipLinks = relationshipLinks;
-            Fields = Attributes.Cast<ResourceFieldAttribute>().Concat(Relationships).ToArray();
-
-            foreach (ResourceFieldAttribute field in Fields)
-            {
-                _fieldsByPublicName.Add(field.PublicName, field);
-                _fieldsByPropertyName.Add(field.Property.Name, field);
-            }
-        }
-
-        public AttrAttribute GetAttributeByPublicName(string publicName)
-        {
-            AttrAttribute? attribute = FindAttributeByPublicName(publicName);
-            return attribute ?? throw new InvalidOperationException($"Attribute '{publicName}' does not exist on resource type '{PublicName}'.");
-        }
-
-        public AttrAttribute? FindAttributeByPublicName(string publicName)
-        {
-            ArgumentGuard.NotNull(publicName, nameof(publicName));
-
-            return _fieldsByPublicName.TryGetValue(publicName, out ResourceFieldAttribute? field) && field is AttrAttribute attribute ? attribute : null;
-        }
-
-        public AttrAttribute GetAttributeByPropertyName(string propertyName)
-        {
-            AttrAttribute? attribute = FindAttributeByPropertyName(propertyName);
-
-            return attribute ??
-                throw new InvalidOperationException($"Attribute for property '{propertyName}' does not exist on resource type '{ClrType.Name}'.");
-        }
-
-        public AttrAttribute? FindAttributeByPropertyName(string propertyName)
-        {
-            ArgumentGuard.NotNull(propertyName, nameof(propertyName));
-
-            return _fieldsByPropertyName.TryGetValue(propertyName, out ResourceFieldAttribute? field) && field is AttrAttribute attribute ? attribute : null;
-        }
-
-        public RelationshipAttribute GetRelationshipByPublicName(string publicName)
-        {
-            RelationshipAttribute? relationship = FindRelationshipByPublicName(publicName);
-            return relationship ?? throw new InvalidOperationException($"Relationship '{publicName}' does not exist on resource type '{PublicName}'.");
-        }
-
-        public RelationshipAttribute? FindRelationshipByPublicName(string publicName)
-        {
-            ArgumentGuard.NotNull(publicName, nameof(publicName));
-
-            return _fieldsByPublicName.TryGetValue(publicName, out ResourceFieldAttribute? field) && field is RelationshipAttribute relationship
-                ? relationship
-                : null;
-        }
-
-        public RelationshipAttribute GetRelationshipByPropertyName(string propertyName)
-        {
-            RelationshipAttribute? relationship = FindRelationshipByPropertyName(propertyName);
-
-            return relationship ??
-                throw new InvalidOperationException($"Relationship for property '{propertyName}' does not exist on resource type '{ClrType.Name}'.");
-        }
-
-        public RelationshipAttribute? FindRelationshipByPropertyName(string propertyName)
-        {
-            ArgumentGuard.NotNull(propertyName, nameof(propertyName));
-
-            return _fieldsByPropertyName.TryGetValue(propertyName, out ResourceFieldAttribute? field) && field is RelationshipAttribute relationship
-                ? relationship
-                : null;
-        }
-
-        public override string ToString()
-        {
-            return PublicName;
-        }
-
-        public override bool Equals(object? obj)
-        {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
-
-            var other = (ResourceType)obj;
-
-            return PublicName == other.PublicName && ClrType == other.ClrType && IdentityClrType == other.IdentityClrType &&
-                Attributes.SequenceEqual(other.Attributes) && Relationships.SequenceEqual(other.Relationships) && EagerLoads.SequenceEqual(other.EagerLoads) &&
-                TopLevelLinks == other.TopLevelLinks && ResourceLinks == other.ResourceLinks && RelationshipLinks == other.RelationshipLinks;
-        }
-
-        public override int GetHashCode()
-        {
-            var hashCode = new HashCode();
-
-            hashCode.Add(PublicName);
-            hashCode.Add(ClrType);
-            hashCode.Add(IdentityClrType);
-
-            foreach (AttrAttribute attribute in Attributes)
-            {
-                hashCode.Add(attribute);
-            }
-
-            foreach (RelationshipAttribute relationship in Relationships)
-            {
-                hashCode.Add(relationship);
-            }
-
-            foreach (EagerLoadAttribute eagerLoad in EagerLoads)
-            {
-                hashCode.Add(eagerLoad);
-            }
-
-            hashCode.Add(TopLevelLinks);
-            hashCode.Add(ResourceLinks);
-            hashCode.Add(RelationshipLinks);
-
-            return hashCode.ToHashCode();
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Configuration/ServiceCollectionExtensions.cs b/src/JsonApiDotNetCore/Configuration/ServiceCollectionExtensions.cs
index c69d9305ca..64a15e2eda 100644
--- a/src/JsonApiDotNetCore/Configuration/ServiceCollectionExtensions.cs
+++ b/src/JsonApiDotNetCore/Configuration/ServiceCollectionExtensions.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Errors;
 using JsonApiDotNetCore.Repositories;
@@ -9,132 +6,131 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+[PublicAPI]
+public static class ServiceCollectionExtensions
 {
-    [PublicAPI]
-    public static class ServiceCollectionExtensions
+    private static readonly TypeLocator TypeLocator = new();
+
+    /// <summary>
+    /// Configures JsonApiDotNetCore by registering resources manually.
+    /// </summary>
+    public static IServiceCollection AddJsonApi(this IServiceCollection services, Action<JsonApiOptions>? options = null,
+        Action<ServiceDiscoveryFacade>? discovery = null, Action<ResourceGraphBuilder>? resources = null, IMvcCoreBuilder? mvcBuilder = null,
+        ICollection<Type>? dbContextTypes = null)
     {
-        private static readonly TypeLocator TypeLocator = new();
-
-        /// <summary>
-        /// Configures JsonApiDotNetCore by registering resources manually.
-        /// </summary>
-        public static IServiceCollection AddJsonApi(this IServiceCollection services, Action<JsonApiOptions>? options = null,
-            Action<ServiceDiscoveryFacade>? discovery = null, Action<ResourceGraphBuilder>? resources = null, IMvcCoreBuilder? mvcBuilder = null,
-            ICollection<Type>? dbContextTypes = null)
-        {
-            ArgumentGuard.NotNull(services, nameof(services));
+        ArgumentGuard.NotNull(services, nameof(services));
 
-            SetupApplicationBuilder(services, options, discovery, resources, mvcBuilder, dbContextTypes ?? Array.Empty<Type>());
+        SetupApplicationBuilder(services, options, discovery, resources, mvcBuilder, dbContextTypes ?? Array.Empty<Type>());
 
-            return services;
-        }
+        return services;
+    }
 
-        /// <summary>
-        /// Configures JsonApiDotNetCore by registering resources from an Entity Framework Core model.
-        /// </summary>
-        public static IServiceCollection AddJsonApi<TDbContext>(this IServiceCollection services, Action<JsonApiOptions>? options = null,
-            Action<ServiceDiscoveryFacade>? discovery = null, Action<ResourceGraphBuilder>? resources = null, IMvcCoreBuilder? mvcBuilder = null)
-            where TDbContext : DbContext
-        {
-            return AddJsonApi(services, options, discovery, resources, mvcBuilder, typeof(TDbContext).AsArray());
-        }
+    /// <summary>
+    /// Configures JsonApiDotNetCore by registering resources from an Entity Framework Core model.
+    /// </summary>
+    public static IServiceCollection AddJsonApi<TDbContext>(this IServiceCollection services, Action<JsonApiOptions>? options = null,
+        Action<ServiceDiscoveryFacade>? discovery = null, Action<ResourceGraphBuilder>? resources = null, IMvcCoreBuilder? mvcBuilder = null)
+        where TDbContext : DbContext
+    {
+        return AddJsonApi(services, options, discovery, resources, mvcBuilder, typeof(TDbContext).AsArray());
+    }
 
-        private static void SetupApplicationBuilder(IServiceCollection services, Action<JsonApiOptions>? configureOptions,
-            Action<ServiceDiscoveryFacade>? configureAutoDiscovery, Action<ResourceGraphBuilder>? configureResources, IMvcCoreBuilder? mvcBuilder,
-            ICollection<Type> dbContextTypes)
-        {
-            using var applicationBuilder = new JsonApiApplicationBuilder(services, mvcBuilder ?? services.AddMvcCore());
-
-            applicationBuilder.ConfigureJsonApiOptions(configureOptions);
-            applicationBuilder.ConfigureAutoDiscovery(configureAutoDiscovery);
-            applicationBuilder.ConfigureResourceGraph(dbContextTypes, configureResources);
-            applicationBuilder.ConfigureMvc();
-            applicationBuilder.DiscoverInjectables();
-            applicationBuilder.ConfigureServiceContainer(dbContextTypes);
-        }
+    private static void SetupApplicationBuilder(IServiceCollection services, Action<JsonApiOptions>? configureOptions,
+        Action<ServiceDiscoveryFacade>? configureAutoDiscovery, Action<ResourceGraphBuilder>? configureResources, IMvcCoreBuilder? mvcBuilder,
+        ICollection<Type> dbContextTypes)
+    {
+        using var applicationBuilder = new JsonApiApplicationBuilder(services, mvcBuilder ?? services.AddMvcCore());
+
+        applicationBuilder.ConfigureJsonApiOptions(configureOptions);
+        applicationBuilder.ConfigureAutoDiscovery(configureAutoDiscovery);
+        applicationBuilder.ConfigureResourceGraph(dbContextTypes, configureResources);
+        applicationBuilder.ConfigureMvc();
+        applicationBuilder.DiscoverInjectables();
+        applicationBuilder.ConfigureServiceContainer(dbContextTypes);
+    }
 
-        /// <summary>
-        /// Adds IoC container registrations for the various JsonApiDotNetCore resource service interfaces, such as <see cref="IGetAllService{TResource,TId}" />,
-        /// <see cref="ICreateService{TResource, TId}" /> and the various others.
-        /// </summary>
-        public static IServiceCollection AddResourceService<TService>(this IServiceCollection services)
-        {
-            ArgumentGuard.NotNull(services, nameof(services));
+    /// <summary>
+    /// Adds IoC container registrations for the various JsonApiDotNetCore resource service interfaces, such as <see cref="IGetAllService{TResource,TId}" />,
+    /// <see cref="ICreateService{TResource, TId}" /> and the various others.
+    /// </summary>
+    public static IServiceCollection AddResourceService<TService>(this IServiceCollection services)
+    {
+        ArgumentGuard.NotNull(services, nameof(services));
 
-            RegisterForConstructedType(services, typeof(TService), ServiceDiscoveryFacade.ServiceInterfaces);
+        RegisterTypeForUnboundInterfaces(services, typeof(TService), ServiceDiscoveryFacade.ServiceUnboundInterfaces);
 
-            return services;
-        }
+        return services;
+    }
 
-        /// <summary>
-        /// Adds IoC container registrations for the various JsonApiDotNetCore resource repository interfaces, such as
-        /// <see cref="IResourceReadRepository{TResource,TId}" /> and <see cref="IResourceWriteRepository{TResource, TId}" />.
-        /// </summary>
-        public static IServiceCollection AddResourceRepository<TRepository>(this IServiceCollection services)
-        {
-            ArgumentGuard.NotNull(services, nameof(services));
+    /// <summary>
+    /// Adds IoC container registrations for the various JsonApiDotNetCore resource repository interfaces, such as
+    /// <see cref="IResourceReadRepository{TResource,TId}" /> and <see cref="IResourceWriteRepository{TResource, TId}" />.
+    /// </summary>
+    public static IServiceCollection AddResourceRepository<TRepository>(this IServiceCollection services)
+    {
+        ArgumentGuard.NotNull(services, nameof(services));
 
-            RegisterForConstructedType(services, typeof(TRepository), ServiceDiscoveryFacade.RepositoryInterfaces);
+        RegisterTypeForUnboundInterfaces(services, typeof(TRepository), ServiceDiscoveryFacade.RepositoryUnboundInterfaces);
 
-            return services;
-        }
+        return services;
+    }
 
-        /// <summary>
-        /// Adds IoC container registrations for the various JsonApiDotNetCore resource definition interfaces, such as
-        /// <see cref="IResourceDefinition{TResource,TId}" />.
-        /// </summary>
-        public static IServiceCollection AddResourceDefinition<TResourceDefinition>(this IServiceCollection services)
-        {
-            ArgumentGuard.NotNull(services, nameof(services));
+    /// <summary>
+    /// Adds IoC container registrations for the various JsonApiDotNetCore resource definition interfaces, such as
+    /// <see cref="IResourceDefinition{TResource,TId}" />.
+    /// </summary>
+    public static IServiceCollection AddResourceDefinition<TResourceDefinition>(this IServiceCollection services)
+    {
+        ArgumentGuard.NotNull(services, nameof(services));
 
-            RegisterForConstructedType(services, typeof(TResourceDefinition), ServiceDiscoveryFacade.ResourceDefinitionInterfaces);
+        RegisterTypeForUnboundInterfaces(services, typeof(TResourceDefinition), ServiceDiscoveryFacade.ResourceDefinitionUnboundInterfaces);
 
-            return services;
-        }
+        return services;
+    }
 
-        private static void RegisterForConstructedType(IServiceCollection services, Type implementationType, IEnumerable<Type> openGenericInterfaces)
-        {
-            bool seenCompatibleInterface = false;
-            ResourceDescriptor? resourceDescriptor = ResolveResourceTypeFromServiceImplementation(implementationType);
+    private static void RegisterTypeForUnboundInterfaces(IServiceCollection serviceCollection, Type implementationType, IEnumerable<Type> unboundInterfaces)
+    {
+        bool seenCompatibleInterface = false;
+        ResourceDescriptor? resourceDescriptor = ResolveResourceTypeFromServiceImplementation(implementationType);
 
-            if (resourceDescriptor != null)
+        if (resourceDescriptor != null)
+        {
+            foreach (Type unboundInterface in unboundInterfaces)
             {
-                foreach (Type openGenericInterface in openGenericInterfaces)
-                {
-                    Type constructedType = openGenericInterface.MakeGenericType(resourceDescriptor.ResourceClrType, resourceDescriptor.IdClrType);
+                Type closedInterface = unboundInterface.MakeGenericType(resourceDescriptor.ResourceClrType, resourceDescriptor.IdClrType);
 
-                    if (constructedType.IsAssignableFrom(implementationType))
-                    {
-                        services.AddScoped(constructedType, implementationType);
-                        seenCompatibleInterface = true;
-                    }
+                if (closedInterface.IsAssignableFrom(implementationType))
+                {
+                    serviceCollection.AddScoped(closedInterface, implementationType);
+                    seenCompatibleInterface = true;
                 }
             }
+        }
 
-            if (!seenCompatibleInterface)
-            {
-                throw new InvalidConfigurationException($"{implementationType} does not implement any of the expected JsonApiDotNetCore interfaces.");
-            }
+        if (!seenCompatibleInterface)
+        {
+            throw new InvalidConfigurationException($"{implementationType} does not implement any of the expected JsonApiDotNetCore interfaces.");
         }
+    }
 
-        private static ResourceDescriptor? ResolveResourceTypeFromServiceImplementation(Type? serviceType)
+    private static ResourceDescriptor? ResolveResourceTypeFromServiceImplementation(Type? serviceType)
+    {
+        if (serviceType != null)
         {
-            if (serviceType != null)
+            foreach (Type @interface in serviceType.GetInterfaces())
             {
-                foreach (Type @interface in serviceType.GetInterfaces())
-                {
-                    Type? firstGenericArgument = @interface.IsGenericType ? @interface.GenericTypeArguments.First() : null;
-                    ResourceDescriptor? resourceDescriptor = TypeLocator.ResolveResourceDescriptor(firstGenericArgument);
+                Type? firstTypeArgument = @interface.IsGenericType ? @interface.GenericTypeArguments.First() : null;
+                ResourceDescriptor? resourceDescriptor = TypeLocator.ResolveResourceDescriptor(firstTypeArgument);
 
-                    if (resourceDescriptor != null)
-                    {
-                        return resourceDescriptor;
-                    }
+                if (resourceDescriptor != null)
+                {
+                    return resourceDescriptor;
                 }
             }
-
-            return null;
         }
+
+        return null;
     }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs b/src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs
index cdd6a65031..7498391afd 100644
--- a/src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs
+++ b/src/JsonApiDotNetCore/Configuration/ServiceDiscoveryFacade.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Repositories;
@@ -9,165 +7,163 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Scans for types like resources, services, repositories and resource definitions in an assembly and registers them to the IoC container.
+/// </summary>
+[PublicAPI]
+public sealed class ServiceDiscoveryFacade
 {
-    /// <summary>
-    /// Scans for types like resources, services, repositories and resource definitions in an assembly and registers them to the IoC container.
-    /// </summary>
-    [PublicAPI]
-    public sealed class ServiceDiscoveryFacade
+    internal static readonly HashSet<Type> ServiceUnboundInterfaces = new()
     {
-        internal static readonly HashSet<Type> ServiceInterfaces = new()
-        {
-            typeof(IResourceService<,>),
-            typeof(IResourceCommandService<,>),
-            typeof(IResourceQueryService<,>),
-            typeof(IGetAllService<,>),
-            typeof(IGetByIdService<,>),
-            typeof(IGetSecondaryService<,>),
-            typeof(IGetRelationshipService<,>),
-            typeof(ICreateService<,>),
-            typeof(IAddToRelationshipService<,>),
-            typeof(IUpdateService<,>),
-            typeof(ISetRelationshipService<,>),
-            typeof(IDeleteService<,>),
-            typeof(IRemoveFromRelationshipService<,>)
-        };
-
-        internal static readonly HashSet<Type> RepositoryInterfaces = new()
-        {
-            typeof(IResourceRepository<,>),
-            typeof(IResourceWriteRepository<,>),
-            typeof(IResourceReadRepository<,>)
-        };
+        typeof(IResourceService<,>),
+        typeof(IResourceCommandService<,>),
+        typeof(IResourceQueryService<,>),
+        typeof(IGetAllService<,>),
+        typeof(IGetByIdService<,>),
+        typeof(IGetSecondaryService<,>),
+        typeof(IGetRelationshipService<,>),
+        typeof(ICreateService<,>),
+        typeof(IAddToRelationshipService<,>),
+        typeof(IUpdateService<,>),
+        typeof(ISetRelationshipService<,>),
+        typeof(IDeleteService<,>),
+        typeof(IRemoveFromRelationshipService<,>)
+    };
+
+    internal static readonly HashSet<Type> RepositoryUnboundInterfaces = new()
+    {
+        typeof(IResourceRepository<,>),
+        typeof(IResourceWriteRepository<,>),
+        typeof(IResourceReadRepository<,>)
+    };
 
-        internal static readonly HashSet<Type> ResourceDefinitionInterfaces = new()
-        {
-            typeof(IResourceDefinition<,>)
-        };
+    internal static readonly HashSet<Type> ResourceDefinitionUnboundInterfaces = new()
+    {
+        typeof(IResourceDefinition<,>)
+    };
 
-        private readonly ILogger<ServiceDiscoveryFacade> _logger;
-        private readonly IServiceCollection _services;
-        private readonly ResourceGraphBuilder _resourceGraphBuilder;
-        private readonly ResourceDescriptorAssemblyCache _assemblyCache = new();
-        private readonly TypeLocator _typeLocator = new();
+    private readonly ILogger<ServiceDiscoveryFacade> _logger;
+    private readonly IServiceCollection _services;
+    private readonly ResourceGraphBuilder _resourceGraphBuilder;
+    private readonly ResourceDescriptorAssemblyCache _assemblyCache = new();
+    private readonly TypeLocator _typeLocator = new();
 
-        public ServiceDiscoveryFacade(IServiceCollection services, ResourceGraphBuilder resourceGraphBuilder, ILoggerFactory loggerFactory)
-        {
-            ArgumentGuard.NotNull(services, nameof(services));
-            ArgumentGuard.NotNull(resourceGraphBuilder, nameof(resourceGraphBuilder));
-            ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
+    public ServiceDiscoveryFacade(IServiceCollection services, ResourceGraphBuilder resourceGraphBuilder, ILoggerFactory loggerFactory)
+    {
+        ArgumentGuard.NotNull(services, nameof(services));
+        ArgumentGuard.NotNull(resourceGraphBuilder, nameof(resourceGraphBuilder));
+        ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
 
-            _logger = loggerFactory.CreateLogger<ServiceDiscoveryFacade>();
-            _services = services;
-            _resourceGraphBuilder = resourceGraphBuilder;
-        }
+        _logger = loggerFactory.CreateLogger<ServiceDiscoveryFacade>();
+        _services = services;
+        _resourceGraphBuilder = resourceGraphBuilder;
+    }
 
-        /// <summary>
-        /// Mark the calling assembly for scanning of resources and injectables.
-        /// </summary>
-        public ServiceDiscoveryFacade AddCurrentAssembly()
-        {
-            return AddAssembly(Assembly.GetCallingAssembly());
-        }
+    /// <summary>
+    /// Mark the calling assembly for scanning of resources and injectables.
+    /// </summary>
+    public ServiceDiscoveryFacade AddCurrentAssembly()
+    {
+        return AddAssembly(Assembly.GetCallingAssembly());
+    }
 
-        /// <summary>
-        /// Mark the specified assembly for scanning of resources and injectables.
-        /// </summary>
-        public ServiceDiscoveryFacade AddAssembly(Assembly assembly)
-        {
-            ArgumentGuard.NotNull(assembly, nameof(assembly));
+    /// <summary>
+    /// Mark the specified assembly for scanning of resources and injectables.
+    /// </summary>
+    public ServiceDiscoveryFacade AddAssembly(Assembly assembly)
+    {
+        ArgumentGuard.NotNull(assembly, nameof(assembly));
 
-            _assemblyCache.RegisterAssembly(assembly);
-            _logger.LogDebug($"Registering assembly '{assembly.FullName}' for discovery of resources and injectables.");
+        _assemblyCache.RegisterAssembly(assembly);
+        _logger.LogDebug($"Registering assembly '{assembly.FullName}' for discovery of resources and injectables.");
 
-            return this;
-        }
+        return this;
+    }
 
-        internal void DiscoverResources()
+    internal void DiscoverResources()
+    {
+        foreach (ResourceDescriptor resourceDescriptor in _assemblyCache.GetResourceDescriptors())
         {
-            foreach (ResourceDescriptor resourceDescriptor in _assemblyCache.GetResourceDescriptors())
-            {
-                AddResource(resourceDescriptor);
-            }
+            AddResource(resourceDescriptor);
         }
+    }
 
-        internal void DiscoverInjectables()
-        {
-            IReadOnlyCollection<ResourceDescriptor> descriptors = _assemblyCache.GetResourceDescriptors();
-            IReadOnlyCollection<Assembly> assemblies = _assemblyCache.GetAssemblies();
-
-            foreach (Assembly assembly in assemblies)
-            {
-                AddDbContextResolvers(assembly);
-                AddInjectables(descriptors, assembly);
-            }
-        }
+    internal void DiscoverInjectables()
+    {
+        IReadOnlyCollection<ResourceDescriptor> descriptors = _assemblyCache.GetResourceDescriptors();
+        IReadOnlyCollection<Assembly> assemblies = _assemblyCache.GetAssemblies();
 
-        private void AddInjectables(IReadOnlyCollection<ResourceDescriptor> resourceDescriptors, Assembly assembly)
+        foreach (Assembly assembly in assemblies)
         {
-            foreach (ResourceDescriptor resourceDescriptor in resourceDescriptors)
-            {
-                AddServices(assembly, resourceDescriptor);
-                AddRepositories(assembly, resourceDescriptor);
-                AddResourceDefinitions(assembly, resourceDescriptor);
-            }
+            AddDbContextResolvers(assembly);
+            AddInjectables(descriptors, assembly);
         }
+    }
 
-        private void AddDbContextResolvers(Assembly assembly)
+    private void AddInjectables(IReadOnlyCollection<ResourceDescriptor> resourceDescriptors, Assembly assembly)
+    {
+        foreach (ResourceDescriptor resourceDescriptor in resourceDescriptors)
         {
-            IEnumerable<Type> dbContextTypes = _typeLocator.GetDerivedTypes(assembly, typeof(DbContext));
-
-            foreach (Type dbContextType in dbContextTypes)
-            {
-                Type dbContextResolverType = typeof(DbContextResolver<>).MakeGenericType(dbContextType);
-                _services.AddScoped(typeof(IDbContextResolver), dbContextResolverType);
-            }
+            AddServices(assembly, resourceDescriptor);
+            AddRepositories(assembly, resourceDescriptor);
+            AddResourceDefinitions(assembly, resourceDescriptor);
         }
+    }
 
-        private void AddResource(ResourceDescriptor resourceDescriptor)
+    private void AddDbContextResolvers(Assembly assembly)
+    {
+        IEnumerable<Type> dbContextTypes = _typeLocator.GetDerivedTypes(assembly, typeof(DbContext));
+
+        foreach (Type dbContextType in dbContextTypes)
         {
-            _resourceGraphBuilder.Add(resourceDescriptor.ResourceClrType, resourceDescriptor.IdClrType);
+            Type dbContextResolverClosedType = typeof(DbContextResolver<>).MakeGenericType(dbContextType);
+            _services.AddScoped(typeof(IDbContextResolver), dbContextResolverClosedType);
         }
+    }
 
-        private void AddServices(Assembly assembly, ResourceDescriptor resourceDescriptor)
+    private void AddResource(ResourceDescriptor resourceDescriptor)
+    {
+        _resourceGraphBuilder.Add(resourceDescriptor.ResourceClrType, resourceDescriptor.IdClrType);
+    }
+
+    private void AddServices(Assembly assembly, ResourceDescriptor resourceDescriptor)
+    {
+        foreach (Type serviceUnboundInterface in ServiceUnboundInterfaces)
         {
-            foreach (Type serviceInterface in ServiceInterfaces)
-            {
-                RegisterImplementations(assembly, serviceInterface, resourceDescriptor);
-            }
+            RegisterImplementations(assembly, serviceUnboundInterface, resourceDescriptor);
         }
+    }
 
-        private void AddRepositories(Assembly assembly, ResourceDescriptor resourceDescriptor)
+    private void AddRepositories(Assembly assembly, ResourceDescriptor resourceDescriptor)
+    {
+        foreach (Type repositoryUnboundInterface in RepositoryUnboundInterfaces)
         {
-            foreach (Type repositoryInterface in RepositoryInterfaces)
-            {
-                RegisterImplementations(assembly, repositoryInterface, resourceDescriptor);
-            }
+            RegisterImplementations(assembly, repositoryUnboundInterface, resourceDescriptor);
         }
+    }
 
-        private void AddResourceDefinitions(Assembly assembly, ResourceDescriptor resourceDescriptor)
+    private void AddResourceDefinitions(Assembly assembly, ResourceDescriptor resourceDescriptor)
+    {
+        foreach (Type resourceDefinitionUnboundInterface in ResourceDefinitionUnboundInterfaces)
         {
-            foreach (Type resourceDefinitionInterface in ResourceDefinitionInterfaces)
-            {
-                RegisterImplementations(assembly, resourceDefinitionInterface, resourceDescriptor);
-            }
+            RegisterImplementations(assembly, resourceDefinitionUnboundInterface, resourceDescriptor);
         }
+    }
+
+    private void RegisterImplementations(Assembly assembly, Type interfaceType, ResourceDescriptor resourceDescriptor)
+    {
+        Type[] typeArguments = interfaceType.GetTypeInfo().GenericTypeParameters.Length == 2
+            ? ArrayFactory.Create(resourceDescriptor.ResourceClrType, resourceDescriptor.IdClrType)
+            : ArrayFactory.Create(resourceDescriptor.ResourceClrType);
+
+        (Type implementationType, Type serviceInterface)? result = _typeLocator.GetContainerRegistrationFromAssembly(assembly, interfaceType, typeArguments);
 
-        private void RegisterImplementations(Assembly assembly, Type interfaceType, ResourceDescriptor resourceDescriptor)
+        if (result != null)
         {
-            Type[] genericArguments = interfaceType.GetTypeInfo().GenericTypeParameters.Length == 2
-                ? ArrayFactory.Create(resourceDescriptor.ResourceClrType, resourceDescriptor.IdClrType)
-                : ArrayFactory.Create(resourceDescriptor.ResourceClrType);
-
-            (Type implementation, Type registrationInterface)? result =
-                _typeLocator.GetGenericInterfaceImplementation(assembly, interfaceType, genericArguments);
-
-            if (result != null)
-            {
-                (Type implementation, Type registrationInterface) = result.Value;
-                _services.AddScoped(registrationInterface, implementation);
-            }
+            (Type implementationType, Type serviceInterface) = result.Value;
+            _services.AddScoped(serviceInterface, implementationType);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Configuration/TypeLocator.cs b/src/JsonApiDotNetCore/Configuration/TypeLocator.cs
index 9ef4f3590e..2a0369d940 100644
--- a/src/JsonApiDotNetCore/Configuration/TypeLocator.cs
+++ b/src/JsonApiDotNetCore/Configuration/TypeLocator.cs
@@ -1,164 +1,166 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Configuration
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Used to locate types and facilitate resource auto-discovery.
+/// </summary>
+internal sealed class TypeLocator
 {
+    // As a reminder, the following terminology is used for generic types:
+    // non-generic          string
+    // generic
+    //     unbound          Dictionary<,>
+    //     constructed
+    //         open         Dictionary<TKey,TValue>
+    //         closed       Dictionary<string,int>
+
     /// <summary>
-    /// Used to locate types and facilitate resource auto-discovery.
+    /// Attempts to lookup the ID type of the specified resource type. Returns <c>null</c> if it does not implement <see cref="IIdentifiable{TId}" />.
     /// </summary>
-    internal sealed class TypeLocator
+    public Type? LookupIdType(Type? resourceClrType)
     {
-        /// <summary>
-        /// Attempts to lookup the ID type of the specified resource type. Returns <c>null</c> if it does not implement <see cref="IIdentifiable{TId}" />.
-        /// </summary>
-        public Type? LookupIdType(Type? resourceClrType)
-        {
-            Type? identifiableInterface = resourceClrType?.GetInterfaces().FirstOrDefault(@interface =>
-                @interface.IsGenericType && @interface.GetGenericTypeDefinition() == typeof(IIdentifiable<>));
+        Type? identifiableClosedInterface = resourceClrType?.GetInterfaces().FirstOrDefault(@interface =>
+            @interface.IsGenericType && @interface.GetGenericTypeDefinition() == typeof(IIdentifiable<>));
 
-            return identifiableInterface?.GetGenericArguments()[0];
-        }
+        return identifiableClosedInterface?.GetGenericArguments()[0];
+    }
 
-        /// <summary>
-        /// Attempts to get a descriptor for the specified resource type.
-        /// </summary>
-        public ResourceDescriptor? ResolveResourceDescriptor(Type? type)
+    /// <summary>
+    /// Attempts to get a descriptor for the specified resource type.
+    /// </summary>
+    public ResourceDescriptor? ResolveResourceDescriptor(Type? type)
+    {
+        if (type != null && type.IsOrImplementsInterface<IIdentifiable>())
         {
-            if (type != null && type.IsOrImplementsInterface<IIdentifiable>())
-            {
-                Type? idType = LookupIdType(type);
+            Type? idType = LookupIdType(type);
 
-                if (idType != null)
-                {
-                    return new ResourceDescriptor(type, idType);
-                }
+            if (idType != null)
+            {
+                return new ResourceDescriptor(type, idType);
             }
-
-            return null;
         }
 
-        /// <summary>
-        /// Gets all implementations of a generic interface.
-        /// </summary>
-        /// <param name="assembly">
-        /// The assembly to search in.
-        /// </param>
-        /// <param name="openGenericInterface">
-        /// The open generic interface.
-        /// </param>
-        /// <param name="interfaceGenericTypeArguments">
-        /// Generic type parameters to construct the generic interface.
-        /// </param>
-        /// <example>
-        /// <code><![CDATA[
-        /// GetGenericInterfaceImplementation(assembly, typeof(IResourceService<,>), typeof(Article), typeof(Guid));
-        /// ]]></code>
-        /// </example>
-        public (Type implementation, Type registrationInterface)? GetGenericInterfaceImplementation(Assembly assembly, Type openGenericInterface,
-            params Type[] interfaceGenericTypeArguments)
-        {
-            ArgumentGuard.NotNull(assembly, nameof(assembly));
-            ArgumentGuard.NotNull(openGenericInterface, nameof(openGenericInterface));
-            ArgumentGuard.NotNull(interfaceGenericTypeArguments, nameof(interfaceGenericTypeArguments));
+        return null;
+    }
 
-            if (!openGenericInterface.IsInterface || !openGenericInterface.IsGenericType ||
-                openGenericInterface != openGenericInterface.GetGenericTypeDefinition())
-            {
-                throw new ArgumentException($"Specified type '{openGenericInterface.FullName}' is not an open generic interface.",
-                    nameof(openGenericInterface));
-            }
+    /// <summary>
+    /// Gets the implementation type with service interface (to be registered in the IoC container) for the specified unbound generic interface and its type
+    /// arguments, by scanning for types in the specified assembly that match the signature.
+    /// </summary>
+    /// <param name="assembly">
+    /// The assembly to search for matching types.
+    /// </param>
+    /// <param name="unboundInterface">
+    /// The unbound generic interface to match against.
+    /// </param>
+    /// <param name="interfaceTypeArguments">
+    /// Generic type arguments to construct <paramref name="unboundInterface" />.
+    /// </param>
+    /// <example>
+    /// <code><![CDATA[
+    /// GetContainerRegistrationFromAssembly(assembly, typeof(IResourceService<,>), typeof(Article), typeof(Guid));
+    /// ]]></code>
+    /// </example>
+    public (Type implementationType, Type serviceInterface)? GetContainerRegistrationFromAssembly(Assembly assembly, Type unboundInterface,
+        params Type[] interfaceTypeArguments)
+    {
+        ArgumentGuard.NotNull(assembly, nameof(assembly));
+        ArgumentGuard.NotNull(unboundInterface, nameof(unboundInterface));
+        ArgumentGuard.NotNull(interfaceTypeArguments, nameof(interfaceTypeArguments));
 
-            if (interfaceGenericTypeArguments.Length != openGenericInterface.GetGenericArguments().Length)
-            {
-                throw new ArgumentException(
-                    $"Interface '{openGenericInterface.FullName}' requires {openGenericInterface.GetGenericArguments().Length} type parameters " +
-                    $"instead of {interfaceGenericTypeArguments.Length}.", nameof(interfaceGenericTypeArguments));
-            }
+        if (!unboundInterface.IsInterface || !unboundInterface.IsGenericType || unboundInterface != unboundInterface.GetGenericTypeDefinition())
+        {
+            throw new ArgumentException($"Specified type '{unboundInterface.FullName}' is not an unbound generic interface.", nameof(unboundInterface));
+        }
 
-            return assembly.GetTypes().Select(type => FindGenericInterfaceImplementationForType(type, openGenericInterface, interfaceGenericTypeArguments))
-                .FirstOrDefault(result => result != null);
+        if (interfaceTypeArguments.Length != unboundInterface.GetGenericArguments().Length)
+        {
+            throw new ArgumentException(
+                $"Interface '{unboundInterface.FullName}' requires {unboundInterface.GetGenericArguments().Length} type arguments " +
+                $"instead of {interfaceTypeArguments.Length}.", nameof(interfaceTypeArguments));
         }
 
-        private static (Type implementation, Type registrationInterface)? FindGenericInterfaceImplementationForType(Type nextType, Type openGenericInterface,
-            Type[] interfaceGenericTypeArguments)
+        return assembly.GetTypes().Select(type => GetContainerRegistrationFromType(type, unboundInterface, interfaceTypeArguments))
+            .FirstOrDefault(result => result != null);
+    }
+
+    private static (Type implementationType, Type serviceInterface)? GetContainerRegistrationFromType(Type nextType, Type unboundInterface,
+        Type[] interfaceTypeArguments)
+    {
+        if (!nextType.IsNested)
         {
-            if (!nextType.IsNested)
+            foreach (Type nextConstructedInterface in nextType.GetInterfaces().Where(type => type.IsGenericType))
             {
-                foreach (Type nextGenericInterface in nextType.GetInterfaces().Where(type => type.IsGenericType))
+                Type nextUnboundInterface = nextConstructedInterface.GetGenericTypeDefinition();
+
+                if (nextUnboundInterface == unboundInterface)
                 {
-                    Type nextOpenGenericInterface = nextGenericInterface.GetGenericTypeDefinition();
+                    Type[] nextTypeArguments = nextConstructedInterface.GetGenericArguments();
 
-                    if (nextOpenGenericInterface == openGenericInterface)
+                    if (nextTypeArguments.Length == interfaceTypeArguments.Length && nextTypeArguments.SequenceEqual(interfaceTypeArguments))
                     {
-                        Type[] nextGenericArguments = nextGenericInterface.GetGenericArguments();
-
-                        if (nextGenericArguments.Length == interfaceGenericTypeArguments.Length &&
-                            nextGenericArguments.SequenceEqual(interfaceGenericTypeArguments))
-                        {
-                            return (nextType, nextOpenGenericInterface.MakeGenericType(interfaceGenericTypeArguments));
-                        }
+                        return (nextType, nextUnboundInterface.MakeGenericType(interfaceTypeArguments));
                     }
                 }
             }
-
-            return null;
         }
 
-        /// <summary>
-        /// Gets all derivatives of the concrete, generic type.
-        /// </summary>
-        /// <param name="assembly">
-        /// The assembly to search.
-        /// </param>
-        /// <param name="openGenericType">
-        /// The open generic type, e.g. `typeof(ResourceDefinition&lt;&gt;)`.
-        /// </param>
-        /// <param name="genericArguments">
-        /// Parameters to the generic type.
-        /// </param>
-        /// <example>
-        /// <code><![CDATA[
-        /// GetDerivedGenericTypes(assembly, typeof(ResourceDefinition<>), typeof(Article))
-        /// ]]></code>
-        /// </example>
-        public IReadOnlyCollection<Type> GetDerivedGenericTypes(Assembly assembly, Type openGenericType, params Type[] genericArguments)
-        {
-            ArgumentGuard.NotNull(assembly, nameof(assembly));
-            ArgumentGuard.NotNull(openGenericType, nameof(openGenericType));
-            ArgumentGuard.NotNull(genericArguments, nameof(genericArguments));
+        return null;
+    }
 
-            Type genericType = openGenericType.MakeGenericType(genericArguments);
-            return GetDerivedTypes(assembly, genericType).ToArray();
-        }
+    /// <summary>
+    /// Scans for types in the specified assembly that derive from the specified unbound generic type.
+    /// </summary>
+    /// <param name="assembly">
+    /// The assembly to search for derived types.
+    /// </param>
+    /// <param name="unboundType">
+    /// The unbound generic type to match against.
+    /// </param>
+    /// <param name="typeArguments">
+    /// Generic type arguments to construct <paramref name="unboundType" />.
+    /// </param>
+    /// <example>
+    /// <code><![CDATA[
+    /// GetDerivedTypesForUnboundType(assembly, typeof(ResourceDefinition<,>), typeof(Article), typeof(int))
+    /// ]]></code>
+    /// </example>
+    public IReadOnlyCollection<Type> GetDerivedTypesForUnboundType(Assembly assembly, Type unboundType, params Type[] typeArguments)
+    {
+        ArgumentGuard.NotNull(assembly, nameof(assembly));
+        ArgumentGuard.NotNull(unboundType, nameof(unboundType));
+        ArgumentGuard.NotNull(typeArguments, nameof(typeArguments));
 
-        /// <summary>
-        /// Gets all derivatives of the specified type.
-        /// </summary>
-        /// <param name="assembly">
-        /// The assembly to search.
-        /// </param>
-        /// <param name="inheritedType">
-        /// The inherited type.
-        /// </param>
-        /// <example>
-        /// <code>
-        /// GetDerivedGenericTypes(assembly, typeof(DbContext))
-        /// </code>
-        /// </example>
-        public IEnumerable<Type> GetDerivedTypes(Assembly assembly, Type inheritedType)
-        {
-            ArgumentGuard.NotNull(assembly, nameof(assembly));
-            ArgumentGuard.NotNull(inheritedType, nameof(inheritedType));
+        Type closedType = unboundType.MakeGenericType(typeArguments);
+        return GetDerivedTypes(assembly, closedType).ToArray();
+    }
 
-            foreach (Type type in assembly.GetTypes())
+    /// <summary>
+    /// Gets all derivatives of the specified type.
+    /// </summary>
+    /// <param name="assembly">
+    /// The assembly to search.
+    /// </param>
+    /// <param name="baseType">
+    /// The inherited type.
+    /// </param>
+    /// <example>
+    /// <code>
+    /// GetDerivedTypes(assembly, typeof(DbContext))
+    /// </code>
+    /// </example>
+    public IEnumerable<Type> GetDerivedTypes(Assembly assembly, Type baseType)
+    {
+        ArgumentGuard.NotNull(assembly, nameof(assembly));
+        ArgumentGuard.NotNull(baseType, nameof(baseType));
+
+        foreach (Type type in assembly.GetTypes())
+        {
+            if (baseType.IsAssignableFrom(type))
             {
-                if (inheritedType.IsAssignableFrom(type))
-                {
-                    yield return type;
-                }
+                yield return type;
             }
         }
     }
diff --git a/src/JsonApiDotNetCore/Controllers/Annotations/DisableQueryStringAttribute.cs b/src/JsonApiDotNetCore/Controllers/Annotations/DisableQueryStringAttribute.cs
index bfa842ed9a..975472ab28 100644
--- a/src/JsonApiDotNetCore/Controllers/Annotations/DisableQueryStringAttribute.cs
+++ b/src/JsonApiDotNetCore/Controllers/Annotations/DisableQueryStringAttribute.cs
@@ -1,63 +1,59 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.QueryStrings;
 
-namespace JsonApiDotNetCore.Controllers.Annotations
+namespace JsonApiDotNetCore.Controllers.Annotations;
+
+/// <summary>
+/// Used on an ASP.NET controller class to indicate which query string parameters are blocked.
+/// </summary>
+/// <example><![CDATA[
+/// [DisableQueryString(JsonApiQueryStringParameters.Sort | JsonApiQueryStringParameters.Page)]
+/// public class CustomersController : JsonApiController<Customer> { }
+/// ]]></example>
+/// <example><![CDATA[
+/// [DisableQueryString("skipCache")]
+/// public class CustomersController : JsonApiController<Customer> { }
+/// ]]></example>
+[PublicAPI]
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
+public sealed class DisableQueryStringAttribute : Attribute
 {
+    public static readonly DisableQueryStringAttribute Empty = new(JsonApiQueryStringParameters.None);
+
+    public IReadOnlySet<string> ParameterNames { get; }
+
     /// <summary>
-    /// Used on an ASP.NET controller class to indicate which query string parameters are blocked.
+    /// Disables one or more of the builtin query parameters for a controller.
     /// </summary>
-    /// <example><![CDATA[
-    /// [DisableQueryString(JsonApiQueryStringParameters.Sort | JsonApiQueryStringParameters.Page)]
-    /// public class CustomersController : JsonApiController<Customer> { }
-    /// ]]></example>
-    /// <example><![CDATA[
-    /// [DisableQueryString("skipCache")]
-    /// public class CustomersController : JsonApiController<Customer> { }
-    /// ]]></example>
-    [PublicAPI]
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface)]
-    public sealed class DisableQueryStringAttribute : Attribute
+    public DisableQueryStringAttribute(JsonApiQueryStringParameters parameters)
     {
-        public static readonly DisableQueryStringAttribute Empty = new(JsonApiQueryStringParameters.None);
+        var parameterNames = new HashSet<string>();
 
-        public IReadOnlySet<string> ParameterNames { get; }
-
-        /// <summary>
-        /// Disables one or more of the builtin query parameters for a controller.
-        /// </summary>
-        public DisableQueryStringAttribute(JsonApiQueryStringParameters parameters)
+        foreach (JsonApiQueryStringParameters value in Enum.GetValues<JsonApiQueryStringParameters>())
         {
-            var parameterNames = new HashSet<string>();
-
-            foreach (JsonApiQueryStringParameters value in Enum.GetValues<JsonApiQueryStringParameters>())
+            if (value != JsonApiQueryStringParameters.None && value != JsonApiQueryStringParameters.All && parameters.HasFlag(value))
             {
-                if (value != JsonApiQueryStringParameters.None && value != JsonApiQueryStringParameters.All && parameters.HasFlag(value))
-                {
-                    parameterNames.Add(value.ToString());
-                }
+                parameterNames.Add(value.ToString());
             }
-
-            ParameterNames = parameterNames;
         }
 
-        /// <summary>
-        /// It is allowed to use a comma-separated list of strings to indicate which query parameters should be disabled, because the user may have defined
-        /// custom query parameters that are not included in the <see cref="JsonApiQueryStringParameters" /> enum.
-        /// </summary>
-        public DisableQueryStringAttribute(string parameterNames)
-        {
-            ArgumentGuard.NotNullNorEmpty(parameterNames, nameof(parameterNames));
+        ParameterNames = parameterNames;
+    }
 
-            ParameterNames = parameterNames.Split(",").ToHashSet();
-        }
+    /// <summary>
+    /// It is allowed to use a comma-separated list of strings to indicate which query parameters should be disabled, because the user may have defined
+    /// custom query parameters that are not included in the <see cref="JsonApiQueryStringParameters" /> enum.
+    /// </summary>
+    public DisableQueryStringAttribute(string parameterNames)
+    {
+        ArgumentGuard.NotNullNorEmpty(parameterNames, nameof(parameterNames));
 
-        public bool ContainsParameter(JsonApiQueryStringParameters parameter)
-        {
-            string name = parameter.ToString();
-            return ParameterNames.Contains(name);
-        }
+        ParameterNames = parameterNames.Split(",").ToHashSet();
+    }
+
+    public bool ContainsParameter(JsonApiQueryStringParameters parameter)
+    {
+        string name = parameter.ToString();
+        return ParameterNames.Contains(name);
     }
 }
diff --git a/src/JsonApiDotNetCore/Controllers/Annotations/DisableRoutingConventionAttribute.cs b/src/JsonApiDotNetCore/Controllers/Annotations/DisableRoutingConventionAttribute.cs
index 34dc0c97f4..34e1132789 100644
--- a/src/JsonApiDotNetCore/Controllers/Annotations/DisableRoutingConventionAttribute.cs
+++ b/src/JsonApiDotNetCore/Controllers/Annotations/DisableRoutingConventionAttribute.cs
@@ -1,18 +1,16 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Controllers.Annotations
+namespace JsonApiDotNetCore.Controllers.Annotations;
+
+/// <summary>
+/// Used on an ASP.NET controller class to indicate that a custom route is used instead of the built-in routing convention.
+/// </summary>
+/// <example><![CDATA[
+/// [DisableRoutingConvention, Route("some/custom/route/to/customers")]
+/// public class CustomersController : JsonApiController<Customer> { }
+/// ]]></example>
+[PublicAPI]
+[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct)]
+public sealed class DisableRoutingConventionAttribute : Attribute
 {
-    /// <summary>
-    /// Used on an ASP.NET controller class to indicate that a custom route is used instead of the built-in routing convention.
-    /// </summary>
-    /// <example><![CDATA[
-    /// [DisableRoutingConvention, Route("some/custom/route/to/customers")]
-    /// public class CustomersController : JsonApiController<Customer> { }
-    /// ]]></example>
-    [PublicAPI]
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface)]
-    public sealed class DisableRoutingConventionAttribute : Attribute
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Controllers/BaseJsonApiController.cs b/src/JsonApiDotNetCore/Controllers/BaseJsonApiController.cs
index 1e37ec66d0..cabe4d49d8 100644
--- a/src/JsonApiDotNetCore/Controllers/BaseJsonApiController.cs
+++ b/src/JsonApiDotNetCore/Controllers/BaseJsonApiController.cs
@@ -1,7 +1,3 @@
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Errors;
 using JsonApiDotNetCore.Middleware;
@@ -10,392 +6,391 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Controllers
+namespace JsonApiDotNetCore.Controllers;
+
+/// <summary>
+/// Implements the foundational ASP.NET controller layer in the JsonApiDotNetCore architecture that delegates to a Resource Service.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+public abstract class BaseJsonApiController<TResource, TId> : CoreJsonApiController
+    where TResource : class, IIdentifiable<TId>
 {
+    private readonly IJsonApiOptions _options;
+    private readonly IResourceGraph _resourceGraph;
+    private readonly IGetAllService<TResource, TId>? _getAll;
+    private readonly IGetByIdService<TResource, TId>? _getById;
+    private readonly IGetSecondaryService<TResource, TId>? _getSecondary;
+    private readonly IGetRelationshipService<TResource, TId>? _getRelationship;
+    private readonly ICreateService<TResource, TId>? _create;
+    private readonly IAddToRelationshipService<TResource, TId>? _addToRelationship;
+    private readonly IUpdateService<TResource, TId>? _update;
+    private readonly ISetRelationshipService<TResource, TId>? _setRelationship;
+    private readonly IDeleteService<TResource, TId>? _delete;
+    private readonly IRemoveFromRelationshipService<TResource, TId>? _removeFromRelationship;
+    private readonly TraceLogWriter<BaseJsonApiController<TResource, TId>> _traceWriter;
+
     /// <summary>
-    /// Implements the foundational ASP.NET controller layer in the JsonApiDotNetCore architecture that delegates to a Resource Service.
+    /// Creates an instance from a read/write service.
     /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    public abstract class BaseJsonApiController<TResource, TId> : CoreJsonApiController
-        where TResource : class, IIdentifiable<TId>
+    protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<TResource, TId> resourceService)
+        : this(options, resourceGraph, loggerFactory, resourceService, resourceService)
     {
-        private readonly IJsonApiOptions _options;
-        private readonly IResourceGraph _resourceGraph;
-        private readonly IGetAllService<TResource, TId>? _getAll;
-        private readonly IGetByIdService<TResource, TId>? _getById;
-        private readonly IGetSecondaryService<TResource, TId>? _getSecondary;
-        private readonly IGetRelationshipService<TResource, TId>? _getRelationship;
-        private readonly ICreateService<TResource, TId>? _create;
-        private readonly IAddToRelationshipService<TResource, TId>? _addToRelationship;
-        private readonly IUpdateService<TResource, TId>? _update;
-        private readonly ISetRelationshipService<TResource, TId>? _setRelationship;
-        private readonly IDeleteService<TResource, TId>? _delete;
-        private readonly IRemoveFromRelationshipService<TResource, TId>? _removeFromRelationship;
-        private readonly TraceLogWriter<BaseJsonApiController<TResource, TId>> _traceWriter;
-
-        /// <summary>
-        /// Creates an instance from a read/write service.
-        /// </summary>
-        protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<TResource, TId> resourceService)
-            : this(options, resourceGraph, loggerFactory, resourceService, resourceService)
-        {
-        }
+    }
 
-        /// <summary>
-        /// Creates an instance from separate services for reading and writing.
-        /// </summary>
-        protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceQueryService<TResource, TId>? queryService = null, IResourceCommandService<TResource, TId>? commandService = null)
-            : this(options, resourceGraph, loggerFactory, queryService, queryService, queryService, queryService, commandService, commandService,
-                commandService, commandService, commandService, commandService)
-        {
-        }
+    /// <summary>
+    /// Creates an instance from separate services for reading and writing.
+    /// </summary>
+    protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceQueryService<TResource, TId>? queryService = null, IResourceCommandService<TResource, TId>? commandService = null)
+        : this(options, resourceGraph, loggerFactory, queryService, queryService, queryService, queryService, commandService, commandService, commandService,
+            commandService, commandService, commandService)
+    {
+    }
+
+    /// <summary>
+    /// Creates an instance from separate services for the various individual read and write methods.
+    /// </summary>
+    protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IGetAllService<TResource, TId>? getAll = null, IGetByIdService<TResource, TId>? getById = null,
+        IGetSecondaryService<TResource, TId>? getSecondary = null, IGetRelationshipService<TResource, TId>? getRelationship = null,
+        ICreateService<TResource, TId>? create = null, IAddToRelationshipService<TResource, TId>? addToRelationship = null,
+        IUpdateService<TResource, TId>? update = null, ISetRelationshipService<TResource, TId>? setRelationship = null,
+        IDeleteService<TResource, TId>? delete = null, IRemoveFromRelationshipService<TResource, TId>? removeFromRelationship = null)
+    {
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
+
+        _options = options;
+        _resourceGraph = resourceGraph;
+        _traceWriter = new TraceLogWriter<BaseJsonApiController<TResource, TId>>(loggerFactory);
+        _getAll = getAll;
+        _getById = getById;
+        _getSecondary = getSecondary;
+        _getRelationship = getRelationship;
+        _create = create;
+        _addToRelationship = addToRelationship;
+        _update = update;
+        _setRelationship = setRelationship;
+        _delete = delete;
+        _removeFromRelationship = removeFromRelationship;
+    }
+
+    /// <summary>
+    /// Gets a collection of primary resources. Example: <code><![CDATA[
+    /// GET /articles HTTP/1.1
+    /// ]]></code>
+    /// </summary>
+    public virtual async Task<IActionResult> GetAsync(CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart();
 
-        /// <summary>
-        /// Creates an instance from separate services for the various individual read and write methods.
-        /// </summary>
-        protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IGetAllService<TResource, TId>? getAll = null, IGetByIdService<TResource, TId>? getById = null,
-            IGetSecondaryService<TResource, TId>? getSecondary = null, IGetRelationshipService<TResource, TId>? getRelationship = null,
-            ICreateService<TResource, TId>? create = null, IAddToRelationshipService<TResource, TId>? addToRelationship = null,
-            IUpdateService<TResource, TId>? update = null, ISetRelationshipService<TResource, TId>? setRelationship = null,
-            IDeleteService<TResource, TId>? delete = null, IRemoveFromRelationshipService<TResource, TId>? removeFromRelationship = null)
+        if (_getAll == null)
         {
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-            ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
-
-            _options = options;
-            _resourceGraph = resourceGraph;
-            _traceWriter = new TraceLogWriter<BaseJsonApiController<TResource, TId>>(loggerFactory);
-            _getAll = getAll;
-            _getById = getById;
-            _getSecondary = getSecondary;
-            _getRelationship = getRelationship;
-            _create = create;
-            _addToRelationship = addToRelationship;
-            _update = update;
-            _setRelationship = setRelationship;
-            _delete = delete;
-            _removeFromRelationship = removeFromRelationship;
+            throw new RouteNotAvailableException(HttpMethod.Get, Request.Path);
         }
 
-        /// <summary>
-        /// Gets a collection of primary resources. Example: <code><![CDATA[
-        /// GET /articles HTTP/1.1
-        /// ]]></code>
-        /// </summary>
-        public virtual async Task<IActionResult> GetAsync(CancellationToken cancellationToken)
-        {
-            _traceWriter.LogMethodStart();
+        IReadOnlyCollection<TResource> resources = await _getAll.GetAsync(cancellationToken);
 
-            if (_getAll == null)
-            {
-                throw new RouteNotAvailableException(HttpMethod.Get, Request.Path);
-            }
+        return Ok(resources);
+    }
 
-            IReadOnlyCollection<TResource> resources = await _getAll.GetAsync(cancellationToken);
+    /// <summary>
+    /// Gets a single primary resource by ID. Example: <code><![CDATA[
+    /// GET /articles/1 HTTP/1.1
+    /// ]]></code>
+    /// </summary>
+    public virtual async Task<IActionResult> GetAsync(TId id, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
+        {
+            id
+        });
 
-            return Ok(resources);
+        if (_getById == null)
+        {
+            throw new RouteNotAvailableException(HttpMethod.Get, Request.Path);
         }
 
-        /// <summary>
-        /// Gets a single primary resource by ID. Example: <code><![CDATA[
-        /// GET /articles/1 HTTP/1.1
-        /// ]]></code>
-        /// </summary>
-        public virtual async Task<IActionResult> GetAsync(TId id, CancellationToken cancellationToken)
-        {
-            _traceWriter.LogMethodStart(new
-            {
-                id
-            });
+        TResource resource = await _getById.GetAsync(id, cancellationToken);
 
-            if (_getById == null)
-            {
-                throw new RouteNotAvailableException(HttpMethod.Get, Request.Path);
-            }
+        return Ok(resource);
+    }
+
+    /// <summary>
+    /// Gets a secondary resource or collection of secondary resources. Example: <code><![CDATA[
+    /// GET /articles/1/author HTTP/1.1
+    /// ]]></code> Example:
+    /// <code><![CDATA[
+    /// GET /articles/1/revisions HTTP/1.1
+    /// ]]></code>
+    /// </summary>
+    public virtual async Task<IActionResult> GetSecondaryAsync(TId id, string relationshipName, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
+        {
+            id,
+            relationshipName
+        });
 
-            TResource resource = await _getById.GetAsync(id, cancellationToken);
+        ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
 
-            return Ok(resource);
+        if (_getSecondary == null)
+        {
+            throw new RouteNotAvailableException(HttpMethod.Get, Request.Path);
         }
 
-        /// <summary>
-        /// Gets a secondary resource or collection of secondary resources. Example: <code><![CDATA[
-        /// GET /articles/1/author HTTP/1.1
-        /// ]]></code> Example:
-        /// <code><![CDATA[
-        /// GET /articles/1/revisions HTTP/1.1
-        /// ]]></code>
-        /// </summary>
-        public virtual async Task<IActionResult> GetSecondaryAsync(TId id, string relationshipName, CancellationToken cancellationToken)
-        {
-            _traceWriter.LogMethodStart(new
-            {
-                id,
-                relationshipName
-            });
+        object? rightValue = await _getSecondary.GetSecondaryAsync(id, relationshipName, cancellationToken);
 
-            ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
+        return Ok(rightValue);
+    }
 
-            if (_getSecondary == null)
-            {
-                throw new RouteNotAvailableException(HttpMethod.Get, Request.Path);
-            }
+    /// <summary>
+    /// Gets a relationship value, which can be a <c>null</c>, a single object or a collection. Example:
+    /// <code><![CDATA[
+    /// GET /articles/1/relationships/author HTTP/1.1
+    /// ]]></code> Example:
+    /// <code><![CDATA[
+    /// GET /articles/1/relationships/revisions HTTP/1.1
+    /// ]]></code>
+    /// </summary>
+    public virtual async Task<IActionResult> GetRelationshipAsync(TId id, string relationshipName, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
+        {
+            id,
+            relationshipName
+        });
 
-            object? rightValue = await _getSecondary.GetSecondaryAsync(id, relationshipName, cancellationToken);
+        ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
 
-            return Ok(rightValue);
+        if (_getRelationship == null)
+        {
+            throw new RouteNotAvailableException(HttpMethod.Get, Request.Path);
         }
 
-        /// <summary>
-        /// Gets a relationship value, which can be a <c>null</c>, a single object or a collection. Example:
-        /// <code><![CDATA[
-        /// GET /articles/1/relationships/author HTTP/1.1
-        /// ]]></code> Example:
-        /// <code><![CDATA[
-        /// GET /articles/1/relationships/revisions HTTP/1.1
-        /// ]]></code>
-        /// </summary>
-        public virtual async Task<IActionResult> GetRelationshipAsync(TId id, string relationshipName, CancellationToken cancellationToken)
-        {
-            _traceWriter.LogMethodStart(new
-            {
-                id,
-                relationshipName
-            });
+        object? rightValue = await _getRelationship.GetRelationshipAsync(id, relationshipName, cancellationToken);
 
-            ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
+        return Ok(rightValue);
+    }
 
-            if (_getRelationship == null)
-            {
-                throw new RouteNotAvailableException(HttpMethod.Get, Request.Path);
-            }
+    /// <summary>
+    /// Creates a new resource with attributes, relationships or both. Example: <code><![CDATA[
+    /// POST /articles HTTP/1.1
+    /// ]]></code>
+    /// </summary>
+    public virtual async Task<IActionResult> PostAsync([FromBody] TResource resource, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
+        {
+            resource
+        });
 
-            object? rightValue = await _getRelationship.GetRelationshipAsync(id, relationshipName, cancellationToken);
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-            return Ok(rightValue);
+        if (_create == null)
+        {
+            throw new RouteNotAvailableException(HttpMethod.Post, Request.Path);
         }
 
-        /// <summary>
-        /// Creates a new resource with attributes, relationships or both. Example: <code><![CDATA[
-        /// POST /articles HTTP/1.1
-        /// ]]></code>
-        /// </summary>
-        public virtual async Task<IActionResult> PostAsync([FromBody] TResource resource, CancellationToken cancellationToken)
+        if (_options.ValidateModelState && !ModelState.IsValid)
         {
-            _traceWriter.LogMethodStart(new
-            {
-                resource
-            });
+            throw new InvalidModelStateException(ModelState, typeof(TResource), _options.IncludeExceptionStackTraceInErrors, _resourceGraph);
+        }
 
-            ArgumentGuard.NotNull(resource, nameof(resource));
+        TResource? newResource = await _create.CreateAsync(resource, cancellationToken);
 
-            if (_create == null)
-            {
-                throw new RouteNotAvailableException(HttpMethod.Post, Request.Path);
-            }
+        string resourceId = (newResource ?? resource).StringId!;
+        string locationUrl = $"{HttpContext.Request.Path}/{resourceId}";
 
-            if (_options.ValidateModelState && !ModelState.IsValid)
-            {
-                throw new InvalidModelStateException(ModelState, typeof(TResource), _options.IncludeExceptionStackTraceInErrors, _resourceGraph);
-            }
+        if (newResource == null)
+        {
+            HttpContext.Response.Headers["Location"] = locationUrl;
+            return NoContent();
+        }
 
-            TResource? newResource = await _create.CreateAsync(resource, cancellationToken);
+        return Created(locationUrl, newResource);
+    }
 
-            string resourceId = (newResource ?? resource).StringId!;
-            string locationUrl = $"{HttpContext.Request.Path}/{resourceId}";
+    /// <summary>
+    /// Adds resources to a to-many relationship. Example: <code><![CDATA[
+    /// POST /articles/1/revisions HTTP/1.1
+    /// ]]></code>
+    /// </summary>
+    /// <param name="id">
+    /// Identifies the left side of the relationship.
+    /// </param>
+    /// <param name="relationshipName">
+    /// The relationship to add resources to.
+    /// </param>
+    /// <param name="rightResourceIds">
+    /// The set of resources to add to the relationship.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    public virtual async Task<IActionResult> PostRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
+        {
+            id,
+            relationshipName,
+            rightResourceIds
+        });
 
-            if (newResource == null)
-            {
-                HttpContext.Response.Headers["Location"] = locationUrl;
-                return NoContent();
-            }
+        ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
+        ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
 
-            return Created(locationUrl, newResource);
+        if (_addToRelationship == null)
+        {
+            throw new RouteNotAvailableException(HttpMethod.Post, Request.Path);
         }
 
-        /// <summary>
-        /// Adds resources to a to-many relationship. Example: <code><![CDATA[
-        /// POST /articles/1/revisions HTTP/1.1
-        /// ]]></code>
-        /// </summary>
-        /// <param name="id">
-        /// Identifies the left side of the relationship.
-        /// </param>
-        /// <param name="relationshipName">
-        /// The relationship to add resources to.
-        /// </param>
-        /// <param name="rightResourceIds">
-        /// The set of resources to add to the relationship.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        public virtual async Task<IActionResult> PostRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-        {
-            _traceWriter.LogMethodStart(new
-            {
-                id,
-                relationshipName,
-                rightResourceIds
-            });
+        await _addToRelationship.AddToToManyRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
 
-            ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
-            ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
+        return NoContent();
+    }
 
-            if (_addToRelationship == null)
-            {
-                throw new RouteNotAvailableException(HttpMethod.Post, Request.Path);
-            }
+    /// <summary>
+    /// Updates the attributes and/or relationships of an existing resource. Only the values of sent attributes are replaced. And only the values of sent
+    /// relationships are replaced. Example: <code><![CDATA[
+    /// PATCH /articles/1 HTTP/1.1
+    /// ]]></code>
+    /// </summary>
+    public virtual async Task<IActionResult> PatchAsync(TId id, [FromBody] TResource resource, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
+        {
+            id,
+            resource
+        });
 
-            await _addToRelationship.AddToToManyRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-            return NoContent();
+        if (_update == null)
+        {
+            throw new RouteNotAvailableException(HttpMethod.Patch, Request.Path);
         }
 
-        /// <summary>
-        /// Updates the attributes and/or relationships of an existing resource. Only the values of sent attributes are replaced. And only the values of sent
-        /// relationships are replaced. Example: <code><![CDATA[
-        /// PATCH /articles/1 HTTP/1.1
-        /// ]]></code>
-        /// </summary>
-        public virtual async Task<IActionResult> PatchAsync(TId id, [FromBody] TResource resource, CancellationToken cancellationToken)
+        if (_options.ValidateModelState && !ModelState.IsValid)
         {
-            _traceWriter.LogMethodStart(new
-            {
-                id,
-                resource
-            });
-
-            ArgumentGuard.NotNull(resource, nameof(resource));
-
-            if (_update == null)
-            {
-                throw new RouteNotAvailableException(HttpMethod.Patch, Request.Path);
-            }
-
-            if (_options.ValidateModelState && !ModelState.IsValid)
-            {
-                throw new InvalidModelStateException(ModelState, typeof(TResource), _options.IncludeExceptionStackTraceInErrors, _resourceGraph);
-            }
+            throw new InvalidModelStateException(ModelState, typeof(TResource), _options.IncludeExceptionStackTraceInErrors, _resourceGraph);
+        }
 
-            TResource? updated = await _update.UpdateAsync(id, resource, cancellationToken);
+        TResource? updated = await _update.UpdateAsync(id, resource, cancellationToken);
 
-            return updated == null ? NoContent() : Ok(updated);
-        }
+        return updated == null ? NoContent() : Ok(updated);
+    }
 
-        /// <summary>
-        /// Performs a complete replacement of a relationship on an existing resource. Example:
-        /// <code><![CDATA[
-        /// PATCH /articles/1/relationships/author HTTP/1.1
-        /// ]]></code> Example:
-        /// <code><![CDATA[
-        /// PATCH /articles/1/relationships/revisions HTTP/1.1
-        /// ]]></code>
-        /// </summary>
-        /// <param name="id">
-        /// Identifies the left side of the relationship.
-        /// </param>
-        /// <param name="relationshipName">
-        /// The relationship for which to perform a complete replacement.
-        /// </param>
-        /// <param name="rightValue">
-        /// The resource or set of resources to assign to the relationship.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        public virtual async Task<IActionResult> PatchRelationshipAsync(TId id, string relationshipName, [FromBody] object? rightValue,
-            CancellationToken cancellationToken)
+    /// <summary>
+    /// Performs a complete replacement of a relationship on an existing resource. Example:
+    /// <code><![CDATA[
+    /// PATCH /articles/1/relationships/author HTTP/1.1
+    /// ]]></code> Example:
+    /// <code><![CDATA[
+    /// PATCH /articles/1/relationships/revisions HTTP/1.1
+    /// ]]></code>
+    /// </summary>
+    /// <param name="id">
+    /// Identifies the left side of the relationship.
+    /// </param>
+    /// <param name="relationshipName">
+    /// The relationship for which to perform a complete replacement.
+    /// </param>
+    /// <param name="rightValue">
+    /// The resource or set of resources to assign to the relationship.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    public virtual async Task<IActionResult> PatchRelationshipAsync(TId id, string relationshipName, [FromBody] object? rightValue,
+        CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                id,
-                relationshipName,
-                rightValue
-            });
+            id,
+            relationshipName,
+            rightValue
+        });
 
-            ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
+        ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
 
-            if (_setRelationship == null)
-            {
-                throw new RouteNotAvailableException(HttpMethod.Patch, Request.Path);
-            }
+        if (_setRelationship == null)
+        {
+            throw new RouteNotAvailableException(HttpMethod.Patch, Request.Path);
+        }
 
-            await _setRelationship.SetRelationshipAsync(id, relationshipName, rightValue, cancellationToken);
+        await _setRelationship.SetRelationshipAsync(id, relationshipName, rightValue, cancellationToken);
 
-            return NoContent();
-        }
+        return NoContent();
+    }
 
-        /// <summary>
-        /// Deletes an existing resource. Example: <code><![CDATA[
-        /// DELETE /articles/1 HTTP/1.1
-        /// ]]></code>
-        /// </summary>
-        public virtual async Task<IActionResult> DeleteAsync(TId id, CancellationToken cancellationToken)
+    /// <summary>
+    /// Deletes an existing resource. Example: <code><![CDATA[
+    /// DELETE /articles/1 HTTP/1.1
+    /// ]]></code>
+    /// </summary>
+    public virtual async Task<IActionResult> DeleteAsync(TId id, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                id
-            });
+            id
+        });
 
-            if (_delete == null)
-            {
-                throw new RouteNotAvailableException(HttpMethod.Delete, Request.Path);
-            }
+        if (_delete == null)
+        {
+            throw new RouteNotAvailableException(HttpMethod.Delete, Request.Path);
+        }
 
-            await _delete.DeleteAsync(id, cancellationToken);
+        await _delete.DeleteAsync(id, cancellationToken);
 
-            return NoContent();
-        }
+        return NoContent();
+    }
 
-        /// <summary>
-        /// Removes resources from a to-many relationship. Example: <code><![CDATA[
-        /// DELETE /articles/1/relationships/revisions HTTP/1.1
-        /// ]]></code>
-        /// </summary>
-        /// <param name="id">
-        /// Identifies the left side of the relationship.
-        /// </param>
-        /// <param name="relationshipName">
-        /// The relationship to remove resources from.
-        /// </param>
-        /// <param name="rightResourceIds">
-        /// The set of resources to remove from the relationship.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        public virtual async Task<IActionResult> DeleteRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
+    /// <summary>
+    /// Removes resources from a to-many relationship. Example: <code><![CDATA[
+    /// DELETE /articles/1/relationships/revisions HTTP/1.1
+    /// ]]></code>
+    /// </summary>
+    /// <param name="id">
+    /// Identifies the left side of the relationship.
+    /// </param>
+    /// <param name="relationshipName">
+    /// The relationship to remove resources from.
+    /// </param>
+    /// <param name="rightResourceIds">
+    /// The set of resources to remove from the relationship.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    public virtual async Task<IActionResult> DeleteRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                id,
-                relationshipName,
-                rightResourceIds
-            });
+            id,
+            relationshipName,
+            rightResourceIds
+        });
 
-            ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
-            ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
+        ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
+        ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
 
-            if (_removeFromRelationship == null)
-            {
-                throw new RouteNotAvailableException(HttpMethod.Delete, Request.Path);
-            }
+        if (_removeFromRelationship == null)
+        {
+            throw new RouteNotAvailableException(HttpMethod.Delete, Request.Path);
+        }
 
-            await _removeFromRelationship.RemoveFromToManyRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
+        await _removeFromRelationship.RemoveFromToManyRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
 
-            return NoContent();
-        }
+        return NoContent();
     }
 }
diff --git a/src/JsonApiDotNetCore/Controllers/BaseJsonApiOperationsController.cs b/src/JsonApiDotNetCore/Controllers/BaseJsonApiOperationsController.cs
index 4a63eb5f54..debcfa5c6f 100644
--- a/src/JsonApiDotNetCore/Controllers/BaseJsonApiOperationsController.cs
+++ b/src/JsonApiDotNetCore/Controllers/BaseJsonApiOperationsController.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.AtomicOperations;
 using JsonApiDotNetCore.Configuration;
@@ -13,199 +8,197 @@
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Controllers
+namespace JsonApiDotNetCore.Controllers;
+
+/// <summary>
+/// Implements the foundational ASP.NET controller layer in the JsonApiDotNetCore architecture for handling atomic:operations requests. See
+/// https://jsonapi.org/ext/atomic/ for details. Delegates work to <see cref="IOperationsProcessor" />.
+/// </summary>
+[PublicAPI]
+public abstract class BaseJsonApiOperationsController : CoreJsonApiController
 {
+    private readonly IJsonApiOptions _options;
+    private readonly IResourceGraph _resourceGraph;
+    private readonly IOperationsProcessor _processor;
+    private readonly IJsonApiRequest _request;
+    private readonly ITargetedFields _targetedFields;
+    private readonly TraceLogWriter<BaseJsonApiOperationsController> _traceWriter;
+
+    protected BaseJsonApiOperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IOperationsProcessor processor, IJsonApiRequest request, ITargetedFields targetedFields)
+    {
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
+        ArgumentGuard.NotNull(processor, nameof(processor));
+        ArgumentGuard.NotNull(request, nameof(request));
+        ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
+
+        _options = options;
+        _resourceGraph = resourceGraph;
+        _processor = processor;
+        _request = request;
+        _targetedFields = targetedFields;
+        _traceWriter = new TraceLogWriter<BaseJsonApiOperationsController>(loggerFactory);
+    }
+
     /// <summary>
-    /// Implements the foundational ASP.NET controller layer in the JsonApiDotNetCore architecture for handling atomic:operations requests. See
-    /// https://jsonapi.org/ext/atomic/ for details. Delegates work to <see cref="IOperationsProcessor" />.
+    /// Atomically processes a list of operations and returns a list of results. All changes are reverted if processing fails. If processing succeeds but
+    /// none of the operations returns any data, then HTTP 201 is returned instead of 200.
     /// </summary>
-    [PublicAPI]
-    public abstract class BaseJsonApiOperationsController : CoreJsonApiController
+    /// <example>
+    /// The next example creates a new resource.
+    /// <code><![CDATA[
+    /// POST /operations HTTP/1.1
+    /// Content-Type: application/vnd.api+json;ext="https://jsonapi.org/ext/atomic"
+    /// 
+    /// {
+    ///   "atomic:operations": [{
+    ///     "op": "add",
+    ///     "data": {
+    ///       "type": "authors",
+    ///       "attributes": {
+    ///         "name": "John Doe"
+    ///       }
+    ///     }
+    ///   }]
+    /// }
+    /// ]]></code>
+    /// </example>
+    /// <example>
+    /// The next example updates an existing resource.
+    /// <code><![CDATA[
+    /// POST /operations HTTP/1.1
+    /// Content-Type: application/vnd.api+json;ext="https://jsonapi.org/ext/atomic"
+    /// 
+    /// {
+    ///   "atomic:operations": [{
+    ///     "op": "update",
+    ///     "data": {
+    ///       "type": "authors",
+    ///       "id": 1,
+    ///       "attributes": {
+    ///         "name": "Jane Doe"
+    ///       }
+    ///     }
+    ///   }]
+    /// }
+    /// ]]></code>
+    /// </example>
+    /// <example>
+    /// The next example deletes an existing resource.
+    /// <code><![CDATA[
+    /// POST /operations HTTP/1.1
+    /// Content-Type: application/vnd.api+json;ext="https://jsonapi.org/ext/atomic"
+    /// 
+    /// {
+    ///   "atomic:operations": [{
+    ///     "op": "remove",
+    ///     "ref": {
+    ///       "type": "authors",
+    ///       "id": 1
+    ///     }
+    ///   }]
+    /// }
+    /// ]]></code>
+    /// </example>
+    public virtual async Task<IActionResult> PostOperationsAsync([FromBody] IList<OperationContainer> operations, CancellationToken cancellationToken)
     {
-        private readonly IJsonApiOptions _options;
-        private readonly IResourceGraph _resourceGraph;
-        private readonly IOperationsProcessor _processor;
-        private readonly IJsonApiRequest _request;
-        private readonly ITargetedFields _targetedFields;
-        private readonly TraceLogWriter<BaseJsonApiOperationsController> _traceWriter;
-
-        protected BaseJsonApiOperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IOperationsProcessor processor, IJsonApiRequest request, ITargetedFields targetedFields)
+        _traceWriter.LogMethodStart(new
         {
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-            ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
-            ArgumentGuard.NotNull(processor, nameof(processor));
-            ArgumentGuard.NotNull(request, nameof(request));
-            ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
-
-            _options = options;
-            _resourceGraph = resourceGraph;
-            _processor = processor;
-            _request = request;
-            _targetedFields = targetedFields;
-            _traceWriter = new TraceLogWriter<BaseJsonApiOperationsController>(loggerFactory);
-        }
+            operations
+        });
 
-        /// <summary>
-        /// Atomically processes a list of operations and returns a list of results. All changes are reverted if processing fails. If processing succeeds but
-        /// none of the operations returns any data, then HTTP 201 is returned instead of 200.
-        /// </summary>
-        /// <example>
-        /// The next example creates a new resource.
-        /// <code><![CDATA[
-        /// POST /operations HTTP/1.1
-        /// Content-Type: application/vnd.api+json;ext="https://jsonapi.org/ext/atomic"
-        /// 
-        /// {
-        ///   "atomic:operations": [{
-        ///     "op": "add",
-        ///     "data": {
-        ///       "type": "authors",
-        ///       "attributes": {
-        ///         "name": "John Doe"
-        ///       }
-        ///     }
-        ///   }]
-        /// }
-        /// ]]></code>
-        /// </example>
-        /// <example>
-        /// The next example updates an existing resource.
-        /// <code><![CDATA[
-        /// POST /operations HTTP/1.1
-        /// Content-Type: application/vnd.api+json;ext="https://jsonapi.org/ext/atomic"
-        /// 
-        /// {
-        ///   "atomic:operations": [{
-        ///     "op": "update",
-        ///     "data": {
-        ///       "type": "authors",
-        ///       "id": 1,
-        ///       "attributes": {
-        ///         "name": "Jane Doe"
-        ///       }
-        ///     }
-        ///   }]
-        /// }
-        /// ]]></code>
-        /// </example>
-        /// <example>
-        /// The next example deletes an existing resource.
-        /// <code><![CDATA[
-        /// POST /operations HTTP/1.1
-        /// Content-Type: application/vnd.api+json;ext="https://jsonapi.org/ext/atomic"
-        /// 
-        /// {
-        ///   "atomic:operations": [{
-        ///     "op": "remove",
-        ///     "ref": {
-        ///       "type": "authors",
-        ///       "id": 1
-        ///     }
-        ///   }]
-        /// }
-        /// ]]></code>
-        /// </example>
-        public virtual async Task<IActionResult> PostOperationsAsync([FromBody] IList<OperationContainer> operations, CancellationToken cancellationToken)
+        ArgumentGuard.NotNull(operations, nameof(operations));
+
+        if (_options.ValidateModelState)
         {
-            _traceWriter.LogMethodStart(new
-            {
-                operations
-            });
+            ValidateModelState(operations);
+        }
+
+        IList<OperationContainer?> results = await _processor.ProcessAsync(operations, cancellationToken);
+        return results.Any(result => result != null) ? Ok(results) : NoContent();
+    }
 
-            ArgumentGuard.NotNull(operations, nameof(operations));
+    protected virtual void ValidateModelState(IList<OperationContainer> operations)
+    {
+        // We must validate the resource inside each operation manually, because they are typed as IIdentifiable.
+        // Instead of validating IIdentifiable we need to validate the resource runtime-type.
+
+        using IDisposable _ = new RevertRequestStateOnDispose(_request, _targetedFields);
+
+        int operationIndex = 0;
+        var requestModelState = new List<(string key, ModelStateEntry? entry)>();
+        int maxErrorsRemaining = ModelState.MaxAllowedErrors;
 
-            if (_options.ValidateModelState)
+        foreach (OperationContainer operation in operations)
+        {
+            if (maxErrorsRemaining < 1)
             {
-                ValidateModelState(operations);
+                break;
             }
 
-            IList<OperationContainer?> results = await _processor.ProcessAsync(operations, cancellationToken);
-            return results.Any(result => result != null) ? Ok(results) : NoContent();
+            maxErrorsRemaining = ValidateOperation(operation, operationIndex, requestModelState, maxErrorsRemaining);
+
+            operationIndex++;
         }
 
-        protected virtual void ValidateModelState(IList<OperationContainer> operations)
+        if (requestModelState.Any())
         {
-            // We must validate the resource inside each operation manually, because they are typed as IIdentifiable.
-            // Instead of validating IIdentifiable we need to validate the resource runtime-type.
+            Dictionary<string, ModelStateEntry?> modelStateDictionary = requestModelState.ToDictionary(tuple => tuple.key, tuple => tuple.entry);
 
-            using IDisposable _ = new RevertRequestStateOnDispose(_request, _targetedFields);
+            throw new InvalidModelStateException(modelStateDictionary, typeof(IList<OperationContainer>), _options.IncludeExceptionStackTraceInErrors,
+                _resourceGraph, (collectionType, index) => collectionType == typeof(IList<OperationContainer>) ? operations[index].Resource.GetType() : null);
+        }
+    }
 
-            int operationIndex = 0;
-            var requestModelState = new List<(string key, ModelStateEntry entry)>();
-            int maxErrorsRemaining = ModelState.MaxAllowedErrors;
+    private int ValidateOperation(OperationContainer operation, int operationIndex, List<(string key, ModelStateEntry? entry)> requestModelState,
+        int maxErrorsRemaining)
+    {
+        if (operation.Request.WriteOperation is WriteOperationKind.CreateResource or WriteOperationKind.UpdateResource)
+        {
+            _targetedFields.CopyFrom(operation.TargetedFields);
+            _request.CopyFrom(operation.Request);
 
-            foreach (OperationContainer operation in operations)
+            var validationContext = new ActionContext
             {
-                if (maxErrorsRemaining < 1)
+                ModelState =
                 {
-                    break;
+                    MaxAllowedErrors = maxErrorsRemaining
                 }
+            };
 
-                maxErrorsRemaining = ValidateOperation(operation, operationIndex, requestModelState, maxErrorsRemaining);
+            ObjectValidator.Validate(validationContext, null, string.Empty, operation.Resource);
 
-                operationIndex++;
-            }
-
-            if (requestModelState.Any())
-            {
-                Dictionary<string, ModelStateEntry> modelStateDictionary = requestModelState.ToDictionary(tuple => tuple.key, tuple => tuple.entry);
-
-                throw new InvalidModelStateException(modelStateDictionary, typeof(IList<OperationContainer>), _options.IncludeExceptionStackTraceInErrors,
-                    _resourceGraph,
-                    (collectionType, index) => collectionType == typeof(IList<OperationContainer>) ? operations[index].Resource.GetType() : null);
-            }
-        }
-
-        private int ValidateOperation(OperationContainer operation, int operationIndex, List<(string key, ModelStateEntry entry)> requestModelState,
-            int maxErrorsRemaining)
-        {
-            if (operation.Request.WriteOperation is WriteOperationKind.CreateResource or WriteOperationKind.UpdateResource)
+            if (!validationContext.ModelState.IsValid)
             {
-                _targetedFields.CopyFrom(operation.TargetedFields);
-                _request.CopyFrom(operation.Request);
+                int errorsRemaining = maxErrorsRemaining;
 
-                var validationContext = new ActionContext
+                foreach (string key in validationContext.ModelState.Keys)
                 {
-                    ModelState =
-                    {
-                        MaxAllowedErrors = maxErrorsRemaining
-                    }
-                };
-
-                ObjectValidator.Validate(validationContext, null, string.Empty, operation.Resource);
+                    ModelStateEntry entry = validationContext.ModelState[key]!;
 
-                if (!validationContext.ModelState.IsValid)
-                {
-                    int errorsRemaining = maxErrorsRemaining;
-
-                    foreach (string key in validationContext.ModelState.Keys)
+                    if (entry.ValidationState == ModelValidationState.Invalid)
                     {
-                        ModelStateEntry entry = validationContext.ModelState[key];
+                        string operationKey = $"[{operationIndex}].{nameof(OperationContainer.Resource)}.{key}";
 
-                        if (entry.ValidationState == ModelValidationState.Invalid)
+                        if (entry.Errors.Count > 0 && entry.Errors[0].Exception is TooManyModelErrorsException)
                         {
-                            string operationKey = $"[{operationIndex}].{nameof(OperationContainer.Resource)}.{key}";
-
-                            if (entry.Errors.Count > 0 && entry.Errors[0].Exception is TooManyModelErrorsException)
-                            {
-                                requestModelState.Insert(0, (operationKey, entry));
-                            }
-                            else
-                            {
-                                requestModelState.Add((operationKey, entry));
-                            }
-
-                            errorsRemaining -= entry.Errors.Count;
+                            requestModelState.Insert(0, (operationKey, entry));
+                        }
+                        else
+                        {
+                            requestModelState.Add((operationKey, entry));
                         }
-                    }
 
-                    return errorsRemaining;
+                        errorsRemaining -= entry.Errors.Count;
+                    }
                 }
-            }
 
-            return maxErrorsRemaining;
+                return errorsRemaining;
+            }
         }
+
+        return maxErrorsRemaining;
     }
 }
diff --git a/src/JsonApiDotNetCore/Controllers/CoreJsonApiController.cs b/src/JsonApiDotNetCore/Controllers/CoreJsonApiController.cs
index 7bb96adedf..561a443d14 100644
--- a/src/JsonApiDotNetCore/Controllers/CoreJsonApiController.cs
+++ b/src/JsonApiDotNetCore/Controllers/CoreJsonApiController.cs
@@ -1,39 +1,36 @@
-using System.Collections.Generic;
-using System.Linq;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.AspNetCore.Mvc;
 
-namespace JsonApiDotNetCore.Controllers
+namespace JsonApiDotNetCore.Controllers;
+
+/// <summary>
+/// Provides helper methods to raise JSON:API compliant errors from controller actions.
+/// </summary>
+public abstract class CoreJsonApiController : ControllerBase
 {
-    /// <summary>
-    /// Provides helper methods to raise JSON:API compliant errors from controller actions.
-    /// </summary>
-    public abstract class CoreJsonApiController : ControllerBase
+    protected IActionResult Error(ErrorObject error)
     {
-        protected IActionResult Error(ErrorObject error)
-        {
-            ArgumentGuard.NotNull(error, nameof(error));
+        ArgumentGuard.NotNull(error, nameof(error));
 
-            return new ObjectResult(error)
-            {
-                StatusCode = (int)error.StatusCode
-            };
-        }
-
-        protected IActionResult Error(IEnumerable<ErrorObject> errors)
+        return new ObjectResult(error)
         {
-            IReadOnlyList<ErrorObject>? errorList = ToErrorList(errors);
-            ArgumentGuard.NotNullNorEmpty(errorList, nameof(errors));
+            StatusCode = (int)error.StatusCode
+        };
+    }
 
-            return new ObjectResult(errorList)
-            {
-                StatusCode = (int)ErrorObject.GetResponseStatusCode(errorList)
-            };
-        }
+    protected IActionResult Error(IEnumerable<ErrorObject> errors)
+    {
+        IReadOnlyList<ErrorObject>? errorList = ToErrorList(errors);
+        ArgumentGuard.NotNullNorEmpty(errorList, nameof(errors));
 
-        private static IReadOnlyList<ErrorObject>? ToErrorList(IEnumerable<ErrorObject>? errors)
+        return new ObjectResult(errorList)
         {
-            return errors?.ToArray();
-        }
+            StatusCode = (int)ErrorObject.GetResponseStatusCode(errorList)
+        };
+    }
+
+    private static IReadOnlyList<ErrorObject>? ToErrorList(IEnumerable<ErrorObject>? errors)
+    {
+        return errors?.ToArray();
     }
 }
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiCommandController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiCommandController.cs
index bbfa52af89..290487cb76 100644
--- a/src/JsonApiDotNetCore/Controllers/JsonApiCommandController.cs
+++ b/src/JsonApiDotNetCore/Controllers/JsonApiCommandController.cs
@@ -3,29 +3,28 @@
 using JsonApiDotNetCore.Services;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Controllers
+namespace JsonApiDotNetCore.Controllers;
+
+/// <summary>
+/// The base class to derive resource-specific write-only controllers from. Returns HTTP 405 on read-only endpoints. If you want to provide routing
+/// templates yourself, you should derive from BaseJsonApiController directly.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+public abstract class JsonApiCommandController<TResource, TId> : JsonApiController<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
     /// <summary>
-    /// The base class to derive resource-specific write-only controllers from. Returns HTTP 405 on read-only endpoints. If you want to provide routing
-    /// templates yourself, you should derive from BaseJsonApiController directly.
+    /// Creates an instance from a write-only service.
     /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    public abstract class JsonApiCommandController<TResource, TId> : JsonApiController<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
+    protected JsonApiCommandController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceCommandService<TResource, TId> commandService)
+        : base(options, resourceGraph, loggerFactory, null, null, null, null, commandService, commandService, commandService, commandService, commandService,
+            commandService)
     {
-        /// <summary>
-        /// Creates an instance from a write-only service.
-        /// </summary>
-        protected JsonApiCommandController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceCommandService<TResource, TId> commandService)
-            : base(options, resourceGraph, loggerFactory, null, null, null, null, commandService, commandService, commandService, commandService,
-                commandService, commandService)
-        {
-        }
     }
 }
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiController.cs
index 6654dc534c..091bbee47b 100644
--- a/src/JsonApiDotNetCore/Controllers/JsonApiController.cs
+++ b/src/JsonApiDotNetCore/Controllers/JsonApiController.cs
@@ -1,121 +1,117 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Controllers
+namespace JsonApiDotNetCore.Controllers;
+
+/// <summary>
+/// The base class to derive resource-specific controllers from. This class delegates all work to <see cref="BaseJsonApiController{TResource, TId}" />
+/// but adds attributes for routing templates. If you want to provide routing templates yourself, you should derive from BaseJsonApiController directly.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+public abstract class JsonApiController<TResource, TId> : BaseJsonApiController<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// The base class to derive resource-specific controllers from. This class delegates all work to <see cref="BaseJsonApiController{TResource, TId}" />
-    /// but adds attributes for routing templates. If you want to provide routing templates yourself, you should derive from BaseJsonApiController directly.
-    /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    public abstract class JsonApiController<TResource, TId> : BaseJsonApiController<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
+    /// <inheritdoc />
+    protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<TResource, TId> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
     {
-        /// <inheritdoc />
-        protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<TResource, TId> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
+    }
 
-        /// <inheritdoc />
-        protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IGetAllService<TResource, TId>? getAll = null, IGetByIdService<TResource, TId>? getById = null,
-            IGetSecondaryService<TResource, TId>? getSecondary = null, IGetRelationshipService<TResource, TId>? getRelationship = null,
-            ICreateService<TResource, TId>? create = null, IAddToRelationshipService<TResource, TId>? addToRelationship = null,
-            IUpdateService<TResource, TId>? update = null, ISetRelationshipService<TResource, TId>? setRelationship = null,
-            IDeleteService<TResource, TId>? delete = null, IRemoveFromRelationshipService<TResource, TId>? removeFromRelationship = null)
-            : base(options, resourceGraph, loggerFactory, getAll, getById, getSecondary, getRelationship, create, addToRelationship, update, setRelationship,
-                delete, removeFromRelationship)
-        {
-        }
+    /// <inheritdoc />
+    protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IGetAllService<TResource, TId>? getAll = null, IGetByIdService<TResource, TId>? getById = null,
+        IGetSecondaryService<TResource, TId>? getSecondary = null, IGetRelationshipService<TResource, TId>? getRelationship = null,
+        ICreateService<TResource, TId>? create = null, IAddToRelationshipService<TResource, TId>? addToRelationship = null,
+        IUpdateService<TResource, TId>? update = null, ISetRelationshipService<TResource, TId>? setRelationship = null,
+        IDeleteService<TResource, TId>? delete = null, IRemoveFromRelationshipService<TResource, TId>? removeFromRelationship = null)
+        : base(options, resourceGraph, loggerFactory, getAll, getById, getSecondary, getRelationship, create, addToRelationship, update, setRelationship,
+            delete, removeFromRelationship)
+    {
+    }
 
-        /// <inheritdoc />
-        [HttpGet]
-        [HttpHead]
-        public override async Task<IActionResult> GetAsync(CancellationToken cancellationToken)
-        {
-            return await base.GetAsync(cancellationToken);
-        }
+    /// <inheritdoc />
+    [HttpGet]
+    [HttpHead]
+    public override async Task<IActionResult> GetAsync(CancellationToken cancellationToken)
+    {
+        return await base.GetAsync(cancellationToken);
+    }
 
-        /// <inheritdoc />
-        [HttpGet("{id}")]
-        [HttpHead("{id}")]
-        public override async Task<IActionResult> GetAsync(TId id, CancellationToken cancellationToken)
-        {
-            return await base.GetAsync(id, cancellationToken);
-        }
+    /// <inheritdoc />
+    [HttpGet("{id}")]
+    [HttpHead("{id}")]
+    public override async Task<IActionResult> GetAsync(TId id, CancellationToken cancellationToken)
+    {
+        return await base.GetAsync(id, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        [HttpGet("{id}/{relationshipName}")]
-        [HttpHead("{id}/{relationshipName}")]
-        public override async Task<IActionResult> GetSecondaryAsync(TId id, string relationshipName, CancellationToken cancellationToken)
-        {
-            return await base.GetSecondaryAsync(id, relationshipName, cancellationToken);
-        }
+    /// <inheritdoc />
+    [HttpGet("{id}/{relationshipName}")]
+    [HttpHead("{id}/{relationshipName}")]
+    public override async Task<IActionResult> GetSecondaryAsync(TId id, string relationshipName, CancellationToken cancellationToken)
+    {
+        return await base.GetSecondaryAsync(id, relationshipName, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        [HttpGet("{id}/relationships/{relationshipName}")]
-        [HttpHead("{id}/relationships/{relationshipName}")]
-        public override async Task<IActionResult> GetRelationshipAsync(TId id, string relationshipName, CancellationToken cancellationToken)
-        {
-            return await base.GetRelationshipAsync(id, relationshipName, cancellationToken);
-        }
+    /// <inheritdoc />
+    [HttpGet("{id}/relationships/{relationshipName}")]
+    [HttpHead("{id}/relationships/{relationshipName}")]
+    public override async Task<IActionResult> GetRelationshipAsync(TId id, string relationshipName, CancellationToken cancellationToken)
+    {
+        return await base.GetRelationshipAsync(id, relationshipName, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        [HttpPost]
-        public override async Task<IActionResult> PostAsync([FromBody] TResource resource, CancellationToken cancellationToken)
-        {
-            return await base.PostAsync(resource, cancellationToken);
-        }
+    /// <inheritdoc />
+    [HttpPost]
+    public override async Task<IActionResult> PostAsync([FromBody] TResource resource, CancellationToken cancellationToken)
+    {
+        return await base.PostAsync(resource, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        [HttpPost("{id}/relationships/{relationshipName}")]
-        public override async Task<IActionResult> PostRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-        {
-            return await base.PostRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
-        }
+    /// <inheritdoc />
+    [HttpPost("{id}/relationships/{relationshipName}")]
+    public override async Task<IActionResult> PostRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        return await base.PostRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        [HttpPatch("{id}")]
-        public override async Task<IActionResult> PatchAsync(TId id, [FromBody] TResource resource, CancellationToken cancellationToken)
-        {
-            return await base.PatchAsync(id, resource, cancellationToken);
-        }
+    /// <inheritdoc />
+    [HttpPatch("{id}")]
+    public override async Task<IActionResult> PatchAsync(TId id, [FromBody] TResource resource, CancellationToken cancellationToken)
+    {
+        return await base.PatchAsync(id, resource, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        [HttpPatch("{id}/relationships/{relationshipName}")]
-        public override async Task<IActionResult> PatchRelationshipAsync(TId id, string relationshipName, [FromBody] object? rightValue,
-            CancellationToken cancellationToken)
-        {
-            return await base.PatchRelationshipAsync(id, relationshipName, rightValue, cancellationToken);
-        }
+    /// <inheritdoc />
+    [HttpPatch("{id}/relationships/{relationshipName}")]
+    public override async Task<IActionResult> PatchRelationshipAsync(TId id, string relationshipName, [FromBody] object? rightValue,
+        CancellationToken cancellationToken)
+    {
+        return await base.PatchRelationshipAsync(id, relationshipName, rightValue, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        [HttpDelete("{id}")]
-        public override async Task<IActionResult> DeleteAsync(TId id, CancellationToken cancellationToken)
-        {
-            return await base.DeleteAsync(id, cancellationToken);
-        }
+    /// <inheritdoc />
+    [HttpDelete("{id}")]
+    public override async Task<IActionResult> DeleteAsync(TId id, CancellationToken cancellationToken)
+    {
+        return await base.DeleteAsync(id, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        [HttpDelete("{id}/relationships/{relationshipName}")]
-        public override async Task<IActionResult> DeleteRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-        {
-            return await base.DeleteRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
-        }
+    /// <inheritdoc />
+    [HttpDelete("{id}/relationships/{relationshipName}")]
+    public override async Task<IActionResult> DeleteRelationshipAsync(TId id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        return await base.DeleteRelationshipAsync(id, relationshipName, rightResourceIds, cancellationToken);
     }
 }
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs
index 3f034c08d8..452a5eac09 100644
--- a/src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs
+++ b/src/JsonApiDotNetCore/Controllers/JsonApiOperationsController.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.AtomicOperations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -8,25 +5,24 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Controllers
+namespace JsonApiDotNetCore.Controllers;
+
+/// <summary>
+/// The base class to derive atomic:operations controllers from. This class delegates all work to <see cref="BaseJsonApiOperationsController" /> but adds
+/// attributes for routing templates. If you want to provide routing templates yourself, you should derive from BaseJsonApiOperationsController directly.
+/// </summary>
+public abstract class JsonApiOperationsController : BaseJsonApiOperationsController
 {
-    /// <summary>
-    /// The base class to derive atomic:operations controllers from. This class delegates all work to <see cref="BaseJsonApiOperationsController" /> but adds
-    /// attributes for routing templates. If you want to provide routing templates yourself, you should derive from BaseJsonApiOperationsController directly.
-    /// </summary>
-    public abstract class JsonApiOperationsController : BaseJsonApiOperationsController
+    protected JsonApiOperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor,
+        IJsonApiRequest request, ITargetedFields targetedFields)
+        : base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
     {
-        protected JsonApiOperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IOperationsProcessor processor, IJsonApiRequest request, ITargetedFields targetedFields)
-            : base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
-        {
-        }
+    }
 
-        /// <inheritdoc />
-        [HttpPost]
-        public override async Task<IActionResult> PostOperationsAsync([FromBody] IList<OperationContainer> operations, CancellationToken cancellationToken)
-        {
-            return await base.PostOperationsAsync(operations, cancellationToken);
-        }
+    /// <inheritdoc />
+    [HttpPost]
+    public override async Task<IActionResult> PostOperationsAsync([FromBody] IList<OperationContainer> operations, CancellationToken cancellationToken)
+    {
+        return await base.PostOperationsAsync(operations, cancellationToken);
     }
 }
diff --git a/src/JsonApiDotNetCore/Controllers/JsonApiQueryController.cs b/src/JsonApiDotNetCore/Controllers/JsonApiQueryController.cs
index d56eab8d60..fa101c2118 100644
--- a/src/JsonApiDotNetCore/Controllers/JsonApiQueryController.cs
+++ b/src/JsonApiDotNetCore/Controllers/JsonApiQueryController.cs
@@ -3,28 +3,27 @@
 using JsonApiDotNetCore.Services;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Controllers
+namespace JsonApiDotNetCore.Controllers;
+
+/// <summary>
+/// The base class to derive resource-specific read-only controllers from. Returns HTTP 405 on write-only endpoints. If you want to provide routing
+/// templates yourself, you should derive from BaseJsonApiController directly.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+public abstract class JsonApiQueryController<TResource, TId> : JsonApiController<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
     /// <summary>
-    /// The base class to derive resource-specific read-only controllers from. Returns HTTP 405 on write-only endpoints. If you want to provide routing
-    /// templates yourself, you should derive from BaseJsonApiController directly.
+    /// Creates an instance from a read-only service.
     /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    public abstract class JsonApiQueryController<TResource, TId> : JsonApiController<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
+    protected JsonApiQueryController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceQueryService<TResource, TId> queryService)
+        : base(options, resourceGraph, loggerFactory, queryService, queryService, queryService, queryService)
     {
-        /// <summary>
-        /// Creates an instance from a read-only service.
-        /// </summary>
-        protected JsonApiQueryController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceQueryService<TResource, TId> queryService)
-            : base(options, resourceGraph, loggerFactory, queryService, queryService, queryService, queryService)
-        {
-        }
     }
 }
diff --git a/src/JsonApiDotNetCore/Diagnostics/AspNetCodeTimerSession.cs b/src/JsonApiDotNetCore/Diagnostics/AspNetCodeTimerSession.cs
index 997580b00e..bef29dba78 100644
--- a/src/JsonApiDotNetCore/Diagnostics/AspNetCodeTimerSession.cs
+++ b/src/JsonApiDotNetCore/Diagnostics/AspNetCodeTimerSession.cs
@@ -1,83 +1,81 @@
-using System;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Http;
 
-namespace JsonApiDotNetCore.Diagnostics
+namespace JsonApiDotNetCore.Diagnostics;
+
+/// <summary>
+/// Code timing session management intended for use in ASP.NET Web Applications. Uses <see cref="HttpContext.Items" /> to isolate concurrent requests.
+/// Can be used with async/wait, but it cannot distinguish between concurrently running threads within a single HTTP request, so you'll need to pass an
+/// <see cref="CascadingCodeTimer" /> instance through the entire call chain in that case.
+/// </summary>
+[PublicAPI]
+public sealed class AspNetCodeTimerSession : ICodeTimerSession
 {
-    /// <summary>
-    /// Code timing session management intended for use in ASP.NET Web Applications. Uses <see cref="HttpContext.Items" /> to isolate concurrent requests.
-    /// Can be used with async/wait, but it cannot distinguish between concurrently running threads within a single HTTP request, so you'll need to pass an
-    /// <see cref="CascadingCodeTimer" /> instance through the entire call chain in that case.
-    /// </summary>
-    [PublicAPI]
-    public sealed class AspNetCodeTimerSession : ICodeTimerSession
-    {
-        private const string HttpContextItemKey = "CascadingCodeTimer:Session";
+    private const string HttpContextItemKey = "CascadingCodeTimer:Session";
 
-        private readonly HttpContext? _httpContext;
-        private readonly IHttpContextAccessor? _httpContextAccessor;
+    private readonly HttpContext? _httpContext;
+    private readonly IHttpContextAccessor? _httpContextAccessor;
 
-        public ICodeTimer CodeTimer
+    public ICodeTimer CodeTimer
+    {
+        get
         {
-            get
-            {
-                HttpContext httpContext = GetHttpContext();
-                var codeTimer = (ICodeTimer?)httpContext.Items[HttpContextItemKey];
-
-                if (codeTimer == null)
-                {
-                    codeTimer = new CascadingCodeTimer();
-                    httpContext.Items[HttpContextItemKey] = codeTimer;
-                }
+            HttpContext httpContext = GetHttpContext();
+            var codeTimer = (ICodeTimer?)httpContext.Items[HttpContextItemKey];
 
-                return codeTimer;
+            if (codeTimer == null)
+            {
+                codeTimer = new CascadingCodeTimer();
+                httpContext.Items[HttpContextItemKey] = codeTimer;
             }
-        }
-
-        public event EventHandler? Disposed;
-
-        public AspNetCodeTimerSession(IHttpContextAccessor httpContextAccessor)
-        {
-            ArgumentGuard.NotNull(httpContextAccessor, nameof(httpContextAccessor));
 
-            _httpContextAccessor = httpContextAccessor;
+            return codeTimer;
         }
+    }
 
-        public AspNetCodeTimerSession(HttpContext httpContext)
-        {
-            ArgumentGuard.NotNull(httpContext, nameof(httpContext));
+    public event EventHandler? Disposed;
 
-            _httpContext = httpContext;
-        }
+    public AspNetCodeTimerSession(IHttpContextAccessor httpContextAccessor)
+    {
+        ArgumentGuard.NotNull(httpContextAccessor, nameof(httpContextAccessor));
 
-        public void Dispose()
-        {
-            HttpContext? httpContext = TryGetHttpContext();
-            var codeTimer = (ICodeTimer?)httpContext?.Items[HttpContextItemKey];
+        _httpContextAccessor = httpContextAccessor;
+    }
 
-            if (codeTimer != null)
-            {
-                codeTimer.Dispose();
-                httpContext!.Items[HttpContextItemKey] = null;
-            }
+    public AspNetCodeTimerSession(HttpContext httpContext)
+    {
+        ArgumentGuard.NotNull(httpContext, nameof(httpContext));
 
-            OnDisposed();
-        }
+        _httpContext = httpContext;
+    }
 
-        private void OnDisposed()
-        {
-            Disposed?.Invoke(this, EventArgs.Empty);
-        }
+    public void Dispose()
+    {
+        HttpContext? httpContext = TryGetHttpContext();
+        var codeTimer = (ICodeTimer?)httpContext?.Items[HttpContextItemKey];
 
-        private HttpContext GetHttpContext()
+        if (codeTimer != null)
         {
-            HttpContext? httpContext = TryGetHttpContext();
-            return httpContext ?? throw new InvalidOperationException("An active HTTP request is required.");
+            codeTimer.Dispose();
+            httpContext!.Items[HttpContextItemKey] = null;
         }
 
-        private HttpContext? TryGetHttpContext()
-        {
-            return _httpContext ?? _httpContextAccessor?.HttpContext;
-        }
+        OnDisposed();
+    }
+
+    private void OnDisposed()
+    {
+        Disposed?.Invoke(this, EventArgs.Empty);
+    }
+
+    private HttpContext GetHttpContext()
+    {
+        HttpContext? httpContext = TryGetHttpContext();
+        return httpContext ?? throw new InvalidOperationException("An active HTTP request is required.");
+    }
+
+    private HttpContext? TryGetHttpContext()
+    {
+        return _httpContext ?? _httpContextAccessor?.HttpContext;
     }
 }
diff --git a/src/JsonApiDotNetCore/Diagnostics/CascadingCodeTimer.cs b/src/JsonApiDotNetCore/Diagnostics/CascadingCodeTimer.cs
index 3b8d5ced72..fde552ec8f 100644
--- a/src/JsonApiDotNetCore/Diagnostics/CascadingCodeTimer.cs
+++ b/src/JsonApiDotNetCore/Diagnostics/CascadingCodeTimer.cs
@@ -1,281 +1,277 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
-using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace JsonApiDotNetCore.Diagnostics
+namespace JsonApiDotNetCore.Diagnostics;
+
+/// <summary>
+/// Records execution times for nested code blocks.
+/// </summary>
+internal sealed class CascadingCodeTimer : ICodeTimer
 {
-    /// <summary>
-    /// Records execution times for nested code blocks.
-    /// </summary>
-    internal sealed class CascadingCodeTimer : ICodeTimer
-    {
-        private readonly Stopwatch _stopwatch = new();
-        private readonly Stack<MeasureScope> _activeScopeStack = new();
-        private readonly List<MeasureScope> _completedScopes = new();
+    private readonly Stopwatch _stopwatch = new();
+    private readonly Stack<MeasureScope> _activeScopeStack = new();
+    private readonly List<MeasureScope> _completedScopes = new();
 
-        static CascadingCodeTimer()
+    static CascadingCodeTimer()
+    {
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Be default, measurements using Stopwatch can differ 25%-30% on the same function on the same computer.
-                // The steps below ensure to get an accuracy of 0.1%-0.2%. With this accuracy, algorithms can be tested and compared.
-                // https://www.codeproject.com/Articles/61964/Performance-Tests-Precise-Run-Time-Measurements-wi
+            // Be default, measurements using Stopwatch can differ 25%-30% on the same function on the same computer.
+            // The steps below ensure to get an accuracy of 0.1%-0.2%. With this accuracy, algorithms can be tested and compared.
+            // https://www.codeproject.com/Articles/61964/Performance-Tests-Precise-Run-Time-Measurements-wi
 
-                // The most important thing is to prevent switching between CPU cores or processors. Switching dismisses the cache, etc. and has a huge performance impact on the test.
-                Process.GetCurrentProcess().ProcessorAffinity = new IntPtr(2);
+            // The most important thing is to prevent switching between CPU cores or processors. Switching dismisses the cache, etc. and has a huge performance impact on the test.
+            Process.GetCurrentProcess().ProcessorAffinity = new IntPtr(2);
 
-                // To get the CPU core more exclusively, we must prevent that other processes can use this CPU core. We set our process priority to achieve this.
-                // Note we should NOT set the thread priority, because async/await usage makes the code jump between pooled threads (depending on Synchronization Context).
-                Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.High;
-            }
+            // To get the CPU core more exclusively, we must prevent that other processes can use this CPU core. We set our process priority to achieve this.
+            // Note we should NOT set the thread priority, because async/await usage makes the code jump between pooled threads (depending on Synchronization Context).
+            Process.GetCurrentProcess().PriorityClass = ProcessPriorityClass.High;
         }
+    }
 
-        /// <inheritdoc />
-        public IDisposable Measure(string name, bool excludeInRelativeCost = false)
-        {
-            MeasureScope childScope = CreateChildScope(name, excludeInRelativeCost);
-            _activeScopeStack.Push(childScope);
+    /// <inheritdoc />
+    public IDisposable Measure(string name, bool excludeInRelativeCost = false)
+    {
+        MeasureScope childScope = CreateChildScope(name, excludeInRelativeCost);
+        _activeScopeStack.Push(childScope);
 
-            return childScope;
-        }
+        return childScope;
+    }
 
-        private MeasureScope CreateChildScope(string name, bool excludeInRelativeCost)
+    private MeasureScope CreateChildScope(string name, bool excludeInRelativeCost)
+    {
+        if (_activeScopeStack.TryPeek(out MeasureScope? topScope))
         {
-            if (_activeScopeStack.TryPeek(out MeasureScope? topScope))
-            {
-                return topScope.SpawnChild(this, name, excludeInRelativeCost);
-            }
+            return topScope.SpawnChild(this, name, excludeInRelativeCost);
+        }
+
+        return new MeasureScope(this, name, excludeInRelativeCost);
+    }
 
-            return new MeasureScope(this, name, excludeInRelativeCost);
+    private void Close(MeasureScope scope)
+    {
+        if (!_activeScopeStack.TryPeek(out MeasureScope? topScope) || topScope != scope)
+        {
+            throw new InvalidOperationException($"Scope '{scope.Name}' cannot be disposed at this time, because it is not the currently active scope.");
         }
 
-        private void Close(MeasureScope scope)
+        _activeScopeStack.Pop();
+
+        if (!_activeScopeStack.Any())
         {
-            if (!_activeScopeStack.TryPeek(out MeasureScope? topScope) || topScope != scope)
-            {
-                throw new InvalidOperationException($"Scope '{scope.Name}' cannot be disposed at this time, because it is not the currently active scope.");
-            }
+            _completedScopes.Add(scope);
+        }
+    }
 
-            _activeScopeStack.Pop();
+    /// <inheritdoc />
+    public string GetResults()
+    {
+        int paddingLength = GetPaddingLength();
 
-            if (!_activeScopeStack.Any())
-            {
-                _completedScopes.Add(scope);
-            }
+        var builder = new StringBuilder();
+        WriteResult(builder, paddingLength);
+
+        return builder.ToString();
+    }
+
+    private int GetPaddingLength()
+    {
+        int maxLength = 0;
+
+        foreach (MeasureScope scope in _completedScopes)
+        {
+            int nextLength = scope.GetPaddingLength();
+            maxLength = Math.Max(maxLength, nextLength);
         }
 
-        /// <inheritdoc />
-        public string GetResults()
+        if (_activeScopeStack.Any())
         {
-            int paddingLength = GetPaddingLength();
+            MeasureScope scope = _activeScopeStack.Peek();
+            int nextLength = scope.GetPaddingLength();
+            maxLength = Math.Max(maxLength, nextLength);
+        }
+
+        return maxLength + 3;
+    }
 
-            var builder = new StringBuilder();
-            WriteResult(builder, paddingLength);
+    private void WriteResult(StringBuilder builder, int paddingLength)
+    {
+        foreach (MeasureScope scope in _completedScopes)
+        {
+            scope.WriteResult(builder, 0, paddingLength);
+        }
 
-            return builder.ToString();
+        if (_activeScopeStack.Any())
+        {
+            MeasureScope scope = _activeScopeStack.Peek();
+            scope.WriteResult(builder, 0, paddingLength);
         }
+    }
 
-        private int GetPaddingLength()
+    public void Dispose()
+    {
+        if (_stopwatch.IsRunning)
         {
-            int maxLength = 0;
+            _stopwatch.Stop();
+        }
 
-            foreach (MeasureScope scope in _completedScopes)
-            {
-                int nextLength = scope.GetPaddingLength();
-                maxLength = Math.Max(maxLength, nextLength);
-            }
+        _completedScopes.Clear();
+        _activeScopeStack.Clear();
+    }
 
-            if (_activeScopeStack.Any())
-            {
-                MeasureScope scope = _activeScopeStack.Peek();
-                int nextLength = scope.GetPaddingLength();
-                maxLength = Math.Max(maxLength, nextLength);
-            }
+    private sealed class MeasureScope : IDisposable
+    {
+        private readonly CascadingCodeTimer _owner;
+        private readonly IList<MeasureScope> _children = new List<MeasureScope>();
+        private readonly bool _excludeInRelativeCost;
+        private readonly TimeSpan _startedAt;
+        private TimeSpan? _stoppedAt;
 
-            return maxLength + 3;
-        }
+        public string Name { get; }
 
-        private void WriteResult(StringBuilder builder, int paddingLength)
+        public MeasureScope(CascadingCodeTimer owner, string name, bool excludeInRelativeCost)
         {
-            foreach (MeasureScope scope in _completedScopes)
-            {
-                scope.WriteResult(builder, 0, paddingLength);
-            }
+            _owner = owner;
+            _excludeInRelativeCost = excludeInRelativeCost;
+            Name = name;
 
-            if (_activeScopeStack.Any())
-            {
-                MeasureScope scope = _activeScopeStack.Peek();
-                scope.WriteResult(builder, 0, paddingLength);
-            }
+            EnsureRunning();
+            _startedAt = owner._stopwatch.Elapsed;
         }
 
-        public void Dispose()
+        private void EnsureRunning()
         {
-            if (_stopwatch.IsRunning)
+            if (!_owner._stopwatch.IsRunning)
             {
-                _stopwatch.Stop();
+                _owner._stopwatch.Start();
             }
-
-            _completedScopes.Clear();
-            _activeScopeStack.Clear();
         }
 
-        private sealed class MeasureScope : IDisposable
+        public MeasureScope SpawnChild(CascadingCodeTimer owner, string name, bool excludeInRelativeCost)
         {
-            private readonly CascadingCodeTimer _owner;
-            private readonly IList<MeasureScope> _children = new List<MeasureScope>();
-            private readonly bool _excludeInRelativeCost;
-            private readonly TimeSpan _startedAt;
-            private TimeSpan? _stoppedAt;
-
-            public string Name { get; }
-
-            public MeasureScope(CascadingCodeTimer owner, string name, bool excludeInRelativeCost)
-            {
-                _owner = owner;
-                _excludeInRelativeCost = excludeInRelativeCost;
-                Name = name;
+            var childScope = new MeasureScope(owner, name, excludeInRelativeCost);
+            _children.Add(childScope);
+            return childScope;
+        }
 
-                EnsureRunning();
-                _startedAt = owner._stopwatch.Elapsed;
-            }
+        public int GetPaddingLength()
+        {
+            return GetPaddingLength(0);
+        }
 
-            private void EnsureRunning()
-            {
-                if (!_owner._stopwatch.IsRunning)
-                {
-                    _owner._stopwatch.Start();
-                }
-            }
+        private int GetPaddingLength(int indent)
+        {
+            int selfLength = indent * 2 + Name.Length;
+            int maxChildrenLength = 0;
 
-            public MeasureScope SpawnChild(CascadingCodeTimer owner, string name, bool excludeInRelativeCost)
+            foreach (MeasureScope child in _children)
             {
-                var childScope = new MeasureScope(owner, name, excludeInRelativeCost);
-                _children.Add(childScope);
-                return childScope;
+                int nextLength = child.GetPaddingLength(indent + 1);
+                maxChildrenLength = Math.Max(nextLength, maxChildrenLength);
             }
 
-            public int GetPaddingLength()
-            {
-                return GetPaddingLength(0);
-            }
+            return Math.Max(selfLength, maxChildrenLength);
+        }
 
-            private int GetPaddingLength(int indent)
-            {
-                int selfLength = indent * 2 + Name.Length;
-                int maxChildrenLength = 0;
+        private TimeSpan GetElapsedInSelf()
+        {
+            return GetElapsedInTotal() - GetElapsedInChildren();
+        }
 
-                foreach (MeasureScope child in _children)
-                {
-                    int nextLength = child.GetPaddingLength(indent + 1);
-                    maxChildrenLength = Math.Max(nextLength, maxChildrenLength);
-                }
+        private TimeSpan GetElapsedInTotal()
+        {
+            TimeSpan stoppedAt = _stoppedAt ?? _owner._stopwatch.Elapsed;
+            return stoppedAt - _startedAt;
+        }
 
-                return Math.Max(selfLength, maxChildrenLength);
-            }
+        private TimeSpan GetElapsedInChildren()
+        {
+            TimeSpan elapsedInChildren = TimeSpan.Zero;
 
-            private TimeSpan GetElapsedInSelf()
+            foreach (MeasureScope childScope in _children)
             {
-                return GetElapsedInTotal() - GetElapsedInChildren();
+                elapsedInChildren += childScope.GetElapsedInTotal();
             }
 
-            private TimeSpan GetElapsedInTotal()
-            {
-                TimeSpan stoppedAt = _stoppedAt ?? _owner._stopwatch.Elapsed;
-                return stoppedAt - _startedAt;
-            }
+            return elapsedInChildren;
+        }
 
-            private TimeSpan GetElapsedInChildren()
-            {
-                TimeSpan elapsedInChildren = TimeSpan.Zero;
+        private TimeSpan GetSkippedInTotal()
+        {
+            TimeSpan skippedInSelf = _excludeInRelativeCost ? GetElapsedInSelf() : TimeSpan.Zero;
+            TimeSpan skippedInChildren = GetSkippedInChildren();
 
-                foreach (MeasureScope childScope in _children)
-                {
-                    elapsedInChildren += childScope.GetElapsedInTotal();
-                }
+            return skippedInSelf + skippedInChildren;
+        }
 
-                return elapsedInChildren;
-            }
+        private TimeSpan GetSkippedInChildren()
+        {
+            TimeSpan skippedInChildren = TimeSpan.Zero;
 
-            private TimeSpan GetSkippedInTotal()
+            foreach (MeasureScope childScope in _children)
             {
-                TimeSpan skippedInSelf = _excludeInRelativeCost ? GetElapsedInSelf() : TimeSpan.Zero;
-                TimeSpan skippedInChildren = GetSkippedInChildren();
-
-                return skippedInSelf + skippedInChildren;
+                skippedInChildren += childScope.GetSkippedInTotal();
             }
 
-            private TimeSpan GetSkippedInChildren()
-            {
-                TimeSpan skippedInChildren = TimeSpan.Zero;
+            return skippedInChildren;
+        }
 
-                foreach (MeasureScope childScope in _children)
-                {
-                    skippedInChildren += childScope.GetSkippedInTotal();
-                }
+        public void WriteResult(StringBuilder builder, int indent, int paddingLength)
+        {
+            TimeSpan timeElapsedGlobal = GetElapsedInTotal() - GetSkippedInTotal();
+            WriteResult(builder, indent, timeElapsedGlobal, paddingLength);
+        }
 
-                return skippedInChildren;
-            }
+        private void WriteResult(StringBuilder builder, int indent, TimeSpan timeElapsedGlobal, int paddingLength)
+        {
+            TimeSpan timeElapsedInSelf = GetElapsedInSelf();
+            double scaleElapsedInSelf = timeElapsedGlobal != TimeSpan.Zero ? timeElapsedInSelf / timeElapsedGlobal : 0;
 
-            public void WriteResult(StringBuilder builder, int indent, int paddingLength)
-            {
-                TimeSpan timeElapsedGlobal = GetElapsedInTotal() - GetSkippedInTotal();
-                WriteResult(builder, indent, timeElapsedGlobal, paddingLength);
-            }
+            WriteIndent(builder, indent);
+            builder.Append(Name);
+            WritePadding(builder, indent, paddingLength);
+            builder.AppendFormat(CultureInfo.InvariantCulture, "{0,19:G}", timeElapsedInSelf);
 
-            private void WriteResult(StringBuilder builder, int indent, TimeSpan timeElapsedGlobal, int paddingLength)
+            if (!_excludeInRelativeCost)
             {
-                TimeSpan timeElapsedInSelf = GetElapsedInSelf();
-                double scaleElapsedInSelf = timeElapsedGlobal != TimeSpan.Zero ? timeElapsedInSelf / timeElapsedGlobal : 0;
-
-                WriteIndent(builder, indent);
-                builder.Append(Name);
-                WritePadding(builder, indent, paddingLength);
-                builder.AppendFormat(CultureInfo.InvariantCulture, "{0,19:G}", timeElapsedInSelf);
-
-                if (!_excludeInRelativeCost)
-                {
-                    builder.Append(" ... ");
-                    builder.AppendFormat(CultureInfo.InvariantCulture, "{0,7:#0.00%}", scaleElapsedInSelf);
-                }
-
-                if (_stoppedAt == null)
-                {
-                    builder.Append(" (active)");
-                }
-
-                builder.AppendLine();
-
-                foreach (MeasureScope child in _children)
-                {
-                    child.WriteResult(builder, indent + 1, timeElapsedGlobal, paddingLength);
-                }
+                builder.Append(" ... ");
+                builder.AppendFormat(CultureInfo.InvariantCulture, "{0,7:#0.00%}", scaleElapsedInSelf);
             }
 
-            private static void WriteIndent(StringBuilder builder, int indent)
+            if (_stoppedAt == null)
             {
-                builder.Append(new string(' ', indent * 2));
+                builder.Append(" (active)");
             }
 
-            private void WritePadding(StringBuilder builder, int indent, int paddingLength)
+            builder.AppendLine();
+
+            foreach (MeasureScope child in _children)
             {
-                string padding = new('.', paddingLength - Name.Length - indent * 2);
-                builder.Append(' ');
-                builder.Append(padding);
-                builder.Append(' ');
+                child.WriteResult(builder, indent + 1, timeElapsedGlobal, paddingLength);
             }
+        }
 
-            public void Dispose()
+        private static void WriteIndent(StringBuilder builder, int indent)
+        {
+            builder.Append(new string(' ', indent * 2));
+        }
+
+        private void WritePadding(StringBuilder builder, int indent, int paddingLength)
+        {
+            string padding = new('.', paddingLength - Name.Length - indent * 2);
+            builder.Append(' ');
+            builder.Append(padding);
+            builder.Append(' ');
+        }
+
+        public void Dispose()
+        {
+            if (_stoppedAt == null)
             {
-                if (_stoppedAt == null)
-                {
-                    _stoppedAt = _owner._stopwatch.Elapsed;
-                    _owner.Close(this);
-                }
+                _stoppedAt = _owner._stopwatch.Elapsed;
+                _owner.Close(this);
             }
         }
     }
diff --git a/src/JsonApiDotNetCore/Diagnostics/CodeTimingSessionManager.cs b/src/JsonApiDotNetCore/Diagnostics/CodeTimingSessionManager.cs
index 2d6b8eaae9..d858aa6f4b 100644
--- a/src/JsonApiDotNetCore/Diagnostics/CodeTimingSessionManager.cs
+++ b/src/JsonApiDotNetCore/Diagnostics/CodeTimingSessionManager.cs
@@ -1,95 +1,92 @@
-using System;
-using System.Linq;
 using System.Reflection;
 
 #pragma warning disable AV1008 // Class should not be static
 
-namespace JsonApiDotNetCore.Diagnostics
+namespace JsonApiDotNetCore.Diagnostics;
+
+/// <summary>
+/// Provides access to the "current" measurement, which removes the need to pass along a <see cref="CascadingCodeTimer" /> instance through the entire
+/// call chain.
+/// </summary>
+public static class CodeTimingSessionManager
 {
-    /// <summary>
-    /// Provides access to the "current" measurement, which removes the need to pass along a <see cref="CascadingCodeTimer" /> instance through the entire
-    /// call chain.
-    /// </summary>
-    public static class CodeTimingSessionManager
-    {
-        public static readonly bool IsEnabled;
-        private static ICodeTimerSession? _session;
+    public static readonly bool IsEnabled;
+    private static ICodeTimerSession? _session;
 
-        public static ICodeTimer Current
+    public static ICodeTimer Current
+    {
+        get
         {
-            get
+            if (!IsEnabled)
             {
-                if (!IsEnabled)
-                {
-                    return DisabledCodeTimer.Instance;
-                }
+                return DisabledCodeTimer.Instance;
+            }
 
-                AssertHasActiveSession();
+            AssertHasActiveSession();
 
-                return _session!.CodeTimer;
-            }
+            return _session!.CodeTimer;
         }
+    }
 
-        static CodeTimingSessionManager()
-        {
+    static CodeTimingSessionManager()
+    {
 #if DEBUG
-            IsEnabled = !IsRunningInTest() && !IsRunningInBenchmark();
+        IsEnabled = !IsRunningInTest() && !IsRunningInBenchmark();
 #else
-            IsEnabled = false;
+        IsEnabled = false;
 #endif
-        }
+    }
 
-        // ReSharper disable once UnusedMember.Local
-        private static bool IsRunningInTest()
-        {
-            const string testAssemblyName = "xunit.core";
+    // ReSharper disable once UnusedMember.Local
+    private static bool IsRunningInTest()
+    {
+        const string testAssemblyName = "xunit.core";
 
-            return AppDomain.CurrentDomain.GetAssemblies().Any(assembly =>
-                assembly.FullName != null && assembly.FullName.StartsWith(testAssemblyName, StringComparison.Ordinal));
-        }
+        return AppDomain.CurrentDomain.GetAssemblies().Any(assembly =>
+            assembly.FullName != null && assembly.FullName.StartsWith(testAssemblyName, StringComparison.Ordinal));
+    }
 
-        // ReSharper disable once UnusedMember.Local
-        private static bool IsRunningInBenchmark()
-        {
-            return Assembly.GetEntryAssembly()?.GetName().Name == "Benchmarks";
-        }
+    // ReSharper disable once UnusedMember.Local
+    private static bool IsRunningInBenchmark()
+    {
+        return Assembly.GetEntryAssembly()?.GetName().Name == "Benchmarks";
+    }
 
-        private static void AssertHasActiveSession()
+    private static void AssertHasActiveSession()
+    {
+        if (_session == null)
         {
-            if (_session == null)
-            {
-                throw new InvalidOperationException($"Call {nameof(Capture)} before accessing the current session.");
-            }
+            throw new InvalidOperationException($"Call {nameof(Capture)} before accessing the current session.");
         }
+    }
 
-        public static void Capture(ICodeTimerSession session)
-        {
-            ArgumentGuard.NotNull(session, nameof(session));
+    public static void Capture(ICodeTimerSession session)
+    {
+        ArgumentGuard.NotNull(session, nameof(session));
 
-            AssertNoActiveSession();
+        AssertNoActiveSession();
 
-            if (IsEnabled)
-            {
-                session.Disposed += SessionOnDisposed;
-                _session = session;
-            }
+        if (IsEnabled)
+        {
+            session.Disposed += SessionOnDisposed;
+            _session = session;
         }
+    }
 
-        private static void AssertNoActiveSession()
+    private static void AssertNoActiveSession()
+    {
+        if (_session != null)
         {
-            if (_session != null)
-            {
-                throw new InvalidOperationException("Sessions cannot be nested. Dispose the current session first.");
-            }
+            throw new InvalidOperationException("Sessions cannot be nested. Dispose the current session first.");
         }
+    }
 
-        private static void SessionOnDisposed(object? sender, EventArgs args)
+    private static void SessionOnDisposed(object? sender, EventArgs args)
+    {
+        if (_session != null)
         {
-            if (_session != null)
-            {
-                _session.Disposed -= SessionOnDisposed;
-                _session = null;
-            }
+            _session.Disposed -= SessionOnDisposed;
+            _session = null;
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Diagnostics/DefaultCodeTimerSession.cs b/src/JsonApiDotNetCore/Diagnostics/DefaultCodeTimerSession.cs
index d35d08cd1f..a1662095cb 100644
--- a/src/JsonApiDotNetCore/Diagnostics/DefaultCodeTimerSession.cs
+++ b/src/JsonApiDotNetCore/Diagnostics/DefaultCodeTimerSession.cs
@@ -1,52 +1,48 @@
-using System;
-using System.Threading;
+namespace JsonApiDotNetCore.Diagnostics;
 
-namespace JsonApiDotNetCore.Diagnostics
+/// <summary>
+/// General code timing session management. Can be used with async/wait, but it cannot distinguish between concurrently running threads, so you'll need
+/// to pass an <see cref="CascadingCodeTimer" /> instance through the entire call chain in that case.
+/// </summary>
+public sealed class DefaultCodeTimerSession : ICodeTimerSession
 {
-    /// <summary>
-    /// General code timing session management. Can be used with async/wait, but it cannot distinguish between concurrently running threads, so you'll need
-    /// to pass an <see cref="CascadingCodeTimer" /> instance through the entire call chain in that case.
-    /// </summary>
-    public sealed class DefaultCodeTimerSession : ICodeTimerSession
-    {
-        private readonly AsyncLocal<ICodeTimer?> _codeTimerInContext = new();
+    private readonly AsyncLocal<ICodeTimer?> _codeTimerInContext = new();
 
-        public ICodeTimer CodeTimer
+    public ICodeTimer CodeTimer
+    {
+        get
         {
-            get
-            {
-                AssertNotDisposed();
+            AssertNotDisposed();
 
-                return _codeTimerInContext.Value!;
-            }
+            return _codeTimerInContext.Value!;
         }
+    }
 
-        public event EventHandler? Disposed;
+    public event EventHandler? Disposed;
 
-        public DefaultCodeTimerSession()
-        {
-            _codeTimerInContext.Value = new CascadingCodeTimer();
-        }
+    public DefaultCodeTimerSession()
+    {
+        _codeTimerInContext.Value = new CascadingCodeTimer();
+    }
 
-        private void AssertNotDisposed()
+    private void AssertNotDisposed()
+    {
+        if (_codeTimerInContext.Value == null)
         {
-            if (_codeTimerInContext.Value == null)
-            {
-                throw new ObjectDisposedException(nameof(DefaultCodeTimerSession));
-            }
+            throw new ObjectDisposedException(nameof(DefaultCodeTimerSession));
         }
+    }
 
-        public void Dispose()
-        {
-            _codeTimerInContext.Value?.Dispose();
-            _codeTimerInContext.Value = null;
+    public void Dispose()
+    {
+        _codeTimerInContext.Value?.Dispose();
+        _codeTimerInContext.Value = null;
 
-            OnDisposed();
-        }
+        OnDisposed();
+    }
 
-        private void OnDisposed()
-        {
-            Disposed?.Invoke(this, EventArgs.Empty);
-        }
+    private void OnDisposed()
+    {
+        Disposed?.Invoke(this, EventArgs.Empty);
     }
 }
diff --git a/src/JsonApiDotNetCore/Diagnostics/DisabledCodeTimer.cs b/src/JsonApiDotNetCore/Diagnostics/DisabledCodeTimer.cs
index 1739ed3e81..928017b7e0 100644
--- a/src/JsonApiDotNetCore/Diagnostics/DisabledCodeTimer.cs
+++ b/src/JsonApiDotNetCore/Diagnostics/DisabledCodeTimer.cs
@@ -1,30 +1,27 @@
-using System;
+namespace JsonApiDotNetCore.Diagnostics;
 
-namespace JsonApiDotNetCore.Diagnostics
+/// <summary>
+/// Doesn't record anything. Intended for Release builds and to not break existing tests.
+/// </summary>
+internal sealed class DisabledCodeTimer : ICodeTimer
 {
-    /// <summary>
-    /// Doesn't record anything. Intended for Release builds and to not break existing tests.
-    /// </summary>
-    internal sealed class DisabledCodeTimer : ICodeTimer
-    {
-        public static readonly DisabledCodeTimer Instance = new();
+    public static readonly DisabledCodeTimer Instance = new();
 
-        private DisabledCodeTimer()
-        {
-        }
+    private DisabledCodeTimer()
+    {
+    }
 
-        public IDisposable Measure(string name, bool excludeInRelativeCost = false)
-        {
-            return this;
-        }
+    public IDisposable Measure(string name, bool excludeInRelativeCost = false)
+    {
+        return this;
+    }
 
-        public string GetResults()
-        {
-            return string.Empty;
-        }
+    public string GetResults()
+    {
+        return string.Empty;
+    }
 
-        public void Dispose()
-        {
-        }
+    public void Dispose()
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Diagnostics/ICodeTimer.cs b/src/JsonApiDotNetCore/Diagnostics/ICodeTimer.cs
index 9e8abfe9e1..23ff4ac605 100644
--- a/src/JsonApiDotNetCore/Diagnostics/ICodeTimer.cs
+++ b/src/JsonApiDotNetCore/Diagnostics/ICodeTimer.cs
@@ -1,27 +1,24 @@
-using System;
+namespace JsonApiDotNetCore.Diagnostics;
 
-namespace JsonApiDotNetCore.Diagnostics
+/// <summary>
+/// Records execution times for code blocks.
+/// </summary>
+public interface ICodeTimer : IDisposable
 {
     /// <summary>
-    /// Records execution times for code blocks.
+    /// Starts recording the duration of a code block. Wrap this call in a <c>using</c> statement, so the recording stops when the return value goes out of
+    /// scope.
     /// </summary>
-    public interface ICodeTimer : IDisposable
-    {
-        /// <summary>
-        /// Starts recording the duration of a code block. Wrap this call in a <c>using</c> statement, so the recording stops when the return value goes out of
-        /// scope.
-        /// </summary>
-        /// <param name="name">
-        /// Description of what is being recorded.
-        /// </param>
-        /// <param name="excludeInRelativeCost">
-        /// When set, indicates to exclude this measurement in calculated percentages. <c>false</c> by default.
-        /// </param>
-        IDisposable Measure(string name, bool excludeInRelativeCost = false);
+    /// <param name="name">
+    /// Description of what is being recorded.
+    /// </param>
+    /// <param name="excludeInRelativeCost">
+    /// When set, indicates to exclude this measurement in calculated percentages. <c>false</c> by default.
+    /// </param>
+    IDisposable Measure(string name, bool excludeInRelativeCost = false);
 
-        /// <summary>
-        /// Returns intermediate or final results.
-        /// </summary>
-        string GetResults();
-    }
+    /// <summary>
+    /// Returns intermediate or final results.
+    /// </summary>
+    string GetResults();
 }
diff --git a/src/JsonApiDotNetCore/Diagnostics/ICodeTimerSession.cs b/src/JsonApiDotNetCore/Diagnostics/ICodeTimerSession.cs
index 5da473c38d..7e631a778c 100644
--- a/src/JsonApiDotNetCore/Diagnostics/ICodeTimerSession.cs
+++ b/src/JsonApiDotNetCore/Diagnostics/ICodeTimerSession.cs
@@ -1,14 +1,11 @@
-using System;
+namespace JsonApiDotNetCore.Diagnostics;
 
-namespace JsonApiDotNetCore.Diagnostics
+/// <summary>
+/// Removes the need to pass along a <see cref="CascadingCodeTimer" /> instance through the entire call chain when using code timing.
+/// </summary>
+public interface ICodeTimerSession : IDisposable
 {
-    /// <summary>
-    /// Removes the need to pass along a <see cref="CascadingCodeTimer" /> instance through the entire call chain when using code timing.
-    /// </summary>
-    public interface ICodeTimerSession : IDisposable
-    {
-        ICodeTimer CodeTimer { get; }
+    ICodeTimer CodeTimer { get; }
 
-        event EventHandler Disposed;
-    }
+    event EventHandler Disposed;
 }
diff --git a/src/JsonApiDotNetCore/Diagnostics/MeasurementSettings.cs b/src/JsonApiDotNetCore/Diagnostics/MeasurementSettings.cs
index 4fd42b2e30..0a92f9d570 100644
--- a/src/JsonApiDotNetCore/Diagnostics/MeasurementSettings.cs
+++ b/src/JsonApiDotNetCore/Diagnostics/MeasurementSettings.cs
@@ -1,10 +1,9 @@
 #pragma warning disable AV1008 // Class should not be static
 
-namespace JsonApiDotNetCore.Diagnostics
+namespace JsonApiDotNetCore.Diagnostics;
+
+internal static class MeasurementSettings
 {
-    internal static class MeasurementSettings
-    {
-        public static readonly bool ExcludeDatabaseInPercentages = bool.Parse(bool.TrueString);
-        public static readonly bool ExcludeJsonSerializationInPercentages = bool.Parse(bool.FalseString);
-    }
+    public static readonly bool ExcludeDatabaseInPercentages = bool.Parse(bool.TrueString);
+    public static readonly bool ExcludeJsonSerializationInPercentages = bool.Parse(bool.FalseString);
 }
diff --git a/src/JsonApiDotNetCore/Errors/CannotClearRequiredRelationshipException.cs b/src/JsonApiDotNetCore/Errors/CannotClearRequiredRelationshipException.cs
index 4a7c6b5e66..b73b256d25 100644
--- a/src/JsonApiDotNetCore/Errors/CannotClearRequiredRelationshipException.cs
+++ b/src/JsonApiDotNetCore/Errors/CannotClearRequiredRelationshipException.cs
@@ -2,22 +2,21 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when a required relationship is cleared.
+/// </summary>
+[PublicAPI]
+public sealed class CannotClearRequiredRelationshipException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when a required relationship is cleared.
-    /// </summary>
-    [PublicAPI]
-    public sealed class CannotClearRequiredRelationshipException : JsonApiException
-    {
-        public CannotClearRequiredRelationshipException(string relationshipName, string resourceId, string resourceType)
-            : base(new ErrorObject(HttpStatusCode.BadRequest)
-            {
-                Title = "Failed to clear a required relationship.",
-                Detail = $"The relationship '{relationshipName}' on resource type '{resourceType}' " +
-                    $"with ID '{resourceId}' cannot be cleared because it is a required relationship."
-            })
+    public CannotClearRequiredRelationshipException(string relationshipName, string resourceId, string resourceType)
+        : base(new ErrorObject(HttpStatusCode.BadRequest)
         {
-        }
+            Title = "Failed to clear a required relationship.",
+            Detail = $"The relationship '{relationshipName}' on resource type '{resourceType}' " +
+                $"with ID '{resourceId}' cannot be cleared because it is a required relationship."
+        })
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/DuplicateLocalIdValueException.cs b/src/JsonApiDotNetCore/Errors/DuplicateLocalIdValueException.cs
index 2926ee43b0..7b714d2b9d 100644
--- a/src/JsonApiDotNetCore/Errors/DuplicateLocalIdValueException.cs
+++ b/src/JsonApiDotNetCore/Errors/DuplicateLocalIdValueException.cs
@@ -2,21 +2,20 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when assigning a local ID that was already assigned in an earlier operation.
+/// </summary>
+[PublicAPI]
+public sealed class DuplicateLocalIdValueException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when assigning a local ID that was already assigned in an earlier operation.
-    /// </summary>
-    [PublicAPI]
-    public sealed class DuplicateLocalIdValueException : JsonApiException
-    {
-        public DuplicateLocalIdValueException(string localId)
-            : base(new ErrorObject(HttpStatusCode.BadRequest)
-            {
-                Title = "Another local ID with the same name is already defined at this point.",
-                Detail = $"Another local ID with name '{localId}' is already defined at this point."
-            })
+    public DuplicateLocalIdValueException(string localId)
+        : base(new ErrorObject(HttpStatusCode.BadRequest)
         {
-        }
+            Title = "Another local ID with the same name is already defined at this point.",
+            Detail = $"Another local ID with name '{localId}' is already defined at this point."
+        })
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/FailedOperationException.cs b/src/JsonApiDotNetCore/Errors/FailedOperationException.cs
index 4ae21ef469..e94b5a7c1b 100644
--- a/src/JsonApiDotNetCore/Errors/FailedOperationException.cs
+++ b/src/JsonApiDotNetCore/Errors/FailedOperationException.cs
@@ -1,27 +1,25 @@
-using System;
 using System.Net;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when an operation in an atomic:operations request failed to be processed for unknown reasons.
+/// </summary>
+[PublicAPI]
+public sealed class FailedOperationException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when an operation in an atomic:operations request failed to be processed for unknown reasons.
-    /// </summary>
-    [PublicAPI]
-    public sealed class FailedOperationException : JsonApiException
-    {
-        public FailedOperationException(int operationIndex, Exception innerException)
-            : base(new ErrorObject(HttpStatusCode.InternalServerError)
-            {
-                Title = "An unhandled error occurred while processing an operation in this request.",
-                Detail = innerException.Message,
-                Source = new ErrorSource
-                {
-                    Pointer = $"/atomic:operations[{operationIndex}]"
-                }
-            }, innerException)
+    public FailedOperationException(int operationIndex, Exception innerException)
+        : base(new ErrorObject(HttpStatusCode.InternalServerError)
         {
-        }
+            Title = "An unhandled error occurred while processing an operation in this request.",
+            Detail = innerException.Message,
+            Source = new ErrorSource
+            {
+                Pointer = $"/atomic:operations[{operationIndex}]"
+            }
+        }, innerException)
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/IncompatibleLocalIdTypeException.cs b/src/JsonApiDotNetCore/Errors/IncompatibleLocalIdTypeException.cs
index 9b2e46357c..f3f7b33bb5 100644
--- a/src/JsonApiDotNetCore/Errors/IncompatibleLocalIdTypeException.cs
+++ b/src/JsonApiDotNetCore/Errors/IncompatibleLocalIdTypeException.cs
@@ -2,21 +2,20 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when referencing a local ID that was assigned to a different resource type.
+/// </summary>
+[PublicAPI]
+public sealed class IncompatibleLocalIdTypeException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when referencing a local ID that was assigned to a different resource type.
-    /// </summary>
-    [PublicAPI]
-    public sealed class IncompatibleLocalIdTypeException : JsonApiException
-    {
-        public IncompatibleLocalIdTypeException(string localId, string declaredType, string currentType)
-            : base(new ErrorObject(HttpStatusCode.BadRequest)
-            {
-                Title = "Incompatible type in Local ID usage.",
-                Detail = $"Local ID '{localId}' belongs to resource type '{declaredType}' instead of '{currentType}'."
-            })
+    public IncompatibleLocalIdTypeException(string localId, string declaredType, string currentType)
+        : base(new ErrorObject(HttpStatusCode.BadRequest)
         {
-        }
+            Title = "Incompatible type in Local ID usage.",
+            Detail = $"Local ID '{localId}' belongs to resource type '{declaredType}' instead of '{currentType}'."
+        })
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/InvalidConfigurationException.cs b/src/JsonApiDotNetCore/Errors/InvalidConfigurationException.cs
index 75a2275f15..e25fa5244c 100644
--- a/src/JsonApiDotNetCore/Errors/InvalidConfigurationException.cs
+++ b/src/JsonApiDotNetCore/Errors/InvalidConfigurationException.cs
@@ -1,17 +1,15 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when configured usage of this library is invalid.
+/// </summary>
+[PublicAPI]
+public sealed class InvalidConfigurationException : Exception
 {
-    /// <summary>
-    /// The error that is thrown when configured usage of this library is invalid.
-    /// </summary>
-    [PublicAPI]
-    public sealed class InvalidConfigurationException : Exception
+    public InvalidConfigurationException(string message, Exception? innerException = null)
+        : base(message, innerException)
     {
-        public InvalidConfigurationException(string message, Exception? innerException = null)
-            : base(message, innerException)
-        {
-        }
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/InvalidModelStateException.cs b/src/JsonApiDotNetCore/Errors/InvalidModelStateException.cs
index 6777412f4e..eede4fed25 100644
--- a/src/JsonApiDotNetCore/Errors/InvalidModelStateException.cs
+++ b/src/JsonApiDotNetCore/Errors/InvalidModelStateException.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Net;
 using System.Reflection;
 using System.Text.Json.Serialization;
@@ -12,371 +9,367 @@
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when ASP.NET ModelState validation fails.
+/// </summary>
+[PublicAPI]
+public sealed class InvalidModelStateException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when ASP.NET ModelState validation fails.
-    /// </summary>
-    [PublicAPI]
-    public sealed class InvalidModelStateException : JsonApiException
+    public InvalidModelStateException(IReadOnlyDictionary<string, ModelStateEntry?> modelState, Type modelType, bool includeExceptionStackTraceInErrors,
+        IResourceGraph resourceGraph, Func<Type, int, Type?>? getCollectionElementTypeCallback = null)
+        : base(FromModelStateDictionary(modelState, modelType, resourceGraph, includeExceptionStackTraceInErrors, getCollectionElementTypeCallback))
     {
-        public InvalidModelStateException(IReadOnlyDictionary<string, ModelStateEntry> modelState, Type modelType, bool includeExceptionStackTraceInErrors,
-            IResourceGraph resourceGraph, Func<Type, int, Type?>? getCollectionElementTypeCallback = null)
-            : base(FromModelStateDictionary(modelState, modelType, resourceGraph, includeExceptionStackTraceInErrors, getCollectionElementTypeCallback))
-        {
-        }
+    }
+
+    private static IEnumerable<ErrorObject> FromModelStateDictionary(IReadOnlyDictionary<string, ModelStateEntry?> modelState, Type modelType,
+        IResourceGraph resourceGraph, bool includeExceptionStackTraceInErrors, Func<Type, int, Type?>? getCollectionElementTypeCallback)
+    {
+        ArgumentGuard.NotNull(modelState, nameof(modelState));
+        ArgumentGuard.NotNull(modelType, nameof(modelType));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
 
-        private static IEnumerable<ErrorObject> FromModelStateDictionary(IReadOnlyDictionary<string, ModelStateEntry> modelState, Type modelType,
-            IResourceGraph resourceGraph, bool includeExceptionStackTraceInErrors, Func<Type, int, Type?>? getCollectionElementTypeCallback)
+        List<ErrorObject> errorObjects = new();
+
+        foreach ((ModelStateEntry entry, string? sourcePointer) in ResolveSourcePointers(modelState, modelType, resourceGraph,
+            getCollectionElementTypeCallback))
         {
-            ArgumentGuard.NotNull(modelState, nameof(modelState));
-            ArgumentGuard.NotNull(modelType, nameof(modelType));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+            AppendToErrorObjects(entry, errorObjects, sourcePointer, includeExceptionStackTraceInErrors);
+        }
 
-            List<ErrorObject> errorObjects = new();
+        return errorObjects;
+    }
 
-            foreach ((ModelStateEntry entry, string? sourcePointer) in ResolveSourcePointers(modelState, modelType, resourceGraph,
-                getCollectionElementTypeCallback))
-            {
-                AppendToErrorObjects(entry, errorObjects, sourcePointer, includeExceptionStackTraceInErrors);
-            }
+    private static IEnumerable<(ModelStateEntry entry, string? sourcePointer)> ResolveSourcePointers(IReadOnlyDictionary<string, ModelStateEntry?> modelState,
+        Type modelType, IResourceGraph resourceGraph, Func<Type, int, Type?>? getCollectionElementTypeCallback)
+    {
+        foreach (string key in modelState.Keys)
+        {
+            var rootSegment = ModelStateKeySegment.Create(modelType, key, getCollectionElementTypeCallback);
+            string? sourcePointer = ResolveSourcePointer(rootSegment, resourceGraph);
 
-            return errorObjects;
+            yield return (modelState[key]!, sourcePointer);
         }
+    }
 
-        private static IEnumerable<(ModelStateEntry entry, string? sourcePointer)> ResolveSourcePointers(
-            IReadOnlyDictionary<string, ModelStateEntry> modelState, Type modelType, IResourceGraph resourceGraph,
-            Func<Type, int, Type?>? getCollectionElementTypeCallback)
+    private static string? ResolveSourcePointer(ModelStateKeySegment segment, IResourceGraph resourceGraph)
+    {
+        if (segment is ArrayIndexerSegment indexerSegment)
         {
-            foreach (string key in modelState.Keys)
-            {
-                var rootSegment = ModelStateKeySegment.Create(modelType, key, getCollectionElementTypeCallback);
-                string? sourcePointer = ResolveSourcePointer(rootSegment, resourceGraph);
-
-                yield return (modelState[key], sourcePointer);
-            }
+            return ResolveSourcePointerInArrayIndexer(indexerSegment, resourceGraph);
         }
 
-        private static string? ResolveSourcePointer(ModelStateKeySegment segment, IResourceGraph resourceGraph)
+        if (segment is PropertySegment propertySegment)
         {
-            if (segment is ArrayIndexerSegment indexerSegment)
+            if (segment.IsInComplexType)
             {
-                return ResolveSourcePointerInArrayIndexer(indexerSegment, resourceGraph);
+                return ResolveSourcePointerInComplexType(propertySegment, resourceGraph);
             }
 
-            if (segment is PropertySegment propertySegment)
+            if (propertySegment.PropertyName == nameof(OperationContainer.Resource) && propertySegment.Parent != null &&
+                propertySegment.Parent.ModelType == typeof(IList<OperationContainer>))
             {
-                if (segment.IsInComplexType)
-                {
-                    return ResolveSourcePointerInComplexType(propertySegment, resourceGraph);
-                }
+                // Special case: Stepping over OperationContainer.Resource property.
 
-                if (propertySegment.PropertyName == nameof(OperationContainer.Resource) && propertySegment.Parent != null &&
-                    propertySegment.Parent.ModelType == typeof(IList<OperationContainer>))
+                if (segment.GetNextSegment(propertySegment.ModelType, false, $"{segment.SourcePointer}/data") is not PropertySegment nextPropertySegment)
                 {
-                    // Special case: Stepping over OperationContainer.Resource property.
-
-                    if (segment.GetNextSegment(propertySegment.ModelType, false, $"{segment.SourcePointer}/data") is not PropertySegment nextPropertySegment)
-                    {
-                        return null;
-                    }
-
-                    propertySegment = nextPropertySegment;
+                    return null;
                 }
 
-                return ResolveSourcePointerInResourceField(propertySegment, resourceGraph);
+                propertySegment = nextPropertySegment;
             }
 
-            return segment.SourcePointer;
+            return ResolveSourcePointerInResourceField(propertySegment, resourceGraph);
         }
 
-        private static string? ResolveSourcePointerInArrayIndexer(ArrayIndexerSegment segment, IResourceGraph resourceGraph)
-        {
-            string sourcePointer = $"{segment.SourcePointer ?? "/atomic:operations"}[{segment.ArrayIndex}]";
-            Type elementType = segment.GetCollectionElementType();
+        return segment.SourcePointer;
+    }
 
-            ModelStateKeySegment? nextSegment = segment.GetNextSegment(elementType, segment.IsInComplexType, sourcePointer);
-            return nextSegment != null ? ResolveSourcePointer(nextSegment, resourceGraph) : sourcePointer;
-        }
+    private static string? ResolveSourcePointerInArrayIndexer(ArrayIndexerSegment segment, IResourceGraph resourceGraph)
+    {
+        string sourcePointer = $"{segment.SourcePointer ?? "/atomic:operations"}[{segment.ArrayIndex}]";
+        Type elementType = segment.GetCollectionElementType();
 
-        private static string? ResolveSourcePointerInComplexType(PropertySegment segment, IResourceGraph resourceGraph)
+        ModelStateKeySegment? nextSegment = segment.GetNextSegment(elementType, segment.IsInComplexType, sourcePointer);
+        return nextSegment != null ? ResolveSourcePointer(nextSegment, resourceGraph) : sourcePointer;
+    }
+
+    private static string? ResolveSourcePointerInComplexType(PropertySegment segment, IResourceGraph resourceGraph)
+    {
+        PropertyInfo? property = segment.ModelType.GetProperty(segment.PropertyName);
+
+        if (property == null)
         {
-            PropertyInfo? property = segment.ModelType.GetProperty(segment.PropertyName);
+            return null;
+        }
 
-            if (property == null)
-            {
-                return null;
-            }
+        string publicName = PropertySegment.GetPublicNameForProperty(property);
+        string? sourcePointer = segment.SourcePointer != null ? $"{segment.SourcePointer}/{publicName}" : null;
 
-            string publicName = PropertySegment.GetPublicNameForProperty(property);
-            string? sourcePointer = segment.SourcePointer != null ? $"{segment.SourcePointer}/{publicName}" : null;
+        ModelStateKeySegment? nextSegment = segment.GetNextSegment(property.PropertyType, true, sourcePointer);
+        return nextSegment != null ? ResolveSourcePointer(nextSegment, resourceGraph) : sourcePointer;
+    }
 
-            ModelStateKeySegment? nextSegment = segment.GetNextSegment(property.PropertyType, true, sourcePointer);
-            return nextSegment != null ? ResolveSourcePointer(nextSegment, resourceGraph) : sourcePointer;
-        }
+    private static string? ResolveSourcePointerInResourceField(PropertySegment segment, IResourceGraph resourceGraph)
+    {
+        ResourceType? resourceType = resourceGraph.FindResourceType(segment.ModelType);
 
-        private static string? ResolveSourcePointerInResourceField(PropertySegment segment, IResourceGraph resourceGraph)
+        if (resourceType != null)
         {
-            ResourceType? resourceType = resourceGraph.FindResourceType(segment.ModelType);
+            AttrAttribute? attribute = resourceType.FindAttributeByPropertyName(segment.PropertyName);
 
-            if (resourceType != null)
+            if (attribute != null)
             {
-                AttrAttribute? attribute = resourceType.FindAttributeByPropertyName(segment.PropertyName);
-
-                if (attribute != null)
-                {
-                    return ResolveSourcePointerInAttribute(segment, attribute, resourceGraph);
-                }
+                return ResolveSourcePointerInAttribute(segment, attribute, resourceGraph);
+            }
 
-                RelationshipAttribute? relationship = resourceType.FindRelationshipByPropertyName(segment.PropertyName);
+            RelationshipAttribute? relationship = resourceType.FindRelationshipByPropertyName(segment.PropertyName);
 
-                if (relationship != null)
-                {
-                    return ResolveSourcePointerInRelationship(segment, relationship, resourceGraph);
-                }
+            if (relationship != null)
+            {
+                return ResolveSourcePointerInRelationship(segment, relationship, resourceGraph);
             }
-
-            return null;
         }
 
-        private static string? ResolveSourcePointerInAttribute(PropertySegment segment, AttrAttribute attribute, IResourceGraph resourceGraph)
-        {
-            string sourcePointer = attribute.Property.Name == nameof(Identifiable<object>.Id)
-                ? $"{segment.SourcePointer ?? "/data"}/{attribute.PublicName}"
-                : $"{segment.SourcePointer ?? "/data"}/attributes/{attribute.PublicName}";
+        return null;
+    }
 
-            ModelStateKeySegment? nextSegment = segment.GetNextSegment(attribute.Property.PropertyType, true, sourcePointer);
-            return nextSegment != null ? ResolveSourcePointer(nextSegment, resourceGraph) : sourcePointer;
-        }
+    private static string? ResolveSourcePointerInAttribute(PropertySegment segment, AttrAttribute attribute, IResourceGraph resourceGraph)
+    {
+        string sourcePointer = attribute.Property.Name == nameof(Identifiable<object>.Id)
+            ? $"{segment.SourcePointer ?? "/data"}/{attribute.PublicName}"
+            : $"{segment.SourcePointer ?? "/data"}/attributes/{attribute.PublicName}";
 
-        private static string? ResolveSourcePointerInRelationship(PropertySegment segment, RelationshipAttribute relationship, IResourceGraph resourceGraph)
-        {
-            string sourcePointer = $"{segment.SourcePointer ?? "/data"}/relationships/{relationship.PublicName}/data";
+        ModelStateKeySegment? nextSegment = segment.GetNextSegment(attribute.Property.PropertyType, true, sourcePointer);
+        return nextSegment != null ? ResolveSourcePointer(nextSegment, resourceGraph) : sourcePointer;
+    }
 
-            ModelStateKeySegment? nextSegment = segment.GetNextSegment(relationship.RightType.ClrType, false, sourcePointer);
-            return nextSegment != null ? ResolveSourcePointer(nextSegment, resourceGraph) : sourcePointer;
-        }
+    private static string? ResolveSourcePointerInRelationship(PropertySegment segment, RelationshipAttribute relationship, IResourceGraph resourceGraph)
+    {
+        string sourcePointer = $"{segment.SourcePointer ?? "/data"}/relationships/{relationship.PublicName}/data";
+
+        ModelStateKeySegment? nextSegment = segment.GetNextSegment(relationship.RightType.ClrType, false, sourcePointer);
+        return nextSegment != null ? ResolveSourcePointer(nextSegment, resourceGraph) : sourcePointer;
+    }
 
-        private static void AppendToErrorObjects(ModelStateEntry entry, List<ErrorObject> errorObjects, string? sourcePointer,
-            bool includeExceptionStackTraceInErrors)
+    private static void AppendToErrorObjects(ModelStateEntry entry, List<ErrorObject> errorObjects, string? sourcePointer,
+        bool includeExceptionStackTraceInErrors)
+    {
+        foreach (ModelError error in entry.Errors)
         {
-            foreach (ModelError error in entry.Errors)
+            if (error.Exception is JsonApiException jsonApiException)
             {
-                if (error.Exception is JsonApiException jsonApiException)
-                {
-                    errorObjects.AddRange(jsonApiException.Errors);
-                }
-                else
-                {
-                    ErrorObject errorObject = FromModelError(error, sourcePointer, includeExceptionStackTraceInErrors);
-                    errorObjects.Add(errorObject);
-                }
+                errorObjects.AddRange(jsonApiException.Errors);
+            }
+            else
+            {
+                ErrorObject errorObject = FromModelError(error, sourcePointer, includeExceptionStackTraceInErrors);
+                errorObjects.Add(errorObject);
             }
         }
+    }
 
-        private static ErrorObject FromModelError(ModelError modelError, string? sourcePointer, bool includeExceptionStackTraceInErrors)
+    private static ErrorObject FromModelError(ModelError modelError, string? sourcePointer, bool includeExceptionStackTraceInErrors)
+    {
+        var error = new ErrorObject(HttpStatusCode.UnprocessableEntity)
         {
-            var error = new ErrorObject(HttpStatusCode.UnprocessableEntity)
-            {
-                Title = "Input validation failed.",
-                Detail = modelError.Exception is TooManyModelErrorsException tooManyException ? tooManyException.Message : modelError.ErrorMessage,
-                Source = sourcePointer == null
-                    ? null
-                    : new ErrorSource
-                    {
-                        Pointer = sourcePointer
-                    }
-            };
-
-            if (includeExceptionStackTraceInErrors && modelError.Exception != null)
-            {
-                Exception exception = modelError.Exception.Demystify();
-                string[] stackTraceLines = exception.ToString().Split(Environment.NewLine);
-
-                if (stackTraceLines.Any())
+            Title = "Input validation failed.",
+            Detail = modelError.Exception is TooManyModelErrorsException tooManyException ? tooManyException.Message : modelError.ErrorMessage,
+            Source = sourcePointer == null
+                ? null
+                : new ErrorSource
                 {
-                    error.Meta ??= new Dictionary<string, object?>();
-                    error.Meta["StackTrace"] = stackTraceLines;
+                    Pointer = sourcePointer
                 }
-            }
+        };
 
-            return error;
-        }
-
-        /// <summary>
-        /// Base type that represents a segment in a ModelState key.
-        /// </summary>
-        private abstract class ModelStateKeySegment
+        if (includeExceptionStackTraceInErrors && modelError.Exception != null)
         {
-            private const char Dot = '.';
-            private const char BracketOpen = '[';
-            private const char BracketClose = ']';
-            private static readonly char[] KeySegmentStartTokens = ArrayFactory.Create(Dot, BracketOpen);
+            Exception exception = modelError.Exception.Demystify();
+            string[] stackTraceLines = exception.ToString().Split(Environment.NewLine);
 
-            // The right part of the full key, which nested segments are produced from.
-            private readonly string _nextKey;
+            if (stackTraceLines.Any())
+            {
+                error.Meta ??= new Dictionary<string, object?>();
+                error.Meta["StackTrace"] = stackTraceLines;
+            }
+        }
 
-            // Enables to resolve the runtime-type of a collection element, such as the resource type in an atomic:operation.
-            protected Func<Type, int, Type?>? GetCollectionElementTypeCallback { get; }
+        return error;
+    }
 
-            // In case of a property, its declaring type. In case of an indexer, the collection type or collection element type (in case the parent is a relationship).
-            public Type ModelType { get; }
+    /// <summary>
+    /// Base type that represents a segment in a ModelState key.
+    /// </summary>
+    private abstract class ModelStateKeySegment
+    {
+        private const char Dot = '.';
+        private const char BracketOpen = '[';
+        private const char BracketClose = ']';
+        private static readonly char[] KeySegmentStartTokens = ArrayFactory.Create(Dot, BracketOpen);
 
-            // Indicates we're in a complex object, so to determine public name, inspect [JsonPropertyName] instead of [Attr], [HasOne] etc.
-            public bool IsInComplexType { get; }
+        // The right part of the full key, which nested segments are produced from.
+        private readonly string _nextKey;
 
-            // The source pointer we've built up, so far. This is null whenever input is not recognized.
-            public string? SourcePointer { get; }
+        // Enables to resolve the runtime-type of a collection element, such as the resource type in an atomic:operation.
+        protected Func<Type, int, Type?>? GetCollectionElementTypeCallback { get; }
 
-            public ModelStateKeySegment? Parent { get; }
+        // In case of a property, its declaring type. In case of an indexer, the collection type or collection element type (in case the parent is a relationship).
+        public Type ModelType { get; }
 
-            protected ModelStateKeySegment(Type modelType, bool isInComplexType, string nextKey, string? sourcePointer, ModelStateKeySegment? parent,
-                Func<Type, int, Type?>? getCollectionElementTypeCallback)
-            {
-                ArgumentGuard.NotNull(modelType, nameof(modelType));
-                ArgumentGuard.NotNull(nextKey, nameof(nextKey));
-
-                ModelType = modelType;
-                IsInComplexType = isInComplexType;
-                _nextKey = nextKey;
-                SourcePointer = sourcePointer;
-                Parent = parent;
-                GetCollectionElementTypeCallback = getCollectionElementTypeCallback;
-            }
+        // Indicates we're in a complex object, so to determine public name, inspect [JsonPropertyName] instead of [Attr], [HasOne] etc.
+        public bool IsInComplexType { get; }
 
-            public ModelStateKeySegment? GetNextSegment(Type modelType, bool isInComplexType, string? sourcePointer)
-            {
-                ArgumentGuard.NotNull(modelType, nameof(modelType));
+        // The source pointer we've built up, so far. This is null whenever input is not recognized.
+        public string? SourcePointer { get; }
 
-                return _nextKey == string.Empty
-                    ? null
-                    : CreateSegment(modelType, _nextKey, isInComplexType, this, sourcePointer, GetCollectionElementTypeCallback);
-            }
+        public ModelStateKeySegment? Parent { get; }
 
-            public static ModelStateKeySegment Create(Type modelType, string key, Func<Type, int, Type?>? getCollectionElementTypeCallback)
-            {
-                ArgumentGuard.NotNull(modelType, nameof(modelType));
-                ArgumentGuard.NotNull(key, nameof(key));
+        protected ModelStateKeySegment(Type modelType, bool isInComplexType, string nextKey, string? sourcePointer, ModelStateKeySegment? parent,
+            Func<Type, int, Type?>? getCollectionElementTypeCallback)
+        {
+            ArgumentGuard.NotNull(modelType, nameof(modelType));
+            ArgumentGuard.NotNull(nextKey, nameof(nextKey));
+
+            ModelType = modelType;
+            IsInComplexType = isInComplexType;
+            _nextKey = nextKey;
+            SourcePointer = sourcePointer;
+            Parent = parent;
+            GetCollectionElementTypeCallback = getCollectionElementTypeCallback;
+        }
 
-                return CreateSegment(modelType, key, false, null, null, getCollectionElementTypeCallback);
-            }
+        public ModelStateKeySegment? GetNextSegment(Type modelType, bool isInComplexType, string? sourcePointer)
+        {
+            ArgumentGuard.NotNull(modelType, nameof(modelType));
 
-            private static ModelStateKeySegment CreateSegment(Type modelType, string key, bool isInComplexType, ModelStateKeySegment? parent,
-                string? sourcePointer, Func<Type, int, Type?>? getCollectionElementTypeCallback)
-            {
-                string? segmentValue = null;
-                string? nextKey = null;
+            return _nextKey == string.Empty ? null : CreateSegment(modelType, _nextKey, isInComplexType, this, sourcePointer, GetCollectionElementTypeCallback);
+        }
 
-                int segmentEndIndex = key.IndexOfAny(KeySegmentStartTokens);
+        public static ModelStateKeySegment Create(Type modelType, string key, Func<Type, int, Type?>? getCollectionElementTypeCallback)
+        {
+            ArgumentGuard.NotNull(modelType, nameof(modelType));
+            ArgumentGuard.NotNull(key, nameof(key));
 
-                if (segmentEndIndex == 0 && key[0] == BracketOpen)
-                {
-                    int bracketCloseIndex = key.IndexOf(BracketClose);
+            return CreateSegment(modelType, key, false, null, null, getCollectionElementTypeCallback);
+        }
 
-                    if (bracketCloseIndex != -1)
-                    {
-                        segmentValue = key[1.. bracketCloseIndex];
+        private static ModelStateKeySegment CreateSegment(Type modelType, string key, bool isInComplexType, ModelStateKeySegment? parent, string? sourcePointer,
+            Func<Type, int, Type?>? getCollectionElementTypeCallback)
+        {
+            string? segmentValue = null;
+            string? nextKey = null;
 
-                        int nextKeyStartIndex = key.Length > bracketCloseIndex + 1 && key[bracketCloseIndex + 1] == Dot
-                            ? bracketCloseIndex + 2
-                            : bracketCloseIndex + 1;
+            int segmentEndIndex = key.IndexOfAny(KeySegmentStartTokens);
 
-                        nextKey = key[nextKeyStartIndex..];
+            if (segmentEndIndex == 0 && key[0] == BracketOpen)
+            {
+                int bracketCloseIndex = key.IndexOf(BracketClose);
 
-                        if (int.TryParse(segmentValue, out int indexValue))
-                        {
-                            return new ArrayIndexerSegment(indexValue, modelType, isInComplexType, nextKey, sourcePointer, parent,
-                                getCollectionElementTypeCallback);
-                        }
+                if (bracketCloseIndex != -1)
+                {
+                    segmentValue = key[1.. bracketCloseIndex];
 
-                        // If the value between brackets is not numeric, consider it an unspeakable property. For example:
-                        // "Foo[Bar]" instead of "Foo.Bar". Its unclear when this happens, but ASP.NET source contains tests for such keys.
-                    }
-                }
+                    int nextKeyStartIndex = key.Length > bracketCloseIndex + 1 && key[bracketCloseIndex + 1] == Dot
+                        ? bracketCloseIndex + 2
+                        : bracketCloseIndex + 1;
 
-                if (segmentValue == null)
-                {
-                    segmentValue = segmentEndIndex == -1 ? key : key[..segmentEndIndex];
+                    nextKey = key[nextKeyStartIndex..];
 
-                    nextKey = segmentEndIndex != -1 && key.Length > segmentEndIndex && key[segmentEndIndex] == Dot
-                        ? key[(segmentEndIndex + 1)..]
-                        : key[segmentValue.Length..];
-                }
+                    if (int.TryParse(segmentValue, out int indexValue))
+                    {
+                        return new ArrayIndexerSegment(indexValue, modelType, isInComplexType, nextKey, sourcePointer, parent,
+                            getCollectionElementTypeCallback);
+                    }
 
-                // Workaround for a quirk in ModelState validation. Some controller action methods have an 'id' parameter before the [FromBody] parameter.
-                // When a validation error occurs on top-level 'Id' in the request body, its key contains 'id' instead of 'Id' (the error message is correct, though).
-                // We compensate for that case here, so that we'll find 'Id' in the resource graph when building the source pointer.
-                if (segmentValue == "id")
-                {
-                    segmentValue = "Id";
+                    // If the value between brackets is not numeric, consider it an unspeakable property. For example:
+                    // "Foo[Bar]" instead of "Foo.Bar". Its unclear when this happens, but ASP.NET source contains tests for such keys.
                 }
-
-                return new PropertySegment(segmentValue, modelType, isInComplexType, nextKey!, sourcePointer, parent, getCollectionElementTypeCallback);
             }
-        }
-
-        /// <summary>
-        /// Represents an array indexer in a ModelState key, such as "1" in "Customer.Orders[1].Amount".
-        /// </summary>
-        private sealed class ArrayIndexerSegment : ModelStateKeySegment
-        {
-            private static readonly CollectionConverter CollectionConverter = new();
-
-            public int ArrayIndex { get; }
 
-            public ArrayIndexerSegment(int arrayIndex, Type modelType, bool isInComplexType, string nextKey, string? sourcePointer,
-                ModelStateKeySegment? parent, Func<Type, int, Type?>? getCollectionElementTypeCallback)
-                : base(modelType, isInComplexType, nextKey, sourcePointer, parent, getCollectionElementTypeCallback)
+            if (segmentValue == null)
             {
-                ArrayIndex = arrayIndex;
+                segmentValue = segmentEndIndex == -1 ? key : key[..segmentEndIndex];
+
+                nextKey = segmentEndIndex != -1 && key.Length > segmentEndIndex && key[segmentEndIndex] == Dot
+                    ? key[(segmentEndIndex + 1)..]
+                    : key[segmentValue.Length..];
             }
 
-            public Type GetCollectionElementType()
+            // Workaround for a quirk in ModelState validation. Some controller action methods have an 'id' parameter before the [FromBody] parameter.
+            // When a validation error occurs on top-level 'Id' in the request body, its key contains 'id' instead of 'Id' (the error message is correct, though).
+            // We compensate for that case here, so that we'll find 'Id' in the resource graph when building the source pointer.
+            if (segmentValue == "id")
             {
-                Type? type = GetCollectionElementTypeCallback?.Invoke(ModelType, ArrayIndex);
-                return type ?? GetDeclaredCollectionElementType();
+                segmentValue = "Id";
             }
 
-            private Type GetDeclaredCollectionElementType()
-            {
-                if (ModelType != typeof(string))
-                {
-                    Type? elementType = CollectionConverter.FindCollectionElementType(ModelType);
+            return new PropertySegment(segmentValue, modelType, isInComplexType, nextKey!, sourcePointer, parent, getCollectionElementTypeCallback);
+        }
+    }
 
-                    if (elementType != null)
-                    {
-                        return elementType;
-                    }
-                }
+    /// <summary>
+    /// Represents an array indexer in a ModelState key, such as "1" in "Customer.Orders[1].Amount".
+    /// </summary>
+    private sealed class ArrayIndexerSegment : ModelStateKeySegment
+    {
+        private static readonly CollectionConverter CollectionConverter = new();
 
-                // In case of a to-many relationship, the ModelType already contains the element type.
-                return ModelType;
-            }
+        public int ArrayIndex { get; }
+
+        public ArrayIndexerSegment(int arrayIndex, Type modelType, bool isInComplexType, string nextKey, string? sourcePointer, ModelStateKeySegment? parent,
+            Func<Type, int, Type?>? getCollectionElementTypeCallback)
+            : base(modelType, isInComplexType, nextKey, sourcePointer, parent, getCollectionElementTypeCallback)
+        {
+            ArrayIndex = arrayIndex;
         }
 
-        /// <summary>
-        /// Represents a property in a ModelState key, such as "Orders" in "Customer.Orders[1].Amount".
-        /// </summary>
-        private sealed class PropertySegment : ModelStateKeySegment
+        public Type GetCollectionElementType()
         {
-            public string PropertyName { get; }
+            Type? type = GetCollectionElementTypeCallback?.Invoke(ModelType, ArrayIndex);
+            return type ?? GetDeclaredCollectionElementType();
+        }
 
-            public PropertySegment(string propertyName, Type modelType, bool isInComplexType, string nextKey, string? sourcePointer,
-                ModelStateKeySegment? parent, Func<Type, int, Type?>? getCollectionElementTypeCallback)
-                : base(modelType, isInComplexType, nextKey, sourcePointer, parent, getCollectionElementTypeCallback)
+        private Type GetDeclaredCollectionElementType()
+        {
+            if (ModelType != typeof(string))
             {
-                ArgumentGuard.NotNull(propertyName, nameof(propertyName));
+                Type? elementType = CollectionConverter.FindCollectionElementType(ModelType);
 
-                PropertyName = propertyName;
+                if (elementType != null)
+                {
+                    return elementType;
+                }
             }
 
-            public static string GetPublicNameForProperty(PropertyInfo property)
-            {
-                ArgumentGuard.NotNull(property, nameof(property));
+            // In case of a to-many relationship, the ModelType already contains the element type.
+            return ModelType;
+        }
+    }
 
-                var jsonNameAttribute = (JsonPropertyNameAttribute?)property.GetCustomAttribute(typeof(JsonPropertyNameAttribute));
-                return jsonNameAttribute?.Name ?? property.Name;
-            }
+    /// <summary>
+    /// Represents a property in a ModelState key, such as "Orders" in "Customer.Orders[1].Amount".
+    /// </summary>
+    private sealed class PropertySegment : ModelStateKeySegment
+    {
+        public string PropertyName { get; }
+
+        public PropertySegment(string propertyName, Type modelType, bool isInComplexType, string nextKey, string? sourcePointer, ModelStateKeySegment? parent,
+            Func<Type, int, Type?>? getCollectionElementTypeCallback)
+            : base(modelType, isInComplexType, nextKey, sourcePointer, parent, getCollectionElementTypeCallback)
+        {
+            ArgumentGuard.NotNull(propertyName, nameof(propertyName));
+
+            PropertyName = propertyName;
+        }
+
+        public static string GetPublicNameForProperty(PropertyInfo property)
+        {
+            ArgumentGuard.NotNull(property, nameof(property));
+
+            var jsonNameAttribute = property.GetCustomAttribute<JsonPropertyNameAttribute>(true);
+            return jsonNameAttribute?.Name ?? property.Name;
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/InvalidQueryException.cs b/src/JsonApiDotNetCore/Errors/InvalidQueryException.cs
index 22c8738002..f4332c1af1 100644
--- a/src/JsonApiDotNetCore/Errors/InvalidQueryException.cs
+++ b/src/JsonApiDotNetCore/Errors/InvalidQueryException.cs
@@ -1,24 +1,22 @@
-using System;
 using System.Net;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when translating a <see cref="QueryLayer" /> to Entity Framework Core fails.
+/// </summary>
+[PublicAPI]
+public sealed class InvalidQueryException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when translating a <see cref="QueryLayer" /> to Entity Framework Core fails.
-    /// </summary>
-    [PublicAPI]
-    public sealed class InvalidQueryException : JsonApiException
-    {
-        public InvalidQueryException(string reason, Exception? innerException)
-            : base(new ErrorObject(HttpStatusCode.BadRequest)
-            {
-                Title = reason,
-                Detail = innerException?.Message
-            }, innerException)
+    public InvalidQueryException(string reason, Exception? innerException)
+        : base(new ErrorObject(HttpStatusCode.BadRequest)
         {
-        }
+            Title = reason,
+            Detail = innerException?.Message
+        }, innerException)
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/InvalidQueryStringParameterException.cs b/src/JsonApiDotNetCore/Errors/InvalidQueryStringParameterException.cs
index e85c7798f5..485cf3685b 100644
--- a/src/JsonApiDotNetCore/Errors/InvalidQueryStringParameterException.cs
+++ b/src/JsonApiDotNetCore/Errors/InvalidQueryStringParameterException.cs
@@ -1,30 +1,28 @@
-using System;
 using System.Net;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when processing the request fails due to an error in the request query string.
+/// </summary>
+[PublicAPI]
+public sealed class InvalidQueryStringParameterException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when processing the request fails due to an error in the request query string.
-    /// </summary>
-    [PublicAPI]
-    public sealed class InvalidQueryStringParameterException : JsonApiException
-    {
-        public string ParameterName { get; }
+    public string ParameterName { get; }
 
-        public InvalidQueryStringParameterException(string parameterName, string genericMessage, string specificMessage, Exception? innerException = null)
-            : base(new ErrorObject(HttpStatusCode.BadRequest)
-            {
-                Title = genericMessage,
-                Detail = specificMessage,
-                Source = new ErrorSource
-                {
-                    Parameter = parameterName
-                }
-            }, innerException)
+    public InvalidQueryStringParameterException(string parameterName, string genericMessage, string specificMessage, Exception? innerException = null)
+        : base(new ErrorObject(HttpStatusCode.BadRequest)
         {
-            ParameterName = parameterName;
-        }
+            Title = genericMessage,
+            Detail = specificMessage,
+            Source = new ErrorSource
+            {
+                Parameter = parameterName
+            }
+        }, innerException)
+    {
+        ParameterName = parameterName;
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/InvalidRequestBodyException.cs b/src/JsonApiDotNetCore/Errors/InvalidRequestBodyException.cs
index 18929ed3d0..d8d752ece4 100644
--- a/src/JsonApiDotNetCore/Errors/InvalidRequestBodyException.cs
+++ b/src/JsonApiDotNetCore/Errors/InvalidRequestBodyException.cs
@@ -1,37 +1,34 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when deserializing the request body fails.
+/// </summary>
+[PublicAPI]
+public sealed class InvalidRequestBodyException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when deserializing the request body fails.
-    /// </summary>
-    [PublicAPI]
-    public sealed class InvalidRequestBodyException : JsonApiException
-    {
-        public InvalidRequestBodyException(string? requestBody, string? genericMessage, string? specificMessage, string? sourcePointer,
-            HttpStatusCode? alternativeStatusCode = null, Exception? innerException = null)
-            : base(new ErrorObject(alternativeStatusCode ?? HttpStatusCode.UnprocessableEntity)
-            {
-                Title = genericMessage != null ? $"Failed to deserialize request body: {genericMessage}" : "Failed to deserialize request body.",
-                Detail = specificMessage,
-                Source = sourcePointer == null
-                    ? null
-                    : new ErrorSource
-                    {
-                        Pointer = sourcePointer
-                    },
-                Meta = string.IsNullOrEmpty(requestBody)
-                    ? null
-                    : new Dictionary<string, object?>
-                    {
-                        ["RequestBody"] = requestBody
-                    }
-            }, innerException)
+    public InvalidRequestBodyException(string? requestBody, string? genericMessage, string? specificMessage, string? sourcePointer,
+        HttpStatusCode? alternativeStatusCode = null, Exception? innerException = null)
+        : base(new ErrorObject(alternativeStatusCode ?? HttpStatusCode.UnprocessableEntity)
         {
-        }
+            Title = genericMessage != null ? $"Failed to deserialize request body: {genericMessage}" : "Failed to deserialize request body.",
+            Detail = specificMessage,
+            Source = sourcePointer == null
+                ? null
+                : new ErrorSource
+                {
+                    Pointer = sourcePointer
+                },
+            Meta = string.IsNullOrEmpty(requestBody)
+                ? null
+                : new Dictionary<string, object?>
+                {
+                    ["RequestBody"] = requestBody
+                }
+        }, innerException)
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/JsonApiException.cs b/src/JsonApiDotNetCore/Errors/JsonApiException.cs
index ea68e67144..6bb62177dc 100644
--- a/src/JsonApiDotNetCore/Errors/JsonApiException.cs
+++ b/src/JsonApiDotNetCore/Errors/JsonApiException.cs
@@ -1,54 +1,50 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The base class for an <see cref="Exception" /> that represents one or more JSON:API error objects in an unsuccessful response.
+/// </summary>
+[PublicAPI]
+public class JsonApiException : Exception
 {
-    /// <summary>
-    /// The base class for an <see cref="Exception" /> that represents one or more JSON:API error objects in an unsuccessful response.
-    /// </summary>
-    [PublicAPI]
-    public class JsonApiException : Exception
+    private static readonly JsonSerializerOptions SerializerOptions = new()
+    {
+        WriteIndented = true,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
+    };
+
+    public IReadOnlyList<ErrorObject> Errors { get; }
+
+    public JsonApiException(ErrorObject error, Exception? innerException = null)
+        : base(null, innerException)
+    {
+        ArgumentGuard.NotNull(error, nameof(error));
+
+        Errors = error.AsArray();
+    }
+
+    public JsonApiException(IEnumerable<ErrorObject> errors, Exception? innerException = null)
+        : base(null, innerException)
+    {
+        IReadOnlyList<ErrorObject>? errorList = ToErrorList(errors);
+        ArgumentGuard.NotNullNorEmpty(errorList, nameof(errors));
+
+        Errors = errorList;
+    }
+
+    private static IReadOnlyList<ErrorObject>? ToErrorList(IEnumerable<ErrorObject>? errors)
+    {
+        return errors?.ToList();
+    }
+
+    public string GetSummary()
     {
-        private static readonly JsonSerializerOptions SerializerOptions = new()
-        {
-            WriteIndented = true,
-            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-            DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
-        };
-
-        public IReadOnlyList<ErrorObject> Errors { get; }
-
-        public JsonApiException(ErrorObject error, Exception? innerException = null)
-            : base(null, innerException)
-        {
-            ArgumentGuard.NotNull(error, nameof(error));
-
-            Errors = error.AsArray();
-        }
-
-        public JsonApiException(IEnumerable<ErrorObject> errors, Exception? innerException = null)
-            : base(null, innerException)
-        {
-            IReadOnlyList<ErrorObject>? errorList = ToErrorList(errors);
-            ArgumentGuard.NotNullNorEmpty(errorList, nameof(errors));
-
-            Errors = errorList;
-        }
-
-        private static IReadOnlyList<ErrorObject>? ToErrorList(IEnumerable<ErrorObject>? errors)
-        {
-            return errors?.ToList();
-        }
-
-        public string GetSummary()
-        {
-            return $"{nameof(JsonApiException)}: Errors = {JsonSerializer.Serialize(Errors, SerializerOptions)}";
-        }
+        return $"{nameof(JsonApiException)}: Errors = {JsonSerializer.Serialize(Errors, SerializerOptions)}";
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/LocalIdSingleOperationException.cs b/src/JsonApiDotNetCore/Errors/LocalIdSingleOperationException.cs
index 35e6a5f40d..d99eb6dfbb 100644
--- a/src/JsonApiDotNetCore/Errors/LocalIdSingleOperationException.cs
+++ b/src/JsonApiDotNetCore/Errors/LocalIdSingleOperationException.cs
@@ -2,21 +2,20 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when assigning and referencing a local ID within the same operation.
+/// </summary>
+[PublicAPI]
+public sealed class LocalIdSingleOperationException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when assigning and referencing a local ID within the same operation.
-    /// </summary>
-    [PublicAPI]
-    public sealed class LocalIdSingleOperationException : JsonApiException
-    {
-        public LocalIdSingleOperationException(string localId)
-            : base(new ErrorObject(HttpStatusCode.BadRequest)
-            {
-                Title = "Local ID cannot be both defined and used within the same operation.",
-                Detail = $"Local ID '{localId}' cannot be both defined and used within the same operation."
-            })
+    public LocalIdSingleOperationException(string localId)
+        : base(new ErrorObject(HttpStatusCode.BadRequest)
         {
-        }
+            Title = "Local ID cannot be both defined and used within the same operation.",
+            Detail = $"Local ID '{localId}' cannot be both defined and used within the same operation."
+        })
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/MissingResourceInRelationship.cs b/src/JsonApiDotNetCore/Errors/MissingResourceInRelationship.cs
index 7afe5b04cc..e80181898d 100644
--- a/src/JsonApiDotNetCore/Errors/MissingResourceInRelationship.cs
+++ b/src/JsonApiDotNetCore/Errors/MissingResourceInRelationship.cs
@@ -1,23 +1,22 @@
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+[PublicAPI]
+public sealed class MissingResourceInRelationship
 {
-    [PublicAPI]
-    public sealed class MissingResourceInRelationship
-    {
-        public string RelationshipName { get; }
-        public string ResourceType { get; }
-        public string ResourceId { get; }
+    public string RelationshipName { get; }
+    public string ResourceType { get; }
+    public string ResourceId { get; }
 
-        public MissingResourceInRelationship(string relationshipName, string resourceType, string resourceId)
-        {
-            ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
-            ArgumentGuard.NotNullNorEmpty(resourceType, nameof(resourceType));
-            ArgumentGuard.NotNullNorEmpty(resourceId, nameof(resourceId));
+    public MissingResourceInRelationship(string relationshipName, string resourceType, string resourceId)
+    {
+        ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
+        ArgumentGuard.NotNullNorEmpty(resourceType, nameof(resourceType));
+        ArgumentGuard.NotNullNorEmpty(resourceId, nameof(resourceId));
 
-            RelationshipName = relationshipName;
-            ResourceType = resourceType;
-            ResourceId = resourceId;
-        }
+        RelationshipName = relationshipName;
+        ResourceType = resourceType;
+        ResourceId = resourceId;
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/MissingTransactionSupportException.cs b/src/JsonApiDotNetCore/Errors/MissingTransactionSupportException.cs
index 81e13baeda..f67dd0d243 100644
--- a/src/JsonApiDotNetCore/Errors/MissingTransactionSupportException.cs
+++ b/src/JsonApiDotNetCore/Errors/MissingTransactionSupportException.cs
@@ -2,21 +2,20 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when accessing a repository that does not support transactions during an atomic:operations request.
+/// </summary>
+[PublicAPI]
+public sealed class MissingTransactionSupportException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when accessing a repository that does not support transactions during an atomic:operations request.
-    /// </summary>
-    [PublicAPI]
-    public sealed class MissingTransactionSupportException : JsonApiException
-    {
-        public MissingTransactionSupportException(string resourceType)
-            : base(new ErrorObject(HttpStatusCode.UnprocessableEntity)
-            {
-                Title = "Unsupported resource type in atomic:operations request.",
-                Detail = $"Operations on resources of type '{resourceType}' cannot be used because transaction support is unavailable."
-            })
+    public MissingTransactionSupportException(string resourceType)
+        : base(new ErrorObject(HttpStatusCode.UnprocessableEntity)
         {
-        }
+            Title = "Unsupported resource type in atomic:operations request.",
+            Detail = $"Operations on resources of type '{resourceType}' cannot be used because transaction support is unavailable."
+        })
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/NonParticipatingTransactionException.cs b/src/JsonApiDotNetCore/Errors/NonParticipatingTransactionException.cs
index 909f4a047d..09e116c4c1 100644
--- a/src/JsonApiDotNetCore/Errors/NonParticipatingTransactionException.cs
+++ b/src/JsonApiDotNetCore/Errors/NonParticipatingTransactionException.cs
@@ -2,21 +2,20 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when a repository does not participate in the overarching transaction during an atomic:operations request.
+/// </summary>
+[PublicAPI]
+public sealed class NonParticipatingTransactionException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when a repository does not participate in the overarching transaction during an atomic:operations request.
-    /// </summary>
-    [PublicAPI]
-    public sealed class NonParticipatingTransactionException : JsonApiException
-    {
-        public NonParticipatingTransactionException()
-            : base(new ErrorObject(HttpStatusCode.UnprocessableEntity)
-            {
-                Title = "Unsupported combination of resource types in atomic:operations request.",
-                Detail = "All operations need to participate in a single shared transaction, which is not the case for this request."
-            })
+    public NonParticipatingTransactionException()
+        : base(new ErrorObject(HttpStatusCode.UnprocessableEntity)
         {
-        }
+            Title = "Unsupported combination of resource types in atomic:operations request.",
+            Detail = "All operations need to participate in a single shared transaction, which is not the case for this request."
+        })
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/RelationshipNotFoundException.cs b/src/JsonApiDotNetCore/Errors/RelationshipNotFoundException.cs
index 07b5d0e25a..5c4d59e479 100644
--- a/src/JsonApiDotNetCore/Errors/RelationshipNotFoundException.cs
+++ b/src/JsonApiDotNetCore/Errors/RelationshipNotFoundException.cs
@@ -2,21 +2,20 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when a relationship does not exist.
+/// </summary>
+[PublicAPI]
+public sealed class RelationshipNotFoundException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when a relationship does not exist.
-    /// </summary>
-    [PublicAPI]
-    public sealed class RelationshipNotFoundException : JsonApiException
-    {
-        public RelationshipNotFoundException(string relationshipName, string resourceType)
-            : base(new ErrorObject(HttpStatusCode.NotFound)
-            {
-                Title = "The requested relationship does not exist.",
-                Detail = $"Resource of type '{resourceType}' does not contain a relationship named '{relationshipName}'."
-            })
+    public RelationshipNotFoundException(string relationshipName, string resourceType)
+        : base(new ErrorObject(HttpStatusCode.NotFound)
         {
-        }
+            Title = "The requested relationship does not exist.",
+            Detail = $"Resource of type '{resourceType}' does not contain a relationship named '{relationshipName}'."
+        })
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/ResourceAlreadyExistsException.cs b/src/JsonApiDotNetCore/Errors/ResourceAlreadyExistsException.cs
index 384289576d..eb4a444d42 100644
--- a/src/JsonApiDotNetCore/Errors/ResourceAlreadyExistsException.cs
+++ b/src/JsonApiDotNetCore/Errors/ResourceAlreadyExistsException.cs
@@ -2,21 +2,20 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when creating a resource with an ID that already exists.
+/// </summary>
+[PublicAPI]
+public sealed class ResourceAlreadyExistsException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when creating a resource with an ID that already exists.
-    /// </summary>
-    [PublicAPI]
-    public sealed class ResourceAlreadyExistsException : JsonApiException
-    {
-        public ResourceAlreadyExistsException(string resourceId, string resourceType)
-            : base(new ErrorObject(HttpStatusCode.Conflict)
-            {
-                Title = "Another resource with the specified ID already exists.",
-                Detail = $"Another resource of type '{resourceType}' with ID '{resourceId}' already exists."
-            })
+    public ResourceAlreadyExistsException(string resourceId, string resourceType)
+        : base(new ErrorObject(HttpStatusCode.Conflict)
         {
-        }
+            Title = "Another resource with the specified ID already exists.",
+            Detail = $"Another resource of type '{resourceType}' with ID '{resourceId}' already exists."
+        })
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/ResourceNotFoundException.cs b/src/JsonApiDotNetCore/Errors/ResourceNotFoundException.cs
index 50a05b70ff..28b60851c3 100644
--- a/src/JsonApiDotNetCore/Errors/ResourceNotFoundException.cs
+++ b/src/JsonApiDotNetCore/Errors/ResourceNotFoundException.cs
@@ -2,21 +2,20 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when a resource does not exist.
+/// </summary>
+[PublicAPI]
+public sealed class ResourceNotFoundException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when a resource does not exist.
-    /// </summary>
-    [PublicAPI]
-    public sealed class ResourceNotFoundException : JsonApiException
-    {
-        public ResourceNotFoundException(string resourceId, string resourceType)
-            : base(new ErrorObject(HttpStatusCode.NotFound)
-            {
-                Title = "The requested resource does not exist.",
-                Detail = $"Resource of type '{resourceType}' with ID '{resourceId}' does not exist."
-            })
+    public ResourceNotFoundException(string resourceId, string resourceType)
+        : base(new ErrorObject(HttpStatusCode.NotFound)
         {
-        }
+            Title = "The requested resource does not exist.",
+            Detail = $"Resource of type '{resourceType}' with ID '{resourceId}' does not exist."
+        })
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/ResourcesInRelationshipsNotFoundException.cs b/src/JsonApiDotNetCore/Errors/ResourcesInRelationshipsNotFoundException.cs
index 550bb290df..f40f76188b 100644
--- a/src/JsonApiDotNetCore/Errors/ResourcesInRelationshipsNotFoundException.cs
+++ b/src/JsonApiDotNetCore/Errors/ResourcesInRelationshipsNotFoundException.cs
@@ -1,30 +1,27 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when referencing one or more non-existing resources in one or more relationships.
+/// </summary>
+[PublicAPI]
+public sealed class ResourcesInRelationshipsNotFoundException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when referencing one or more non-existing resources in one or more relationships.
-    /// </summary>
-    [PublicAPI]
-    public sealed class ResourcesInRelationshipsNotFoundException : JsonApiException
+    public ResourcesInRelationshipsNotFoundException(IEnumerable<MissingResourceInRelationship> missingResources)
+        : base(missingResources.Select(CreateError))
     {
-        public ResourcesInRelationshipsNotFoundException(IEnumerable<MissingResourceInRelationship> missingResources)
-            : base(missingResources.Select(CreateError))
-        {
-        }
+    }
 
-        private static ErrorObject CreateError(MissingResourceInRelationship missingResourceInRelationship)
+    private static ErrorObject CreateError(MissingResourceInRelationship missingResourceInRelationship)
+    {
+        return new ErrorObject(HttpStatusCode.NotFound)
         {
-            return new ErrorObject(HttpStatusCode.NotFound)
-            {
-                Title = "A related resource does not exist.",
-                Detail = $"Related resource of type '{missingResourceInRelationship.ResourceType}' with ID '{missingResourceInRelationship.ResourceId}' " +
-                    $"in relationship '{missingResourceInRelationship.RelationshipName}' does not exist."
-            };
-        }
+            Title = "A related resource does not exist.",
+            Detail = $"Related resource of type '{missingResourceInRelationship.ResourceType}' with ID '{missingResourceInRelationship.ResourceId}' " +
+                $"in relationship '{missingResourceInRelationship.RelationshipName}' does not exist."
+        };
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/RouteNotAvailableException.cs b/src/JsonApiDotNetCore/Errors/RouteNotAvailableException.cs
index ed0797efba..80a368379b 100644
--- a/src/JsonApiDotNetCore/Errors/RouteNotAvailableException.cs
+++ b/src/JsonApiDotNetCore/Errors/RouteNotAvailableException.cs
@@ -1,26 +1,24 @@
 using System.Net;
-using System.Net.Http;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when a request is received for an HTTP route that is not exposed.
+/// </summary>
+[PublicAPI]
+public sealed class RouteNotAvailableException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when a request is received for an HTTP route that is not exposed.
-    /// </summary>
-    [PublicAPI]
-    public sealed class RouteNotAvailableException : JsonApiException
-    {
-        public HttpMethod Method { get; }
+    public HttpMethod Method { get; }
 
-        public RouteNotAvailableException(HttpMethod method, string route)
-            : base(new ErrorObject(HttpStatusCode.Forbidden)
-            {
-                Title = "The requested endpoint is not accessible.",
-                Detail = $"Endpoint '{route}' is not accessible for {method} requests."
-            })
+    public RouteNotAvailableException(HttpMethod method, string route)
+        : base(new ErrorObject(HttpStatusCode.Forbidden)
         {
-            Method = method;
-        }
+            Title = "The requested endpoint is not accessible.",
+            Detail = $"Endpoint '{route}' is not accessible for {method} requests."
+        })
+    {
+        Method = method;
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/UnknownLocalIdValueException.cs b/src/JsonApiDotNetCore/Errors/UnknownLocalIdValueException.cs
index 6882853eab..b5eeef052e 100644
--- a/src/JsonApiDotNetCore/Errors/UnknownLocalIdValueException.cs
+++ b/src/JsonApiDotNetCore/Errors/UnknownLocalIdValueException.cs
@@ -2,21 +2,20 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Errors
+namespace JsonApiDotNetCore.Errors;
+
+/// <summary>
+/// The error that is thrown when referencing a local ID that hasn't been assigned.
+/// </summary>
+[PublicAPI]
+public sealed class UnknownLocalIdValueException : JsonApiException
 {
-    /// <summary>
-    /// The error that is thrown when referencing a local ID that hasn't been assigned.
-    /// </summary>
-    [PublicAPI]
-    public sealed class UnknownLocalIdValueException : JsonApiException
-    {
-        public UnknownLocalIdValueException(string localId)
-            : base(new ErrorObject(HttpStatusCode.BadRequest)
-            {
-                Title = "Server-generated value for local ID is not available at this point.",
-                Detail = $"Server-generated value for local ID '{localId}' is not available at this point."
-            })
+    public UnknownLocalIdValueException(string localId)
+        : base(new ErrorObject(HttpStatusCode.BadRequest)
         {
-        }
+            Title = "Server-generated value for local ID is not available at this point.",
+            Detail = $"Server-generated value for local ID '{localId}' is not available at this point."
+        })
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Errors/UnsuccessfulActionResultException.cs b/src/JsonApiDotNetCore/Errors/UnsuccessfulActionResultException.cs
index 34f3faafc4..c5c55e4b70 100644
--- a/src/JsonApiDotNetCore/Errors/UnsuccessfulActionResultException.cs
+++ b/src/JsonApiDotNetCore/Errors/UnsuccessfulActionResultException.cs
@@ -3,51 +3,50 @@
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.AspNetCore.Mvc;
 
-namespace JsonApiDotNetCore.Errors
-{
-    /// <summary>
-    /// The error that is thrown when an <see cref="IActionResult" /> with non-success status is returned from a controller method.
-    /// </summary>
-    [PublicAPI]
-    public sealed class UnsuccessfulActionResultException : JsonApiException
-    {
-        public UnsuccessfulActionResultException(HttpStatusCode status)
-            : base(new ErrorObject(status)
-            {
-                Title = status.ToString()
-            })
-        {
-        }
+namespace JsonApiDotNetCore.Errors;
 
-        public UnsuccessfulActionResultException(ProblemDetails problemDetails)
-            : base(ToError(problemDetails))
+/// <summary>
+/// The error that is thrown when an <see cref="IActionResult" /> with non-success status is returned from a controller method.
+/// </summary>
+[PublicAPI]
+public sealed class UnsuccessfulActionResultException : JsonApiException
+{
+    public UnsuccessfulActionResultException(HttpStatusCode status)
+        : base(new ErrorObject(status)
         {
-        }
+            Title = status.ToString()
+        })
+    {
+    }
 
-        private static ErrorObject ToError(ProblemDetails problemDetails)
-        {
-            ArgumentGuard.NotNull(problemDetails, nameof(problemDetails));
+    public UnsuccessfulActionResultException(ProblemDetails problemDetails)
+        : base(ToError(problemDetails))
+    {
+    }
 
-            HttpStatusCode status = problemDetails.Status != null ? (HttpStatusCode)problemDetails.Status.Value : HttpStatusCode.InternalServerError;
+    private static ErrorObject ToError(ProblemDetails problemDetails)
+    {
+        ArgumentGuard.NotNull(problemDetails, nameof(problemDetails));
 
-            var error = new ErrorObject(status)
-            {
-                Title = problemDetails.Title,
-                Detail = problemDetails.Detail
-            };
+        HttpStatusCode status = problemDetails.Status != null ? (HttpStatusCode)problemDetails.Status.Value : HttpStatusCode.InternalServerError;
 
-            if (!string.IsNullOrWhiteSpace(problemDetails.Instance))
-            {
-                error.Id = problemDetails.Instance;
-            }
+        var error = new ErrorObject(status)
+        {
+            Title = problemDetails.Title,
+            Detail = problemDetails.Detail
+        };
 
-            if (!string.IsNullOrWhiteSpace(problemDetails.Type))
-            {
-                error.Links ??= new ErrorLinks();
-                error.Links.About = problemDetails.Type;
-            }
+        if (!string.IsNullOrWhiteSpace(problemDetails.Instance))
+        {
+            error.Id = problemDetails.Instance;
+        }
 
-            return error;
+        if (!string.IsNullOrWhiteSpace(problemDetails.Type))
+        {
+            error.Links ??= new ErrorLinks();
+            error.Links.About = problemDetails.Type;
         }
+
+        return error;
     }
 }
diff --git a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
index b4e9e4e077..cc91d0f324 100644
--- a/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
+++ b/src/JsonApiDotNetCore/JsonApiDotNetCore.csproj
@@ -1,12 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
+    <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <PropertyGroup>
-    <PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net</PackageTags>
+    <VersionPrefix>$(JsonApiDotNetCoreVersionPrefix)</VersionPrefix>
+    <PackageTags>jsonapidotnetcore;jsonapi;json:api;dotnet;asp.net;rest;web-api</PackageTags>
     <Description>A framework for building JSON:API compliant REST APIs using ASP.NET and Entity Framework Core. Includes support for Atomic Operations. The ultimate goal of this library is to eliminate as much boilerplate as possible by offering out-of-the-box features such as sorting, filtering and pagination. You just need to focus on defining the resources and implementing your custom business logic. This library has been designed around dependency injection making extensibility incredibly easy.</Description>
     <Authors>json-api-dotnet</Authors>
     <PackageProjectUrl>https://www.jsonapi.net/</PackageProjectUrl>
@@ -20,22 +21,27 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\logo.png">
+    <None Include="..\..\logo.png" Visible="false">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\JsonApiDotNetCore.Annotations\JsonApiDotNetCore.Annotations.csproj" />
+    <ProjectReference Include="..\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" IncludeAssets="analyzers" />
+  </ItemGroup>
+
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Ben.Demystifier" Version="0.4.1" />
-    <PackageReference Include="Humanizer" Version="2.11.10" />
+    <PackageReference Include="Humanizer.Core" Version="$(HumanizerVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="SauceControl.InheritDoc" Version="1.3.0" PrivateAssets="All" />
     <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
diff --git a/src/JsonApiDotNetCore/Middleware/AsyncConvertEmptyActionResultFilter.cs b/src/JsonApiDotNetCore/Middleware/AsyncConvertEmptyActionResultFilter.cs
index efe5a54f00..cf51a82733 100644
--- a/src/JsonApiDotNetCore/Middleware/AsyncConvertEmptyActionResultFilter.cs
+++ b/src/JsonApiDotNetCore/Middleware/AsyncConvertEmptyActionResultFilter.cs
@@ -1,34 +1,32 @@
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <inheritdoc />
+public sealed class AsyncConvertEmptyActionResultFilter : IAsyncConvertEmptyActionResultFilter
 {
     /// <inheritdoc />
-    public sealed class AsyncConvertEmptyActionResultFilter : IAsyncConvertEmptyActionResultFilter
+    public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
     {
-        /// <inheritdoc />
-        public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next)
-        {
-            ArgumentGuard.NotNull(context, nameof(context));
-            ArgumentGuard.NotNull(next, nameof(next));
+        ArgumentGuard.NotNull(context, nameof(context));
+        ArgumentGuard.NotNull(next, nameof(next));
 
-            if (context.HttpContext.IsJsonApiRequest())
+        if (context.HttpContext.IsJsonApiRequest())
+        {
+            if (context.Result is not ObjectResult objectResult || objectResult.Value == null)
             {
-                if (context.Result is not ObjectResult objectResult || objectResult.Value == null)
+                if (context.Result is IStatusCodeActionResult statusCodeResult)
                 {
-                    if (context.Result is IStatusCodeActionResult statusCodeResult)
+                    context.Result = new ObjectResult(null)
                     {
-                        context.Result = new ObjectResult(null)
-                        {
-                            StatusCode = statusCodeResult.StatusCode
-                        };
-                    }
+                        StatusCode = statusCodeResult.StatusCode
+                    };
                 }
             }
-
-            await next();
         }
+
+        await next();
     }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/AsyncJsonApiExceptionFilter.cs b/src/JsonApiDotNetCore/Middleware/AsyncJsonApiExceptionFilter.cs
index d82cbddeed..e87fc98389 100644
--- a/src/JsonApiDotNetCore/Middleware/AsyncJsonApiExceptionFilter.cs
+++ b/src/JsonApiDotNetCore/Middleware/AsyncJsonApiExceptionFilter.cs
@@ -1,41 +1,38 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <inheritdoc />
+[PublicAPI]
+public sealed class AsyncJsonApiExceptionFilter : IAsyncJsonApiExceptionFilter
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public sealed class AsyncJsonApiExceptionFilter : IAsyncJsonApiExceptionFilter
+    private readonly IExceptionHandler _exceptionHandler;
+
+    public AsyncJsonApiExceptionFilter(IExceptionHandler exceptionHandler)
     {
-        private readonly IExceptionHandler _exceptionHandler;
+        ArgumentGuard.NotNull(exceptionHandler, nameof(exceptionHandler));
 
-        public AsyncJsonApiExceptionFilter(IExceptionHandler exceptionHandler)
-        {
-            ArgumentGuard.NotNull(exceptionHandler, nameof(exceptionHandler));
+        _exceptionHandler = exceptionHandler;
+    }
 
-            _exceptionHandler = exceptionHandler;
-        }
+    /// <inheritdoc />
+    public Task OnExceptionAsync(ExceptionContext context)
+    {
+        ArgumentGuard.NotNull(context, nameof(context));
 
-        /// <inheritdoc />
-        public Task OnExceptionAsync(ExceptionContext context)
+        if (context.HttpContext.IsJsonApiRequest())
         {
-            ArgumentGuard.NotNull(context, nameof(context));
+            IReadOnlyList<ErrorObject> errors = _exceptionHandler.HandleException(context.Exception);
 
-            if (context.HttpContext.IsJsonApiRequest())
+            context.Result = new ObjectResult(errors)
             {
-                IReadOnlyList<ErrorObject> errors = _exceptionHandler.HandleException(context.Exception);
-
-                context.Result = new ObjectResult(errors)
-                {
-                    StatusCode = (int)ErrorObject.GetResponseStatusCode(errors)
-                };
-            }
-
-            return Task.CompletedTask;
+                StatusCode = (int)ErrorObject.GetResponseStatusCode(errors)
+            };
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/AsyncQueryStringActionFilter.cs b/src/JsonApiDotNetCore/Middleware/AsyncQueryStringActionFilter.cs
index 7a72874e5b..6f31c28d2a 100644
--- a/src/JsonApiDotNetCore/Middleware/AsyncQueryStringActionFilter.cs
+++ b/src/JsonApiDotNetCore/Middleware/AsyncQueryStringActionFilter.cs
@@ -1,36 +1,34 @@
 using System.Reflection;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Controllers.Annotations;
 using JsonApiDotNetCore.QueryStrings;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <inheritdoc />
+public sealed class AsyncQueryStringActionFilter : IAsyncQueryStringActionFilter
 {
-    /// <inheritdoc />
-    public sealed class AsyncQueryStringActionFilter : IAsyncQueryStringActionFilter
+    private readonly IQueryStringReader _queryStringReader;
+
+    public AsyncQueryStringActionFilter(IQueryStringReader queryStringReader)
     {
-        private readonly IQueryStringReader _queryStringReader;
+        ArgumentGuard.NotNull(queryStringReader, nameof(queryStringReader));
 
-        public AsyncQueryStringActionFilter(IQueryStringReader queryStringReader)
-        {
-            ArgumentGuard.NotNull(queryStringReader, nameof(queryStringReader));
+        _queryStringReader = queryStringReader;
+    }
 
-            _queryStringReader = queryStringReader;
-        }
+    /// <inheritdoc />
+    public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+    {
+        ArgumentGuard.NotNull(context, nameof(context));
+        ArgumentGuard.NotNull(next, nameof(next));
 
-        /// <inheritdoc />
-        public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+        if (context.HttpContext.IsJsonApiRequest())
         {
-            ArgumentGuard.NotNull(context, nameof(context));
-            ArgumentGuard.NotNull(next, nameof(next));
-
-            if (context.HttpContext.IsJsonApiRequest())
-            {
-                var disableQueryStringAttribute = context.Controller.GetType().GetCustomAttribute<DisableQueryStringAttribute>();
-                _queryStringReader.ReadAll(disableQueryStringAttribute);
-            }
-
-            await next();
+            var disableQueryStringAttribute = context.Controller.GetType().GetCustomAttribute<DisableQueryStringAttribute>(true);
+            _queryStringReader.ReadAll(disableQueryStringAttribute);
         }
+
+        await next();
     }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/EndpointKind.cs b/src/JsonApiDotNetCore/Middleware/EndpointKind.cs
index 6123aa09f9..b97d7735f3 100644
--- a/src/JsonApiDotNetCore/Middleware/EndpointKind.cs
+++ b/src/JsonApiDotNetCore/Middleware/EndpointKind.cs
@@ -1,25 +1,24 @@
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+public enum EndpointKind
 {
-    public enum EndpointKind
-    {
-        /// <summary>
-        /// A top-level resource request, for example: "/blogs" or "/blogs/123"
-        /// </summary>
-        Primary,
+    /// <summary>
+    /// A top-level resource request, for example: "/blogs" or "/blogs/123"
+    /// </summary>
+    Primary,
 
-        /// <summary>
-        /// A nested resource request, for example: "/blogs/123/author" or "/author/123/articles"
-        /// </summary>
-        Secondary,
+    /// <summary>
+    /// A nested resource request, for example: "/blogs/123/author" or "/author/123/articles"
+    /// </summary>
+    Secondary,
 
-        /// <summary>
-        /// A relationship request, for example: "/blogs/123/relationships/author" or "/author/123/relationships/articles"
-        /// </summary>
-        Relationship,
+    /// <summary>
+    /// A relationship request, for example: "/blogs/123/relationships/author" or "/author/123/relationships/articles"
+    /// </summary>
+    Relationship,
 
-        /// <summary>
-        /// A request to an atomic:operations endpoint.
-        /// </summary>
-        AtomicOperations
-    }
+    /// <summary>
+    /// A request to an atomic:operations endpoint.
+    /// </summary>
+    AtomicOperations
 }
diff --git a/src/JsonApiDotNetCore/Middleware/ExceptionHandler.cs b/src/JsonApiDotNetCore/Middleware/ExceptionHandler.cs
index 5a0aab7787..ea1d67743d 100644
--- a/src/JsonApiDotNetCore/Middleware/ExceptionHandler.cs
+++ b/src/JsonApiDotNetCore/Middleware/ExceptionHandler.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
 using System.Net;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
@@ -9,100 +6,99 @@
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <inheritdoc />
+[PublicAPI]
+public class ExceptionHandler : IExceptionHandler
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public class ExceptionHandler : IExceptionHandler
+    private readonly IJsonApiOptions _options;
+    private readonly ILogger _logger;
+
+    public ExceptionHandler(ILoggerFactory loggerFactory, IJsonApiOptions options)
     {
-        private readonly IJsonApiOptions _options;
-        private readonly ILogger _logger;
+        ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
+        ArgumentGuard.NotNull(options, nameof(options));
 
-        public ExceptionHandler(ILoggerFactory loggerFactory, IJsonApiOptions options)
-        {
-            ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
-            ArgumentGuard.NotNull(options, nameof(options));
+        _options = options;
+        _logger = loggerFactory.CreateLogger<ExceptionHandler>();
+    }
 
-            _options = options;
-            _logger = loggerFactory.CreateLogger<ExceptionHandler>();
-        }
+    public IReadOnlyList<ErrorObject> HandleException(Exception exception)
+    {
+        ArgumentGuard.NotNull(exception, nameof(exception));
 
-        public IReadOnlyList<ErrorObject> HandleException(Exception exception)
-        {
-            ArgumentGuard.NotNull(exception, nameof(exception));
+        Exception demystified = exception.Demystify();
 
-            Exception demystified = exception.Demystify();
+        LogException(demystified);
 
-            LogException(demystified);
+        return CreateErrorResponse(demystified);
+    }
 
-            return CreateErrorResponse(demystified);
-        }
+    private void LogException(Exception exception)
+    {
+        LogLevel level = GetLogLevel(exception);
+        string message = GetLogMessage(exception);
 
-        private void LogException(Exception exception)
-        {
-            LogLevel level = GetLogLevel(exception);
-            string message = GetLogMessage(exception);
+        _logger.Log(level, exception, message);
+    }
 
-            _logger.Log(level, exception, message);
-        }
+    protected virtual LogLevel GetLogLevel(Exception exception)
+    {
+        ArgumentGuard.NotNull(exception, nameof(exception));
 
-        protected virtual LogLevel GetLogLevel(Exception exception)
+        if (exception is OperationCanceledException)
         {
-            ArgumentGuard.NotNull(exception, nameof(exception));
+            return LogLevel.None;
+        }
 
-            if (exception is OperationCanceledException)
-            {
-                return LogLevel.None;
-            }
+        if (exception is JsonApiException and not FailedOperationException)
+        {
+            return LogLevel.Information;
+        }
 
-            if (exception is JsonApiException and not FailedOperationException)
-            {
-                return LogLevel.Information;
-            }
+        return LogLevel.Error;
+    }
 
-            return LogLevel.Error;
-        }
+    protected virtual string GetLogMessage(Exception exception)
+    {
+        ArgumentGuard.NotNull(exception, nameof(exception));
 
-        protected virtual string GetLogMessage(Exception exception)
-        {
-            ArgumentGuard.NotNull(exception, nameof(exception));
+        return exception is JsonApiException jsonApiException ? jsonApiException.GetSummary() : exception.Message;
+    }
 
-            return exception is JsonApiException jsonApiException ? jsonApiException.GetSummary() : exception.Message;
-        }
+    protected virtual IReadOnlyList<ErrorObject> CreateErrorResponse(Exception exception)
+    {
+        ArgumentGuard.NotNull(exception, nameof(exception));
 
-        protected virtual IReadOnlyList<ErrorObject> CreateErrorResponse(Exception exception)
-        {
-            ArgumentGuard.NotNull(exception, nameof(exception));
-
-            IReadOnlyList<ErrorObject> errors = exception is JsonApiException jsonApiException ? jsonApiException.Errors :
-                exception is OperationCanceledException ? new ErrorObject((HttpStatusCode)499)
-                {
-                    Title = "Request execution was canceled."
-                }.AsArray() : new ErrorObject(HttpStatusCode.InternalServerError)
-                {
-                    Title = "An unhandled error occurred while processing this request.",
-                    Detail = exception.Message
-                }.AsArray();
-
-            if (_options.IncludeExceptionStackTraceInErrors && exception is not InvalidModelStateException)
+        IReadOnlyList<ErrorObject> errors = exception is JsonApiException jsonApiException ? jsonApiException.Errors :
+            exception is OperationCanceledException ? new ErrorObject((HttpStatusCode)499)
             {
-                IncludeStackTraces(exception, errors);
-            }
+                Title = "Request execution was canceled."
+            }.AsArray() : new ErrorObject(HttpStatusCode.InternalServerError)
+            {
+                Title = "An unhandled error occurred while processing this request.",
+                Detail = exception.Message
+            }.AsArray();
 
-            return errors;
+        if (_options.IncludeExceptionStackTraceInErrors && exception is not InvalidModelStateException)
+        {
+            IncludeStackTraces(exception, errors);
         }
 
-        private void IncludeStackTraces(Exception exception, IReadOnlyList<ErrorObject> errors)
-        {
-            string[] stackTraceLines = exception.ToString().Split(Environment.NewLine);
+        return errors;
+    }
+
+    private void IncludeStackTraces(Exception exception, IReadOnlyList<ErrorObject> errors)
+    {
+        string[] stackTraceLines = exception.ToString().Split(Environment.NewLine);
 
-            if (stackTraceLines.Any())
+        if (stackTraceLines.Any())
+        {
+            foreach (ErrorObject error in errors)
             {
-                foreach (ErrorObject error in errors)
-                {
-                    error.Meta ??= new Dictionary<string, object?>();
-                    error.Meta["StackTrace"] = stackTraceLines;
-                }
+                error.Meta ??= new Dictionary<string, object?>();
+                error.Meta["StackTrace"] = stackTraceLines;
             }
         }
     }
diff --git a/src/JsonApiDotNetCore/Middleware/FixedQueryFeature.cs b/src/JsonApiDotNetCore/Middleware/FixedQueryFeature.cs
deleted file mode 100644
index 36105b5e88..0000000000
--- a/src/JsonApiDotNetCore/Middleware/FixedQueryFeature.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Http.Features;
-using Microsoft.Extensions.Primitives;
-
-namespace JsonApiDotNetCore.Middleware
-{
-    /// <summary>
-    /// Replacement implementation for the ASP.NET built-in <see cref="QueryFeature" />, to workaround bug https://github.com/dotnet/aspnetcore/issues/33394.
-    /// This is identical to the built-in version, except it calls <see cref="FixedQueryHelpers.ParseNullableQuery" />.
-    /// </summary>
-    internal sealed class FixedQueryFeature : IQueryFeature
-    {
-        // Lambda hoisted to static readonly field to improve inlining https://github.com/dotnet/roslyn/issues/13624
-        private static readonly Func<IFeatureCollection, IHttpRequestFeature?> NullRequestFeature = _ => null;
-
-        private FeatureReferences<IHttpRequestFeature> _features;
-
-        private string? _original;
-        private IQueryCollection? _parsedValues;
-
-        private IHttpRequestFeature HttpRequestFeature => _features.Fetch(ref _features.Cache, NullRequestFeature)!;
-
-        /// <inheritdoc />
-        [AllowNull]
-        public IQueryCollection Query
-        {
-            get
-            {
-                if (IsFeatureCollectionNull())
-                {
-                    return _parsedValues ??= QueryCollection.Empty;
-                }
-
-                string current = HttpRequestFeature.QueryString;
-
-                if (_parsedValues == null || !string.Equals(_original, current, StringComparison.Ordinal))
-                {
-                    _original = current;
-
-                    Dictionary<string, StringValues>? result = FixedQueryHelpers.ParseNullableQuery(current);
-
-                    _parsedValues = result == null ? QueryCollection.Empty : new QueryCollection(result);
-                }
-
-                return _parsedValues;
-            }
-            set
-            {
-                _parsedValues = value;
-
-                if (!IsFeatureCollectionNull())
-                {
-                    if (value == null)
-                    {
-                        _original = string.Empty;
-                        HttpRequestFeature.QueryString = string.Empty;
-                    }
-                    else
-                    {
-                        _original = QueryString.Create(_parsedValues!).ToString();
-                        HttpRequestFeature.QueryString = _original;
-                    }
-                }
-            }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of <see cref="QueryFeature" />.
-        /// </summary>
-        /// <param name="features">
-        /// The <see cref="IFeatureCollection" /> to initialize.
-        /// </param>
-        public FixedQueryFeature(IFeatureCollection features)
-        {
-            ArgumentGuard.NotNull(features, nameof(features));
-
-            _features.Initalize(features);
-        }
-
-        private bool IsFeatureCollectionNull()
-        {
-            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-            // Justification: This code was copied from the ASP.NET sources. A struct instance can be created without calling one of its constructors.
-            return _features.Collection == null;
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Middleware/FixedQueryHelpers.cs b/src/JsonApiDotNetCore/Middleware/FixedQueryHelpers.cs
deleted file mode 100644
index 7c42d0aeea..0000000000
--- a/src/JsonApiDotNetCore/Middleware/FixedQueryHelpers.cs
+++ /dev/null
@@ -1,102 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Microsoft.AspNetCore.WebUtilities;
-using Microsoft.Extensions.Primitives;
-
-#pragma warning disable AV1008 // Class should not be static
-#pragma warning disable AV1708 // Type name contains term that should be avoided
-#pragma warning disable AV1130 // Return type in method signature should be a collection interface instead of a concrete type
-#pragma warning disable AV1532 // Loop statement contains nested loop
-
-namespace JsonApiDotNetCore.Middleware
-{
-    /// <summary>
-    /// Replacement implementation for the ASP.NET built-in <see cref="QueryHelpers" />, to workaround bug https://github.com/dotnet/aspnetcore/issues/33394.
-    /// This is identical to the built-in version, except it properly un-escapes query string keys without a value.
-    /// </summary>
-    internal static class FixedQueryHelpers
-    {
-        /// <summary>
-        /// Parse a query string into its component key and value parts.
-        /// </summary>
-        /// <param name="queryString">
-        /// The raw query string value, with or without the leading '?'.
-        /// </param>
-        /// <returns>
-        /// A collection of parsed keys and values, null if there are no entries.
-        /// </returns>
-        public static Dictionary<string, StringValues>? ParseNullableQuery(string queryString)
-        {
-            var accumulator = new KeyValueAccumulator();
-
-            if (string.IsNullOrEmpty(queryString) || queryString == "?")
-            {
-                return null;
-            }
-
-            int scanIndex = 0;
-
-            if (queryString[0] == '?')
-            {
-                scanIndex = 1;
-            }
-
-            int textLength = queryString.Length;
-            int equalIndex = queryString.IndexOf('=');
-
-            if (equalIndex == -1)
-            {
-                equalIndex = textLength;
-            }
-
-            while (scanIndex < textLength)
-            {
-                int delimiterIndex = queryString.IndexOf('&', scanIndex);
-
-                if (delimiterIndex == -1)
-                {
-                    delimiterIndex = textLength;
-                }
-
-                if (equalIndex < delimiterIndex)
-                {
-                    while (scanIndex != equalIndex && char.IsWhiteSpace(queryString[scanIndex]))
-                    {
-                        ++scanIndex;
-                    }
-
-                    string name = queryString.Substring(scanIndex, equalIndex - scanIndex);
-                    string value = queryString.Substring(equalIndex + 1, delimiterIndex - equalIndex - 1);
-                    accumulator.Append(Uri.UnescapeDataString(name.Replace('+', ' ')), Uri.UnescapeDataString(value.Replace('+', ' ')));
-                    equalIndex = queryString.IndexOf('=', delimiterIndex);
-
-                    if (equalIndex == -1)
-                    {
-                        equalIndex = textLength;
-                    }
-                }
-                else
-                {
-                    if (delimiterIndex > scanIndex)
-                    {
-                        // original code:
-                        // accumulator.Append(queryString.Substring(scanIndex, delimiterIndex - scanIndex), string.Empty);
-
-                        // replacement:
-                        string name = queryString.Substring(scanIndex, delimiterIndex - scanIndex);
-                        accumulator.Append(Uri.UnescapeDataString(name.Replace('+', ' ')), string.Empty);
-                    }
-                }
-
-                scanIndex = delimiterIndex + 1;
-            }
-
-            if (!accumulator.HasValues)
-            {
-                return null;
-            }
-
-            return accumulator.GetResults();
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Middleware/HeaderConstants.cs b/src/JsonApiDotNetCore/Middleware/HeaderConstants.cs
index c860204c52..43a5989d59 100644
--- a/src/JsonApiDotNetCore/Middleware/HeaderConstants.cs
+++ b/src/JsonApiDotNetCore/Middleware/HeaderConstants.cs
@@ -2,12 +2,11 @@
 
 #pragma warning disable AV1008 // Class should not be static
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+[PublicAPI]
+public static class HeaderConstants
 {
-    [PublicAPI]
-    public static class HeaderConstants
-    {
-        public const string MediaType = "application/vnd.api+json";
-        public const string AtomicOperationsMediaType = MediaType + "; ext=\"https://jsonapi.org/ext/atomic\"";
-    }
+    public const string MediaType = "application/vnd.api+json";
+    public const string AtomicOperationsMediaType = MediaType + "; ext=\"https://jsonapi.org/ext/atomic\"";
 }
diff --git a/src/JsonApiDotNetCore/Middleware/HttpContextExtensions.cs b/src/JsonApiDotNetCore/Middleware/HttpContextExtensions.cs
index a3d137fefd..b6785e8198 100644
--- a/src/JsonApiDotNetCore/Middleware/HttpContextExtensions.cs
+++ b/src/JsonApiDotNetCore/Middleware/HttpContextExtensions.cs
@@ -1,29 +1,28 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Http;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+[PublicAPI]
+public static class HttpContextExtensions
 {
-    [PublicAPI]
-    public static class HttpContextExtensions
-    {
-        private const string IsJsonApiRequestKey = "JsonApiDotNetCore_IsJsonApiRequest";
+    private const string IsJsonApiRequestKey = "JsonApiDotNetCore_IsJsonApiRequest";
 
-        /// <summary>
-        /// Indicates whether the currently executing HTTP request is being handled by JsonApiDotNetCore.
-        /// </summary>
-        public static bool IsJsonApiRequest(this HttpContext httpContext)
-        {
-            ArgumentGuard.NotNull(httpContext, nameof(httpContext));
+    /// <summary>
+    /// Indicates whether the currently executing HTTP request is being handled by JsonApiDotNetCore.
+    /// </summary>
+    public static bool IsJsonApiRequest(this HttpContext httpContext)
+    {
+        ArgumentGuard.NotNull(httpContext, nameof(httpContext));
 
-            string? value = httpContext.Items[IsJsonApiRequestKey] as string;
-            return value == bool.TrueString;
-        }
+        string? value = httpContext.Items[IsJsonApiRequestKey] as string;
+        return value == bool.TrueString;
+    }
 
-        internal static void RegisterJsonApiRequest(this HttpContext httpContext)
-        {
-            ArgumentGuard.NotNull(httpContext, nameof(httpContext));
+    internal static void RegisterJsonApiRequest(this HttpContext httpContext)
+    {
+        ArgumentGuard.NotNull(httpContext, nameof(httpContext));
 
-            httpContext.Items[IsJsonApiRequestKey] = bool.TrueString;
-        }
+        httpContext.Items[IsJsonApiRequestKey] = bool.TrueString;
     }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/IAsyncConvertEmptyActionResultFilter.cs b/src/JsonApiDotNetCore/Middleware/IAsyncConvertEmptyActionResultFilter.cs
index 8e0f8b394e..87676657e5 100644
--- a/src/JsonApiDotNetCore/Middleware/IAsyncConvertEmptyActionResultFilter.cs
+++ b/src/JsonApiDotNetCore/Middleware/IAsyncConvertEmptyActionResultFilter.cs
@@ -1,20 +1,19 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <summary>
+/// Converts action result without parameters into action result with null parameter.
+/// <example>
+/// <code><![CDATA[
+/// return NotFound() -> return NotFound(null)
+/// ]]></code>
+/// </example>
+/// This ensures our formatter is invoked, where we'll build a JSON:API compliant response. For details, see:
+/// https://github.com/dotnet/aspnetcore/issues/16969
+/// </summary>
+[PublicAPI]
+public interface IAsyncConvertEmptyActionResultFilter : IAsyncAlwaysRunResultFilter
 {
-    /// <summary>
-    /// Converts action result without parameters into action result with null parameter.
-    /// <example>
-    /// <code><![CDATA[
-    /// return NotFound() -> return NotFound(null)
-    /// ]]></code>
-    /// </example>
-    /// This ensures our formatter is invoked, where we'll build a JSON:API compliant response. For details, see:
-    /// https://github.com/dotnet/aspnetcore/issues/16969
-    /// </summary>
-    [PublicAPI]
-    public interface IAsyncConvertEmptyActionResultFilter : IAsyncAlwaysRunResultFilter
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/IAsyncJsonApiExceptionFilter.cs b/src/JsonApiDotNetCore/Middleware/IAsyncJsonApiExceptionFilter.cs
index 7ae6981c77..fb0cbb9b17 100644
--- a/src/JsonApiDotNetCore/Middleware/IAsyncJsonApiExceptionFilter.cs
+++ b/src/JsonApiDotNetCore/Middleware/IAsyncJsonApiExceptionFilter.cs
@@ -1,13 +1,12 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <summary>
+/// Application-wide exception filter that invokes <see cref="IExceptionHandler" /> for JSON:API requests.
+/// </summary>
+[PublicAPI]
+public interface IAsyncJsonApiExceptionFilter : IAsyncExceptionFilter
 {
-    /// <summary>
-    /// Application-wide exception filter that invokes <see cref="IExceptionHandler" /> for JSON:API requests.
-    /// </summary>
-    [PublicAPI]
-    public interface IAsyncJsonApiExceptionFilter : IAsyncExceptionFilter
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/IAsyncQueryStringActionFilter.cs b/src/JsonApiDotNetCore/Middleware/IAsyncQueryStringActionFilter.cs
index 4ad18fcf35..0c9cbfbb29 100644
--- a/src/JsonApiDotNetCore/Middleware/IAsyncQueryStringActionFilter.cs
+++ b/src/JsonApiDotNetCore/Middleware/IAsyncQueryStringActionFilter.cs
@@ -1,13 +1,12 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Mvc.Filters;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <summary>
+/// Application-wide entry point for processing JSON:API request query strings.
+/// </summary>
+[PublicAPI]
+public interface IAsyncQueryStringActionFilter : IAsyncActionFilter
 {
-    /// <summary>
-    /// Application-wide entry point for processing JSON:API request query strings.
-    /// </summary>
-    [PublicAPI]
-    public interface IAsyncQueryStringActionFilter : IAsyncActionFilter
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/IControllerResourceMapping.cs b/src/JsonApiDotNetCore/Middleware/IControllerResourceMapping.cs
index c15f3037bd..dc47971808 100644
--- a/src/JsonApiDotNetCore/Middleware/IControllerResourceMapping.cs
+++ b/src/JsonApiDotNetCore/Middleware/IControllerResourceMapping.cs
@@ -1,21 +1,19 @@
-using System;
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <summary>
+/// Registry of which resource type is associated with which controller.
+/// </summary>
+public interface IControllerResourceMapping
 {
     /// <summary>
-    /// Registry of which resource type is associated with which controller.
+    /// Gets the associated resource type for the provided controller type.
     /// </summary>
-    public interface IControllerResourceMapping
-    {
-        /// <summary>
-        /// Gets the associated resource type for the provided controller type.
-        /// </summary>
-        ResourceType? GetResourceTypeForController(Type? controllerType);
+    ResourceType? GetResourceTypeForController(Type? controllerType);
 
-        /// <summary>
-        /// Gets the associated controller name for the provided resource type.
-        /// </summary>
-        string? GetControllerNameForResourceType(ResourceType? resourceType);
-    }
+    /// <summary>
+    /// Gets the associated controller name for the provided resource type.
+    /// </summary>
+    string? GetControllerNameForResourceType(ResourceType? resourceType);
 }
diff --git a/src/JsonApiDotNetCore/Middleware/IExceptionHandler.cs b/src/JsonApiDotNetCore/Middleware/IExceptionHandler.cs
index a962d8cfdd..3b3f5307be 100644
--- a/src/JsonApiDotNetCore/Middleware/IExceptionHandler.cs
+++ b/src/JsonApiDotNetCore/Middleware/IExceptionHandler.cs
@@ -1,14 +1,11 @@
-using System;
-using System.Collections.Generic;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <summary>
+/// Central place to handle all exceptions, such as log them and translate into error response.
+/// </summary>
+public interface IExceptionHandler
 {
-    /// <summary>
-    /// Central place to handle all exceptions, such as log them and translate into error response.
-    /// </summary>
-    public interface IExceptionHandler
-    {
-        IReadOnlyList<ErrorObject> HandleException(Exception exception);
-    }
+    IReadOnlyList<ErrorObject> HandleException(Exception exception);
 }
diff --git a/src/JsonApiDotNetCore/Middleware/IJsonApiInputFormatter.cs b/src/JsonApiDotNetCore/Middleware/IJsonApiInputFormatter.cs
index 268c0a2697..cb5fe76167 100644
--- a/src/JsonApiDotNetCore/Middleware/IJsonApiInputFormatter.cs
+++ b/src/JsonApiDotNetCore/Middleware/IJsonApiInputFormatter.cs
@@ -1,13 +1,12 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Mvc.Formatters;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <summary>
+/// Application-wide entry point for reading JSON:API request bodies.
+/// </summary>
+[PublicAPI]
+public interface IJsonApiInputFormatter : IInputFormatter
 {
-    /// <summary>
-    /// Application-wide entry point for reading JSON:API request bodies.
-    /// </summary>
-    [PublicAPI]
-    public interface IJsonApiInputFormatter : IInputFormatter
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/IJsonApiOutputFormatter.cs b/src/JsonApiDotNetCore/Middleware/IJsonApiOutputFormatter.cs
index 725accb03f..bc7213ebed 100644
--- a/src/JsonApiDotNetCore/Middleware/IJsonApiOutputFormatter.cs
+++ b/src/JsonApiDotNetCore/Middleware/IJsonApiOutputFormatter.cs
@@ -1,13 +1,12 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Mvc.Formatters;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <summary>
+/// Application-wide entry point for writing JSON:API response bodies.
+/// </summary>
+[PublicAPI]
+public interface IJsonApiOutputFormatter : IOutputFormatter
 {
-    /// <summary>
-    /// Application-wide entry point for writing JSON:API response bodies.
-    /// </summary>
-    [PublicAPI]
-    public interface IJsonApiOutputFormatter : IOutputFormatter
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/IJsonApiRequest.cs b/src/JsonApiDotNetCore/Middleware/IJsonApiRequest.cs
index c1d353851d..1d66bf517f 100644
--- a/src/JsonApiDotNetCore/Middleware/IJsonApiRequest.cs
+++ b/src/JsonApiDotNetCore/Middleware/IJsonApiRequest.cs
@@ -1,68 +1,67 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <summary>
+/// Metadata associated with the JSON:API request that is currently being processed.
+/// </summary>
+public interface IJsonApiRequest
 {
     /// <summary>
-    /// Metadata associated with the JSON:API request that is currently being processed.
+    /// Routing information, based on the path of the request URL.
     /// </summary>
-    public interface IJsonApiRequest
-    {
-        /// <summary>
-        /// Routing information, based on the path of the request URL.
-        /// </summary>
-        public EndpointKind Kind { get; }
+    public EndpointKind Kind { get; }
 
-        /// <summary>
-        /// The ID of the primary resource for this request. This would be <c>null</c> in "/blogs", "123" in "/blogs/123" or "/blogs/123/author". This is
-        /// <c>null</c> before and after processing operations in an atomic:operations request.
-        /// </summary>
-        string? PrimaryId { get; }
+    /// <summary>
+    /// The ID of the primary resource for this request. This would be <c>null</c> in "/blogs", "123" in "/blogs/123" or "/blogs/123/author". This is
+    /// <c>null</c> before and after processing operations in an atomic:operations request.
+    /// </summary>
+    string? PrimaryId { get; }
 
-        /// <summary>
-        /// The primary resource type for this request. This would be "blogs" in "/blogs", "/blogs/123" or "/blogs/123/author". This is <c>null</c> before and
-        /// after processing operations in an atomic:operations request.
-        /// </summary>
-        ResourceType? PrimaryResourceType { get; }
+    /// <summary>
+    /// The primary resource type for this request. This would be "blogs" in "/blogs", "/blogs/123" or "/blogs/123/author". This is <c>null</c> before and
+    /// after processing operations in an atomic:operations request.
+    /// </summary>
+    ResourceType? PrimaryResourceType { get; }
 
-        /// <summary>
-        /// The secondary resource type for this request. This would be <c>null</c> in "/blogs", "/blogs/123" and "/blogs/123/unknownResource" or "people" in
-        /// "/blogs/123/author" and "/blogs/123/relationships/author". This is <c>null</c> before and after processing operations in an atomic:operations
-        /// request.
-        /// </summary>
-        ResourceType? SecondaryResourceType { get; }
+    /// <summary>
+    /// The secondary resource type for this request. This would be <c>null</c> in "/blogs", "/blogs/123" and "/blogs/123/unknownResource" or "people" in
+    /// "/blogs/123/author" and "/blogs/123/relationships/author". This is <c>null</c> before and after processing operations in an atomic:operations
+    /// request.
+    /// </summary>
+    ResourceType? SecondaryResourceType { get; }
 
-        /// <summary>
-        /// The relationship for this request. This would be <c>null</c> in "/blogs", "/blogs/123" and "/blogs/123/unknownResource" or "author" in
-        /// "/blogs/123/author" and "/blogs/123/relationships/author". This is <c>null</c> before and after processing operations in an atomic:operations
-        /// request.
-        /// </summary>
-        RelationshipAttribute? Relationship { get; }
+    /// <summary>
+    /// The relationship for this request. This would be <c>null</c> in "/blogs", "/blogs/123" and "/blogs/123/unknownResource" or "author" in
+    /// "/blogs/123/author" and "/blogs/123/relationships/author". This is <c>null</c> before and after processing operations in an atomic:operations
+    /// request.
+    /// </summary>
+    RelationshipAttribute? Relationship { get; }
 
-        /// <summary>
-        /// Indicates whether this request targets a single resource or a collection of resources.
-        /// </summary>
-        bool IsCollection { get; }
+    /// <summary>
+    /// Indicates whether this request targets a single resource or a collection of resources.
+    /// </summary>
+    bool IsCollection { get; }
 
-        /// <summary>
-        /// Indicates whether this request targets only fetching of data (resources and relationships), as opposed to applying changes.
-        /// </summary>
-        bool IsReadOnly { get; }
+    /// <summary>
+    /// Indicates whether this request targets only fetching of data (resources and relationships), as opposed to applying changes.
+    /// </summary>
+    bool IsReadOnly { get; }
 
-        /// <summary>
-        /// In case of a non-readonly request, this indicates the kind of write operation currently being processed. This is <c>null</c> when processing a
-        /// read-only operation, and before and after processing operations in an atomic:operations request.
-        /// </summary>
-        WriteOperationKind? WriteOperation { get; }
+    /// <summary>
+    /// In case of a non-readonly request, this indicates the kind of write operation currently being processed. This is <c>null</c> when processing a
+    /// read-only operation, and before and after processing operations in an atomic:operations request.
+    /// </summary>
+    WriteOperationKind? WriteOperation { get; }
 
-        /// <summary>
-        /// In case of an atomic:operations request, identifies the overarching transaction.
-        /// </summary>
-        string? TransactionId { get; }
+    /// <summary>
+    /// In case of an atomic:operations request, identifies the overarching transaction.
+    /// </summary>
+    string? TransactionId { get; }
 
-        /// <summary>
-        /// Performs a shallow copy.
-        /// </summary>
-        void CopyFrom(IJsonApiRequest other);
-    }
+    /// <summary>
+    /// Performs a shallow copy.
+    /// </summary>
+    void CopyFrom(IJsonApiRequest other);
 }
diff --git a/src/JsonApiDotNetCore/Middleware/IJsonApiRoutingConvention.cs b/src/JsonApiDotNetCore/Middleware/IJsonApiRoutingConvention.cs
index d5db22efa6..86b68a9b03 100644
--- a/src/JsonApiDotNetCore/Middleware/IJsonApiRoutingConvention.cs
+++ b/src/JsonApiDotNetCore/Middleware/IJsonApiRoutingConvention.cs
@@ -1,13 +1,12 @@
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <summary>
+/// Service for specifying which routing convention to use. This can be overridden to customize the relation between controllers and mapped routes.
+/// </summary>
+[PublicAPI]
+public interface IJsonApiRoutingConvention : IApplicationModelConvention, IControllerResourceMapping
 {
-    /// <summary>
-    /// Service for specifying which routing convention to use. This can be overridden to customize the relation between controllers and mapped routes.
-    /// </summary>
-    [PublicAPI]
-    public interface IJsonApiRoutingConvention : IApplicationModelConvention, IControllerResourceMapping
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/JsonApiInputFormatter.cs b/src/JsonApiDotNetCore/Middleware/JsonApiInputFormatter.cs
index 46153e6502..077f0573f0 100644
--- a/src/JsonApiDotNetCore/Middleware/JsonApiInputFormatter.cs
+++ b/src/JsonApiDotNetCore/Middleware/JsonApiInputFormatter.cs
@@ -1,31 +1,29 @@
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Serialization.Request;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <inheritdoc />
+public sealed class JsonApiInputFormatter : IJsonApiInputFormatter
 {
     /// <inheritdoc />
-    public sealed class JsonApiInputFormatter : IJsonApiInputFormatter
+    public bool CanRead(InputFormatterContext context)
     {
-        /// <inheritdoc />
-        public bool CanRead(InputFormatterContext context)
-        {
-            ArgumentGuard.NotNull(context, nameof(context));
+        ArgumentGuard.NotNull(context, nameof(context));
 
-            return context.HttpContext.IsJsonApiRequest();
-        }
+        return context.HttpContext.IsJsonApiRequest();
+    }
 
-        /// <inheritdoc />
-        public async Task<InputFormatterResult> ReadAsync(InputFormatterContext context)
-        {
-            ArgumentGuard.NotNull(context, nameof(context));
+    /// <inheritdoc />
+    public async Task<InputFormatterResult> ReadAsync(InputFormatterContext context)
+    {
+        ArgumentGuard.NotNull(context, nameof(context));
 
-            var reader = context.HttpContext.RequestServices.GetRequiredService<IJsonApiReader>();
+        var reader = context.HttpContext.RequestServices.GetRequiredService<IJsonApiReader>();
 
-            object? model = await reader.ReadAsync(context.HttpContext.Request);
+        object? model = await reader.ReadAsync(context.HttpContext.Request);
 
-            return model == null ? await InputFormatterResult.NoValueAsync() : await InputFormatterResult.SuccessAsync(model);
-        }
+        return model == null ? await InputFormatterResult.NoValueAsync() : await InputFormatterResult.SuccessAsync(model);
     }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs b/src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs
index 934839e56e..94507750da 100644
--- a/src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs
+++ b/src/JsonApiDotNetCore/Middleware/JsonApiMiddleware.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Diagnostics;
@@ -11,293 +7,282 @@
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
-using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <summary>
+/// Intercepts HTTP requests to populate injected <see cref="IJsonApiRequest" /> instance for JSON:API requests.
+/// </summary>
+[PublicAPI]
+public sealed class JsonApiMiddleware
 {
-    /// <summary>
-    /// Intercepts HTTP requests to populate injected <see cref="IJsonApiRequest" /> instance for JSON:API requests.
-    /// </summary>
-    [PublicAPI]
-    public sealed class JsonApiMiddleware
-    {
-        private static readonly MediaTypeHeaderValue MediaType = MediaTypeHeaderValue.Parse(HeaderConstants.MediaType);
-        private static readonly MediaTypeHeaderValue AtomicOperationsMediaType = MediaTypeHeaderValue.Parse(HeaderConstants.AtomicOperationsMediaType);
+    private static readonly MediaTypeHeaderValue MediaType = MediaTypeHeaderValue.Parse(HeaderConstants.MediaType);
+    private static readonly MediaTypeHeaderValue AtomicOperationsMediaType = MediaTypeHeaderValue.Parse(HeaderConstants.AtomicOperationsMediaType);
 
-        private readonly RequestDelegate _next;
+    private readonly RequestDelegate _next;
 
-        public JsonApiMiddleware(RequestDelegate next, IHttpContextAccessor httpContextAccessor)
-        {
-            _next = next;
+    public JsonApiMiddleware(RequestDelegate next, IHttpContextAccessor httpContextAccessor)
+    {
+        _next = next;
 
-            var session = new AspNetCodeTimerSession(httpContextAccessor);
-            CodeTimingSessionManager.Capture(session);
-        }
+        var session = new AspNetCodeTimerSession(httpContextAccessor);
+        CodeTimingSessionManager.Capture(session);
+    }
 
-        public async Task InvokeAsync(HttpContext httpContext, IControllerResourceMapping controllerResourceMapping, IJsonApiOptions options,
-            IJsonApiRequest request, ILogger<JsonApiMiddleware> logger)
+    public async Task InvokeAsync(HttpContext httpContext, IControllerResourceMapping controllerResourceMapping, IJsonApiOptions options,
+        IJsonApiRequest request, ILogger<JsonApiMiddleware> logger)
+    {
+        ArgumentGuard.NotNull(httpContext, nameof(httpContext));
+        ArgumentGuard.NotNull(controllerResourceMapping, nameof(controllerResourceMapping));
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(request, nameof(request));
+        ArgumentGuard.NotNull(logger, nameof(logger));
+
+        using (CodeTimingSessionManager.Current.Measure("JSON:API middleware"))
         {
-            ArgumentGuard.NotNull(httpContext, nameof(httpContext));
-            ArgumentGuard.NotNull(controllerResourceMapping, nameof(controllerResourceMapping));
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(request, nameof(request));
-            ArgumentGuard.NotNull(logger, nameof(logger));
+            if (!await ValidateIfMatchHeaderAsync(httpContext, options.SerializerWriteOptions))
+            {
+                return;
+            }
 
-            using (CodeTimingSessionManager.Current.Measure("JSON:API middleware"))
+            RouteValueDictionary routeValues = httpContext.GetRouteData().Values;
+            ResourceType? primaryResourceType = CreatePrimaryResourceType(httpContext, controllerResourceMapping);
+
+            if (primaryResourceType != null)
             {
-                if (!await ValidateIfMatchHeaderAsync(httpContext, options.SerializerWriteOptions))
+                if (!await ValidateContentTypeHeaderAsync(HeaderConstants.MediaType, httpContext, options.SerializerWriteOptions) ||
+                    !await ValidateAcceptHeaderAsync(MediaType, httpContext, options.SerializerWriteOptions))
                 {
                     return;
                 }
 
-                RouteValueDictionary routeValues = httpContext.GetRouteData().Values;
-                ResourceType? primaryResourceType = CreatePrimaryResourceType(httpContext, controllerResourceMapping);
-
-                if (primaryResourceType != null)
-                {
-                    if (!await ValidateContentTypeHeaderAsync(HeaderConstants.MediaType, httpContext, options.SerializerWriteOptions) ||
-                        !await ValidateAcceptHeaderAsync(MediaType, httpContext, options.SerializerWriteOptions))
-                    {
-                        return;
-                    }
+                SetupResourceRequest((JsonApiRequest)request, primaryResourceType, routeValues, httpContext.Request);
 
-                    SetupResourceRequest((JsonApiRequest)request, primaryResourceType, routeValues, httpContext.Request);
-
-                    httpContext.RegisterJsonApiRequest();
-                }
-                else if (IsRouteForOperations(routeValues))
+                httpContext.RegisterJsonApiRequest();
+            }
+            else if (IsRouteForOperations(routeValues))
+            {
+                if (!await ValidateContentTypeHeaderAsync(HeaderConstants.AtomicOperationsMediaType, httpContext, options.SerializerWriteOptions) ||
+                    !await ValidateAcceptHeaderAsync(AtomicOperationsMediaType, httpContext, options.SerializerWriteOptions))
                 {
-                    if (!await ValidateContentTypeHeaderAsync(HeaderConstants.AtomicOperationsMediaType, httpContext, options.SerializerWriteOptions) ||
-                        !await ValidateAcceptHeaderAsync(AtomicOperationsMediaType, httpContext, options.SerializerWriteOptions))
-                    {
-                        return;
-                    }
-
-                    SetupOperationsRequest((JsonApiRequest)request, options, httpContext.Request);
-
-                    httpContext.RegisterJsonApiRequest();
+                    return;
                 }
 
-                // Workaround for bug https://github.com/dotnet/aspnetcore/issues/33394 (fixed in .NET 6)
-                // Note that integration tests do not cover this, because the query string is short-circuited through WebApplicationFactory.
-                // To manually test, execute a GET request such as http://localhost:14140/api/v1/todoItems?include=owner&fields[people]=
-                // and observe it does not fail with 400 "Unknown query string parameter".
-                httpContext.Features.Set<IQueryFeature>(new FixedQueryFeature(httpContext.Features));
+                SetupOperationsRequest((JsonApiRequest)request, options, httpContext.Request);
 
-                using (CodeTimingSessionManager.Current.Measure("Subsequent middleware"))
-                {
-                    await _next(httpContext);
-                }
+                httpContext.RegisterJsonApiRequest();
             }
 
-            if (CodeTimingSessionManager.IsEnabled)
+            using (CodeTimingSessionManager.Current.Measure("Subsequent middleware"))
             {
-                string timingResults = CodeTimingSessionManager.Current.GetResults();
-                string url = httpContext.Request.GetDisplayUrl();
-                logger.LogInformation($"Measurement results for {httpContext.Request.Method} {url}:{Environment.NewLine}{timingResults}");
+                await _next(httpContext);
             }
         }
 
-        private async Task<bool> ValidateIfMatchHeaderAsync(HttpContext httpContext, JsonSerializerOptions serializerOptions)
+        if (CodeTimingSessionManager.IsEnabled)
+        {
+            string timingResults = CodeTimingSessionManager.Current.GetResults();
+            string url = httpContext.Request.GetDisplayUrl();
+            logger.LogInformation($"Measurement results for {httpContext.Request.Method} {url}:{Environment.NewLine}{timingResults}");
+        }
+    }
+
+    private async Task<bool> ValidateIfMatchHeaderAsync(HttpContext httpContext, JsonSerializerOptions serializerOptions)
+    {
+        if (httpContext.Request.Headers.ContainsKey(HeaderNames.IfMatch))
         {
-            if (httpContext.Request.Headers.ContainsKey(HeaderNames.IfMatch))
+            await FlushResponseAsync(httpContext.Response, serializerOptions, new ErrorObject(HttpStatusCode.PreconditionFailed)
             {
-                await FlushResponseAsync(httpContext.Response, serializerOptions, new ErrorObject(HttpStatusCode.PreconditionFailed)
+                Title = "Detection of mid-air edit collisions using ETags is not supported.",
+                Source = new ErrorSource
                 {
-                    Title = "Detection of mid-air edit collisions using ETags is not supported.",
-                    Source = new ErrorSource
-                    {
-                        Header = "If-Match"
-                    }
-                });
-
-                return false;
-            }
+                    Header = "If-Match"
+                }
+            });
 
-            return true;
+            return false;
         }
 
-        private static ResourceType? CreatePrimaryResourceType(HttpContext httpContext, IControllerResourceMapping controllerResourceMapping)
-        {
-            Endpoint? endpoint = httpContext.GetEndpoint();
-            var controllerActionDescriptor = endpoint?.Metadata.GetMetadata<ControllerActionDescriptor>();
+        return true;
+    }
 
-            return controllerActionDescriptor != null
-                ? controllerResourceMapping.GetResourceTypeForController(controllerActionDescriptor.ControllerTypeInfo)
-                : null;
-        }
+    private static ResourceType? CreatePrimaryResourceType(HttpContext httpContext, IControllerResourceMapping controllerResourceMapping)
+    {
+        Endpoint? endpoint = httpContext.GetEndpoint();
+        var controllerActionDescriptor = endpoint?.Metadata.GetMetadata<ControllerActionDescriptor>();
 
-        private static async Task<bool> ValidateContentTypeHeaderAsync(string allowedContentType, HttpContext httpContext,
-            JsonSerializerOptions serializerOptions)
-        {
-            string? contentType = httpContext.Request.ContentType;
+        return controllerActionDescriptor != null
+            ? controllerResourceMapping.GetResourceTypeForController(controllerActionDescriptor.ControllerTypeInfo)
+            : null;
+    }
+
+    private static async Task<bool> ValidateContentTypeHeaderAsync(string allowedContentType, HttpContext httpContext, JsonSerializerOptions serializerOptions)
+    {
+        string? contentType = httpContext.Request.ContentType;
 
-            // ReSharper disable once ConditionIsAlwaysTrueOrFalse
-            // Justification: Workaround for https://github.com/dotnet/aspnetcore/issues/32097 (fixed in .NET 6)
-            if (contentType != null && contentType != allowedContentType)
+        if (contentType != null && contentType != allowedContentType)
+        {
+            await FlushResponseAsync(httpContext.Response, serializerOptions, new ErrorObject(HttpStatusCode.UnsupportedMediaType)
             {
-                await FlushResponseAsync(httpContext.Response, serializerOptions, new ErrorObject(HttpStatusCode.UnsupportedMediaType)
+                Title = "The specified Content-Type header value is not supported.",
+                Detail = $"Please specify '{allowedContentType}' instead of '{contentType}' for the Content-Type header value.",
+                Source = new ErrorSource
                 {
-                    Title = "The specified Content-Type header value is not supported.",
-                    Detail = $"Please specify '{allowedContentType}' instead of '{contentType}' for the Content-Type header value.",
-                    Source = new ErrorSource
-                    {
-                        Header = "Content-Type"
-                    }
-                });
-
-                return false;
-            }
+                    Header = "Content-Type"
+                }
+            });
 
-            return true;
+            return false;
         }
 
-        private static async Task<bool> ValidateAcceptHeaderAsync(MediaTypeHeaderValue allowedMediaTypeValue, HttpContext httpContext,
-            JsonSerializerOptions serializerOptions)
-        {
-            string[] acceptHeaders = httpContext.Request.Headers.GetCommaSeparatedValues("Accept");
+        return true;
+    }
 
-            if (!acceptHeaders.Any())
-            {
-                return true;
-            }
+    private static async Task<bool> ValidateAcceptHeaderAsync(MediaTypeHeaderValue allowedMediaTypeValue, HttpContext httpContext,
+        JsonSerializerOptions serializerOptions)
+    {
+        string[] acceptHeaders = httpContext.Request.Headers.GetCommaSeparatedValues("Accept");
+
+        if (!acceptHeaders.Any())
+        {
+            return true;
+        }
 
-            bool seenCompatibleMediaType = false;
+        bool seenCompatibleMediaType = false;
 
-            foreach (string acceptHeader in acceptHeaders)
+        foreach (string acceptHeader in acceptHeaders)
+        {
+            if (MediaTypeHeaderValue.TryParse(acceptHeader, out MediaTypeHeaderValue? headerValue))
             {
-                if (MediaTypeHeaderValue.TryParse(acceptHeader, out MediaTypeHeaderValue? headerValue))
+                headerValue.Quality = null;
+
+                if (headerValue.MediaType == "*/*" || headerValue.MediaType == "application/*")
                 {
-                    headerValue.Quality = null;
-
-                    if (headerValue.MediaType == "*/*" || headerValue.MediaType == "application/*")
-                    {
-                        seenCompatibleMediaType = true;
-                        break;
-                    }
-
-                    if (allowedMediaTypeValue.Equals(headerValue))
-                    {
-                        seenCompatibleMediaType = true;
-                        break;
-                    }
+                    seenCompatibleMediaType = true;
+                    break;
                 }
-            }
 
-            if (!seenCompatibleMediaType)
-            {
-                await FlushResponseAsync(httpContext.Response, serializerOptions, new ErrorObject(HttpStatusCode.NotAcceptable)
+                if (allowedMediaTypeValue.Equals(headerValue))
                 {
-                    Title = "The specified Accept header value does not contain any supported media types.",
-                    Detail = $"Please include '{allowedMediaTypeValue}' in the Accept header values.",
-                    Source = new ErrorSource
-                    {
-                        Header = "Accept"
-                    }
-                });
-
-                return false;
+                    seenCompatibleMediaType = true;
+                    break;
+                }
             }
-
-            return true;
         }
 
-        private static async Task FlushResponseAsync(HttpResponse httpResponse, JsonSerializerOptions serializerOptions, ErrorObject error)
+        if (!seenCompatibleMediaType)
         {
-            httpResponse.ContentType = HeaderConstants.MediaType;
-            httpResponse.StatusCode = (int)error.StatusCode;
-
-            var errorDocument = new Document
+            await FlushResponseAsync(httpContext.Response, serializerOptions, new ErrorObject(HttpStatusCode.NotAcceptable)
             {
-                Errors = error.AsList()
-            };
+                Title = "The specified Accept header value does not contain any supported media types.",
+                Detail = $"Please include '{allowedMediaTypeValue}' in the Accept header values.",
+                Source = new ErrorSource
+                {
+                    Header = "Accept"
+                }
+            });
 
-            await JsonSerializer.SerializeAsync(httpResponse.Body, errorDocument, serializerOptions);
-            await httpResponse.Body.FlushAsync();
+            return false;
         }
 
-        private static void SetupResourceRequest(JsonApiRequest request, ResourceType primaryResourceType, RouteValueDictionary routeValues,
-            HttpRequest httpRequest)
-        {
-            request.IsReadOnly = httpRequest.Method == HttpMethod.Get.Method || httpRequest.Method == HttpMethod.Head.Method;
-            request.PrimaryResourceType = primaryResourceType;
-            request.PrimaryId = GetPrimaryRequestId(routeValues);
+        return true;
+    }
 
-            string? relationshipName = GetRelationshipNameForSecondaryRequest(routeValues);
+    private static async Task FlushResponseAsync(HttpResponse httpResponse, JsonSerializerOptions serializerOptions, ErrorObject error)
+    {
+        httpResponse.ContentType = HeaderConstants.MediaType;
+        httpResponse.StatusCode = (int)error.StatusCode;
 
-            if (relationshipName != null)
-            {
-                request.Kind = IsRouteForRelationship(routeValues) ? EndpointKind.Relationship : EndpointKind.Secondary;
+        var errorDocument = new Document
+        {
+            Errors = error.AsList()
+        };
 
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await JsonSerializer.SerializeAsync(httpResponse.Body, errorDocument, serializerOptions);
+        await httpResponse.Body.FlushAsync();
+    }
 
-                request.WriteOperation =
-                    httpRequest.Method == HttpMethod.Post.Method ? WriteOperationKind.AddToRelationship :
-                    httpRequest.Method == HttpMethod.Patch.Method ? WriteOperationKind.SetRelationship :
-                    httpRequest.Method == HttpMethod.Delete.Method ? WriteOperationKind.RemoveFromRelationship : null;
+    private static void SetupResourceRequest(JsonApiRequest request, ResourceType primaryResourceType, RouteValueDictionary routeValues,
+        HttpRequest httpRequest)
+    {
+        request.IsReadOnly = httpRequest.Method == HttpMethod.Get.Method || httpRequest.Method == HttpMethod.Head.Method;
+        request.PrimaryResourceType = primaryResourceType;
+        request.PrimaryId = GetPrimaryRequestId(routeValues);
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+        string? relationshipName = GetRelationshipNameForSecondaryRequest(routeValues);
 
-                RelationshipAttribute? requestRelationship = primaryResourceType.FindRelationshipByPublicName(relationshipName);
+        if (relationshipName != null)
+        {
+            request.Kind = IsRouteForRelationship(routeValues) ? EndpointKind.Relationship : EndpointKind.Secondary;
 
-                if (requestRelationship != null)
-                {
-                    request.Relationship = requestRelationship;
-                    request.SecondaryResourceType = requestRelationship.RightType;
-                }
-            }
-            else
-            {
-                request.Kind = EndpointKind.Primary;
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+            request.WriteOperation =
+                httpRequest.Method == HttpMethod.Post.Method ? WriteOperationKind.AddToRelationship :
+                httpRequest.Method == HttpMethod.Patch.Method ? WriteOperationKind.SetRelationship :
+                httpRequest.Method == HttpMethod.Delete.Method ? WriteOperationKind.RemoveFromRelationship : null;
 
-                request.WriteOperation =
-                    httpRequest.Method == HttpMethod.Post.Method ? WriteOperationKind.CreateResource :
-                    httpRequest.Method == HttpMethod.Patch.Method ? WriteOperationKind.UpdateResource :
-                    httpRequest.Method == HttpMethod.Delete.Method ? WriteOperationKind.DeleteResource : null;
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
-            }
+            RelationshipAttribute? requestRelationship = primaryResourceType.FindRelationshipByPublicName(relationshipName);
 
-            bool isGetAll = request.PrimaryId == null && request.IsReadOnly;
-            request.IsCollection = isGetAll || request.Relationship is HasManyAttribute;
+            if (requestRelationship != null)
+            {
+                request.Relationship = requestRelationship;
+                request.SecondaryResourceType = requestRelationship.RightType;
+            }
         }
-
-        private static string? GetPrimaryRequestId(RouteValueDictionary routeValues)
+        else
         {
-            return routeValues.TryGetValue("id", out object? id) ? (string?)id : null;
-        }
+            request.Kind = EndpointKind.Primary;
 
-        private static string? GetRelationshipNameForSecondaryRequest(RouteValueDictionary routeValues)
-        {
-            return routeValues.TryGetValue("relationshipName", out object? routeValue) ? (string?)routeValue : null;
-        }
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-        private static bool IsRouteForRelationship(RouteValueDictionary routeValues)
-        {
-            string actionName = (string)routeValues["action"]!;
-            return actionName.EndsWith("Relationship", StringComparison.Ordinal);
-        }
+            request.WriteOperation =
+                httpRequest.Method == HttpMethod.Post.Method ? WriteOperationKind.CreateResource :
+                httpRequest.Method == HttpMethod.Patch.Method ? WriteOperationKind.UpdateResource :
+                httpRequest.Method == HttpMethod.Delete.Method ? WriteOperationKind.DeleteResource : null;
 
-        private static bool IsRouteForOperations(RouteValueDictionary routeValues)
-        {
-            string actionName = (string)routeValues["action"]!;
-            return actionName == "PostOperations";
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
         }
 
-        private static void SetupOperationsRequest(JsonApiRequest request, IJsonApiOptions options, HttpRequest httpRequest)
-        {
-            request.IsReadOnly = false;
-            request.Kind = EndpointKind.AtomicOperations;
-        }
+        bool isGetAll = request.PrimaryId == null && request.IsReadOnly;
+        request.IsCollection = isGetAll || request.Relationship is HasManyAttribute;
+    }
+
+    private static string? GetPrimaryRequestId(RouteValueDictionary routeValues)
+    {
+        return routeValues.TryGetValue("id", out object? id) ? (string?)id : null;
+    }
+
+    private static string? GetRelationshipNameForSecondaryRequest(RouteValueDictionary routeValues)
+    {
+        return routeValues.TryGetValue("relationshipName", out object? routeValue) ? (string?)routeValue : null;
+    }
+
+    private static bool IsRouteForRelationship(RouteValueDictionary routeValues)
+    {
+        string actionName = (string)routeValues["action"]!;
+        return actionName.EndsWith("Relationship", StringComparison.Ordinal);
+    }
+
+    private static bool IsRouteForOperations(RouteValueDictionary routeValues)
+    {
+        string actionName = (string)routeValues["action"]!;
+        return actionName == "PostOperations";
+    }
+
+    private static void SetupOperationsRequest(JsonApiRequest request, IJsonApiOptions options, HttpRequest httpRequest)
+    {
+        request.IsReadOnly = false;
+        request.Kind = EndpointKind.AtomicOperations;
     }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/JsonApiOutputFormatter.cs b/src/JsonApiDotNetCore/Middleware/JsonApiOutputFormatter.cs
index 93d531dc58..c32bb9d9f9 100644
--- a/src/JsonApiDotNetCore/Middleware/JsonApiOutputFormatter.cs
+++ b/src/JsonApiDotNetCore/Middleware/JsonApiOutputFormatter.cs
@@ -1,28 +1,26 @@
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Serialization.Response;
 using Microsoft.AspNetCore.Mvc.Formatters;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <inheritdoc />
+public sealed class JsonApiOutputFormatter : IJsonApiOutputFormatter
 {
     /// <inheritdoc />
-    public sealed class JsonApiOutputFormatter : IJsonApiOutputFormatter
+    public bool CanWriteResult(OutputFormatterCanWriteContext context)
     {
-        /// <inheritdoc />
-        public bool CanWriteResult(OutputFormatterCanWriteContext context)
-        {
-            ArgumentGuard.NotNull(context, nameof(context));
+        ArgumentGuard.NotNull(context, nameof(context));
 
-            return context.HttpContext.IsJsonApiRequest();
-        }
+        return context.HttpContext.IsJsonApiRequest();
+    }
 
-        /// <inheritdoc />
-        public async Task WriteAsync(OutputFormatterWriteContext context)
-        {
-            ArgumentGuard.NotNull(context, nameof(context));
+    /// <inheritdoc />
+    public async Task WriteAsync(OutputFormatterWriteContext context)
+    {
+        ArgumentGuard.NotNull(context, nameof(context));
 
-            var writer = context.HttpContext.RequestServices.GetRequiredService<IJsonApiWriter>();
-            await writer.WriteAsync(context.Object, context.HttpContext);
-        }
+        var writer = context.HttpContext.RequestServices.GetRequiredService<IJsonApiWriter>();
+        await writer.WriteAsync(context.Object, context.HttpContext);
     }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/JsonApiRequest.cs b/src/JsonApiDotNetCore/Middleware/JsonApiRequest.cs
index 7801d059d3..a28c01fcd6 100644
--- a/src/JsonApiDotNetCore/Middleware/JsonApiRequest.cs
+++ b/src/JsonApiDotNetCore/Middleware/JsonApiRequest.cs
@@ -2,53 +2,52 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <inheritdoc />
+[PublicAPI]
+public sealed class JsonApiRequest : IJsonApiRequest
 {
     /// <inheritdoc />
-    [PublicAPI]
-    public sealed class JsonApiRequest : IJsonApiRequest
-    {
-        /// <inheritdoc />
-        public EndpointKind Kind { get; set; }
+    public EndpointKind Kind { get; set; }
 
-        /// <inheritdoc />
-        public string? PrimaryId { get; set; }
-
-        /// <inheritdoc />
-        public ResourceType? PrimaryResourceType { get; set; }
+    /// <inheritdoc />
+    public string? PrimaryId { get; set; }
 
-        /// <inheritdoc />
-        public ResourceType? SecondaryResourceType { get; set; }
+    /// <inheritdoc />
+    public ResourceType? PrimaryResourceType { get; set; }
 
-        /// <inheritdoc />
-        public RelationshipAttribute? Relationship { get; set; }
+    /// <inheritdoc />
+    public ResourceType? SecondaryResourceType { get; set; }
 
-        /// <inheritdoc />
-        public bool IsCollection { get; set; }
+    /// <inheritdoc />
+    public RelationshipAttribute? Relationship { get; set; }
 
-        /// <inheritdoc />
-        public bool IsReadOnly { get; set; }
+    /// <inheritdoc />
+    public bool IsCollection { get; set; }
 
-        /// <inheritdoc />
-        public WriteOperationKind? WriteOperation { get; set; }
+    /// <inheritdoc />
+    public bool IsReadOnly { get; set; }
 
-        /// <inheritdoc />
-        public string? TransactionId { get; set; }
+    /// <inheritdoc />
+    public WriteOperationKind? WriteOperation { get; set; }
 
-        /// <inheritdoc />
-        public void CopyFrom(IJsonApiRequest other)
-        {
-            ArgumentGuard.NotNull(other, nameof(other));
+    /// <inheritdoc />
+    public string? TransactionId { get; set; }
 
-            Kind = other.Kind;
-            PrimaryId = other.PrimaryId;
-            PrimaryResourceType = other.PrimaryResourceType;
-            SecondaryResourceType = other.SecondaryResourceType;
-            Relationship = other.Relationship;
-            IsCollection = other.IsCollection;
-            IsReadOnly = other.IsReadOnly;
-            WriteOperation = other.WriteOperation;
-            TransactionId = other.TransactionId;
-        }
+    /// <inheritdoc />
+    public void CopyFrom(IJsonApiRequest other)
+    {
+        ArgumentGuard.NotNull(other, nameof(other));
+
+        Kind = other.Kind;
+        PrimaryId = other.PrimaryId;
+        PrimaryResourceType = other.PrimaryResourceType;
+        SecondaryResourceType = other.SecondaryResourceType;
+        Relationship = other.Relationship;
+        IsCollection = other.IsCollection;
+        IsReadOnly = other.IsReadOnly;
+        WriteOperation = other.WriteOperation;
+        TransactionId = other.TransactionId;
     }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/JsonApiRoutingConvention.cs b/src/JsonApiDotNetCore/Middleware/JsonApiRoutingConvention.cs
index d304fc9d1c..fe95d93446 100644
--- a/src/JsonApiDotNetCore/Middleware/JsonApiRoutingConvention.cs
+++ b/src/JsonApiDotNetCore/Middleware/JsonApiRoutingConvention.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
@@ -11,180 +8,181 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ApplicationModels;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <summary>
+/// The default routing convention registers the name of the resource as the route using the serializer naming convention. The default for this is a
+/// camel case formatter. If the controller directly inherits from <see cref="CoreJsonApiController" /> and there is no resource directly associated, it
+/// uses the name of the controller instead of the name of the type.
+/// </summary>
+/// <example><![CDATA[
+/// public class SomeResourceController : JsonApiController<SomeResource> { } // => /someResources/relationship/relatedResource
+/// 
+/// public class RandomNameController<SomeResource> : JsonApiController<SomeResource> { } // => /someResources/relationship/relatedResource
+/// 
+/// // when using kebab-case naming convention:
+/// public class SomeResourceController<SomeResource> : JsonApiController<SomeResource> { } // => /some-resources/relationship/related-resource
+/// 
+/// public class SomeVeryCustomController<SomeResource> : CoreJsonApiController { } // => /someVeryCustoms/relationship/relatedResource
+/// ]]></example>
+[PublicAPI]
+public sealed class JsonApiRoutingConvention : IJsonApiRoutingConvention
 {
-    /// <summary>
-    /// The default routing convention registers the name of the resource as the route using the serializer naming convention. The default for this is a
-    /// camel case formatter. If the controller directly inherits from <see cref="CoreJsonApiController" /> and there is no resource directly associated, it
-    /// uses the name of the controller instead of the name of the type.
-    /// </summary>
-    /// <example><![CDATA[
-    /// public class SomeResourceController : JsonApiController<SomeResource> { } // => /someResources/relationship/relatedResource
-    /// 
-    /// public class RandomNameController<SomeResource> : JsonApiController<SomeResource> { } // => /someResources/relationship/relatedResource
-    /// 
-    /// // when using kebab-case naming convention:
-    /// public class SomeResourceController<SomeResource> : JsonApiController<SomeResource> { } // => /some-resources/relationship/related-resource
-    /// 
-    /// public class SomeVeryCustomController<SomeResource> : CoreJsonApiController { } // => /someVeryCustoms/relationship/relatedResource
-    /// ]]></example>
-    [PublicAPI]
-    public sealed class JsonApiRoutingConvention : IJsonApiRoutingConvention
+    private readonly IJsonApiOptions _options;
+    private readonly IResourceGraph _resourceGraph;
+    private readonly Dictionary<string, string> _registeredControllerNameByTemplate = new();
+    private readonly Dictionary<Type, ResourceType> _resourceTypePerControllerTypeMap = new();
+    private readonly Dictionary<ResourceType, ControllerModel> _controllerPerResourceTypeMap = new();
+
+    public JsonApiRoutingConvention(IJsonApiOptions options, IResourceGraph resourceGraph)
     {
-        private readonly IJsonApiOptions _options;
-        private readonly IResourceGraph _resourceGraph;
-        private readonly Dictionary<string, string> _registeredControllerNameByTemplate = new();
-        private readonly Dictionary<Type, ResourceType> _resourceTypePerControllerTypeMap = new();
-        private readonly Dictionary<ResourceType, ControllerModel> _controllerPerResourceTypeMap = new();
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
 
-        public JsonApiRoutingConvention(IJsonApiOptions options, IResourceGraph resourceGraph)
-        {
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        _options = options;
+        _resourceGraph = resourceGraph;
+    }
 
-            _options = options;
-            _resourceGraph = resourceGraph;
-        }
+    /// <inheritdoc />
+    public ResourceType? GetResourceTypeForController(Type? controllerType)
+    {
+        return controllerType != null && _resourceTypePerControllerTypeMap.TryGetValue(controllerType, out ResourceType? resourceType) ? resourceType : null;
+    }
 
-        /// <inheritdoc />
-        public ResourceType? GetResourceTypeForController(Type? controllerType)
-        {
-            return controllerType != null && _resourceTypePerControllerTypeMap.TryGetValue(controllerType, out ResourceType? resourceType)
-                ? resourceType
-                : null;
-        }
+    /// <inheritdoc />
+    public string? GetControllerNameForResourceType(ResourceType? resourceType)
+    {
+        return resourceType != null && _controllerPerResourceTypeMap.TryGetValue(resourceType, out ControllerModel? controllerModel)
+            ? controllerModel.ControllerName
+            : null;
+    }
 
-        /// <inheritdoc />
-        public string? GetControllerNameForResourceType(ResourceType? resourceType)
-        {
-            return resourceType != null && _controllerPerResourceTypeMap.TryGetValue(resourceType, out ControllerModel? controllerModel)
-                ? controllerModel.ControllerName
-                : null;
-        }
+    /// <inheritdoc />
+    public void Apply(ApplicationModel application)
+    {
+        ArgumentGuard.NotNull(application, nameof(application));
 
-        /// <inheritdoc />
-        public void Apply(ApplicationModel application)
+        foreach (ControllerModel controller in application.Controllers)
         {
-            ArgumentGuard.NotNull(application, nameof(application));
+            bool isOperationsController = IsOperationsController(controller.ControllerType);
 
-            foreach (ControllerModel controller in application.Controllers)
+            if (!isOperationsController)
             {
-                bool isOperationsController = IsOperationsController(controller.ControllerType);
+                Type? resourceClrType = ExtractResourceClrTypeFromController(controller.ControllerType);
 
-                if (!isOperationsController)
+                if (resourceClrType != null)
                 {
-                    Type? resourceClrType = ExtractResourceClrTypeFromController(controller.ControllerType);
+                    ResourceType? resourceType = _resourceGraph.FindResourceType(resourceClrType);
 
-                    if (resourceClrType != null)
+                    if (resourceType != null)
                     {
-                        ResourceType? resourceType = _resourceGraph.FindResourceType(resourceClrType);
-
-                        if (resourceType != null)
-                        {
-                            _resourceTypePerControllerTypeMap.Add(controller.ControllerType, resourceType);
-                            _controllerPerResourceTypeMap.Add(resourceType, controller);
-                        }
-                        else
+                        if (_controllerPerResourceTypeMap.ContainsKey(resourceType))
                         {
-                            throw new InvalidConfigurationException($"Controller '{controller.ControllerType}' depends on " +
-                                $"resource type '{resourceClrType}', which does not exist in the resource graph.");
+                            throw new InvalidConfigurationException($"Multiple controllers found for resource type '{resourceType}'.");
                         }
+
+                        _resourceTypePerControllerTypeMap.Add(controller.ControllerType, resourceType);
+                        _controllerPerResourceTypeMap.Add(resourceType, controller);
+                    }
+                    else
+                    {
+                        throw new InvalidConfigurationException($"Controller '{controller.ControllerType}' depends on " +
+                            $"resource type '{resourceClrType}', which does not exist in the resource graph.");
                     }
                 }
+            }
 
-                if (!IsRoutingConventionEnabled(controller))
-                {
-                    continue;
-                }
+            if (!IsRoutingConventionEnabled(controller))
+            {
+                continue;
+            }
 
-                string template = TemplateFromResource(controller) ?? TemplateFromController(controller);
+            string template = TemplateFromResource(controller) ?? TemplateFromController(controller);
 
-                if (_registeredControllerNameByTemplate.ContainsKey(template))
-                {
-                    throw new InvalidConfigurationException(
-                        $"Cannot register '{controller.ControllerType.FullName}' for template '{template}' because '{_registeredControllerNameByTemplate[template]}' was already registered for this template.");
-                }
+            if (_registeredControllerNameByTemplate.ContainsKey(template))
+            {
+                throw new InvalidConfigurationException(
+                    $"Cannot register '{controller.ControllerType.FullName}' for template '{template}' because '{_registeredControllerNameByTemplate[template]}' was already registered for this template.");
+            }
 
-                _registeredControllerNameByTemplate.Add(template, controller.ControllerType.FullName!);
+            _registeredControllerNameByTemplate.Add(template, controller.ControllerType.FullName!);
 
-                controller.Selectors[0].AttributeRouteModel = new AttributeRouteModel
-                {
-                    Template = template
-                };
-            }
+            controller.Selectors[0].AttributeRouteModel = new AttributeRouteModel
+            {
+                Template = template
+            };
         }
+    }
 
-        private bool IsRoutingConventionEnabled(ControllerModel controller)
+    private bool IsRoutingConventionEnabled(ControllerModel controller)
+    {
+        return controller.ControllerType.IsSubclassOf(typeof(CoreJsonApiController)) &&
+            controller.ControllerType.GetCustomAttribute<DisableRoutingConventionAttribute>(true) == null;
+    }
+
+    /// <summary>
+    /// Derives a template from the resource type, and checks if this template was already registered.
+    /// </summary>
+    private string? TemplateFromResource(ControllerModel model)
+    {
+        if (_resourceTypePerControllerTypeMap.TryGetValue(model.ControllerType, out ResourceType? resourceType))
         {
-            return controller.ControllerType.IsSubclassOf(typeof(CoreJsonApiController)) &&
-                controller.ControllerType.GetCustomAttribute<DisableRoutingConventionAttribute>() == null;
+            return $"{_options.Namespace}/{resourceType.PublicName}";
         }
 
-        /// <summary>
-        /// Derives a template from the resource type, and checks if this template was already registered.
-        /// </summary>
-        private string? TemplateFromResource(ControllerModel model)
-        {
-            if (_resourceTypePerControllerTypeMap.TryGetValue(model.ControllerType, out ResourceType? resourceType))
-            {
-                return $"{_options.Namespace}/{resourceType.PublicName}";
-            }
+        return null;
+    }
 
-            return null;
-        }
+    /// <summary>
+    /// Derives a template from the controller name, and checks if this template was already registered.
+    /// </summary>
+    private string TemplateFromController(ControllerModel model)
+    {
+        string controllerName = _options.SerializerOptions.PropertyNamingPolicy == null
+            ? model.ControllerName
+            : _options.SerializerOptions.PropertyNamingPolicy.ConvertName(model.ControllerName);
 
-        /// <summary>
-        /// Derives a template from the controller name, and checks if this template was already registered.
-        /// </summary>
-        private string TemplateFromController(ControllerModel model)
-        {
-            string controllerName = _options.SerializerOptions.PropertyNamingPolicy == null
-                ? model.ControllerName
-                : _options.SerializerOptions.PropertyNamingPolicy.ConvertName(model.ControllerName);
+        return $"{_options.Namespace}/{controllerName}";
+    }
 
-            return $"{_options.Namespace}/{controllerName}";
-        }
+    /// <summary>
+    /// Determines the resource type associated to a controller by inspecting generic type arguments in its inheritance tree.
+    /// </summary>
+    private Type? ExtractResourceClrTypeFromController(Type controllerType)
+    {
+        Type aspNetControllerType = typeof(ControllerBase);
+        Type coreControllerType = typeof(CoreJsonApiController);
+        Type baseControllerUnboundType = typeof(BaseJsonApiController<,>);
+        Type? currentType = controllerType;
 
-        /// <summary>
-        /// Determines the resource associated to a controller by inspecting generic arguments in its inheritance tree.
-        /// </summary>
-        private Type? ExtractResourceClrTypeFromController(Type type)
+        while (!currentType.IsGenericType || currentType.GetGenericTypeDefinition() != baseControllerUnboundType)
         {
-            Type aspNetControllerType = typeof(ControllerBase);
-            Type coreControllerType = typeof(CoreJsonApiController);
-            Type baseControllerType = typeof(BaseJsonApiController<,>);
-            Type? currentType = type;
+            Type? nextBaseType = currentType.BaseType;
 
-            while (!currentType.IsGenericType || currentType.GetGenericTypeDefinition() != baseControllerType)
+            if ((nextBaseType == aspNetControllerType || nextBaseType == coreControllerType) && currentType.IsGenericType)
             {
-                Type? nextBaseType = currentType.BaseType;
+                Type? resourceClrType = currentType.GetGenericArguments().FirstOrDefault(typeArgument => typeArgument.IsOrImplementsInterface<IIdentifiable>());
 
-                if ((nextBaseType == aspNetControllerType || nextBaseType == coreControllerType) && currentType.IsGenericType)
+                if (resourceClrType != null)
                 {
-                    Type? resourceClrType = currentType.GetGenericArguments()
-                        .FirstOrDefault(typeArgument => typeArgument.IsOrImplementsInterface<IIdentifiable>());
-
-                    if (resourceClrType != null)
-                    {
-                        return resourceClrType;
-                    }
+                    return resourceClrType;
                 }
+            }
 
-                currentType = nextBaseType;
+            currentType = nextBaseType;
 
-                if (currentType == null)
-                {
-                    break;
-                }
+            if (currentType == null)
+            {
+                break;
             }
-
-            return currentType?.GetGenericArguments().First();
         }
 
-        private static bool IsOperationsController(Type type)
-        {
-            Type baseControllerType = typeof(BaseJsonApiOperationsController);
-            return baseControllerType.IsAssignableFrom(type);
-        }
+        return currentType?.GetGenericArguments().First();
+    }
+
+    private static bool IsOperationsController(Type type)
+    {
+        Type baseControllerType = typeof(BaseJsonApiOperationsController);
+        return baseControllerType.IsAssignableFrom(type);
     }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/TraceLogWriter.cs b/src/JsonApiDotNetCore/Middleware/TraceLogWriter.cs
index 03e38d827d..e00bbd50a8 100644
--- a/src/JsonApiDotNetCore/Middleware/TraceLogWriter.cs
+++ b/src/JsonApiDotNetCore/Middleware/TraceLogWriter.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Text;
@@ -7,149 +6,148 @@
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+internal abstract class TraceLogWriter
 {
-    internal abstract class TraceLogWriter
+    protected static readonly JsonSerializerOptions SerializerOptions = new()
     {
-        protected static readonly JsonSerializerOptions SerializerOptions = new()
-        {
-            WriteIndented = true,
-            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
-            ReferenceHandler = ReferenceHandler.Preserve
-        };
-    }
+        WriteIndented = true,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
+        ReferenceHandler = ReferenceHandler.Preserve
+    };
+}
 
-    internal sealed class TraceLogWriter<T> : TraceLogWriter
-    {
-        private readonly ILogger _logger;
+internal sealed class TraceLogWriter<T> : TraceLogWriter
+{
+    private readonly ILogger _logger;
 
-        private bool IsEnabled => _logger.IsEnabled(LogLevel.Trace);
+    private bool IsEnabled => _logger.IsEnabled(LogLevel.Trace);
 
-        public TraceLogWriter(ILoggerFactory loggerFactory)
-        {
-            _logger = loggerFactory.CreateLogger(typeof(T));
-        }
+    public TraceLogWriter(ILoggerFactory loggerFactory)
+    {
+        _logger = loggerFactory.CreateLogger(typeof(T));
+    }
 
-        public void LogMethodStart(object? parameters = null, [CallerMemberName] string memberName = "")
+    public void LogMethodStart(object? parameters = null, [CallerMemberName] string memberName = "")
+    {
+        if (IsEnabled)
         {
-            if (IsEnabled)
-            {
-                string message = FormatMessage(memberName, parameters);
-                WriteMessageToLog(message);
-            }
+            string message = FormatMessage(memberName, parameters);
+            WriteMessageToLog(message);
         }
+    }
 
-        public void LogMessage(Func<string> messageFactory)
+    public void LogMessage(Func<string> messageFactory)
+    {
+        if (IsEnabled)
         {
-            if (IsEnabled)
-            {
-                string message = messageFactory();
-                WriteMessageToLog(message);
-            }
+            string message = messageFactory();
+            WriteMessageToLog(message);
         }
+    }
 
-        private static string FormatMessage(string memberName, object? parameters)
-        {
-            var builder = new StringBuilder();
+    private static string FormatMessage(string memberName, object? parameters)
+    {
+        var builder = new StringBuilder();
 
-            builder.Append("Entering ");
-            builder.Append(memberName);
-            builder.Append('(');
-            WriteProperties(builder, parameters);
-            builder.Append(')');
+        builder.Append("Entering ");
+        builder.Append(memberName);
+        builder.Append('(');
+        WriteProperties(builder, parameters);
+        builder.Append(')');
 
-            return builder.ToString();
-        }
+        return builder.ToString();
+    }
 
-        private static void WriteProperties(StringBuilder builder, object? propertyContainer)
+    private static void WriteProperties(StringBuilder builder, object? propertyContainer)
+    {
+        if (propertyContainer != null)
         {
-            if (propertyContainer != null)
-            {
-                bool isFirstMember = true;
+            bool isFirstMember = true;
 
-                foreach (PropertyInfo property in propertyContainer.GetType().GetProperties())
+            foreach (PropertyInfo property in propertyContainer.GetType().GetProperties())
+            {
+                if (isFirstMember)
                 {
-                    if (isFirstMember)
-                    {
-                        isFirstMember = false;
-                    }
-                    else
-                    {
-                        builder.Append(", ");
-                    }
-
-                    WriteProperty(builder, property, propertyContainer);
+                    isFirstMember = false;
                 }
+                else
+                {
+                    builder.Append(", ");
+                }
+
+                WriteProperty(builder, property, propertyContainer);
             }
         }
+    }
 
-        private static void WriteProperty(StringBuilder builder, PropertyInfo property, object instance)
-        {
-            builder.Append(property.Name);
-            builder.Append(": ");
+    private static void WriteProperty(StringBuilder builder, PropertyInfo property, object instance)
+    {
+        builder.Append(property.Name);
+        builder.Append(": ");
 
-            object? value = property.GetValue(instance);
+        object? value = property.GetValue(instance);
 
-            if (value == null)
-            {
-                builder.Append("null");
-            }
-            else if (value is string stringValue)
-            {
-                builder.Append('"');
-                builder.Append(stringValue);
-                builder.Append('"');
-            }
-            else
-            {
-                WriteObject(builder, value);
-            }
+        if (value == null)
+        {
+            builder.Append("null");
         }
-
-        private static void WriteObject(StringBuilder builder, object value)
+        else if (value is string stringValue)
         {
-            if (HasToStringOverload(value.GetType()))
-            {
-                builder.Append(value);
-            }
-            else
-            {
-                string text = SerializeObject(value);
-                builder.Append(text);
-            }
+            builder.Append('"');
+            builder.Append(stringValue);
+            builder.Append('"');
         }
-
-        private static bool HasToStringOverload(Type? type)
+        else
         {
-            if (type != null)
-            {
-                MethodInfo? toStringMethod = type.GetMethod("ToString", Array.Empty<Type>());
-
-                if (toStringMethod != null && toStringMethod.DeclaringType != typeof(object))
-                {
-                    return true;
-                }
-            }
+            WriteObject(builder, value);
+        }
+    }
 
-            return false;
+    private static void WriteObject(StringBuilder builder, object value)
+    {
+        if (HasToStringOverload(value.GetType()))
+        {
+            builder.Append(value);
         }
+        else
+        {
+            string text = SerializeObject(value);
+            builder.Append(text);
+        }
+    }
 
-        private static string SerializeObject(object value)
+    private static bool HasToStringOverload(Type? type)
+    {
+        if (type != null)
         {
-            try
-            {
-                return JsonSerializer.Serialize(value, SerializerOptions);
-            }
-            catch (JsonException)
+            MethodInfo? toStringMethod = type.GetMethod("ToString", Array.Empty<Type>());
+
+            if (toStringMethod != null && toStringMethod.DeclaringType != typeof(object))
             {
-                // Never crash as a result of logging, this is best-effort only.
-                return "object";
+                return true;
             }
         }
 
-        private void WriteMessageToLog(string message)
+        return false;
+    }
+
+    private static string SerializeObject(object value)
+    {
+        try
+        {
+            return JsonSerializer.Serialize(value, SerializerOptions);
+        }
+        catch (JsonException)
         {
-            _logger.LogTrace(message);
+            // Never crash as a result of logging, this is best-effort only.
+            return "object";
         }
     }
+
+    private void WriteMessageToLog(string message)
+    {
+        _logger.LogTrace(message);
+    }
 }
diff --git a/src/JsonApiDotNetCore/Middleware/WriteOperationKind.cs b/src/JsonApiDotNetCore/Middleware/WriteOperationKind.cs
index aeec6c1cab..b5c553d533 100644
--- a/src/JsonApiDotNetCore/Middleware/WriteOperationKind.cs
+++ b/src/JsonApiDotNetCore/Middleware/WriteOperationKind.cs
@@ -1,40 +1,39 @@
-namespace JsonApiDotNetCore.Middleware
+namespace JsonApiDotNetCore.Middleware;
+
+/// <summary>
+/// Lists the functional write operations, originating from a POST/PATCH/DELETE request against a single resource/relationship or a POST request against
+/// a list of operations.
+/// </summary>
+public enum WriteOperationKind
 {
     /// <summary>
-    /// Lists the functional write operations, originating from a POST/PATCH/DELETE request against a single resource/relationship or a POST request against
-    /// a list of operations.
+    /// Create a new resource with attributes, relationships or both.
     /// </summary>
-    public enum WriteOperationKind
-    {
-        /// <summary>
-        /// Create a new resource with attributes, relationships or both.
-        /// </summary>
-        CreateResource,
+    CreateResource,
 
-        /// <summary>
-        /// Update the attributes and/or relationships of an existing resource. Only the values of sent attributes are replaced. And only the values of sent
-        /// relationships are replaced.
-        /// </summary>
-        UpdateResource,
+    /// <summary>
+    /// Update the attributes and/or relationships of an existing resource. Only the values of sent attributes are replaced. And only the values of sent
+    /// relationships are replaced.
+    /// </summary>
+    UpdateResource,
 
-        /// <summary>
-        /// Delete an existing resource.
-        /// </summary>
-        DeleteResource,
+    /// <summary>
+    /// Delete an existing resource.
+    /// </summary>
+    DeleteResource,
 
-        /// <summary>
-        /// Perform a complete replacement of a relationship on an existing resource.
-        /// </summary>
-        SetRelationship,
+    /// <summary>
+    /// Perform a complete replacement of a relationship on an existing resource.
+    /// </summary>
+    SetRelationship,
 
-        /// <summary>
-        /// Add resources to a to-many relationship.
-        /// </summary>
-        AddToRelationship,
+    /// <summary>
+    /// Add resources to a to-many relationship.
+    /// </summary>
+    AddToRelationship,
 
-        /// <summary>
-        /// Remove resources from a to-many relationship.
-        /// </summary>
-        RemoveFromRelationship
-    }
+    /// <summary>
+    /// Remove resources from a to-many relationship.
+    /// </summary>
+    RemoveFromRelationship
 }
diff --git a/src/JsonApiDotNetCore/ObjectExtensions.cs b/src/JsonApiDotNetCore/ObjectExtensions.cs
deleted file mode 100644
index e0f4ce6af7..0000000000
--- a/src/JsonApiDotNetCore/ObjectExtensions.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-using System.Collections.Generic;
-
-#pragma warning disable AV1130 // Return type in method signature should be a collection interface instead of a concrete type
-
-namespace JsonApiDotNetCore
-{
-    internal static class ObjectExtensions
-    {
-        public static IEnumerable<T> AsEnumerable<T>(this T element)
-        {
-            yield return element;
-        }
-
-        public static T[] AsArray<T>(this T element)
-        {
-            return new[]
-            {
-                element
-            };
-        }
-
-        public static List<T> AsList<T>(this T element)
-        {
-            return new List<T>
-            {
-                element
-            };
-        }
-
-        public static HashSet<T> AsHashSet<T>(this T element)
-        {
-            return new HashSet<T>
-            {
-                element
-            };
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Queries/ExpressionInScope.cs b/src/JsonApiDotNetCore/Queries/ExpressionInScope.cs
index 5b73deee0a..37d40f127b 100644
--- a/src/JsonApiDotNetCore/Queries/ExpressionInScope.cs
+++ b/src/JsonApiDotNetCore/Queries/ExpressionInScope.cs
@@ -2,28 +2,27 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
 
-namespace JsonApiDotNetCore.Queries
+namespace JsonApiDotNetCore.Queries;
+
+/// <summary>
+/// Represents an expression coming from query string. The scope determines at which depth in the <see cref="IResourceGraph" /> to apply its expression.
+/// </summary>
+[PublicAPI]
+public class ExpressionInScope
 {
-    /// <summary>
-    /// Represents an expression coming from query string. The scope determines at which depth in the <see cref="IResourceGraph" /> to apply its expression.
-    /// </summary>
-    [PublicAPI]
-    public class ExpressionInScope
-    {
-        public ResourceFieldChainExpression? Scope { get; }
-        public QueryExpression Expression { get; }
+    public ResourceFieldChainExpression? Scope { get; }
+    public QueryExpression Expression { get; }
 
-        public ExpressionInScope(ResourceFieldChainExpression? scope, QueryExpression expression)
-        {
-            ArgumentGuard.NotNull(expression, nameof(expression));
+    public ExpressionInScope(ResourceFieldChainExpression? scope, QueryExpression expression)
+    {
+        ArgumentGuard.NotNull(expression, nameof(expression));
 
-            Scope = scope;
-            Expression = expression;
-        }
+        Scope = scope;
+        Expression = expression;
+    }
 
-        public override string ToString()
-        {
-            return $"{Scope} => {Expression}";
-        }
+    public override string ToString()
+    {
+        return $"{Scope} => {Expression}";
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/AnyExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/AnyExpression.cs
index 0682cc64a0..be8a22abee 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/AnyExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/AnyExpression.cs
@@ -1,82 +1,79 @@
-using System;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Text;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries.Internal.Parsing;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents the "any" filter function, resulting from text such as: any(name,'Jack','Joe')
+/// </summary>
+[PublicAPI]
+public class AnyExpression : FilterExpression
 {
-    /// <summary>
-    /// Represents the "any" filter function, resulting from text such as: any(name,'Jack','Joe')
-    /// </summary>
-    [PublicAPI]
-    public class AnyExpression : FilterExpression
+    public ResourceFieldChainExpression TargetAttribute { get; }
+    public IImmutableSet<LiteralConstantExpression> Constants { get; }
+
+    public AnyExpression(ResourceFieldChainExpression targetAttribute, IImmutableSet<LiteralConstantExpression> constants)
     {
-        public ResourceFieldChainExpression TargetAttribute { get; }
-        public IImmutableSet<LiteralConstantExpression> Constants { get; }
+        ArgumentGuard.NotNull(targetAttribute, nameof(targetAttribute));
+        ArgumentGuard.NotNull(constants, nameof(constants));
 
-        public AnyExpression(ResourceFieldChainExpression targetAttribute, IImmutableSet<LiteralConstantExpression> constants)
+        if (constants.Count < 2)
         {
-            ArgumentGuard.NotNull(targetAttribute, nameof(targetAttribute));
-            ArgumentGuard.NotNull(constants, nameof(constants));
+            throw new ArgumentException("At least two constants are required.", nameof(constants));
+        }
 
-            if (constants.Count < 2)
-            {
-                throw new ArgumentException("At least two constants are required.", nameof(constants));
-            }
+        TargetAttribute = targetAttribute;
+        Constants = constants;
+    }
 
-            TargetAttribute = targetAttribute;
-            Constants = constants;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitAny(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitAny(this, argument);
-        }
+    public override string ToString()
+    {
+        var builder = new StringBuilder();
 
-        public override string ToString()
-        {
-            var builder = new StringBuilder();
+        builder.Append(Keywords.Any);
+        builder.Append('(');
+        builder.Append(TargetAttribute);
+        builder.Append(',');
+        builder.Append(string.Join(",", Constants.Select(constant => constant.ToString()).OrderBy(value => value)));
+        builder.Append(')');
 
-            builder.Append(Keywords.Any);
-            builder.Append('(');
-            builder.Append(TargetAttribute);
-            builder.Append(',');
-            builder.Append(string.Join(",", Constants.Select(constant => constant.ToString()).OrderBy(value => value)));
-            builder.Append(')');
+        return builder.ToString();
+    }
 
-            return builder.ToString();
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
+            return false;
+        }
 
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+        var other = (AnyExpression)obj;
 
-            var other = (AnyExpression)obj;
+        return TargetAttribute.Equals(other.TargetAttribute) && Constants.SetEquals(other.Constants);
+    }
 
-            return TargetAttribute.Equals(other.TargetAttribute) && Constants.SetEquals(other.Constants);
-        }
+    public override int GetHashCode()
+    {
+        var hashCode = new HashCode();
+        hashCode.Add(TargetAttribute);
 
-        public override int GetHashCode()
+        foreach (LiteralConstantExpression constant in Constants)
         {
-            var hashCode = new HashCode();
-            hashCode.Add(TargetAttribute);
-
-            foreach (LiteralConstantExpression constant in Constants)
-            {
-                hashCode.Add(constant);
-            }
-
-            return hashCode.ToHashCode();
+            hashCode.Add(constant);
         }
+
+        return hashCode.ToHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/ComparisonExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/ComparisonExpression.cs
index 77d0281063..4c858bd743 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/ComparisonExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/ComparisonExpression.cs
@@ -1,59 +1,57 @@
-using System;
 using Humanizer;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents a comparison filter function, resulting from text such as: equals(name,'Joe')
+/// </summary>
+[PublicAPI]
+public class ComparisonExpression : FilterExpression
 {
-    /// <summary>
-    /// Represents a comparison filter function, resulting from text such as: equals(name,'Joe')
-    /// </summary>
-    [PublicAPI]
-    public class ComparisonExpression : FilterExpression
+    public ComparisonOperator Operator { get; }
+    public QueryExpression Left { get; }
+    public QueryExpression Right { get; }
+
+    public ComparisonExpression(ComparisonOperator @operator, QueryExpression left, QueryExpression right)
     {
-        public ComparisonOperator Operator { get; }
-        public QueryExpression Left { get; }
-        public QueryExpression Right { get; }
+        ArgumentGuard.NotNull(left, nameof(left));
+        ArgumentGuard.NotNull(right, nameof(right));
 
-        public ComparisonExpression(ComparisonOperator @operator, QueryExpression left, QueryExpression right)
-        {
-            ArgumentGuard.NotNull(left, nameof(left));
-            ArgumentGuard.NotNull(right, nameof(right));
+        Operator = @operator;
+        Left = left;
+        Right = right;
+    }
 
-            Operator = @operator;
-            Left = left;
-            Right = right;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitComparison(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitComparison(this, argument);
-        }
+    public override string ToString()
+    {
+        return $"{Operator.ToString().Camelize()}({Left},{Right})";
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            return $"{Operator.ToString().Camelize()}({Left},{Right})";
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var other = (ComparisonExpression)obj;
+        var other = (ComparisonExpression)obj;
 
-            return Operator == other.Operator && Left.Equals(other.Left) && Right.Equals(other.Right);
-        }
+        return Operator == other.Operator && Left.Equals(other.Left) && Right.Equals(other.Right);
+    }
 
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(Operator, Left, Right);
-        }
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(Operator, Left, Right);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/ComparisonOperator.cs b/src/JsonApiDotNetCore/Queries/Expressions/ComparisonOperator.cs
index fbe12f1b0c..ca06d02254 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/ComparisonOperator.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/ComparisonOperator.cs
@@ -1,11 +1,10 @@
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+public enum ComparisonOperator
 {
-    public enum ComparisonOperator
-    {
-        Equals,
-        GreaterThan,
-        GreaterOrEqual,
-        LessThan,
-        LessOrEqual
-    }
+    Equals,
+    GreaterThan,
+    GreaterOrEqual,
+    LessThan,
+    LessOrEqual
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/CountExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/CountExpression.cs
index e60867c63d..1bab96eaab 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/CountExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/CountExpression.cs
@@ -1,53 +1,52 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries.Internal.Parsing;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents the "count" function, resulting from text such as: count(articles)
+/// </summary>
+[PublicAPI]
+public class CountExpression : FunctionExpression
 {
-    /// <summary>
-    /// Represents the "count" function, resulting from text such as: count(articles)
-    /// </summary>
-    [PublicAPI]
-    public class CountExpression : FunctionExpression
+    public ResourceFieldChainExpression TargetCollection { get; }
+
+    public CountExpression(ResourceFieldChainExpression targetCollection)
     {
-        public ResourceFieldChainExpression TargetCollection { get; }
+        ArgumentGuard.NotNull(targetCollection, nameof(targetCollection));
 
-        public CountExpression(ResourceFieldChainExpression targetCollection)
-        {
-            ArgumentGuard.NotNull(targetCollection, nameof(targetCollection));
+        TargetCollection = targetCollection;
+    }
 
-            TargetCollection = targetCollection;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitCount(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitCount(this, argument);
-        }
+    public override string ToString()
+    {
+        return $"{Keywords.Count}({TargetCollection})";
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            return $"{Keywords.Count}({TargetCollection})";
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var other = (CountExpression)obj;
+        var other = (CountExpression)obj;
 
-            return TargetCollection.Equals(other.TargetCollection);
-        }
+        return TargetCollection.Equals(other.TargetCollection);
+    }
 
-        public override int GetHashCode()
-        {
-            return TargetCollection.GetHashCode();
-        }
+    public override int GetHashCode()
+    {
+        return TargetCollection.GetHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/FilterExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/FilterExpression.cs
index 1ed0ed1de0..513fbf9ac8 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/FilterExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/FilterExpression.cs
@@ -1,9 +1,8 @@
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents the base type for filter functions that return a boolean value.
+/// </summary>
+public abstract class FilterExpression : FunctionExpression
 {
-    /// <summary>
-    /// Represents the base type for filter functions that return a boolean value.
-    /// </summary>
-    public abstract class FilterExpression : FunctionExpression
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/FunctionExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/FunctionExpression.cs
index 6d7990a16a..2e0b76b255 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/FunctionExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/FunctionExpression.cs
@@ -1,9 +1,8 @@
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents the base type for functions that return a value.
+/// </summary>
+public abstract class FunctionExpression : QueryExpression
 {
-    /// <summary>
-    /// Represents the base type for functions that return a value.
-    /// </summary>
-    public abstract class FunctionExpression : QueryExpression
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/HasExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/HasExpression.cs
index 7e38acd447..d1376a3091 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/HasExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/HasExpression.cs
@@ -1,70 +1,68 @@
-using System;
 using System.Text;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries.Internal.Parsing;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents the "has" filter function, resulting from text such as: has(articles) or has(articles,equals(isHidden,'false'))
+/// </summary>
+[PublicAPI]
+public class HasExpression : FilterExpression
 {
-    /// <summary>
-    /// Represents the "has" filter function, resulting from text such as: has(articles) or has(articles,equals(isHidden,'false'))
-    /// </summary>
-    [PublicAPI]
-    public class HasExpression : FilterExpression
+    public ResourceFieldChainExpression TargetCollection { get; }
+    public FilterExpression? Filter { get; }
+
+    public HasExpression(ResourceFieldChainExpression targetCollection, FilterExpression? filter)
     {
-        public ResourceFieldChainExpression TargetCollection { get; }
-        public FilterExpression? Filter { get; }
+        ArgumentGuard.NotNull(targetCollection, nameof(targetCollection));
 
-        public HasExpression(ResourceFieldChainExpression targetCollection, FilterExpression? filter)
-        {
-            ArgumentGuard.NotNull(targetCollection, nameof(targetCollection));
+        TargetCollection = targetCollection;
+        Filter = filter;
+    }
 
-            TargetCollection = targetCollection;
-            Filter = filter;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitHas(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitHas(this, argument);
-        }
+    public override string ToString()
+    {
+        var builder = new StringBuilder();
+        builder.Append(Keywords.Has);
+        builder.Append('(');
+        builder.Append(TargetCollection);
 
-        public override string ToString()
+        if (Filter != null)
         {
-            var builder = new StringBuilder();
-            builder.Append(Keywords.Has);
-            builder.Append('(');
-            builder.Append(TargetCollection);
+            builder.Append(',');
+            builder.Append(Filter);
+        }
 
-            if (Filter != null)
-            {
-                builder.Append(',');
-                builder.Append(Filter);
-            }
+        builder.Append(')');
 
-            builder.Append(')');
+        return builder.ToString();
+    }
 
-            return builder.ToString();
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var other = (HasExpression)obj;
+        var other = (HasExpression)obj;
 
-            return TargetCollection.Equals(other.TargetCollection) && Equals(Filter, other.Filter);
-        }
+        return TargetCollection.Equals(other.TargetCollection) && Equals(Filter, other.Filter);
+    }
 
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(TargetCollection, Filter);
-        }
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(TargetCollection, Filter);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/IdentifierExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/IdentifierExpression.cs
index 974c4892de..133af83ad4 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/IdentifierExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/IdentifierExpression.cs
@@ -1,9 +1,8 @@
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents the base type for an identifier, such as a field/relationship name, a constant between quotes or <c>null</c>.
+/// </summary>
+public abstract class IdentifierExpression : QueryExpression
 {
-    /// <summary>
-    /// Represents the base type for an identifier, such as a field/relationship name, a constant between quotes or <c>null</c>.
-    /// </summary>
-    public abstract class IdentifierExpression : QueryExpression
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/IncludeChainConverter.cs b/src/JsonApiDotNetCore/Queries/Expressions/IncludeChainConverter.cs
index 19bc92e5d6..edf44e1f14 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/IncludeChainConverter.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/IncludeChainConverter.cs
@@ -1,169 +1,165 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Converts includes between tree and chain formats. Exists for backwards compatibility, subject to be removed in the future.
+/// </summary>
+internal sealed class IncludeChainConverter
 {
     /// <summary>
-    /// Converts includes between tree and chain formats. Exists for backwards compatibility, subject to be removed in the future.
+    /// Converts a tree of inclusions into a set of relationship chains.
     /// </summary>
-    internal sealed class IncludeChainConverter
+    /// <example>
+    /// Input tree: <code><![CDATA[
+    /// Article
+    /// {
+    ///   Blog,
+    ///   Revisions
+    ///   {
+    ///     Author
+    ///   }
+    /// }
+    /// ]]></code> Output chains:
+    /// <code><![CDATA[
+    /// Article -> Blog,
+    /// Article -> Revisions -> Author
+    /// ]]></code>
+    /// </example>
+    public IReadOnlyCollection<ResourceFieldChainExpression> GetRelationshipChains(IncludeExpression include)
     {
-        /// <summary>
-        /// Converts a tree of inclusions into a set of relationship chains.
-        /// </summary>
-        /// <example>
-        /// Input tree: <code><![CDATA[
-        /// Article
-        /// {
-        ///   Blog,
-        ///   Revisions
-        ///   {
-        ///     Author
-        ///   }
-        /// }
-        /// ]]></code> Output chains:
-        /// <code><![CDATA[
-        /// Article -> Blog,
-        /// Article -> Revisions -> Author
-        /// ]]></code>
-        /// </example>
-        public IReadOnlyCollection<ResourceFieldChainExpression> GetRelationshipChains(IncludeExpression include)
+        ArgumentGuard.NotNull(include, nameof(include));
+
+        if (!include.Elements.Any())
         {
-            ArgumentGuard.NotNull(include, nameof(include));
+            return Array.Empty<ResourceFieldChainExpression>();
+        }
 
-            if (!include.Elements.Any())
-            {
-                return Array.Empty<ResourceFieldChainExpression>();
-            }
+        var converter = new IncludeToChainsConverter();
+        converter.Visit(include, null);
 
-            var converter = new IncludeToChainsConverter();
-            converter.Visit(include, null);
+        return converter.Chains;
+    }
 
-            return converter.Chains;
-        }
+    /// <summary>
+    /// Converts a set of relationship chains into a tree of inclusions.
+    /// </summary>
+    /// <example>
+    /// Input chains: <code><![CDATA[
+    /// Article -> Blog,
+    /// Article -> Revisions -> Author
+    /// ]]></code> Output tree:
+    /// <code><![CDATA[
+    /// Article
+    /// {
+    ///   Blog,
+    ///   Revisions
+    ///   {
+    ///     Author
+    ///   }
+    /// }
+    /// ]]></code>
+    /// </example>
+    public IncludeExpression FromRelationshipChains(IEnumerable<ResourceFieldChainExpression> chains)
+    {
+        ArgumentGuard.NotNull(chains, nameof(chains));
 
-        /// <summary>
-        /// Converts a set of relationship chains into a tree of inclusions.
-        /// </summary>
-        /// <example>
-        /// Input chains: <code><![CDATA[
-        /// Article -> Blog,
-        /// Article -> Revisions -> Author
-        /// ]]></code> Output tree:
-        /// <code><![CDATA[
-        /// Article
-        /// {
-        ///   Blog,
-        ///   Revisions
-        ///   {
-        ///     Author
-        ///   }
-        /// }
-        /// ]]></code>
-        /// </example>
-        public IncludeExpression FromRelationshipChains(IEnumerable<ResourceFieldChainExpression> chains)
-        {
-            ArgumentGuard.NotNull(chains, nameof(chains));
+        IImmutableSet<IncludeElementExpression> elements = ConvertChainsToElements(chains);
+        return elements.Any() ? new IncludeExpression(elements) : IncludeExpression.Empty;
+    }
 
-            IImmutableSet<IncludeElementExpression> elements = ConvertChainsToElements(chains);
-            return elements.Any() ? new IncludeExpression(elements) : IncludeExpression.Empty;
-        }
+    private static IImmutableSet<IncludeElementExpression> ConvertChainsToElements(IEnumerable<ResourceFieldChainExpression> chains)
+    {
+        var rootNode = new MutableIncludeNode(null!);
 
-        private static IImmutableSet<IncludeElementExpression> ConvertChainsToElements(IEnumerable<ResourceFieldChainExpression> chains)
+        foreach (ResourceFieldChainExpression chain in chains)
         {
-            var rootNode = new MutableIncludeNode(null!);
+            ConvertChainToElement(chain, rootNode);
+        }
+
+        return rootNode.Children.Values.Select(child => child.ToExpression()).ToImmutableHashSet();
+    }
 
-            foreach (ResourceFieldChainExpression chain in chains)
+    private static void ConvertChainToElement(ResourceFieldChainExpression chain, MutableIncludeNode rootNode)
+    {
+        MutableIncludeNode currentNode = rootNode;
+
+        foreach (RelationshipAttribute relationship in chain.Fields.OfType<RelationshipAttribute>())
+        {
+            if (!currentNode.Children.ContainsKey(relationship))
             {
-                ConvertChainToElement(chain, rootNode);
+                currentNode.Children[relationship] = new MutableIncludeNode(relationship);
             }
 
-            return rootNode.Children.Values.Select(child => child.ToExpression()).ToImmutableHashSet();
+            currentNode = currentNode.Children[relationship];
         }
+    }
 
-        private static void ConvertChainToElement(ResourceFieldChainExpression chain, MutableIncludeNode rootNode)
-        {
-            MutableIncludeNode currentNode = rootNode;
+    private sealed class IncludeToChainsConverter : QueryExpressionVisitor<object?, object?>
+    {
+        private readonly Stack<RelationshipAttribute> _parentRelationshipStack = new();
 
-            foreach (RelationshipAttribute relationship in chain.Fields.OfType<RelationshipAttribute>())
-            {
-                if (!currentNode.Children.ContainsKey(relationship))
-                {
-                    currentNode.Children[relationship] = new MutableIncludeNode(relationship);
-                }
+        public List<ResourceFieldChainExpression> Chains { get; } = new();
 
-                currentNode = currentNode.Children[relationship];
+        public override object? VisitInclude(IncludeExpression expression, object? argument)
+        {
+            foreach (IncludeElementExpression element in expression.Elements)
+            {
+                Visit(element, null);
             }
+
+            return null;
         }
 
-        private sealed class IncludeToChainsConverter : QueryExpressionVisitor<object?, object?>
+        public override object? VisitIncludeElement(IncludeElementExpression expression, object? argument)
         {
-            private readonly Stack<RelationshipAttribute> _parentRelationshipStack = new();
-
-            public List<ResourceFieldChainExpression> Chains { get; } = new();
-
-            public override object? VisitInclude(IncludeExpression expression, object? argument)
+            if (!expression.Children.Any())
             {
-                foreach (IncludeElementExpression element in expression.Elements)
-                {
-                    Visit(element, null);
-                }
-
-                return null;
+                FlushChain(expression);
             }
-
-            public override object? VisitIncludeElement(IncludeElementExpression expression, object? argument)
+            else
             {
-                if (!expression.Children.Any())
-                {
-                    FlushChain(expression);
-                }
-                else
-                {
-                    _parentRelationshipStack.Push(expression.Relationship);
-
-                    foreach (IncludeElementExpression child in expression.Children)
-                    {
-                        Visit(child, null);
-                    }
+                _parentRelationshipStack.Push(expression.Relationship);
 
-                    _parentRelationshipStack.Pop();
+                foreach (IncludeElementExpression child in expression.Children)
+                {
+                    Visit(child, null);
                 }
 
-                return null;
+                _parentRelationshipStack.Pop();
             }
 
-            private void FlushChain(IncludeElementExpression expression)
-            {
-                ImmutableArray<ResourceFieldAttribute>.Builder chainBuilder =
-                    ImmutableArray.CreateBuilder<ResourceFieldAttribute>(_parentRelationshipStack.Count + 1);
+            return null;
+        }
 
-                chainBuilder.AddRange(_parentRelationshipStack.Reverse());
-                chainBuilder.Add(expression.Relationship);
+        private void FlushChain(IncludeElementExpression expression)
+        {
+            ImmutableArray<ResourceFieldAttribute>.Builder chainBuilder =
+                ImmutableArray.CreateBuilder<ResourceFieldAttribute>(_parentRelationshipStack.Count + 1);
 
-                Chains.Add(new ResourceFieldChainExpression(chainBuilder.ToImmutable()));
-            }
+            chainBuilder.AddRange(_parentRelationshipStack.Reverse());
+            chainBuilder.Add(expression.Relationship);
+
+            Chains.Add(new ResourceFieldChainExpression(chainBuilder.ToImmutable()));
         }
+    }
 
-        private sealed class MutableIncludeNode
-        {
-            private readonly RelationshipAttribute _relationship;
+    private sealed class MutableIncludeNode
+    {
+        private readonly RelationshipAttribute _relationship;
 
-            public IDictionary<RelationshipAttribute, MutableIncludeNode> Children { get; } = new Dictionary<RelationshipAttribute, MutableIncludeNode>();
+        public IDictionary<RelationshipAttribute, MutableIncludeNode> Children { get; } = new Dictionary<RelationshipAttribute, MutableIncludeNode>();
 
-            public MutableIncludeNode(RelationshipAttribute relationship)
-            {
-                _relationship = relationship;
-            }
+        public MutableIncludeNode(RelationshipAttribute relationship)
+        {
+            _relationship = relationship;
+        }
 
-            public IncludeElementExpression ToExpression()
-            {
-                IImmutableSet<IncludeElementExpression> elementChildren = Children.Values.Select(child => child.ToExpression()).ToImmutableHashSet();
-                return new IncludeElementExpression(_relationship, elementChildren);
-            }
+        public IncludeElementExpression ToExpression()
+        {
+            IImmutableSet<IncludeElementExpression> elementChildren = Children.Values.Select(child => child.ToExpression()).ToImmutableHashSet();
+            return new IncludeElementExpression(_relationship, elementChildren);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/IncludeElementExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/IncludeElementExpression.cs
index 8cc148376b..cd95ef61a3 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/IncludeElementExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/IncludeElementExpression.cs
@@ -1,83 +1,80 @@
-using System;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Text;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents an element in <see cref="IncludeExpression" />.
+/// </summary>
+[PublicAPI]
+public class IncludeElementExpression : QueryExpression
 {
-    /// <summary>
-    /// Represents an element in <see cref="IncludeExpression" />.
-    /// </summary>
-    [PublicAPI]
-    public class IncludeElementExpression : QueryExpression
+    public RelationshipAttribute Relationship { get; }
+    public IImmutableSet<IncludeElementExpression> Children { get; }
+
+    public IncludeElementExpression(RelationshipAttribute relationship)
+        : this(relationship, ImmutableHashSet<IncludeElementExpression>.Empty)
     {
-        public RelationshipAttribute Relationship { get; }
-        public IImmutableSet<IncludeElementExpression> Children { get; }
+    }
 
-        public IncludeElementExpression(RelationshipAttribute relationship)
-            : this(relationship, ImmutableHashSet<IncludeElementExpression>.Empty)
-        {
-        }
+    public IncludeElementExpression(RelationshipAttribute relationship, IImmutableSet<IncludeElementExpression> children)
+    {
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
+        ArgumentGuard.NotNull(children, nameof(children));
 
-        public IncludeElementExpression(RelationshipAttribute relationship, IImmutableSet<IncludeElementExpression> children)
-        {
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
-            ArgumentGuard.NotNull(children, nameof(children));
+        Relationship = relationship;
+        Children = children;
+    }
 
-            Relationship = relationship;
-            Children = children;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitIncludeElement(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitIncludeElement(this, argument);
-        }
+    public override string ToString()
+    {
+        var builder = new StringBuilder();
+        builder.Append(Relationship);
 
-        public override string ToString()
+        if (Children.Any())
         {
-            var builder = new StringBuilder();
-            builder.Append(Relationship);
+            builder.Append('{');
+            builder.Append(string.Join(",", Children.Select(child => child.ToString()).OrderBy(name => name)));
+            builder.Append('}');
+        }
 
-            if (Children.Any())
-            {
-                builder.Append('{');
-                builder.Append(string.Join(",", Children.Select(child => child.ToString()).OrderBy(name => name)));
-                builder.Append('}');
-            }
+        return builder.ToString();
+    }
 
-            return builder.ToString();
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
+            return false;
+        }
 
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+        var other = (IncludeElementExpression)obj;
 
-            var other = (IncludeElementExpression)obj;
+        return Relationship.Equals(other.Relationship) && Children.SetEquals(other.Children);
+    }
 
-            return Relationship.Equals(other.Relationship) && Children.SetEquals(other.Children);
-        }
+    public override int GetHashCode()
+    {
+        var hashCode = new HashCode();
+        hashCode.Add(Relationship);
 
-        public override int GetHashCode()
+        foreach (IncludeElementExpression child in Children)
         {
-            var hashCode = new HashCode();
-            hashCode.Add(Relationship);
-
-            foreach (IncludeElementExpression child in Children)
-            {
-                hashCode.Add(child);
-            }
-
-            return hashCode.ToHashCode();
+            hashCode.Add(child);
         }
+
+        return hashCode.ToHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/IncludeExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/IncludeExpression.cs
index 3c5cbeb333..4597570ba3 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/IncludeExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/IncludeExpression.cs
@@ -1,73 +1,69 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents an inclusion tree, resulting from text such as: owner,articles.revisions
+/// </summary>
+[PublicAPI]
+public class IncludeExpression : QueryExpression
 {
-    /// <summary>
-    /// Represents an inclusion tree, resulting from text such as: owner,articles.revisions
-    /// </summary>
-    [PublicAPI]
-    public class IncludeExpression : QueryExpression
-    {
-        private static readonly IncludeChainConverter IncludeChainConverter = new();
+    private static readonly IncludeChainConverter IncludeChainConverter = new();
 
-        public static readonly IncludeExpression Empty = new();
+    public static readonly IncludeExpression Empty = new();
 
-        public IImmutableSet<IncludeElementExpression> Elements { get; }
+    public IImmutableSet<IncludeElementExpression> Elements { get; }
 
-        public IncludeExpression(IImmutableSet<IncludeElementExpression> elements)
-        {
-            ArgumentGuard.NotNullNorEmpty(elements, nameof(elements));
+    public IncludeExpression(IImmutableSet<IncludeElementExpression> elements)
+    {
+        ArgumentGuard.NotNullNorEmpty(elements, nameof(elements));
 
-            Elements = elements;
-        }
+        Elements = elements;
+    }
 
-        private IncludeExpression()
-        {
-            Elements = ImmutableHashSet<IncludeElementExpression>.Empty;
-        }
+    private IncludeExpression()
+    {
+        Elements = ImmutableHashSet<IncludeElementExpression>.Empty;
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitInclude(this, argument);
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitInclude(this, argument);
+    }
+
+    public override string ToString()
+    {
+        IReadOnlyCollection<ResourceFieldChainExpression> chains = IncludeChainConverter.GetRelationshipChains(this);
+        return string.Join(",", chains.Select(child => child.ToString()).OrderBy(name => name));
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            IReadOnlyCollection<ResourceFieldChainExpression> chains = IncludeChainConverter.GetRelationshipChains(this);
-            return string.Join(",", chains.Select(child => child.ToString()).OrderBy(name => name));
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
+            return false;
+        }
 
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+        var other = (IncludeExpression)obj;
 
-            var other = (IncludeExpression)obj;
+        return Elements.SetEquals(other.Elements);
+    }
 
-            return Elements.SetEquals(other.Elements);
-        }
+    public override int GetHashCode()
+    {
+        var hashCode = new HashCode();
 
-        public override int GetHashCode()
+        foreach (IncludeElementExpression element in Elements)
         {
-            var hashCode = new HashCode();
-
-            foreach (IncludeElementExpression element in Elements)
-            {
-                hashCode.Add(element);
-            }
-
-            return hashCode.ToHashCode();
+            hashCode.Add(element);
         }
+
+        return hashCode.ToHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/LiteralConstantExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/LiteralConstantExpression.cs
index 962914d83d..bc5b4790ac 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/LiteralConstantExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/LiteralConstantExpression.cs
@@ -1,53 +1,52 @@
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents a non-null constant value, resulting from text such as: equals(firstName,'Jack')
+/// </summary>
+[PublicAPI]
+public class LiteralConstantExpression : IdentifierExpression
 {
-    /// <summary>
-    /// Represents a non-null constant value, resulting from text such as: equals(firstName,'Jack')
-    /// </summary>
-    [PublicAPI]
-    public class LiteralConstantExpression : IdentifierExpression
+    public string Value { get; }
+
+    public LiteralConstantExpression(string text)
     {
-        public string Value { get; }
+        ArgumentGuard.NotNull(text, nameof(text));
 
-        public LiteralConstantExpression(string text)
-        {
-            ArgumentGuard.NotNull(text, nameof(text));
+        Value = text;
+    }
 
-            Value = text;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitLiteralConstant(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitLiteralConstant(this, argument);
-        }
+    public override string ToString()
+    {
+        string value = Value.Replace("\'", "\'\'");
+        return $"'{value}'";
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            string value = Value.Replace("\'", "\'\'");
-            return $"'{value}'";
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var other = (LiteralConstantExpression)obj;
+        var other = (LiteralConstantExpression)obj;
 
-            return Value == other.Value;
-        }
+        return Value == other.Value;
+    }
 
-        public override int GetHashCode()
-        {
-            return Value.GetHashCode();
-        }
+    public override int GetHashCode()
+    {
+        return Value.GetHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/LogicalExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/LogicalExpression.cs
index 6ab16b885f..0308c04de2 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/LogicalExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/LogicalExpression.cs
@@ -1,93 +1,90 @@
-using System;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Text;
 using Humanizer;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents a logical filter function, resulting from text such as: and(equals(title,'Work'),has(articles))
+/// </summary>
+[PublicAPI]
+public class LogicalExpression : FilterExpression
 {
-    /// <summary>
-    /// Represents a logical filter function, resulting from text such as: and(equals(title,'Work'),has(articles))
-    /// </summary>
-    [PublicAPI]
-    public class LogicalExpression : FilterExpression
+    public LogicalOperator Operator { get; }
+    public IImmutableList<FilterExpression> Terms { get; }
+
+    public LogicalExpression(LogicalOperator @operator, params FilterExpression[] terms)
+        : this(@operator, terms.ToImmutableArray())
     {
-        public LogicalOperator Operator { get; }
-        public IImmutableList<FilterExpression> Terms { get; }
+    }
 
-        public LogicalExpression(LogicalOperator @operator, params FilterExpression[] terms)
-            : this(@operator, terms.ToImmutableArray())
-        {
-        }
+    public LogicalExpression(LogicalOperator @operator, IImmutableList<FilterExpression> terms)
+    {
+        ArgumentGuard.NotNull(terms, nameof(terms));
 
-        public LogicalExpression(LogicalOperator @operator, IImmutableList<FilterExpression> terms)
+        if (terms.Count < 2)
         {
-            ArgumentGuard.NotNull(terms, nameof(terms));
+            throw new ArgumentException("At least two terms are required.", nameof(terms));
+        }
 
-            if (terms.Count < 2)
-            {
-                throw new ArgumentException("At least two terms are required.", nameof(terms));
-            }
+        Operator = @operator;
+        Terms = terms;
+    }
 
-            Operator = @operator;
-            Terms = terms;
-        }
+    public static FilterExpression? Compose(LogicalOperator @operator, params FilterExpression?[] filters)
+    {
+        ArgumentGuard.NotNull(filters, nameof(filters));
 
-        public static FilterExpression? Compose(LogicalOperator @operator, params FilterExpression?[] filters)
-        {
-            ArgumentGuard.NotNull(filters, nameof(filters));
+        ImmutableArray<FilterExpression> terms = filters.WhereNotNull().ToImmutableArray();
 
-            ImmutableArray<FilterExpression> terms = filters.WhereNotNull().ToImmutableArray();
+        return terms.Length > 1 ? new LogicalExpression(@operator, terms) : terms.FirstOrDefault();
+    }
 
-            return terms.Length > 1 ? new LogicalExpression(@operator, terms) : terms.FirstOrDefault();
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitLogical(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitLogical(this, argument);
-        }
+    public override string ToString()
+    {
+        var builder = new StringBuilder();
 
-        public override string ToString()
-        {
-            var builder = new StringBuilder();
+        builder.Append(Operator.ToString().Camelize());
+        builder.Append('(');
+        builder.Append(string.Join(",", Terms.Select(term => term.ToString())));
+        builder.Append(')');
 
-            builder.Append(Operator.ToString().Camelize());
-            builder.Append('(');
-            builder.Append(string.Join(",", Terms.Select(term => term.ToString())));
-            builder.Append(')');
+        return builder.ToString();
+    }
 
-            return builder.ToString();
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
+            return false;
+        }
 
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+        var other = (LogicalExpression)obj;
 
-            var other = (LogicalExpression)obj;
+        return Operator == other.Operator && Terms.SequenceEqual(other.Terms);
+    }
 
-            return Operator == other.Operator && Terms.SequenceEqual(other.Terms);
-        }
+    public override int GetHashCode()
+    {
+        var hashCode = new HashCode();
+        hashCode.Add(Operator);
 
-        public override int GetHashCode()
+        foreach (QueryExpression term in Terms)
         {
-            var hashCode = new HashCode();
-            hashCode.Add(Operator);
-
-            foreach (QueryExpression term in Terms)
-            {
-                hashCode.Add(term);
-            }
-
-            return hashCode.ToHashCode();
+            hashCode.Add(term);
         }
+
+        return hashCode.ToHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/LogicalOperator.cs b/src/JsonApiDotNetCore/Queries/Expressions/LogicalOperator.cs
index 3514820f86..c6c838c47e 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/LogicalOperator.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/LogicalOperator.cs
@@ -1,8 +1,7 @@
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+public enum LogicalOperator
 {
-    public enum LogicalOperator
-    {
-        And,
-        Or
-    }
+    And,
+    Or
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/MatchTextExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/MatchTextExpression.cs
index 2f82548e1d..f528790fd3 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/MatchTextExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/MatchTextExpression.cs
@@ -1,67 +1,65 @@
-using System;
 using System.Text;
 using Humanizer;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents a text-matching filter function, resulting from text such as: startsWith(name,'A')
+/// </summary>
+[PublicAPI]
+public class MatchTextExpression : FilterExpression
 {
-    /// <summary>
-    /// Represents a text-matching filter function, resulting from text such as: startsWith(name,'A')
-    /// </summary>
-    [PublicAPI]
-    public class MatchTextExpression : FilterExpression
+    public ResourceFieldChainExpression TargetAttribute { get; }
+    public LiteralConstantExpression TextValue { get; }
+    public TextMatchKind MatchKind { get; }
+
+    public MatchTextExpression(ResourceFieldChainExpression targetAttribute, LiteralConstantExpression textValue, TextMatchKind matchKind)
     {
-        public ResourceFieldChainExpression TargetAttribute { get; }
-        public LiteralConstantExpression TextValue { get; }
-        public TextMatchKind MatchKind { get; }
+        ArgumentGuard.NotNull(targetAttribute, nameof(targetAttribute));
+        ArgumentGuard.NotNull(textValue, nameof(textValue));
 
-        public MatchTextExpression(ResourceFieldChainExpression targetAttribute, LiteralConstantExpression textValue, TextMatchKind matchKind)
-        {
-            ArgumentGuard.NotNull(targetAttribute, nameof(targetAttribute));
-            ArgumentGuard.NotNull(textValue, nameof(textValue));
+        TargetAttribute = targetAttribute;
+        TextValue = textValue;
+        MatchKind = matchKind;
+    }
 
-            TargetAttribute = targetAttribute;
-            TextValue = textValue;
-            MatchKind = matchKind;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitMatchText(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitMatchText(this, argument);
-        }
+    public override string ToString()
+    {
+        var builder = new StringBuilder();
 
-        public override string ToString()
-        {
-            var builder = new StringBuilder();
+        builder.Append(MatchKind.ToString().Camelize());
+        builder.Append('(');
+        builder.Append(string.Join(",", TargetAttribute, TextValue));
+        builder.Append(')');
 
-            builder.Append(MatchKind.ToString().Camelize());
-            builder.Append('(');
-            builder.Append(string.Join(",", TargetAttribute, TextValue));
-            builder.Append(')');
+        return builder.ToString();
+    }
 
-            return builder.ToString();
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var other = (MatchTextExpression)obj;
+        var other = (MatchTextExpression)obj;
 
-            return TargetAttribute.Equals(other.TargetAttribute) && TextValue.Equals(other.TextValue) && MatchKind == other.MatchKind;
-        }
+        return TargetAttribute.Equals(other.TargetAttribute) && TextValue.Equals(other.TextValue) && MatchKind == other.MatchKind;
+    }
 
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(TargetAttribute, TextValue, MatchKind);
-        }
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(TargetAttribute, TextValue, MatchKind);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/NotExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/NotExpression.cs
index f7a34aa212..c6d13f9876 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/NotExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/NotExpression.cs
@@ -1,53 +1,52 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries.Internal.Parsing;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents the "not" filter function, resulting from text such as: not(equals(title,'Work'))
+/// </summary>
+[PublicAPI]
+public class NotExpression : FilterExpression
 {
-    /// <summary>
-    /// Represents the "not" filter function, resulting from text such as: not(equals(title,'Work'))
-    /// </summary>
-    [PublicAPI]
-    public class NotExpression : FilterExpression
+    public FilterExpression Child { get; }
+
+    public NotExpression(FilterExpression child)
     {
-        public FilterExpression Child { get; }
+        ArgumentGuard.NotNull(child, nameof(child));
 
-        public NotExpression(FilterExpression child)
-        {
-            ArgumentGuard.NotNull(child, nameof(child));
+        Child = child;
+    }
 
-            Child = child;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitNot(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitNot(this, argument);
-        }
+    public override string ToString()
+    {
+        return $"{Keywords.Not}({Child})";
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            return $"{Keywords.Not}({Child})";
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var other = (NotExpression)obj;
+        var other = (NotExpression)obj;
 
-            return Child.Equals(other.Child);
-        }
+        return Child.Equals(other.Child);
+    }
 
-        public override int GetHashCode()
-        {
-            return Child.GetHashCode();
-        }
+    public override int GetHashCode()
+    {
+        return Child.GetHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/NullConstantExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/NullConstantExpression.cs
index 172a900884..bd9d3cf268 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/NullConstantExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/NullConstantExpression.cs
@@ -1,49 +1,47 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries.Internal.Parsing;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents the constant <c>null</c>, resulting from text such as: equals(lastName,null)
+/// </summary>
+[PublicAPI]
+public class NullConstantExpression : IdentifierExpression
 {
-    /// <summary>
-    /// Represents the constant <c>null</c>, resulting from text such as: equals(lastName,null)
-    /// </summary>
-    [PublicAPI]
-    public class NullConstantExpression : IdentifierExpression
-    {
-        public static readonly NullConstantExpression Instance = new();
+    public static readonly NullConstantExpression Instance = new();
 
-        private NullConstantExpression()
-        {
-        }
+    private NullConstantExpression()
+    {
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitNullConstant(this, argument);
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitNullConstant(this, argument);
+    }
 
-        public override string ToString()
-        {
-            return Keywords.Null;
-        }
+    public override string ToString()
+    {
+        return Keywords.Null;
+    }
 
-        public override bool Equals(object? obj)
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
-
             return true;
         }
 
-        public override int GetHashCode()
+        if (obj is null || GetType() != obj.GetType())
         {
-            return new HashCode().ToHashCode();
+            return false;
         }
+
+        return true;
+    }
+
+    public override int GetHashCode()
+    {
+        return new HashCode().ToHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/PaginationElementQueryStringValueExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/PaginationElementQueryStringValueExpression.cs
index 69bb675bdc..d60282bcb0 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/PaginationElementQueryStringValueExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/PaginationElementQueryStringValueExpression.cs
@@ -1,53 +1,51 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents an element in <see cref="PaginationQueryStringValueExpression" />.
+/// </summary>
+[PublicAPI]
+public class PaginationElementQueryStringValueExpression : QueryExpression
 {
-    /// <summary>
-    /// Represents an element in <see cref="PaginationQueryStringValueExpression" />.
-    /// </summary>
-    [PublicAPI]
-    public class PaginationElementQueryStringValueExpression : QueryExpression
+    public ResourceFieldChainExpression? Scope { get; }
+    public int Value { get; }
+
+    public PaginationElementQueryStringValueExpression(ResourceFieldChainExpression? scope, int value)
     {
-        public ResourceFieldChainExpression? Scope { get; }
-        public int Value { get; }
+        Scope = scope;
+        Value = value;
+    }
 
-        public PaginationElementQueryStringValueExpression(ResourceFieldChainExpression? scope, int value)
-        {
-            Scope = scope;
-            Value = value;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.PaginationElementQueryStringValue(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.PaginationElementQueryStringValue(this, argument);
-        }
+    public override string ToString()
+    {
+        return Scope == null ? Value.ToString() : $"{Scope}: {Value}";
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            return Scope == null ? Value.ToString() : $"{Scope}: {Value}";
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var other = (PaginationElementQueryStringValueExpression)obj;
+        var other = (PaginationElementQueryStringValueExpression)obj;
 
-            return Equals(Scope, other.Scope) && Value == other.Value;
-        }
+        return Equals(Scope, other.Scope) && Value == other.Value;
+    }
 
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(Scope, Value);
-        }
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(Scope, Value);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/PaginationExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/PaginationExpression.cs
index f15e714c2e..4b88ca55da 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/PaginationExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/PaginationExpression.cs
@@ -1,56 +1,54 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents a pagination, produced from <see cref="PaginationQueryStringValueExpression" />.
+/// </summary>
+[PublicAPI]
+public class PaginationExpression : QueryExpression
 {
-    /// <summary>
-    /// Represents a pagination, produced from <see cref="PaginationQueryStringValueExpression" />.
-    /// </summary>
-    [PublicAPI]
-    public class PaginationExpression : QueryExpression
+    public PageNumber PageNumber { get; }
+    public PageSize? PageSize { get; }
+
+    public PaginationExpression(PageNumber pageNumber, PageSize? pageSize)
     {
-        public PageNumber PageNumber { get; }
-        public PageSize? PageSize { get; }
+        ArgumentGuard.NotNull(pageNumber, nameof(pageNumber));
 
-        public PaginationExpression(PageNumber pageNumber, PageSize? pageSize)
-        {
-            ArgumentGuard.NotNull(pageNumber, nameof(pageNumber));
+        PageNumber = pageNumber;
+        PageSize = pageSize;
+    }
 
-            PageNumber = pageNumber;
-            PageSize = pageSize;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitPagination(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitPagination(this, argument);
-        }
+    public override string ToString()
+    {
+        return PageSize != null ? $"Page number: {PageNumber}, size: {PageSize}" : "(none)";
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            return PageSize != null ? $"Page number: {PageNumber}, size: {PageSize}" : "(none)";
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var other = (PaginationExpression)obj;
+        var other = (PaginationExpression)obj;
 
-            return PageNumber.Equals(other.PageNumber) && Equals(PageSize, other.PageSize);
-        }
+        return PageNumber.Equals(other.PageNumber) && Equals(PageSize, other.PageSize);
+    }
 
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(PageNumber, PageSize);
-        }
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(PageNumber, PageSize);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/PaginationQueryStringValueExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/PaginationQueryStringValueExpression.cs
index 3afce49b3b..68eb353b5c 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/PaginationQueryStringValueExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/PaginationQueryStringValueExpression.cs
@@ -1,62 +1,59 @@
-using System;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents pagination in a query string, resulting from text such as: 1,articles:2
+/// </summary>
+[PublicAPI]
+public class PaginationQueryStringValueExpression : QueryExpression
 {
-    /// <summary>
-    /// Represents pagination in a query string, resulting from text such as: 1,articles:2
-    /// </summary>
-    [PublicAPI]
-    public class PaginationQueryStringValueExpression : QueryExpression
+    public IImmutableList<PaginationElementQueryStringValueExpression> Elements { get; }
+
+    public PaginationQueryStringValueExpression(IImmutableList<PaginationElementQueryStringValueExpression> elements)
     {
-        public IImmutableList<PaginationElementQueryStringValueExpression> Elements { get; }
+        ArgumentGuard.NotNullNorEmpty(elements, nameof(elements));
 
-        public PaginationQueryStringValueExpression(IImmutableList<PaginationElementQueryStringValueExpression> elements)
-        {
-            ArgumentGuard.NotNullNorEmpty(elements, nameof(elements));
+        Elements = elements;
+    }
 
-            Elements = elements;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.PaginationQueryStringValue(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.PaginationQueryStringValue(this, argument);
-        }
+    public override string ToString()
+    {
+        return string.Join(",", Elements.Select(constant => constant.ToString()));
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            return string.Join(",", Elements.Select(constant => constant.ToString()));
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
+            return false;
+        }
 
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+        var other = (PaginationQueryStringValueExpression)obj;
 
-            var other = (PaginationQueryStringValueExpression)obj;
+        return Elements.SequenceEqual(other.Elements);
+    }
 
-            return Elements.SequenceEqual(other.Elements);
-        }
+    public override int GetHashCode()
+    {
+        var hashCode = new HashCode();
 
-        public override int GetHashCode()
+        foreach (PaginationElementQueryStringValueExpression element in Elements)
         {
-            var hashCode = new HashCode();
-
-            foreach (PaginationElementQueryStringValueExpression element in Elements)
-            {
-                hashCode.Add(element);
-            }
-
-            return hashCode.ToHashCode();
+            hashCode.Add(element);
         }
+
+        return hashCode.ToHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/QueryExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/QueryExpression.cs
index 44d5311b19..e442e6968d 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/QueryExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/QueryExpression.cs
@@ -1,13 +1,12 @@
 using System.Linq.Expressions;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents the base data structure for immutable types that query string parameters are converted into. This intermediate structure is later
+/// transformed into system <see cref="Expression" /> trees that are handled by Entity Framework Core.
+/// </summary>
+public abstract class QueryExpression
 {
-    /// <summary>
-    /// Represents the base data structure for immutable types that query string parameters are converted into. This intermediate structure is later
-    /// transformed into system <see cref="Expression" /> trees that are handled by Entity Framework Core.
-    /// </summary>
-    public abstract class QueryExpression
-    {
-        public abstract TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument);
-    }
+    public abstract TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument);
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionRewriter.cs b/src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionRewriter.cs
index 8ba23c826d..cd5937cd80 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionRewriter.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionRewriter.cs
@@ -2,292 +2,291 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Building block for rewriting <see cref="QueryExpression" /> trees. It walks through nested expressions and updates parent on changes.
+/// </summary>
+[PublicAPI]
+public class QueryExpressionRewriter<TArgument> : QueryExpressionVisitor<TArgument, QueryExpression?>
 {
-    /// <summary>
-    /// Building block for rewriting <see cref="QueryExpression" /> trees. It walks through nested expressions and updates parent on changes.
-    /// </summary>
-    [PublicAPI]
-    public class QueryExpressionRewriter<TArgument> : QueryExpressionVisitor<TArgument, QueryExpression?>
+    public override QueryExpression? Visit(QueryExpression expression, TArgument argument)
     {
-        public override QueryExpression? Visit(QueryExpression expression, TArgument argument)
-        {
-            return expression.Accept(this, argument);
-        }
+        return expression.Accept(this, argument);
+    }
+
+    public override QueryExpression DefaultVisit(QueryExpression expression, TArgument argument)
+    {
+        return expression;
+    }
+
+    public override QueryExpression? VisitComparison(ComparisonExpression expression, TArgument argument)
+    {
+        QueryExpression? newLeft = Visit(expression.Left, argument);
+        QueryExpression? newRight = Visit(expression.Right, argument);
 
-        public override QueryExpression DefaultVisit(QueryExpression expression, TArgument argument)
+        if (newLeft != null && newRight != null)
         {
-            return expression;
+            var newExpression = new ComparisonExpression(expression.Operator, newLeft, newRight);
+            return newExpression.Equals(expression) ? expression : newExpression;
         }
 
-        public override QueryExpression? VisitComparison(ComparisonExpression expression, TArgument argument)
-        {
-            QueryExpression? newLeft = Visit(expression.Left, argument);
-            QueryExpression? newRight = Visit(expression.Right, argument);
+        return null;
+    }
 
-            if (newLeft != null && newRight != null)
-            {
-                var newExpression = new ComparisonExpression(expression.Operator, newLeft, newRight);
-                return newExpression.Equals(expression) ? expression : newExpression;
-            }
+    public override QueryExpression? VisitResourceFieldChain(ResourceFieldChainExpression expression, TArgument argument)
+    {
+        return expression;
+    }
 
-            return null;
-        }
+    public override QueryExpression VisitLiteralConstant(LiteralConstantExpression expression, TArgument argument)
+    {
+        return expression;
+    }
 
-        public override QueryExpression? VisitResourceFieldChain(ResourceFieldChainExpression expression, TArgument argument)
+    public override QueryExpression VisitNullConstant(NullConstantExpression expression, TArgument argument)
+    {
+        return expression;
+    }
+
+    public override QueryExpression? VisitLogical(LogicalExpression expression, TArgument argument)
+    {
+        IImmutableList<FilterExpression> newTerms = VisitList(expression.Terms, argument);
+
+        if (newTerms.Count == 1)
         {
-            return expression;
+            return newTerms[0];
         }
 
-        public override QueryExpression VisitLiteralConstant(LiteralConstantExpression expression, TArgument argument)
+        if (newTerms.Count != 0)
         {
-            return expression;
+            var newExpression = new LogicalExpression(expression.Operator, newTerms);
+            return newExpression.Equals(expression) ? expression : newExpression;
         }
 
-        public override QueryExpression VisitNullConstant(NullConstantExpression expression, TArgument argument)
+        return null;
+    }
+
+    public override QueryExpression? VisitNot(NotExpression expression, TArgument argument)
+    {
+        if (Visit(expression.Child, argument) is FilterExpression newChild)
         {
-            return expression;
+            var newExpression = new NotExpression(newChild);
+            return newExpression.Equals(expression) ? expression : newExpression;
         }
 
-        public override QueryExpression? VisitLogical(LogicalExpression expression, TArgument argument)
+        return null;
+    }
+
+    public override QueryExpression? VisitHas(HasExpression expression, TArgument argument)
+    {
+        if (Visit(expression.TargetCollection, argument) is ResourceFieldChainExpression newTargetCollection)
         {
-            IImmutableList<FilterExpression> newTerms = VisitList(expression.Terms, argument);
+            FilterExpression? newFilter = expression.Filter != null ? Visit(expression.Filter, argument) as FilterExpression : null;
 
-            if (newTerms.Count == 1)
-            {
-                return newTerms[0];
-            }
+            var newExpression = new HasExpression(newTargetCollection, newFilter);
+            return newExpression.Equals(expression) ? expression : newExpression;
+        }
 
-            if (newTerms.Count != 0)
-            {
-                var newExpression = new LogicalExpression(expression.Operator, newTerms);
-                return newExpression.Equals(expression) ? expression : newExpression;
-            }
+        return null;
+    }
 
-            return null;
-        }
+    public override QueryExpression? VisitSortElement(SortElementExpression expression, TArgument argument)
+    {
+        SortElementExpression? newExpression = null;
 
-        public override QueryExpression? VisitNot(NotExpression expression, TArgument argument)
+        if (expression.Count != null)
         {
-            if (Visit(expression.Child, argument) is FilterExpression newChild)
+            if (Visit(expression.Count, argument) is CountExpression newCount)
             {
-                var newExpression = new NotExpression(newChild);
-                return newExpression.Equals(expression) ? expression : newExpression;
+                newExpression = new SortElementExpression(newCount, expression.IsAscending);
             }
-
-            return null;
         }
-
-        public override QueryExpression? VisitHas(HasExpression expression, TArgument argument)
+        else if (expression.TargetAttribute != null)
         {
-            if (Visit(expression.TargetCollection, argument) is ResourceFieldChainExpression newTargetCollection)
+            if (Visit(expression.TargetAttribute, argument) is ResourceFieldChainExpression newTargetAttribute)
             {
-                FilterExpression? newFilter = expression.Filter != null ? Visit(expression.Filter, argument) as FilterExpression : null;
-
-                var newExpression = new HasExpression(newTargetCollection, newFilter);
-                return newExpression.Equals(expression) ? expression : newExpression;
+                newExpression = new SortElementExpression(newTargetAttribute, expression.IsAscending);
             }
-
-            return null;
         }
 
-        public override QueryExpression? VisitSortElement(SortElementExpression expression, TArgument argument)
+        if (newExpression != null)
         {
-            SortElementExpression? newExpression = null;
-
-            if (expression.Count != null)
-            {
-                if (Visit(expression.Count, argument) is CountExpression newCount)
-                {
-                    newExpression = new SortElementExpression(newCount, expression.IsAscending);
-                }
-            }
-            else if (expression.TargetAttribute != null)
-            {
-                if (Visit(expression.TargetAttribute, argument) is ResourceFieldChainExpression newTargetAttribute)
-                {
-                    newExpression = new SortElementExpression(newTargetAttribute, expression.IsAscending);
-                }
-            }
+            return newExpression.Equals(expression) ? expression : newExpression;
+        }
 
-            if (newExpression != null)
-            {
-                return newExpression.Equals(expression) ? expression : newExpression;
-            }
+        return null;
+    }
 
-            return null;
-        }
+    public override QueryExpression? VisitSort(SortExpression expression, TArgument argument)
+    {
+        IImmutableList<SortElementExpression> newElements = VisitList(expression.Elements, argument);
 
-        public override QueryExpression? VisitSort(SortExpression expression, TArgument argument)
+        if (newElements.Count != 0)
         {
-            IImmutableList<SortElementExpression> newElements = VisitList(expression.Elements, argument);
+            var newExpression = new SortExpression(newElements);
+            return newExpression.Equals(expression) ? expression : newExpression;
+        }
 
-            if (newElements.Count != 0)
-            {
-                var newExpression = new SortExpression(newElements);
-                return newExpression.Equals(expression) ? expression : newExpression;
-            }
+        return null;
+    }
 
-            return null;
-        }
+    public override QueryExpression VisitPagination(PaginationExpression expression, TArgument argument)
+    {
+        return expression;
+    }
 
-        public override QueryExpression VisitPagination(PaginationExpression expression, TArgument argument)
+    public override QueryExpression? VisitCount(CountExpression expression, TArgument argument)
+    {
+        if (Visit(expression.TargetCollection, argument) is ResourceFieldChainExpression newTargetCollection)
         {
-            return expression;
+            var newExpression = new CountExpression(newTargetCollection);
+            return newExpression.Equals(expression) ? expression : newExpression;
         }
 
-        public override QueryExpression? VisitCount(CountExpression expression, TArgument argument)
-        {
-            if (Visit(expression.TargetCollection, argument) is ResourceFieldChainExpression newTargetCollection)
-            {
-                var newExpression = new CountExpression(newTargetCollection);
-                return newExpression.Equals(expression) ? expression : newExpression;
-            }
+        return null;
+    }
 
-            return null;
-        }
+    public override QueryExpression? VisitMatchText(MatchTextExpression expression, TArgument argument)
+    {
+        var newTargetAttribute = Visit(expression.TargetAttribute, argument) as ResourceFieldChainExpression;
+        var newTextValue = Visit(expression.TextValue, argument) as LiteralConstantExpression;
 
-        public override QueryExpression? VisitMatchText(MatchTextExpression expression, TArgument argument)
+        if (newTargetAttribute != null && newTextValue != null)
         {
-            var newTargetAttribute = Visit(expression.TargetAttribute, argument) as ResourceFieldChainExpression;
-            var newTextValue = Visit(expression.TextValue, argument) as LiteralConstantExpression;
-
-            if (newTargetAttribute != null && newTextValue != null)
-            {
-                var newExpression = new MatchTextExpression(newTargetAttribute, newTextValue, expression.MatchKind);
-                return newExpression.Equals(expression) ? expression : newExpression;
-            }
-
-            return null;
+            var newExpression = new MatchTextExpression(newTargetAttribute, newTextValue, expression.MatchKind);
+            return newExpression.Equals(expression) ? expression : newExpression;
         }
 
-        public override QueryExpression? VisitAny(AnyExpression expression, TArgument argument)
-        {
-            var newTargetAttribute = Visit(expression.TargetAttribute, argument) as ResourceFieldChainExpression;
-            IImmutableSet<LiteralConstantExpression> newConstants = VisitSet(expression.Constants, argument);
+        return null;
+    }
 
-            if (newTargetAttribute != null)
-            {
-                var newExpression = new AnyExpression(newTargetAttribute, newConstants);
-                return newExpression.Equals(expression) ? expression : newExpression;
-            }
+    public override QueryExpression? VisitAny(AnyExpression expression, TArgument argument)
+    {
+        var newTargetAttribute = Visit(expression.TargetAttribute, argument) as ResourceFieldChainExpression;
+        IImmutableSet<LiteralConstantExpression> newConstants = VisitSet(expression.Constants, argument);
 
-            return null;
+        if (newTargetAttribute != null)
+        {
+            var newExpression = new AnyExpression(newTargetAttribute, newConstants);
+            return newExpression.Equals(expression) ? expression : newExpression;
         }
 
-        public override QueryExpression? VisitSparseFieldTable(SparseFieldTableExpression expression, TArgument argument)
-        {
-            ImmutableDictionary<ResourceType, SparseFieldSetExpression>.Builder newTable =
-                ImmutableDictionary.CreateBuilder<ResourceType, SparseFieldSetExpression>();
+        return null;
+    }
 
-            foreach ((ResourceType resourceType, SparseFieldSetExpression sparseFieldSet) in expression.Table)
-            {
-                if (Visit(sparseFieldSet, argument) is SparseFieldSetExpression newSparseFieldSet)
-                {
-                    newTable[resourceType] = newSparseFieldSet;
-                }
-            }
+    public override QueryExpression? VisitSparseFieldTable(SparseFieldTableExpression expression, TArgument argument)
+    {
+        ImmutableDictionary<ResourceType, SparseFieldSetExpression>.Builder newTable =
+            ImmutableDictionary.CreateBuilder<ResourceType, SparseFieldSetExpression>();
 
-            if (newTable.Count > 0)
+        foreach ((ResourceType resourceType, SparseFieldSetExpression sparseFieldSet) in expression.Table)
+        {
+            if (Visit(sparseFieldSet, argument) is SparseFieldSetExpression newSparseFieldSet)
             {
-                var newExpression = new SparseFieldTableExpression(newTable.ToImmutable());
-                return newExpression.Equals(expression) ? expression : newExpression;
+                newTable[resourceType] = newSparseFieldSet;
             }
-
-            return null;
         }
 
-        public override QueryExpression VisitSparseFieldSet(SparseFieldSetExpression expression, TArgument argument)
+        if (newTable.Count > 0)
         {
-            return expression;
+            var newExpression = new SparseFieldTableExpression(newTable.ToImmutable());
+            return newExpression.Equals(expression) ? expression : newExpression;
         }
 
-        public override QueryExpression? VisitQueryStringParameterScope(QueryStringParameterScopeExpression expression, TArgument argument)
-        {
-            var newParameterName = Visit(expression.ParameterName, argument) as LiteralConstantExpression;
-            ResourceFieldChainExpression? newScope = expression.Scope != null ? Visit(expression.Scope, argument) as ResourceFieldChainExpression : null;
+        return null;
+    }
 
-            if (newParameterName != null)
-            {
-                var newExpression = new QueryStringParameterScopeExpression(newParameterName, newScope);
-                return newExpression.Equals(expression) ? expression : newExpression;
-            }
+    public override QueryExpression VisitSparseFieldSet(SparseFieldSetExpression expression, TArgument argument)
+    {
+        return expression;
+    }
 
-            return null;
-        }
+    public override QueryExpression? VisitQueryStringParameterScope(QueryStringParameterScopeExpression expression, TArgument argument)
+    {
+        var newParameterName = Visit(expression.ParameterName, argument) as LiteralConstantExpression;
+        ResourceFieldChainExpression? newScope = expression.Scope != null ? Visit(expression.Scope, argument) as ResourceFieldChainExpression : null;
 
-        public override QueryExpression PaginationQueryStringValue(PaginationQueryStringValueExpression expression, TArgument argument)
+        if (newParameterName != null)
         {
-            IImmutableList<PaginationElementQueryStringValueExpression> newElements = VisitList(expression.Elements, argument);
-
-            var newExpression = new PaginationQueryStringValueExpression(newElements);
+            var newExpression = new QueryStringParameterScopeExpression(newParameterName, newScope);
             return newExpression.Equals(expression) ? expression : newExpression;
         }
 
-        public override QueryExpression PaginationElementQueryStringValue(PaginationElementQueryStringValueExpression expression, TArgument argument)
-        {
-            ResourceFieldChainExpression? newScope = expression.Scope != null ? Visit(expression.Scope, argument) as ResourceFieldChainExpression : null;
-
-            var newExpression = new PaginationElementQueryStringValueExpression(newScope, expression.Value);
-            return newExpression.Equals(expression) ? expression : newExpression;
-        }
+        return null;
+    }
 
-        public override QueryExpression VisitInclude(IncludeExpression expression, TArgument argument)
-        {
-            IImmutableSet<IncludeElementExpression> newElements = VisitSet(expression.Elements, argument);
+    public override QueryExpression PaginationQueryStringValue(PaginationQueryStringValueExpression expression, TArgument argument)
+    {
+        IImmutableList<PaginationElementQueryStringValueExpression> newElements = VisitList(expression.Elements, argument);
 
-            if (newElements.Count == 0)
-            {
-                return IncludeExpression.Empty;
-            }
+        var newExpression = new PaginationQueryStringValueExpression(newElements);
+        return newExpression.Equals(expression) ? expression : newExpression;
+    }
 
-            var newExpression = new IncludeExpression(newElements);
-            return newExpression.Equals(expression) ? expression : newExpression;
-        }
+    public override QueryExpression PaginationElementQueryStringValue(PaginationElementQueryStringValueExpression expression, TArgument argument)
+    {
+        ResourceFieldChainExpression? newScope = expression.Scope != null ? Visit(expression.Scope, argument) as ResourceFieldChainExpression : null;
 
-        public override QueryExpression VisitIncludeElement(IncludeElementExpression expression, TArgument argument)
-        {
-            IImmutableSet<IncludeElementExpression> newElements = VisitSet(expression.Children, argument);
+        var newExpression = new PaginationElementQueryStringValueExpression(newScope, expression.Value);
+        return newExpression.Equals(expression) ? expression : newExpression;
+    }
 
-            var newExpression = new IncludeElementExpression(expression.Relationship, newElements);
-            return newExpression.Equals(expression) ? expression : newExpression;
-        }
+    public override QueryExpression VisitInclude(IncludeExpression expression, TArgument argument)
+    {
+        IImmutableSet<IncludeElementExpression> newElements = VisitSet(expression.Elements, argument);
 
-        public override QueryExpression VisitQueryableHandler(QueryableHandlerExpression expression, TArgument argument)
+        if (newElements.Count == 0)
         {
-            return expression;
+            return IncludeExpression.Empty;
         }
 
-        protected virtual IImmutableList<TExpression> VisitList<TExpression>(IImmutableList<TExpression> elements, TArgument argument)
-            where TExpression : QueryExpression
-        {
-            ImmutableArray<TExpression>.Builder arrayBuilder = ImmutableArray.CreateBuilder<TExpression>(elements.Count);
+        var newExpression = new IncludeExpression(newElements);
+        return newExpression.Equals(expression) ? expression : newExpression;
+    }
 
-            foreach (TExpression element in elements)
+    public override QueryExpression VisitIncludeElement(IncludeElementExpression expression, TArgument argument)
+    {
+        IImmutableSet<IncludeElementExpression> newElements = VisitSet(expression.Children, argument);
+
+        var newExpression = new IncludeElementExpression(expression.Relationship, newElements);
+        return newExpression.Equals(expression) ? expression : newExpression;
+    }
+
+    public override QueryExpression VisitQueryableHandler(QueryableHandlerExpression expression, TArgument argument)
+    {
+        return expression;
+    }
+
+    protected virtual IImmutableList<TExpression> VisitList<TExpression>(IImmutableList<TExpression> elements, TArgument argument)
+        where TExpression : QueryExpression
+    {
+        ImmutableArray<TExpression>.Builder arrayBuilder = ImmutableArray.CreateBuilder<TExpression>(elements.Count);
+
+        foreach (TExpression element in elements)
+        {
+            if (Visit(element, argument) is TExpression newElement)
             {
-                if (Visit(element, argument) is TExpression newElement)
-                {
-                    arrayBuilder.Add(newElement);
-                }
+                arrayBuilder.Add(newElement);
             }
-
-            return arrayBuilder.ToImmutable();
         }
 
-        protected virtual IImmutableSet<TExpression> VisitSet<TExpression>(IImmutableSet<TExpression> elements, TArgument argument)
-            where TExpression : QueryExpression
-        {
-            ImmutableHashSet<TExpression>.Builder setBuilder = ImmutableHashSet.CreateBuilder<TExpression>();
+        return arrayBuilder.ToImmutable();
+    }
+
+    protected virtual IImmutableSet<TExpression> VisitSet<TExpression>(IImmutableSet<TExpression> elements, TArgument argument)
+        where TExpression : QueryExpression
+    {
+        ImmutableHashSet<TExpression>.Builder setBuilder = ImmutableHashSet.CreateBuilder<TExpression>();
 
-            foreach (TExpression element in elements)
+        foreach (TExpression element in elements)
+        {
+            if (Visit(element, argument) is TExpression newElement)
             {
-                if (Visit(element, argument) is TExpression newElement)
-                {
-                    setBuilder.Add(newElement);
-                }
+                setBuilder.Add(newElement);
             }
-
-            return setBuilder.ToImmutable();
         }
+
+        return setBuilder.ToImmutable();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionVisitor.cs b/src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionVisitor.cs
index dc5963a573..7c893ba81c 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionVisitor.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/QueryExpressionVisitor.cs
@@ -1,126 +1,125 @@
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Implements the visitor design pattern that enables traversing a <see cref="QueryExpression" /> tree.
+/// </summary>
+[PublicAPI]
+public abstract class QueryExpressionVisitor<TArgument, TResult>
 {
-    /// <summary>
-    /// Implements the visitor design pattern that enables traversing a <see cref="QueryExpression" /> tree.
-    /// </summary>
-    [PublicAPI]
-    public abstract class QueryExpressionVisitor<TArgument, TResult>
-    {
-        public virtual TResult Visit(QueryExpression expression, TArgument argument)
-        {
-            return expression.Accept(this, argument);
-        }
-
-        public virtual TResult DefaultVisit(QueryExpression expression, TArgument argument)
-        {
-            return default!;
-        }
-
-        public virtual TResult VisitComparison(ComparisonExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitResourceFieldChain(ResourceFieldChainExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitLiteralConstant(LiteralConstantExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitNullConstant(NullConstantExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitLogical(LogicalExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitNot(NotExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitHas(HasExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitSortElement(SortElementExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitSort(SortExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitPagination(PaginationExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitCount(CountExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitMatchText(MatchTextExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitAny(AnyExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitSparseFieldTable(SparseFieldTableExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitSparseFieldSet(SparseFieldSetExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitQueryStringParameterScope(QueryStringParameterScopeExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult PaginationQueryStringValue(PaginationQueryStringValueExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult PaginationElementQueryStringValue(PaginationElementQueryStringValueExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitInclude(IncludeExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitIncludeElement(IncludeElementExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
-
-        public virtual TResult VisitQueryableHandler(QueryableHandlerExpression expression, TArgument argument)
-        {
-            return DefaultVisit(expression, argument);
-        }
+    public virtual TResult Visit(QueryExpression expression, TArgument argument)
+    {
+        return expression.Accept(this, argument);
+    }
+
+    public virtual TResult DefaultVisit(QueryExpression expression, TArgument argument)
+    {
+        return default!;
+    }
+
+    public virtual TResult VisitComparison(ComparisonExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitResourceFieldChain(ResourceFieldChainExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitLiteralConstant(LiteralConstantExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitNullConstant(NullConstantExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitLogical(LogicalExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitNot(NotExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitHas(HasExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitSortElement(SortElementExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitSort(SortExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitPagination(PaginationExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitCount(CountExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitMatchText(MatchTextExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitAny(AnyExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitSparseFieldTable(SparseFieldTableExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitSparseFieldSet(SparseFieldSetExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitQueryStringParameterScope(QueryStringParameterScopeExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult PaginationQueryStringValue(PaginationQueryStringValueExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult PaginationElementQueryStringValue(PaginationElementQueryStringValueExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitInclude(IncludeExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitIncludeElement(IncludeElementExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
+    }
+
+    public virtual TResult VisitQueryableHandler(QueryableHandlerExpression expression, TArgument argument)
+    {
+        return DefaultVisit(expression, argument);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/QueryStringParameterScopeExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/QueryStringParameterScopeExpression.cs
index dcd59928d4..db0e887c09 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/QueryStringParameterScopeExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/QueryStringParameterScopeExpression.cs
@@ -1,55 +1,53 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents the scope of a query string parameter, resulting from text such as: ?filter[articles]=...
+/// </summary>
+[PublicAPI]
+public class QueryStringParameterScopeExpression : QueryExpression
 {
-    /// <summary>
-    /// Represents the scope of a query string parameter, resulting from text such as: ?filter[articles]=...
-    /// </summary>
-    [PublicAPI]
-    public class QueryStringParameterScopeExpression : QueryExpression
+    public LiteralConstantExpression ParameterName { get; }
+    public ResourceFieldChainExpression? Scope { get; }
+
+    public QueryStringParameterScopeExpression(LiteralConstantExpression parameterName, ResourceFieldChainExpression? scope)
     {
-        public LiteralConstantExpression ParameterName { get; }
-        public ResourceFieldChainExpression? Scope { get; }
+        ArgumentGuard.NotNull(parameterName, nameof(parameterName));
 
-        public QueryStringParameterScopeExpression(LiteralConstantExpression parameterName, ResourceFieldChainExpression? scope)
-        {
-            ArgumentGuard.NotNull(parameterName, nameof(parameterName));
+        ParameterName = parameterName;
+        Scope = scope;
+    }
 
-            ParameterName = parameterName;
-            Scope = scope;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitQueryStringParameterScope(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitQueryStringParameterScope(this, argument);
-        }
+    public override string ToString()
+    {
+        return Scope == null ? ParameterName.ToString() : $"{ParameterName}: {Scope}";
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            return Scope == null ? ParameterName.ToString() : $"{ParameterName}: {Scope}";
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var other = (QueryStringParameterScopeExpression)obj;
+        var other = (QueryStringParameterScopeExpression)obj;
 
-            return ParameterName.Equals(other.ParameterName) && Equals(Scope, other.Scope);
-        }
+        return ParameterName.Equals(other.ParameterName) && Equals(Scope, other.Scope);
+    }
 
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(ParameterName, Scope);
-        }
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(ParameterName, Scope);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/QueryableHandlerExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/QueryableHandlerExpression.cs
index 6e57c55172..bffd8ae0ce 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/QueryableHandlerExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/QueryableHandlerExpression.cs
@@ -1,65 +1,62 @@
-using System;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Holds an <see cref="IQueryable{T}" /> expression, used for custom query string handlers from <see cref="IResourceDefinition{TResource,TId}" />s.
+/// </summary>
+[PublicAPI]
+public class QueryableHandlerExpression : QueryExpression
 {
-    /// <summary>
-    /// Holds an <see cref="IQueryable{T}" /> expression, used for custom query string handlers from <see cref="IResourceDefinition{TResource,TId}" />s.
-    /// </summary>
-    [PublicAPI]
-    public class QueryableHandlerExpression : QueryExpression
+    private readonly object _queryableHandler;
+    private readonly StringValues _parameterValue;
+
+    public QueryableHandlerExpression(object queryableHandler, StringValues parameterValue)
     {
-        private readonly object _queryableHandler;
-        private readonly StringValues _parameterValue;
+        ArgumentGuard.NotNull(queryableHandler, nameof(queryableHandler));
 
-        public QueryableHandlerExpression(object queryableHandler, StringValues parameterValue)
-        {
-            ArgumentGuard.NotNull(queryableHandler, nameof(queryableHandler));
+        _queryableHandler = queryableHandler;
+        _parameterValue = parameterValue;
+    }
 
-            _queryableHandler = queryableHandler;
-            _parameterValue = parameterValue;
-        }
+    public IQueryable<TResource> Apply<TResource>(IQueryable<TResource> query)
+        where TResource : class, IIdentifiable
+    {
+        var handler = (Func<IQueryable<TResource>, StringValues, IQueryable<TResource>>)_queryableHandler;
+        return handler(query, _parameterValue);
+    }
 
-        public IQueryable<TResource> Apply<TResource>(IQueryable<TResource> query)
-            where TResource : class, IIdentifiable
-        {
-            var handler = (Func<IQueryable<TResource>, StringValues, IQueryable<TResource>>)_queryableHandler;
-            return handler(query, _parameterValue);
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitQueryableHandler(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitQueryableHandler(this, argument);
-        }
+    public override string ToString()
+    {
+        return $"handler('{_parameterValue}')";
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            return $"handler('{_parameterValue}')";
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+            return false;
+        }
 
-            var other = (QueryableHandlerExpression)obj;
+        var other = (QueryableHandlerExpression)obj;
 
-            return _queryableHandler == other._queryableHandler && _parameterValue.Equals(other._parameterValue);
-        }
+        return _queryableHandler == other._queryableHandler && _parameterValue.Equals(other._parameterValue);
+    }
 
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(_queryableHandler, _parameterValue);
-        }
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(_queryableHandler, _parameterValue);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/ResourceFieldChainExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/ResourceFieldChainExpression.cs
index 59b78d9e55..7f19c55ba0 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/ResourceFieldChainExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/ResourceFieldChainExpression.cs
@@ -1,70 +1,67 @@
-using System;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents a chain of fields (relationships and attributes), resulting from text such as: articles.revisions.author
+/// </summary>
+[PublicAPI]
+public class ResourceFieldChainExpression : IdentifierExpression
 {
-    /// <summary>
-    /// Represents a chain of fields (relationships and attributes), resulting from text such as: articles.revisions.author
-    /// </summary>
-    [PublicAPI]
-    public class ResourceFieldChainExpression : IdentifierExpression
+    public IImmutableList<ResourceFieldAttribute> Fields { get; }
+
+    public ResourceFieldChainExpression(ResourceFieldAttribute field)
     {
-        public IImmutableList<ResourceFieldAttribute> Fields { get; }
+        ArgumentGuard.NotNull(field, nameof(field));
 
-        public ResourceFieldChainExpression(ResourceFieldAttribute field)
-        {
-            ArgumentGuard.NotNull(field, nameof(field));
+        Fields = ImmutableArray.Create(field);
+    }
 
-            Fields = ImmutableArray.Create(field);
-        }
+    public ResourceFieldChainExpression(IImmutableList<ResourceFieldAttribute> fields)
+    {
+        ArgumentGuard.NotNullNorEmpty(fields, nameof(fields));
 
-        public ResourceFieldChainExpression(IImmutableList<ResourceFieldAttribute> fields)
-        {
-            ArgumentGuard.NotNullNorEmpty(fields, nameof(fields));
+        Fields = fields;
+    }
 
-            Fields = fields;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitResourceFieldChain(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitResourceFieldChain(this, argument);
-        }
+    public override string ToString()
+    {
+        return string.Join(".", Fields.Select(field => field.PublicName));
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            return string.Join(".", Fields.Select(field => field.PublicName));
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
+            return false;
+        }
 
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+        var other = (ResourceFieldChainExpression)obj;
 
-            var other = (ResourceFieldChainExpression)obj;
+        return Fields.SequenceEqual(other.Fields);
+    }
 
-            return Fields.SequenceEqual(other.Fields);
-        }
+    public override int GetHashCode()
+    {
+        var hashCode = new HashCode();
 
-        public override int GetHashCode()
+        foreach (ResourceFieldAttribute field in Fields)
         {
-            var hashCode = new HashCode();
-
-            foreach (ResourceFieldAttribute field in Fields)
-            {
-                hashCode.Add(field);
-            }
-
-            return hashCode.ToHashCode();
+            hashCode.Add(field);
         }
+
+        return hashCode.ToHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/SortElementExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/SortElementExpression.cs
index d2f342db16..9de73655ad 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/SortElementExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/SortElementExpression.cs
@@ -1,81 +1,79 @@
-using System;
 using System.Text;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents an element in <see cref="SortExpression" />.
+/// </summary>
+[PublicAPI]
+public class SortElementExpression : QueryExpression
 {
-    /// <summary>
-    /// Represents an element in <see cref="SortExpression" />.
-    /// </summary>
-    [PublicAPI]
-    public class SortElementExpression : QueryExpression
+    public ResourceFieldChainExpression? TargetAttribute { get; }
+    public CountExpression? Count { get; }
+    public bool IsAscending { get; }
+
+    public SortElementExpression(ResourceFieldChainExpression targetAttribute, bool isAscending)
     {
-        public ResourceFieldChainExpression? TargetAttribute { get; }
-        public CountExpression? Count { get; }
-        public bool IsAscending { get; }
+        ArgumentGuard.NotNull(targetAttribute, nameof(targetAttribute));
 
-        public SortElementExpression(ResourceFieldChainExpression targetAttribute, bool isAscending)
-        {
-            ArgumentGuard.NotNull(targetAttribute, nameof(targetAttribute));
+        TargetAttribute = targetAttribute;
+        IsAscending = isAscending;
+    }
 
-            TargetAttribute = targetAttribute;
-            IsAscending = isAscending;
-        }
+    public SortElementExpression(CountExpression count, bool isAscending)
+    {
+        ArgumentGuard.NotNull(count, nameof(count));
 
-        public SortElementExpression(CountExpression count, bool isAscending)
-        {
-            ArgumentGuard.NotNull(count, nameof(count));
+        Count = count;
+        IsAscending = isAscending;
+    }
 
-            Count = count;
-            IsAscending = isAscending;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitSortElement(this, argument);
+    }
+
+    public override string ToString()
+    {
+        var builder = new StringBuilder();
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+        if (!IsAscending)
         {
-            return visitor.VisitSortElement(this, argument);
+            builder.Append('-');
         }
 
-        public override string ToString()
+        if (TargetAttribute != null)
         {
-            var builder = new StringBuilder();
-
-            if (!IsAscending)
-            {
-                builder.Append('-');
-            }
-
-            if (TargetAttribute != null)
-            {
-                builder.Append(TargetAttribute);
-            }
-            else if (Count != null)
-            {
-                builder.Append(Count);
-            }
-
-            return builder.ToString();
+            builder.Append(TargetAttribute);
         }
-
-        public override bool Equals(object? obj)
+        else if (Count != null)
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+            builder.Append(Count);
+        }
 
-            var other = (SortElementExpression)obj;
+        return builder.ToString();
+    }
 
-            return Equals(TargetAttribute, other.TargetAttribute) && Equals(Count, other.Count) && IsAscending == other.IsAscending;
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
         }
 
-        public override int GetHashCode()
+        if (obj is null || GetType() != obj.GetType())
         {
-            return HashCode.Combine(TargetAttribute, Count, IsAscending);
+            return false;
         }
+
+        var other = (SortElementExpression)obj;
+
+        return Equals(TargetAttribute, other.TargetAttribute) && Equals(Count, other.Count) && IsAscending == other.IsAscending;
+    }
+
+    public override int GetHashCode()
+    {
+        return HashCode.Combine(TargetAttribute, Count, IsAscending);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/SortExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/SortExpression.cs
index c8a375d7cc..b61b34eb91 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/SortExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/SortExpression.cs
@@ -1,62 +1,59 @@
-using System;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents a sorting, resulting from text such as: lastName,-lastModifiedAt
+/// </summary>
+[PublicAPI]
+public class SortExpression : QueryExpression
 {
-    /// <summary>
-    /// Represents a sorting, resulting from text such as: lastName,-lastModifiedAt
-    /// </summary>
-    [PublicAPI]
-    public class SortExpression : QueryExpression
+    public IImmutableList<SortElementExpression> Elements { get; }
+
+    public SortExpression(IImmutableList<SortElementExpression> elements)
     {
-        public IImmutableList<SortElementExpression> Elements { get; }
+        ArgumentGuard.NotNullNorEmpty(elements, nameof(elements));
 
-        public SortExpression(IImmutableList<SortElementExpression> elements)
-        {
-            ArgumentGuard.NotNullNorEmpty(elements, nameof(elements));
+        Elements = elements;
+    }
 
-            Elements = elements;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitSort(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitSort(this, argument);
-        }
+    public override string ToString()
+    {
+        return string.Join(",", Elements.Select(child => child.ToString()));
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            return string.Join(",", Elements.Select(child => child.ToString()));
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
+            return false;
+        }
 
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+        var other = (SortExpression)obj;
 
-            var other = (SortExpression)obj;
+        return Elements.SequenceEqual(other.Elements);
+    }
 
-            return Elements.SequenceEqual(other.Elements);
-        }
+    public override int GetHashCode()
+    {
+        var hashCode = new HashCode();
 
-        public override int GetHashCode()
+        foreach (SortElementExpression element in Elements)
         {
-            var hashCode = new HashCode();
-
-            foreach (SortElementExpression element in Elements)
-            {
-                hashCode.Add(element);
-            }
-
-            return hashCode.ToHashCode();
+            hashCode.Add(element);
         }
+
+        return hashCode.ToHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldSetExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldSetExpression.cs
index 6bb4611375..c0532070e5 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldSetExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldSetExpression.cs
@@ -1,63 +1,60 @@
-using System;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents a sparse fieldset, resulting from text such as: firstName,lastName,articles
+/// </summary>
+[PublicAPI]
+public class SparseFieldSetExpression : QueryExpression
 {
-    /// <summary>
-    /// Represents a sparse fieldset, resulting from text such as: firstName,lastName,articles
-    /// </summary>
-    [PublicAPI]
-    public class SparseFieldSetExpression : QueryExpression
+    public IImmutableSet<ResourceFieldAttribute> Fields { get; }
+
+    public SparseFieldSetExpression(IImmutableSet<ResourceFieldAttribute> fields)
     {
-        public IImmutableSet<ResourceFieldAttribute> Fields { get; }
+        ArgumentGuard.NotNullNorEmpty(fields, nameof(fields));
 
-        public SparseFieldSetExpression(IImmutableSet<ResourceFieldAttribute> fields)
-        {
-            ArgumentGuard.NotNullNorEmpty(fields, nameof(fields));
+        Fields = fields;
+    }
 
-            Fields = fields;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitSparseFieldSet(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitSparseFieldSet(this, argument);
-        }
+    public override string ToString()
+    {
+        return string.Join(",", Fields.Select(child => child.PublicName).OrderBy(name => name));
+    }
 
-        public override string ToString()
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
         {
-            return string.Join(",", Fields.Select(child => child.PublicName).OrderBy(name => name));
+            return true;
         }
 
-        public override bool Equals(object? obj)
+        if (obj is null || GetType() != obj.GetType())
         {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
+            return false;
+        }
 
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
+        var other = (SparseFieldSetExpression)obj;
 
-            var other = (SparseFieldSetExpression)obj;
+        return Fields.SetEquals(other.Fields);
+    }
 
-            return Fields.SetEquals(other.Fields);
-        }
+    public override int GetHashCode()
+    {
+        var hashCode = new HashCode();
 
-        public override int GetHashCode()
+        foreach (ResourceFieldAttribute field in Fields)
         {
-            var hashCode = new HashCode();
-
-            foreach (ResourceFieldAttribute field in Fields)
-            {
-                hashCode.Add(field);
-            }
-
-            return hashCode.ToHashCode();
+            hashCode.Add(field);
         }
+
+        return hashCode.ToHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldSetExpressionExtensions.cs b/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldSetExpressionExtensions.cs
index a9d037165a..f0e434cccd 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldSetExpressionExtensions.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldSetExpressionExtensions.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Immutable;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
@@ -6,70 +5,69 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+[PublicAPI]
+public static class SparseFieldSetExpressionExtensions
 {
-    [PublicAPI]
-    public static class SparseFieldSetExpressionExtensions
+    public static SparseFieldSetExpression? Including<TResource>(this SparseFieldSetExpression? sparseFieldSet,
+        Expression<Func<TResource, dynamic?>> fieldSelector, IResourceGraph resourceGraph)
+        where TResource : class, IIdentifiable
     {
-        public static SparseFieldSetExpression? Including<TResource>(this SparseFieldSetExpression? sparseFieldSet,
-            Expression<Func<TResource, dynamic?>> fieldSelector, IResourceGraph resourceGraph)
-            where TResource : class, IIdentifiable
-        {
-            ArgumentGuard.NotNull(fieldSelector, nameof(fieldSelector));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-
-            SparseFieldSetExpression? newSparseFieldSet = sparseFieldSet;
+        ArgumentGuard.NotNull(fieldSelector, nameof(fieldSelector));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
 
-            foreach (ResourceFieldAttribute field in resourceGraph.GetFields(fieldSelector))
-            {
-                newSparseFieldSet = IncludeField(newSparseFieldSet, field);
-            }
+        SparseFieldSetExpression? newSparseFieldSet = sparseFieldSet;
 
-            return newSparseFieldSet;
+        foreach (ResourceFieldAttribute field in resourceGraph.GetFields(fieldSelector))
+        {
+            newSparseFieldSet = IncludeField(newSparseFieldSet, field);
         }
 
-        private static SparseFieldSetExpression? IncludeField(SparseFieldSetExpression? sparseFieldSet, ResourceFieldAttribute fieldToInclude)
-        {
-            if (sparseFieldSet == null || sparseFieldSet.Fields.Contains(fieldToInclude))
-            {
-                return sparseFieldSet;
-            }
+        return newSparseFieldSet;
+    }
 
-            IImmutableSet<ResourceFieldAttribute> newSparseFieldSet = sparseFieldSet.Fields.Add(fieldToInclude);
-            return new SparseFieldSetExpression(newSparseFieldSet);
+    private static SparseFieldSetExpression? IncludeField(SparseFieldSetExpression? sparseFieldSet, ResourceFieldAttribute fieldToInclude)
+    {
+        if (sparseFieldSet == null || sparseFieldSet.Fields.Contains(fieldToInclude))
+        {
+            return sparseFieldSet;
         }
 
-        public static SparseFieldSetExpression? Excluding<TResource>(this SparseFieldSetExpression? sparseFieldSet,
-            Expression<Func<TResource, dynamic?>> fieldSelector, IResourceGraph resourceGraph)
-            where TResource : class, IIdentifiable
-        {
-            ArgumentGuard.NotNull(fieldSelector, nameof(fieldSelector));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        IImmutableSet<ResourceFieldAttribute> newSparseFieldSet = sparseFieldSet.Fields.Add(fieldToInclude);
+        return new SparseFieldSetExpression(newSparseFieldSet);
+    }
 
-            SparseFieldSetExpression? newSparseFieldSet = sparseFieldSet;
+    public static SparseFieldSetExpression? Excluding<TResource>(this SparseFieldSetExpression? sparseFieldSet,
+        Expression<Func<TResource, dynamic?>> fieldSelector, IResourceGraph resourceGraph)
+        where TResource : class, IIdentifiable
+    {
+        ArgumentGuard.NotNull(fieldSelector, nameof(fieldSelector));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
 
-            foreach (ResourceFieldAttribute field in resourceGraph.GetFields(fieldSelector))
-            {
-                newSparseFieldSet = ExcludeField(newSparseFieldSet, field);
-            }
+        SparseFieldSetExpression? newSparseFieldSet = sparseFieldSet;
 
-            return newSparseFieldSet;
+        foreach (ResourceFieldAttribute field in resourceGraph.GetFields(fieldSelector))
+        {
+            newSparseFieldSet = ExcludeField(newSparseFieldSet, field);
         }
 
-        private static SparseFieldSetExpression? ExcludeField(SparseFieldSetExpression? sparseFieldSet, ResourceFieldAttribute fieldToExclude)
-        {
-            // Design tradeoff: When the sparse fieldset is empty, it means all fields will be selected.
-            // Adding an exclusion in that case is a no-op, which results in still retrieving the excluded field from data store.
-            // But later, when serializing the response, the sparse fieldset is first populated with all fields,
-            // so then the exclusion will actually be applied and the excluded field is not returned to the client.
+        return newSparseFieldSet;
+    }
 
-            if (sparseFieldSet == null || !sparseFieldSet.Fields.Contains(fieldToExclude))
-            {
-                return sparseFieldSet;
-            }
+    private static SparseFieldSetExpression? ExcludeField(SparseFieldSetExpression? sparseFieldSet, ResourceFieldAttribute fieldToExclude)
+    {
+        // Design tradeoff: When the sparse fieldset is empty, it means all fields will be selected.
+        // Adding an exclusion in that case is a no-op, which results in still retrieving the excluded field from data store.
+        // But later, when serializing the response, the sparse fieldset is first populated with all fields,
+        // so then the exclusion will actually be applied and the excluded field is not returned to the client.
 
-            IImmutableSet<ResourceFieldAttribute> newSparseFieldSet = sparseFieldSet.Fields.Remove(fieldToExclude);
-            return new SparseFieldSetExpression(newSparseFieldSet);
+        if (sparseFieldSet == null || !sparseFieldSet.Fields.Contains(fieldToExclude))
+        {
+            return sparseFieldSet;
         }
+
+        IImmutableSet<ResourceFieldAttribute> newSparseFieldSet = sparseFieldSet.Fields.Remove(fieldToExclude);
+        return new SparseFieldSetExpression(newSparseFieldSet);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldTableExpression.cs b/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldTableExpression.cs
index 8543823199..8ec77f12fc 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldTableExpression.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/SparseFieldTableExpression.cs
@@ -1,79 +1,77 @@
-using System;
 using System.Collections.Immutable;
 using System.Text;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+/// <summary>
+/// Represents a lookup table of sparse fieldsets per resource type.
+/// </summary>
+[PublicAPI]
+public class SparseFieldTableExpression : QueryExpression
 {
-    /// <summary>
-    /// Represents a lookup table of sparse fieldsets per resource type.
-    /// </summary>
-    [PublicAPI]
-    public class SparseFieldTableExpression : QueryExpression
+    public IImmutableDictionary<ResourceType, SparseFieldSetExpression> Table { get; }
+
+    public SparseFieldTableExpression(IImmutableDictionary<ResourceType, SparseFieldSetExpression> table)
     {
-        public IImmutableDictionary<ResourceType, SparseFieldSetExpression> Table { get; }
+        ArgumentGuard.NotNullNorEmpty(table, nameof(table), "entries");
 
-        public SparseFieldTableExpression(IImmutableDictionary<ResourceType, SparseFieldSetExpression> table)
-        {
-            ArgumentGuard.NotNullNorEmpty(table, nameof(table), "entries");
+        Table = table;
+    }
 
-            Table = table;
-        }
+    public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
+    {
+        return visitor.VisitSparseFieldTable(this, argument);
+    }
 
-        public override TResult Accept<TArgument, TResult>(QueryExpressionVisitor<TArgument, TResult> visitor, TArgument argument)
-        {
-            return visitor.VisitSparseFieldTable(this, argument);
-        }
+    public override string ToString()
+    {
+        var builder = new StringBuilder();
 
-        public override string ToString()
+        foreach ((ResourceType resourceType, SparseFieldSetExpression fields) in Table)
         {
-            var builder = new StringBuilder();
-
-            foreach ((ResourceType resourceType, SparseFieldSetExpression fields) in Table)
+            if (builder.Length > 0)
             {
-                if (builder.Length > 0)
-                {
-                    builder.Append(',');
-                }
-
-                builder.Append(resourceType.PublicName);
-                builder.Append('(');
-                builder.Append(fields);
-                builder.Append(')');
+                builder.Append(',');
             }
 
-            return builder.ToString();
+            builder.Append(resourceType.PublicName);
+            builder.Append('(');
+            builder.Append(fields);
+            builder.Append(')');
         }
 
-        public override bool Equals(object? obj)
-        {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
-
-            var other = (SparseFieldTableExpression)obj;
+        return builder.ToString();
+    }
 
-            return Table.DictionaryEqual(other.Table);
+    public override bool Equals(object? obj)
+    {
+        if (ReferenceEquals(this, obj))
+        {
+            return true;
         }
 
-        public override int GetHashCode()
+        if (obj is null || GetType() != obj.GetType())
         {
-            var hashCode = new HashCode();
+            return false;
+        }
 
-            foreach ((ResourceType resourceType, SparseFieldSetExpression sparseFieldSet) in Table)
-            {
-                hashCode.Add(resourceType);
-                hashCode.Add(sparseFieldSet);
-            }
+        var other = (SparseFieldTableExpression)obj;
+
+        return Table.DictionaryEqual(other.Table);
+    }
 
-            return hashCode.ToHashCode();
+    public override int GetHashCode()
+    {
+        var hashCode = new HashCode();
+
+        foreach ((ResourceType resourceType, SparseFieldSetExpression sparseFieldSet) in Table)
+        {
+            hashCode.Add(resourceType);
+            hashCode.Add(sparseFieldSet);
         }
+
+        return hashCode.ToHashCode();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Expressions/TextMatchKind.cs b/src/JsonApiDotNetCore/Queries/Expressions/TextMatchKind.cs
index e51436b252..e9b28c4b88 100644
--- a/src/JsonApiDotNetCore/Queries/Expressions/TextMatchKind.cs
+++ b/src/JsonApiDotNetCore/Queries/Expressions/TextMatchKind.cs
@@ -1,9 +1,8 @@
-namespace JsonApiDotNetCore.Queries.Expressions
+namespace JsonApiDotNetCore.Queries.Expressions;
+
+public enum TextMatchKind
 {
-    public enum TextMatchKind
-    {
-        Contains,
-        StartsWith,
-        EndsWith
-    }
+    Contains,
+    StartsWith,
+    EndsWith
 }
diff --git a/src/JsonApiDotNetCore/Queries/IPaginationContext.cs b/src/JsonApiDotNetCore/Queries/IPaginationContext.cs
index da769a3ade..44578e5277 100644
--- a/src/JsonApiDotNetCore/Queries/IPaginationContext.cs
+++ b/src/JsonApiDotNetCore/Queries/IPaginationContext.cs
@@ -1,38 +1,37 @@
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCore.Queries
+namespace JsonApiDotNetCore.Queries;
+
+/// <summary>
+/// Tracks values used for pagination, which is a combined effort from options, query string parsing and fetching the total number of rows.
+/// </summary>
+public interface IPaginationContext
 {
     /// <summary>
-    /// Tracks values used for pagination, which is a combined effort from options, query string parsing and fetching the total number of rows.
+    /// The value 1, unless specified from query string. Never null. Cannot be higher than options.MaximumPageNumber.
     /// </summary>
-    public interface IPaginationContext
-    {
-        /// <summary>
-        /// The value 1, unless specified from query string. Never null. Cannot be higher than options.MaximumPageNumber.
-        /// </summary>
-        PageNumber PageNumber { get; set; }
+    PageNumber PageNumber { get; set; }
 
-        /// <summary>
-        /// The default page size from options, unless specified in query string. Can be <c>null</c>, which means no paging. Cannot be higher than
-        /// options.MaximumPageSize.
-        /// </summary>
-        PageSize? PageSize { get; set; }
+    /// <summary>
+    /// The default page size from options, unless specified in query string. Can be <c>null</c>, which means no paging. Cannot be higher than
+    /// options.MaximumPageSize.
+    /// </summary>
+    PageSize? PageSize { get; set; }
 
-        /// <summary>
-        /// Indicates whether the number of resources on the current page equals the page size. When <c>true</c>, a subsequent page might exist (assuming
-        /// <see cref="TotalResourceCount" /> is unknown).
-        /// </summary>
-        bool IsPageFull { get; set; }
+    /// <summary>
+    /// Indicates whether the number of resources on the current page equals the page size. When <c>true</c>, a subsequent page might exist (assuming
+    /// <see cref="TotalResourceCount" /> is unknown).
+    /// </summary>
+    bool IsPageFull { get; set; }
 
-        /// <summary>
-        /// The total number of resources. <c>null</c> when <see cref="IJsonApiOptions.IncludeTotalResourceCount" /> is set to <c>false</c>.
-        /// </summary>
-        int? TotalResourceCount { get; set; }
+    /// <summary>
+    /// The total number of resources. <c>null</c> when <see cref="IJsonApiOptions.IncludeTotalResourceCount" /> is set to <c>false</c>.
+    /// </summary>
+    int? TotalResourceCount { get; set; }
 
-        /// <summary>
-        /// The total number of resource pages. <c>null</c> when <see cref="IJsonApiOptions.IncludeTotalResourceCount" /> is set to <c>false</c> or
-        /// <see cref="PageSize" /> is <c>null</c>.
-        /// </summary>
-        int? TotalPageCount { get; }
-    }
+    /// <summary>
+    /// The total number of resource pages. <c>null</c> when <see cref="IJsonApiOptions.IncludeTotalResourceCount" /> is set to <c>false</c> or
+    /// <see cref="PageSize" /> is <c>null</c>.
+    /// </summary>
+    int? TotalPageCount { get; }
 }
diff --git a/src/JsonApiDotNetCore/Queries/IQueryConstraintProvider.cs b/src/JsonApiDotNetCore/Queries/IQueryConstraintProvider.cs
index c9a82a7b36..451297a509 100644
--- a/src/JsonApiDotNetCore/Queries/IQueryConstraintProvider.cs
+++ b/src/JsonApiDotNetCore/Queries/IQueryConstraintProvider.cs
@@ -1,15 +1,12 @@
-using System.Collections.Generic;
+namespace JsonApiDotNetCore.Queries;
 
-namespace JsonApiDotNetCore.Queries
+/// <summary>
+/// Provides constraints (such as filters, sorting, pagination, sparse fieldsets and inclusions) to be applied on a data set.
+/// </summary>
+public interface IQueryConstraintProvider
 {
     /// <summary>
-    /// Provides constraints (such as filters, sorting, pagination, sparse fieldsets and inclusions) to be applied on a data set.
+    /// Returns a set of scoped expressions.
     /// </summary>
-    public interface IQueryConstraintProvider
-    {
-        /// <summary>
-        /// Returns a set of scoped expressions.
-        /// </summary>
-        public IReadOnlyCollection<ExpressionInScope> GetConstraints();
-    }
+    public IReadOnlyCollection<ExpressionInScope> GetConstraints();
 }
diff --git a/src/JsonApiDotNetCore/Queries/IQueryLayerComposer.cs b/src/JsonApiDotNetCore/Queries/IQueryLayerComposer.cs
index b81c9bacd4..a9d99c3b13 100644
--- a/src/JsonApiDotNetCore/Queries/IQueryLayerComposer.cs
+++ b/src/JsonApiDotNetCore/Queries/IQueryLayerComposer.cs
@@ -1,66 +1,64 @@
-using System.Collections.Generic;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries
+namespace JsonApiDotNetCore.Queries;
+
+/// <summary>
+/// Takes scoped expressions from <see cref="IQueryConstraintProvider" />s and transforms them.
+/// </summary>
+public interface IQueryLayerComposer
 {
     /// <summary>
-    /// Takes scoped expressions from <see cref="IQueryConstraintProvider" />s and transforms them.
+    /// Builds a filter from constraints, used to determine total resource count on a primary collection endpoint.
     /// </summary>
-    public interface IQueryLayerComposer
-    {
-        /// <summary>
-        /// Builds a filter from constraints, used to determine total resource count on a primary collection endpoint.
-        /// </summary>
-        FilterExpression? GetPrimaryFilterFromConstraints(ResourceType primaryResourceType);
+    FilterExpression? GetPrimaryFilterFromConstraints(ResourceType primaryResourceType);
 
-        /// <summary>
-        /// Builds a filter from constraints, used to determine total resource count on a secondary collection endpoint.
-        /// </summary>
-        FilterExpression? GetSecondaryFilterFromConstraints<TId>(TId primaryId, HasManyAttribute hasManyRelationship);
+    /// <summary>
+    /// Builds a filter from constraints, used to determine total resource count on a secondary collection endpoint.
+    /// </summary>
+    FilterExpression? GetSecondaryFilterFromConstraints<TId>(TId primaryId, HasManyAttribute hasManyRelationship);
 
-        /// <summary>
-        /// Collects constraints and builds a <see cref="QueryLayer" /> out of them, used to retrieve the actual resources.
-        /// </summary>
-        QueryLayer ComposeFromConstraints(ResourceType requestResourceType);
+    /// <summary>
+    /// Collects constraints and builds a <see cref="QueryLayer" /> out of them, used to retrieve the actual resources.
+    /// </summary>
+    QueryLayer ComposeFromConstraints(ResourceType requestResourceType);
 
-        /// <summary>
-        /// Collects constraints and builds a <see cref="QueryLayer" /> out of them, used to retrieve one resource.
-        /// </summary>
-        QueryLayer ComposeForGetById<TId>(TId id, ResourceType primaryResourceType, TopFieldSelection fieldSelection);
+    /// <summary>
+    /// Collects constraints and builds a <see cref="QueryLayer" /> out of them, used to retrieve one resource.
+    /// </summary>
+    QueryLayer ComposeForGetById<TId>(TId id, ResourceType primaryResourceType, TopFieldSelection fieldSelection);
 
-        /// <summary>
-        /// Collects constraints and builds the secondary layer for a relationship endpoint.
-        /// </summary>
-        QueryLayer ComposeSecondaryLayerForRelationship(ResourceType secondaryResourceType);
+    /// <summary>
+    /// Collects constraints and builds the secondary layer for a relationship endpoint.
+    /// </summary>
+    QueryLayer ComposeSecondaryLayerForRelationship(ResourceType secondaryResourceType);
 
-        /// <summary>
-        /// Wraps a layer for a secondary endpoint into a primary layer, rewriting top-level includes.
-        /// </summary>
-        QueryLayer WrapLayerForSecondaryEndpoint<TId>(QueryLayer secondaryLayer, ResourceType primaryResourceType, TId primaryId,
-            RelationshipAttribute relationship);
+    /// <summary>
+    /// Wraps a layer for a secondary endpoint into a primary layer, rewriting top-level includes.
+    /// </summary>
+    QueryLayer WrapLayerForSecondaryEndpoint<TId>(QueryLayer secondaryLayer, ResourceType primaryResourceType, TId primaryId,
+        RelationshipAttribute relationship);
 
-        /// <summary>
-        /// Builds a query that retrieves the primary resource, including all of its attributes and all targeted relationships, during a create/update/delete
-        /// request.
-        /// </summary>
-        QueryLayer ComposeForUpdate<TId>(TId id, ResourceType primaryResourceType);
+    /// <summary>
+    /// Builds a query that retrieves the primary resource, including all of its attributes and all targeted relationships, during a create/update/delete
+    /// request.
+    /// </summary>
+    QueryLayer ComposeForUpdate<TId>(TId id, ResourceType primaryResourceType);
 
-        /// <summary>
-        /// Builds a query for each targeted relationship with a filter to match on its right resource IDs.
-        /// </summary>
-        IEnumerable<(QueryLayer, RelationshipAttribute)> ComposeForGetTargetedSecondaryResourceIds(IIdentifiable primaryResource);
+    /// <summary>
+    /// Builds a query for each targeted relationship with a filter to match on its right resource IDs.
+    /// </summary>
+    IEnumerable<(QueryLayer, RelationshipAttribute)> ComposeForGetTargetedSecondaryResourceIds(IIdentifiable primaryResource);
 
-        /// <summary>
-        /// Builds a query for the specified relationship with a filter to match on its right resource IDs.
-        /// </summary>
-        QueryLayer ComposeForGetRelationshipRightIds(RelationshipAttribute relationship, ICollection<IIdentifiable> rightResourceIds);
+    /// <summary>
+    /// Builds a query for the specified relationship with a filter to match on its right resource IDs.
+    /// </summary>
+    QueryLayer ComposeForGetRelationshipRightIds(RelationshipAttribute relationship, ICollection<IIdentifiable> rightResourceIds);
 
-        /// <summary>
-        /// Builds a query for a to-many relationship with a filter to match on its left and right resource IDs.
-        /// </summary>
-        QueryLayer ComposeForHasMany<TId>(HasManyAttribute hasManyRelationship, TId leftId, ICollection<IIdentifiable> rightResourceIds);
-    }
+    /// <summary>
+    /// Builds a query for a to-many relationship with a filter to match on its left and right resource IDs.
+    /// </summary>
+    QueryLayer ComposeForHasMany<TId>(HasManyAttribute hasManyRelationship, TId leftId, ICollection<IIdentifiable> rightResourceIds);
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/EvaluatedIncludeCache.cs b/src/JsonApiDotNetCore/Queries/Internal/EvaluatedIncludeCache.cs
index 44baafc65f..509baf73ee 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/EvaluatedIncludeCache.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/EvaluatedIncludeCache.cs
@@ -1,24 +1,23 @@
 using JsonApiDotNetCore.Queries.Expressions;
 
-namespace JsonApiDotNetCore.Queries.Internal
+namespace JsonApiDotNetCore.Queries.Internal;
+
+/// <inheritdoc />
+internal sealed class EvaluatedIncludeCache : IEvaluatedIncludeCache
 {
+    private IncludeExpression? _include;
+
     /// <inheritdoc />
-    internal sealed class EvaluatedIncludeCache : IEvaluatedIncludeCache
+    public void Set(IncludeExpression include)
     {
-        private IncludeExpression? _include;
-
-        /// <inheritdoc />
-        public void Set(IncludeExpression include)
-        {
-            ArgumentGuard.NotNull(include, nameof(include));
+        ArgumentGuard.NotNull(include, nameof(include));
 
-            _include = include;
-        }
+        _include = include;
+    }
 
-        /// <inheritdoc />
-        public IncludeExpression? Get()
-        {
-            return _include;
-        }
+    /// <inheritdoc />
+    public IncludeExpression? Get()
+    {
+        return _include;
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/IEvaluatedIncludeCache.cs b/src/JsonApiDotNetCore/Queries/Internal/IEvaluatedIncludeCache.cs
index 618caeb286..93b85c090e 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/IEvaluatedIncludeCache.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/IEvaluatedIncludeCache.cs
@@ -1,23 +1,22 @@
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Queries.Internal
+namespace JsonApiDotNetCore.Queries.Internal;
+
+/// <summary>
+/// Provides in-memory storage for the evaluated inclusion tree within a request. This tree is produced from query string and resource definition
+/// callbacks. The cache enables the serialization layer to take changes from <see cref="IResourceDefinition{TResource,TId}.OnApplyIncludes" /> into
+/// account.
+/// </summary>
+public interface IEvaluatedIncludeCache
 {
     /// <summary>
-    /// Provides in-memory storage for the evaluated inclusion tree within a request. This tree is produced from query string and resource definition
-    /// callbacks. The cache enables the serialization layer to take changes from <see cref="IResourceDefinition{TResource,TId}.OnApplyIncludes" /> into
-    /// account.
+    /// Stores the evaluated inclusion tree for later usage.
     /// </summary>
-    public interface IEvaluatedIncludeCache
-    {
-        /// <summary>
-        /// Stores the evaluated inclusion tree for later usage.
-        /// </summary>
-        void Set(IncludeExpression include);
+    void Set(IncludeExpression include);
 
-        /// <summary>
-        /// Gets the evaluated inclusion tree that was stored earlier.
-        /// </summary>
-        IncludeExpression? Get();
-    }
+    /// <summary>
+    /// Gets the evaluated inclusion tree that was stored earlier.
+    /// </summary>
+    IncludeExpression? Get();
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/ISparseFieldSetCache.cs b/src/JsonApiDotNetCore/Queries/Internal/ISparseFieldSetCache.cs
index cb3ab1f2d3..32a4724637 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/ISparseFieldSetCache.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/ISparseFieldSetCache.cs
@@ -3,38 +3,37 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal
+namespace JsonApiDotNetCore.Queries.Internal;
+
+/// <summary>
+/// Takes sparse fieldsets from <see cref="IQueryConstraintProvider" />s and invokes
+/// <see cref="IResourceDefinition{TResource,TId}.OnApplySparseFieldSet" /> on them.
+/// </summary>
+/// <remarks>
+/// This cache ensures that for each request (or operation per request), the resource definition callback is executed only twice per resource type. The
+/// first invocation is used to obtain the fields to retrieve from the underlying data store, while the second invocation is used to determine which
+/// fields to write to the response body.
+/// </remarks>
+public interface ISparseFieldSetCache
 {
     /// <summary>
-    /// Takes sparse fieldsets from <see cref="IQueryConstraintProvider" />s and invokes
-    /// <see cref="IResourceDefinition{TResource,TId}.OnApplySparseFieldSet" /> on them.
+    /// Gets the set of sparse fields to retrieve from the underlying data store. Returns an empty set to retrieve all fields.
     /// </summary>
-    /// <remarks>
-    /// This cache ensures that for each request (or operation per request), the resource definition callback is executed only twice per resource type. The
-    /// first invocation is used to obtain the fields to retrieve from the underlying data store, while the second invocation is used to determine which
-    /// fields to write to the response body.
-    /// </remarks>
-    public interface ISparseFieldSetCache
-    {
-        /// <summary>
-        /// Gets the set of sparse fields to retrieve from the underlying data store. Returns an empty set to retrieve all fields.
-        /// </summary>
-        IImmutableSet<ResourceFieldAttribute> GetSparseFieldSetForQuery(ResourceType resourceType);
+    IImmutableSet<ResourceFieldAttribute> GetSparseFieldSetForQuery(ResourceType resourceType);
 
-        /// <summary>
-        /// Gets the set of attributes to retrieve from the underlying data store for relationship endpoints. This always returns 'id', along with any additional
-        /// attributes from resource definition callback.
-        /// </summary>
-        IImmutableSet<AttrAttribute> GetIdAttributeSetForRelationshipQuery(ResourceType resourceType);
+    /// <summary>
+    /// Gets the set of attributes to retrieve from the underlying data store for relationship endpoints. This always returns 'id', along with any additional
+    /// attributes from resource definition callback.
+    /// </summary>
+    IImmutableSet<AttrAttribute> GetIdAttributeSetForRelationshipQuery(ResourceType resourceType);
 
-        /// <summary>
-        /// Gets the evaluated set of sparse fields to serialize into the response body.
-        /// </summary>
-        IImmutableSet<ResourceFieldAttribute> GetSparseFieldSetForSerializer(ResourceType resourceType);
+    /// <summary>
+    /// Gets the evaluated set of sparse fields to serialize into the response body.
+    /// </summary>
+    IImmutableSet<ResourceFieldAttribute> GetSparseFieldSetForSerializer(ResourceType resourceType);
 
-        /// <summary>
-        /// Resets the cached results from resource definition callbacks.
-        /// </summary>
-        void Reset();
-    }
+    /// <summary>
+    /// Resets the cached results from resource definition callbacks.
+    /// </summary>
+    void Reset();
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/FieldChainRequirements.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/FieldChainRequirements.cs
index 5864c18d3e..58ab6f0830 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/FieldChainRequirements.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/FieldChainRequirements.cs
@@ -1,34 +1,32 @@
-using System;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+/// <summary>
+/// Used internally when parsing subexpressions in the query string parsers to indicate requirements when resolving a chain of fields. Note these may be
+/// interpreted differently or even discarded completely by the various parser implementations, as they tend to better understand the characteristics of
+/// the entire expression being parsed.
+/// </summary>
+[Flags]
+public enum FieldChainRequirements
 {
     /// <summary>
-    /// Used internally when parsing subexpressions in the query string parsers to indicate requirements when resolving a chain of fields. Note these may be
-    /// interpreted differently or even discarded completely by the various parser implementations, as they tend to better understand the characteristics of
-    /// the entire expression being parsed.
+    /// Indicates a single <see cref="AttrAttribute" />, optionally preceded by a chain of <see cref="RelationshipAttribute" />s.
     /// </summary>
-    [Flags]
-    public enum FieldChainRequirements
-    {
-        /// <summary>
-        /// Indicates a single <see cref="AttrAttribute" />, optionally preceded by a chain of <see cref="RelationshipAttribute" />s.
-        /// </summary>
-        EndsInAttribute = 1,
+    EndsInAttribute = 1,
 
-        /// <summary>
-        /// Indicates a single <see cref="HasOneAttribute" />, optionally preceded by a chain of <see cref="RelationshipAttribute" />s.
-        /// </summary>
-        EndsInToOne = 2,
+    /// <summary>
+    /// Indicates a single <see cref="HasOneAttribute" />, optionally preceded by a chain of <see cref="RelationshipAttribute" />s.
+    /// </summary>
+    EndsInToOne = 2,
 
-        /// <summary>
-        /// Indicates a single <see cref="HasManyAttribute" />, optionally preceded by a chain of <see cref="RelationshipAttribute" />s.
-        /// </summary>
-        EndsInToMany = 4,
+    /// <summary>
+    /// Indicates a single <see cref="HasManyAttribute" />, optionally preceded by a chain of <see cref="RelationshipAttribute" />s.
+    /// </summary>
+    EndsInToMany = 4,
 
-        /// <summary>
-        /// Indicates one or a chain of <see cref="RelationshipAttribute" />s.
-        /// </summary>
-        IsRelationship = EndsInToOne | EndsInToMany
-    }
+    /// <summary>
+    /// Indicates one or a chain of <see cref="RelationshipAttribute" />s.
+    /// </summary>
+    IsRelationship = EndsInToOne | EndsInToMany
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/FilterParser.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/FilterParser.cs
index de2f246503..c2b66f9063 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/FilterParser.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/FilterParser.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Immutable;
 using System.Reflection;
 using Humanizer;
@@ -8,354 +7,353 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+[PublicAPI]
+public class FilterParser : QueryExpressionParser
 {
-    [PublicAPI]
-    public class FilterParser : QueryExpressionParser
-    {
-        private readonly IResourceFactory _resourceFactory;
-        private readonly Action<ResourceFieldAttribute, ResourceType, string>? _validateSingleFieldCallback;
-        private ResourceType? _resourceTypeInScope;
+    private readonly IResourceFactory _resourceFactory;
+    private readonly Action<ResourceFieldAttribute, ResourceType, string>? _validateSingleFieldCallback;
+    private ResourceType? _resourceTypeInScope;
 
-        public FilterParser(IResourceFactory resourceFactory, Action<ResourceFieldAttribute, ResourceType, string>? validateSingleFieldCallback = null)
-        {
-            ArgumentGuard.NotNull(resourceFactory, nameof(resourceFactory));
+    public FilterParser(IResourceFactory resourceFactory, Action<ResourceFieldAttribute, ResourceType, string>? validateSingleFieldCallback = null)
+    {
+        ArgumentGuard.NotNull(resourceFactory, nameof(resourceFactory));
 
-            _resourceFactory = resourceFactory;
-            _validateSingleFieldCallback = validateSingleFieldCallback;
-        }
+        _resourceFactory = resourceFactory;
+        _validateSingleFieldCallback = validateSingleFieldCallback;
+    }
 
-        public FilterExpression Parse(string source, ResourceType resourceTypeInScope)
-        {
-            ArgumentGuard.NotNull(resourceTypeInScope, nameof(resourceTypeInScope));
+    public FilterExpression Parse(string source, ResourceType resourceTypeInScope)
+    {
+        ArgumentGuard.NotNull(resourceTypeInScope, nameof(resourceTypeInScope));
 
-            _resourceTypeInScope = resourceTypeInScope;
+        _resourceTypeInScope = resourceTypeInScope;
 
-            Tokenize(source);
+        Tokenize(source);
 
-            FilterExpression expression = ParseFilter();
+        FilterExpression expression = ParseFilter();
 
-            AssertTokenStackIsEmpty();
+        AssertTokenStackIsEmpty();
 
-            return expression;
-        }
+        return expression;
+    }
 
-        protected FilterExpression ParseFilter()
+    protected FilterExpression ParseFilter()
+    {
+        if (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.Text)
         {
-            if (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.Text)
+            switch (nextToken.Value)
             {
-                switch (nextToken.Value)
+                case Keywords.Not:
+                {
+                    return ParseNot();
+                }
+                case Keywords.And:
+                case Keywords.Or:
+                {
+                    return ParseLogical(nextToken.Value);
+                }
+                case Keywords.Equals:
+                case Keywords.LessThan:
+                case Keywords.LessOrEqual:
+                case Keywords.GreaterThan:
+                case Keywords.GreaterOrEqual:
+                {
+                    return ParseComparison(nextToken.Value);
+                }
+                case Keywords.Contains:
+                case Keywords.StartsWith:
+                case Keywords.EndsWith:
                 {
-                    case Keywords.Not:
-                    {
-                        return ParseNot();
-                    }
-                    case Keywords.And:
-                    case Keywords.Or:
-                    {
-                        return ParseLogical(nextToken.Value);
-                    }
-                    case Keywords.Equals:
-                    case Keywords.LessThan:
-                    case Keywords.LessOrEqual:
-                    case Keywords.GreaterThan:
-                    case Keywords.GreaterOrEqual:
-                    {
-                        return ParseComparison(nextToken.Value);
-                    }
-                    case Keywords.Contains:
-                    case Keywords.StartsWith:
-                    case Keywords.EndsWith:
-                    {
-                        return ParseTextMatch(nextToken.Value);
-                    }
-                    case Keywords.Any:
-                    {
-                        return ParseAny();
-                    }
-                    case Keywords.Has:
-                    {
-                        return ParseHas();
-                    }
+                    return ParseTextMatch(nextToken.Value);
+                }
+                case Keywords.Any:
+                {
+                    return ParseAny();
+                }
+                case Keywords.Has:
+                {
+                    return ParseHas();
                 }
             }
-
-            throw new QueryParseException("Filter function expected.");
         }
 
-        protected NotExpression ParseNot()
-        {
-            EatText(Keywords.Not);
-            EatSingleCharacterToken(TokenKind.OpenParen);
+        throw new QueryParseException("Filter function expected.");
+    }
 
-            FilterExpression child = ParseFilter();
+    protected NotExpression ParseNot()
+    {
+        EatText(Keywords.Not);
+        EatSingleCharacterToken(TokenKind.OpenParen);
 
-            EatSingleCharacterToken(TokenKind.CloseParen);
+        FilterExpression child = ParseFilter();
 
-            return new NotExpression(child);
-        }
+        EatSingleCharacterToken(TokenKind.CloseParen);
 
-        protected LogicalExpression ParseLogical(string operatorName)
-        {
-            EatText(operatorName);
-            EatSingleCharacterToken(TokenKind.OpenParen);
+        return new NotExpression(child);
+    }
 
-            ImmutableArray<FilterExpression>.Builder termsBuilder = ImmutableArray.CreateBuilder<FilterExpression>();
+    protected LogicalExpression ParseLogical(string operatorName)
+    {
+        EatText(operatorName);
+        EatSingleCharacterToken(TokenKind.OpenParen);
 
-            FilterExpression term = ParseFilter();
-            termsBuilder.Add(term);
+        ImmutableArray<FilterExpression>.Builder termsBuilder = ImmutableArray.CreateBuilder<FilterExpression>();
 
+        FilterExpression term = ParseFilter();
+        termsBuilder.Add(term);
+
+        EatSingleCharacterToken(TokenKind.Comma);
+
+        term = ParseFilter();
+        termsBuilder.Add(term);
+
+        while (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.Comma)
+        {
             EatSingleCharacterToken(TokenKind.Comma);
 
             term = ParseFilter();
             termsBuilder.Add(term);
+        }
 
-            while (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.Comma)
-            {
-                EatSingleCharacterToken(TokenKind.Comma);
+        EatSingleCharacterToken(TokenKind.CloseParen);
 
-                term = ParseFilter();
-                termsBuilder.Add(term);
-            }
+        var logicalOperator = Enum.Parse<LogicalOperator>(operatorName.Pascalize());
+        return new LogicalExpression(logicalOperator, termsBuilder.ToImmutable());
+    }
 
-            EatSingleCharacterToken(TokenKind.CloseParen);
+    protected ComparisonExpression ParseComparison(string operatorName)
+    {
+        var comparisonOperator = Enum.Parse<ComparisonOperator>(operatorName.Pascalize());
 
-            var logicalOperator = Enum.Parse<LogicalOperator>(operatorName.Pascalize());
-            return new LogicalExpression(logicalOperator, termsBuilder.ToImmutable());
-        }
+        EatText(operatorName);
+        EatSingleCharacterToken(TokenKind.OpenParen);
 
-        protected ComparisonExpression ParseComparison(string operatorName)
-        {
-            var comparisonOperator = Enum.Parse<ComparisonOperator>(operatorName.Pascalize());
+        // Allow equality comparison of a HasOne relationship with null.
+        FieldChainRequirements leftChainRequirements = comparisonOperator == ComparisonOperator.Equals
+            ? FieldChainRequirements.EndsInAttribute | FieldChainRequirements.EndsInToOne
+            : FieldChainRequirements.EndsInAttribute;
 
-            EatText(operatorName);
-            EatSingleCharacterToken(TokenKind.OpenParen);
+        QueryExpression leftTerm = ParseCountOrField(leftChainRequirements);
 
-            // Allow equality comparison of a HasOne relationship with null.
-            FieldChainRequirements leftChainRequirements = comparisonOperator == ComparisonOperator.Equals
-                ? FieldChainRequirements.EndsInAttribute | FieldChainRequirements.EndsInToOne
-                : FieldChainRequirements.EndsInAttribute;
+        EatSingleCharacterToken(TokenKind.Comma);
 
-            QueryExpression leftTerm = ParseCountOrField(leftChainRequirements);
+        QueryExpression rightTerm = ParseCountOrConstantOrNullOrField(FieldChainRequirements.EndsInAttribute);
 
-            EatSingleCharacterToken(TokenKind.Comma);
+        EatSingleCharacterToken(TokenKind.CloseParen);
 
-            QueryExpression rightTerm = ParseCountOrConstantOrNullOrField(FieldChainRequirements.EndsInAttribute);
+        if (leftTerm is ResourceFieldChainExpression leftChain)
+        {
+            if (leftChainRequirements.HasFlag(FieldChainRequirements.EndsInToOne) && rightTerm is not NullConstantExpression)
+            {
+                // Run another pass over left chain to have it fail when chain ends in relationship.
+                OnResolveFieldChain(leftChain.ToString(), FieldChainRequirements.EndsInAttribute);
+            }
 
-            EatSingleCharacterToken(TokenKind.CloseParen);
+            PropertyInfo leftProperty = leftChain.Fields[^1].Property;
 
-            if (leftTerm is ResourceFieldChainExpression leftChain)
+            if (leftProperty.Name == nameof(Identifiable<object>.Id) && rightTerm is LiteralConstantExpression rightConstant)
             {
-                if (leftChainRequirements.HasFlag(FieldChainRequirements.EndsInToOne) && rightTerm is not NullConstantExpression)
-                {
-                    // Run another pass over left chain to have it fail when chain ends in relationship.
-                    OnResolveFieldChain(leftChain.ToString(), FieldChainRequirements.EndsInAttribute);
-                }
+                string id = DeObfuscateStringId(leftProperty.ReflectedType!, rightConstant.Value);
+                rightTerm = new LiteralConstantExpression(id);
+            }
+        }
 
-                PropertyInfo leftProperty = leftChain.Fields[^1].Property;
+        return new ComparisonExpression(comparisonOperator, leftTerm, rightTerm);
+    }
 
-                if (leftProperty.Name == nameof(Identifiable<object>.Id) && rightTerm is LiteralConstantExpression rightConstant)
-                {
-                    string id = DeObfuscateStringId(leftProperty.ReflectedType!, rightConstant.Value);
-                    rightTerm = new LiteralConstantExpression(id);
-                }
-            }
+    protected MatchTextExpression ParseTextMatch(string matchFunctionName)
+    {
+        EatText(matchFunctionName);
+        EatSingleCharacterToken(TokenKind.OpenParen);
 
-            return new ComparisonExpression(comparisonOperator, leftTerm, rightTerm);
-        }
+        ResourceFieldChainExpression targetAttribute = ParseFieldChain(FieldChainRequirements.EndsInAttribute, null);
 
-        protected MatchTextExpression ParseTextMatch(string matchFunctionName)
-        {
-            EatText(matchFunctionName);
-            EatSingleCharacterToken(TokenKind.OpenParen);
+        EatSingleCharacterToken(TokenKind.Comma);
 
-            ResourceFieldChainExpression targetAttribute = ParseFieldChain(FieldChainRequirements.EndsInAttribute, null);
+        LiteralConstantExpression constant = ParseConstant();
 
-            EatSingleCharacterToken(TokenKind.Comma);
+        EatSingleCharacterToken(TokenKind.CloseParen);
 
-            LiteralConstantExpression constant = ParseConstant();
+        var matchKind = Enum.Parse<TextMatchKind>(matchFunctionName.Pascalize());
+        return new MatchTextExpression(targetAttribute, constant, matchKind);
+    }
 
-            EatSingleCharacterToken(TokenKind.CloseParen);
+    protected AnyExpression ParseAny()
+    {
+        EatText(Keywords.Any);
+        EatSingleCharacterToken(TokenKind.OpenParen);
 
-            var matchKind = Enum.Parse<TextMatchKind>(matchFunctionName.Pascalize());
-            return new MatchTextExpression(targetAttribute, constant, matchKind);
-        }
+        ResourceFieldChainExpression targetAttribute = ParseFieldChain(FieldChainRequirements.EndsInAttribute, null);
 
-        protected AnyExpression ParseAny()
-        {
-            EatText(Keywords.Any);
-            EatSingleCharacterToken(TokenKind.OpenParen);
+        EatSingleCharacterToken(TokenKind.Comma);
 
-            ResourceFieldChainExpression targetAttribute = ParseFieldChain(FieldChainRequirements.EndsInAttribute, null);
+        ImmutableHashSet<LiteralConstantExpression>.Builder constantsBuilder = ImmutableHashSet.CreateBuilder<LiteralConstantExpression>();
 
-            EatSingleCharacterToken(TokenKind.Comma);
+        LiteralConstantExpression constant = ParseConstant();
+        constantsBuilder.Add(constant);
 
-            ImmutableHashSet<LiteralConstantExpression>.Builder constantsBuilder = ImmutableHashSet.CreateBuilder<LiteralConstantExpression>();
+        EatSingleCharacterToken(TokenKind.Comma);
 
-            LiteralConstantExpression constant = ParseConstant();
-            constantsBuilder.Add(constant);
+        constant = ParseConstant();
+        constantsBuilder.Add(constant);
 
+        while (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.Comma)
+        {
             EatSingleCharacterToken(TokenKind.Comma);
 
             constant = ParseConstant();
             constantsBuilder.Add(constant);
+        }
 
-            while (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.Comma)
-            {
-                EatSingleCharacterToken(TokenKind.Comma);
-
-                constant = ParseConstant();
-                constantsBuilder.Add(constant);
-            }
+        EatSingleCharacterToken(TokenKind.CloseParen);
 
-            EatSingleCharacterToken(TokenKind.CloseParen);
+        IImmutableSet<LiteralConstantExpression> constantSet = constantsBuilder.ToImmutable();
 
-            IImmutableSet<LiteralConstantExpression> constantSet = constantsBuilder.ToImmutable();
+        PropertyInfo targetAttributeProperty = targetAttribute.Fields[^1].Property;
 
-            PropertyInfo targetAttributeProperty = targetAttribute.Fields[^1].Property;
+        if (targetAttributeProperty.Name == nameof(Identifiable<object>.Id))
+        {
+            constantSet = DeObfuscateIdConstants(constantSet, targetAttributeProperty);
+        }
 
-            if (targetAttributeProperty.Name == nameof(Identifiable<object>.Id))
-            {
-                constantSet = DeObfuscateIdConstants(constantSet, targetAttributeProperty);
-            }
+        return new AnyExpression(targetAttribute, constantSet);
+    }
 
-            return new AnyExpression(targetAttribute, constantSet);
-        }
+    private IImmutableSet<LiteralConstantExpression> DeObfuscateIdConstants(IImmutableSet<LiteralConstantExpression> constantSet,
+        PropertyInfo targetAttributeProperty)
+    {
+        ImmutableHashSet<LiteralConstantExpression>.Builder idConstantsBuilder = ImmutableHashSet.CreateBuilder<LiteralConstantExpression>();
 
-        private IImmutableSet<LiteralConstantExpression> DeObfuscateIdConstants(IImmutableSet<LiteralConstantExpression> constantSet,
-            PropertyInfo targetAttributeProperty)
+        foreach (LiteralConstantExpression idConstant in constantSet)
         {
-            ImmutableHashSet<LiteralConstantExpression>.Builder idConstantsBuilder = ImmutableHashSet.CreateBuilder<LiteralConstantExpression>();
+            string stringId = idConstant.Value;
+            string id = DeObfuscateStringId(targetAttributeProperty.ReflectedType!, stringId);
 
-            foreach (LiteralConstantExpression idConstant in constantSet)
-            {
-                string stringId = idConstant.Value;
-                string id = DeObfuscateStringId(targetAttributeProperty.ReflectedType!, stringId);
+            idConstantsBuilder.Add(new LiteralConstantExpression(id));
+        }
 
-                idConstantsBuilder.Add(new LiteralConstantExpression(id));
-            }
+        return idConstantsBuilder.ToImmutable();
+    }
 
-            return idConstantsBuilder.ToImmutable();
-        }
+    protected HasExpression ParseHas()
+    {
+        EatText(Keywords.Has);
+        EatSingleCharacterToken(TokenKind.OpenParen);
 
-        protected HasExpression ParseHas()
+        ResourceFieldChainExpression targetCollection = ParseFieldChain(FieldChainRequirements.EndsInToMany, null);
+        FilterExpression? filter = null;
+
+        if (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.Comma)
         {
-            EatText(Keywords.Has);
-            EatSingleCharacterToken(TokenKind.OpenParen);
+            EatSingleCharacterToken(TokenKind.Comma);
 
-            ResourceFieldChainExpression targetCollection = ParseFieldChain(FieldChainRequirements.EndsInToMany, null);
-            FilterExpression? filter = null;
+            filter = ParseFilterInHas((HasManyAttribute)targetCollection.Fields[^1]);
+        }
 
-            if (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.Comma)
-            {
-                EatSingleCharacterToken(TokenKind.Comma);
+        EatSingleCharacterToken(TokenKind.CloseParen);
 
-                filter = ParseFilterInHas((HasManyAttribute)targetCollection.Fields[^1]);
-            }
+        return new HasExpression(targetCollection, filter);
+    }
 
-            EatSingleCharacterToken(TokenKind.CloseParen);
+    private FilterExpression ParseFilterInHas(HasManyAttribute hasManyRelationship)
+    {
+        ResourceType outerScopeBackup = _resourceTypeInScope!;
 
-            return new HasExpression(targetCollection, filter);
-        }
+        _resourceTypeInScope = hasManyRelationship.RightType;
 
-        private FilterExpression ParseFilterInHas(HasManyAttribute hasManyRelationship)
-        {
-            ResourceType outerScopeBackup = _resourceTypeInScope!;
+        FilterExpression filter = ParseFilter();
 
-            _resourceTypeInScope = hasManyRelationship.RightType;
+        _resourceTypeInScope = outerScopeBackup;
+        return filter;
+    }
 
-            FilterExpression filter = ParseFilter();
+    protected QueryExpression ParseCountOrField(FieldChainRequirements chainRequirements)
+    {
+        CountExpression? count = TryParseCount();
 
-            _resourceTypeInScope = outerScopeBackup;
-            return filter;
+        if (count != null)
+        {
+            return count;
         }
 
-        protected QueryExpression ParseCountOrField(FieldChainRequirements chainRequirements)
-        {
-            CountExpression? count = TryParseCount();
+        return ParseFieldChain(chainRequirements, "Count function or field name expected.");
+    }
 
-            if (count != null)
-            {
-                return count;
-            }
+    protected QueryExpression ParseCountOrConstantOrNullOrField(FieldChainRequirements chainRequirements)
+    {
+        CountExpression? count = TryParseCount();
 
-            return ParseFieldChain(chainRequirements, "Count function or field name expected.");
+        if (count != null)
+        {
+            return count;
         }
 
-        protected QueryExpression ParseCountOrConstantOrNullOrField(FieldChainRequirements chainRequirements)
+        IdentifierExpression? constantOrNull = TryParseConstantOrNull();
+
+        if (constantOrNull != null)
         {
-            CountExpression? count = TryParseCount();
+            return constantOrNull;
+        }
 
-            if (count != null)
+        return ParseFieldChain(chainRequirements, "Count function, value between quotes, null or field name expected.");
+    }
+
+    protected IdentifierExpression? TryParseConstantOrNull()
+    {
+        if (TokenStack.TryPeek(out Token? nextToken))
+        {
+            if (nextToken.Kind == TokenKind.Text && nextToken.Value == Keywords.Null)
             {
-                return count;
+                TokenStack.Pop();
+                return NullConstantExpression.Instance;
             }
 
-            IdentifierExpression? constantOrNull = TryParseConstantOrNull();
-
-            if (constantOrNull != null)
+            if (nextToken.Kind == TokenKind.QuotedText)
             {
-                return constantOrNull;
+                TokenStack.Pop();
+                return new LiteralConstantExpression(nextToken.Value!);
             }
-
-            return ParseFieldChain(chainRequirements, "Count function, value between quotes, null or field name expected.");
         }
 
-        protected IdentifierExpression? TryParseConstantOrNull()
+        return null;
+    }
+
+    protected LiteralConstantExpression ParseConstant()
+    {
+        if (TokenStack.TryPop(out Token? token) && token.Kind == TokenKind.QuotedText)
         {
-            if (TokenStack.TryPeek(out Token? nextToken))
-            {
-                if (nextToken.Kind == TokenKind.Text && nextToken.Value == Keywords.Null)
-                {
-                    TokenStack.Pop();
-                    return NullConstantExpression.Instance;
-                }
+            return new LiteralConstantExpression(token.Value!);
+        }
 
-                if (nextToken.Kind == TokenKind.QuotedText)
-                {
-                    TokenStack.Pop();
-                    return new LiteralConstantExpression(nextToken.Value!);
-                }
-            }
+        throw new QueryParseException("Value between quotes expected.");
+    }
 
-            return null;
-        }
+    private string DeObfuscateStringId(Type resourceClrType, string stringId)
+    {
+        IIdentifiable tempResource = _resourceFactory.CreateInstance(resourceClrType);
+        tempResource.StringId = stringId;
+        return tempResource.GetTypedId().ToString()!;
+    }
 
-        protected LiteralConstantExpression ParseConstant()
+    protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
+    {
+        if (chainRequirements == FieldChainRequirements.EndsInToMany)
         {
-            if (TokenStack.TryPop(out Token? token) && token.Kind == TokenKind.QuotedText)
-            {
-                return new LiteralConstantExpression(token.Value!);
-            }
-
-            throw new QueryParseException("Value between quotes expected.");
+            return ChainResolver.ResolveToOneChainEndingInToMany(_resourceTypeInScope!, path, _validateSingleFieldCallback);
         }
 
-        private string DeObfuscateStringId(Type resourceClrType, string stringId)
+        if (chainRequirements == FieldChainRequirements.EndsInAttribute)
         {
-            IIdentifiable tempResource = _resourceFactory.CreateInstance(resourceClrType);
-            tempResource.StringId = stringId;
-            return tempResource.GetTypedId().ToString()!;
+            return ChainResolver.ResolveToOneChainEndingInAttribute(_resourceTypeInScope!, path, _validateSingleFieldCallback);
         }
 
-        protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
+        if (chainRequirements.HasFlag(FieldChainRequirements.EndsInAttribute) && chainRequirements.HasFlag(FieldChainRequirements.EndsInToOne))
         {
-            if (chainRequirements == FieldChainRequirements.EndsInToMany)
-            {
-                return ChainResolver.ResolveToOneChainEndingInToMany(_resourceTypeInScope!, path, _validateSingleFieldCallback);
-            }
-
-            if (chainRequirements == FieldChainRequirements.EndsInAttribute)
-            {
-                return ChainResolver.ResolveToOneChainEndingInAttribute(_resourceTypeInScope!, path, _validateSingleFieldCallback);
-            }
-
-            if (chainRequirements.HasFlag(FieldChainRequirements.EndsInAttribute) && chainRequirements.HasFlag(FieldChainRequirements.EndsInToOne))
-            {
-                return ChainResolver.ResolveToOneChainEndingInAttributeOrToOne(_resourceTypeInScope!, path, _validateSingleFieldCallback);
-            }
-
-            throw new InvalidOperationException($"Unexpected combination of chain requirement flags '{chainRequirements}'.");
+            return ChainResolver.ResolveToOneChainEndingInAttributeOrToOne(_resourceTypeInScope!, path, _validateSingleFieldCallback);
         }
+
+        throw new InvalidOperationException($"Unexpected combination of chain requirement flags '{chainRequirements}'.");
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/IncludeParser.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/IncludeParser.cs
index 012fd617c3..95e51dca92 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/IncludeParser.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/IncludeParser.cs
@@ -1,79 +1,75 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+[PublicAPI]
+public class IncludeParser : QueryExpressionParser
 {
-    [PublicAPI]
-    public class IncludeParser : QueryExpressionParser
-    {
-        private static readonly IncludeChainConverter IncludeChainConverter = new();
+    private static readonly IncludeChainConverter IncludeChainConverter = new();
 
-        private readonly Action<RelationshipAttribute, ResourceType, string>? _validateSingleRelationshipCallback;
-        private ResourceType? _resourceTypeInScope;
+    private readonly Action<RelationshipAttribute, ResourceType, string>? _validateSingleRelationshipCallback;
+    private ResourceType? _resourceTypeInScope;
 
-        public IncludeParser(Action<RelationshipAttribute, ResourceType, string>? validateSingleRelationshipCallback = null)
-        {
-            _validateSingleRelationshipCallback = validateSingleRelationshipCallback;
-        }
+    public IncludeParser(Action<RelationshipAttribute, ResourceType, string>? validateSingleRelationshipCallback = null)
+    {
+        _validateSingleRelationshipCallback = validateSingleRelationshipCallback;
+    }
 
-        public IncludeExpression Parse(string source, ResourceType resourceTypeInScope, int? maximumDepth)
-        {
-            ArgumentGuard.NotNull(resourceTypeInScope, nameof(resourceTypeInScope));
+    public IncludeExpression Parse(string source, ResourceType resourceTypeInScope, int? maximumDepth)
+    {
+        ArgumentGuard.NotNull(resourceTypeInScope, nameof(resourceTypeInScope));
 
-            _resourceTypeInScope = resourceTypeInScope;
+        _resourceTypeInScope = resourceTypeInScope;
 
-            Tokenize(source);
+        Tokenize(source);
 
-            IncludeExpression expression = ParseInclude(maximumDepth);
+        IncludeExpression expression = ParseInclude(maximumDepth);
 
-            AssertTokenStackIsEmpty();
+        AssertTokenStackIsEmpty();
 
-            return expression;
-        }
+        return expression;
+    }
 
-        protected IncludeExpression ParseInclude(int? maximumDepth)
-        {
-            ResourceFieldChainExpression firstChain = ParseFieldChain(FieldChainRequirements.IsRelationship, "Relationship name expected.");
+    protected IncludeExpression ParseInclude(int? maximumDepth)
+    {
+        ResourceFieldChainExpression firstChain = ParseFieldChain(FieldChainRequirements.IsRelationship, "Relationship name expected.");
 
-            List<ResourceFieldChainExpression> chains = firstChain.AsList();
+        List<ResourceFieldChainExpression> chains = firstChain.AsList();
 
-            while (TokenStack.Any())
-            {
-                EatSingleCharacterToken(TokenKind.Comma);
+        while (TokenStack.Any())
+        {
+            EatSingleCharacterToken(TokenKind.Comma);
 
-                ResourceFieldChainExpression nextChain = ParseFieldChain(FieldChainRequirements.IsRelationship, "Relationship name expected.");
-                chains.Add(nextChain);
-            }
+            ResourceFieldChainExpression nextChain = ParseFieldChain(FieldChainRequirements.IsRelationship, "Relationship name expected.");
+            chains.Add(nextChain);
+        }
 
-            ValidateMaximumIncludeDepth(maximumDepth, chains);
+        ValidateMaximumIncludeDepth(maximumDepth, chains);
 
-            return IncludeChainConverter.FromRelationshipChains(chains);
-        }
+        return IncludeChainConverter.FromRelationshipChains(chains);
+    }
 
-        private static void ValidateMaximumIncludeDepth(int? maximumDepth, IEnumerable<ResourceFieldChainExpression> chains)
+    private static void ValidateMaximumIncludeDepth(int? maximumDepth, IEnumerable<ResourceFieldChainExpression> chains)
+    {
+        if (maximumDepth != null)
         {
-            if (maximumDepth != null)
+            foreach (ResourceFieldChainExpression chain in chains)
             {
-                foreach (ResourceFieldChainExpression chain in chains)
+                if (chain.Fields.Count > maximumDepth)
                 {
-                    if (chain.Fields.Count > maximumDepth)
-                    {
-                        string path = string.Join('.', chain.Fields.Select(field => field.PublicName));
-                        throw new QueryParseException($"Including '{path}' exceeds the maximum inclusion depth of {maximumDepth}.");
-                    }
+                    string path = string.Join('.', chain.Fields.Select(field => field.PublicName));
+                    throw new QueryParseException($"Including '{path}' exceeds the maximum inclusion depth of {maximumDepth}.");
                 }
             }
         }
+    }
 
-        protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
-        {
-            return ChainResolver.ResolveRelationshipChain(_resourceTypeInScope!, path, _validateSingleRelationshipCallback);
-        }
+    protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
+    {
+        return ChainResolver.ResolveRelationshipChain(_resourceTypeInScope!, path, _validateSingleRelationshipCallback);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/Keywords.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/Keywords.cs
index 0bf32ff17e..dd0bda51b7 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/Keywords.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/Keywords.cs
@@ -3,25 +3,24 @@
 #pragma warning disable AV1008 // Class should not be static
 #pragma warning disable AV1010 // Member hides inherited member
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+[PublicAPI]
+public static class Keywords
 {
-    [PublicAPI]
-    public static class Keywords
-    {
-        public const string Null = "null";
-        public const string Not = "not";
-        public const string And = "and";
-        public const string Or = "or";
-        public new const string Equals = "equals";
-        public const string GreaterThan = "greaterThan";
-        public const string GreaterOrEqual = "greaterOrEqual";
-        public const string LessThan = "lessThan";
-        public const string LessOrEqual = "lessOrEqual";
-        public const string Contains = "contains";
-        public const string StartsWith = "startsWith";
-        public const string EndsWith = "endsWith";
-        public const string Any = "any";
-        public const string Count = "count";
-        public const string Has = "has";
-    }
+    public const string Null = "null";
+    public const string Not = "not";
+    public const string And = "and";
+    public const string Or = "or";
+    public new const string Equals = "equals";
+    public const string GreaterThan = "greaterThan";
+    public const string GreaterOrEqual = "greaterOrEqual";
+    public const string LessThan = "lessThan";
+    public const string LessOrEqual = "lessOrEqual";
+    public const string Contains = "contains";
+    public const string StartsWith = "startsWith";
+    public const string EndsWith = "endsWith";
+    public const string Any = "any";
+    public const string Count = "count";
+    public const string Has = "has";
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/PaginationParser.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/PaginationParser.cs
index dd76b4e58f..29c7713b11 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/PaginationParser.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/PaginationParser.cs
@@ -1,112 +1,109 @@
-using System;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+[PublicAPI]
+public class PaginationParser : QueryExpressionParser
 {
-    [PublicAPI]
-    public class PaginationParser : QueryExpressionParser
+    private readonly Action<ResourceFieldAttribute, ResourceType, string>? _validateSingleFieldCallback;
+    private ResourceType? _resourceTypeInScope;
+
+    public PaginationParser(Action<ResourceFieldAttribute, ResourceType, string>? validateSingleFieldCallback = null)
     {
-        private readonly Action<ResourceFieldAttribute, ResourceType, string>? _validateSingleFieldCallback;
-        private ResourceType? _resourceTypeInScope;
+        _validateSingleFieldCallback = validateSingleFieldCallback;
+    }
 
-        public PaginationParser(Action<ResourceFieldAttribute, ResourceType, string>? validateSingleFieldCallback = null)
-        {
-            _validateSingleFieldCallback = validateSingleFieldCallback;
-        }
+    public PaginationQueryStringValueExpression Parse(string source, ResourceType resourceTypeInScope)
+    {
+        ArgumentGuard.NotNull(resourceTypeInScope, nameof(resourceTypeInScope));
 
-        public PaginationQueryStringValueExpression Parse(string source, ResourceType resourceTypeInScope)
-        {
-            ArgumentGuard.NotNull(resourceTypeInScope, nameof(resourceTypeInScope));
+        _resourceTypeInScope = resourceTypeInScope;
 
-            _resourceTypeInScope = resourceTypeInScope;
+        Tokenize(source);
 
-            Tokenize(source);
+        PaginationQueryStringValueExpression expression = ParsePagination();
 
-            PaginationQueryStringValueExpression expression = ParsePagination();
+        AssertTokenStackIsEmpty();
 
-            AssertTokenStackIsEmpty();
+        return expression;
+    }
 
-            return expression;
-        }
+    protected PaginationQueryStringValueExpression ParsePagination()
+    {
+        ImmutableArray<PaginationElementQueryStringValueExpression>.Builder elementsBuilder =
+            ImmutableArray.CreateBuilder<PaginationElementQueryStringValueExpression>();
+
+        PaginationElementQueryStringValueExpression element = ParsePaginationElement();
+        elementsBuilder.Add(element);
 
-        protected PaginationQueryStringValueExpression ParsePagination()
+        while (TokenStack.Any())
         {
-            ImmutableArray<PaginationElementQueryStringValueExpression>.Builder elementsBuilder =
-                ImmutableArray.CreateBuilder<PaginationElementQueryStringValueExpression>();
+            EatSingleCharacterToken(TokenKind.Comma);
 
-            PaginationElementQueryStringValueExpression element = ParsePaginationElement();
+            element = ParsePaginationElement();
             elementsBuilder.Add(element);
-
-            while (TokenStack.Any())
-            {
-                EatSingleCharacterToken(TokenKind.Comma);
-
-                element = ParsePaginationElement();
-                elementsBuilder.Add(element);
-            }
-
-            return new PaginationQueryStringValueExpression(elementsBuilder.ToImmutable());
         }
 
-        protected PaginationElementQueryStringValueExpression ParsePaginationElement()
-        {
-            int? number = TryParseNumber();
+        return new PaginationQueryStringValueExpression(elementsBuilder.ToImmutable());
+    }
 
-            if (number != null)
-            {
-                return new PaginationElementQueryStringValueExpression(null, number.Value);
-            }
+    protected PaginationElementQueryStringValueExpression ParsePaginationElement()
+    {
+        int? number = TryParseNumber();
 
-            ResourceFieldChainExpression scope = ParseFieldChain(FieldChainRequirements.EndsInToMany, "Number or relationship name expected.");
+        if (number != null)
+        {
+            return new PaginationElementQueryStringValueExpression(null, number.Value);
+        }
 
-            EatSingleCharacterToken(TokenKind.Colon);
+        ResourceFieldChainExpression scope = ParseFieldChain(FieldChainRequirements.EndsInToMany, "Number or relationship name expected.");
 
-            number = TryParseNumber();
+        EatSingleCharacterToken(TokenKind.Colon);
 
-            if (number == null)
-            {
-                throw new QueryParseException("Number expected.");
-            }
+        number = TryParseNumber();
 
-            return new PaginationElementQueryStringValueExpression(scope, number.Value);
+        if (number == null)
+        {
+            throw new QueryParseException("Number expected.");
         }
 
-        protected int? TryParseNumber()
+        return new PaginationElementQueryStringValueExpression(scope, number.Value);
+    }
+
+    protected int? TryParseNumber()
+    {
+        if (TokenStack.TryPeek(out Token? nextToken))
         {
-            if (TokenStack.TryPeek(out Token? nextToken))
+            int number;
+
+            if (nextToken.Kind == TokenKind.Minus)
             {
-                int number;
+                TokenStack.Pop();
 
-                if (nextToken.Kind == TokenKind.Minus)
+                if (TokenStack.TryPop(out Token? token) && token.Kind == TokenKind.Text && int.TryParse(token.Value, out number))
                 {
-                    TokenStack.Pop();
-
-                    if (TokenStack.TryPop(out Token? token) && token.Kind == TokenKind.Text && int.TryParse(token.Value, out number))
-                    {
-                        return -number;
-                    }
-
-                    throw new QueryParseException("Digits expected.");
+                    return -number;
                 }
 
-                if (nextToken.Kind == TokenKind.Text && int.TryParse(nextToken.Value, out number))
-                {
-                    TokenStack.Pop();
-                    return number;
-                }
+                throw new QueryParseException("Digits expected.");
             }
 
-            return null;
+            if (nextToken.Kind == TokenKind.Text && int.TryParse(nextToken.Value, out number))
+            {
+                TokenStack.Pop();
+                return number;
+            }
         }
 
-        protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
-        {
-            return ChainResolver.ResolveToManyChain(_resourceTypeInScope!, path, _validateSingleFieldCallback);
-        }
+        return null;
+    }
+
+    protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
+    {
+        return ChainResolver.ResolveToManyChain(_resourceTypeInScope!, path, _validateSingleFieldCallback);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryExpressionParser.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryExpressionParser.cs
index f0e1392e30..4dc7230c24 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryExpressionParser.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryExpressionParser.cs
@@ -1,92 +1,89 @@
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+/// <summary>
+/// The base class for parsing query string parameters, using the Recursive Descent algorithm.
+/// </summary>
+/// <remarks>
+/// Uses a tokenizer to populate a stack of tokens, which is then manipulated from the various parsing routines for subexpressions. Implementations
+/// should throw <see cref="QueryParseException" /> on invalid input.
+/// </remarks>
+[PublicAPI]
+public abstract class QueryExpressionParser
 {
+    protected Stack<Token> TokenStack { get; private set; } = null!;
+    private protected ResourceFieldChainResolver ChainResolver { get; } = new();
+
     /// <summary>
-    /// The base class for parsing query string parameters, using the Recursive Descent algorithm.
+    /// Takes a dotted path and walks the resource graph to produce a chain of fields.
     /// </summary>
-    /// <remarks>
-    /// Uses a tokenizer to populate a stack of tokens, which is then manipulated from the various parsing routines for subexpressions. Implementations
-    /// should throw <see cref="QueryParseException" /> on invalid input.
-    /// </remarks>
-    [PublicAPI]
-    public abstract class QueryExpressionParser
-    {
-        protected Stack<Token> TokenStack { get; private set; } = null!;
-        private protected ResourceFieldChainResolver ChainResolver { get; } = new();
+    protected abstract IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements);
 
-        /// <summary>
-        /// Takes a dotted path and walks the resource graph to produce a chain of fields.
-        /// </summary>
-        protected abstract IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements);
+    protected virtual void Tokenize(string source)
+    {
+        var tokenizer = new QueryTokenizer(source);
+        TokenStack = new Stack<Token>(tokenizer.EnumerateTokens().Reverse());
+    }
 
-        protected virtual void Tokenize(string source)
+    protected ResourceFieldChainExpression ParseFieldChain(FieldChainRequirements chainRequirements, string? alternativeErrorMessage)
+    {
+        if (TokenStack.TryPop(out Token? token) && token.Kind == TokenKind.Text)
         {
-            var tokenizer = new QueryTokenizer(source);
-            TokenStack = new Stack<Token>(tokenizer.EnumerateTokens().Reverse());
-        }
+            IImmutableList<ResourceFieldAttribute> chain = OnResolveFieldChain(token.Value!, chainRequirements);
 
-        protected ResourceFieldChainExpression ParseFieldChain(FieldChainRequirements chainRequirements, string? alternativeErrorMessage)
-        {
-            if (TokenStack.TryPop(out Token? token) && token.Kind == TokenKind.Text)
+            if (chain.Any())
             {
-                IImmutableList<ResourceFieldAttribute> chain = OnResolveFieldChain(token.Value!, chainRequirements);
-
-                if (chain.Any())
-                {
-                    return new ResourceFieldChainExpression(chain);
-                }
+                return new ResourceFieldChainExpression(chain);
             }
-
-            throw new QueryParseException(alternativeErrorMessage ?? "Field name expected.");
         }
 
-        protected CountExpression? TryParseCount()
+        throw new QueryParseException(alternativeErrorMessage ?? "Field name expected.");
+    }
+
+    protected CountExpression? TryParseCount()
+    {
+        if (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.Text && nextToken.Value == Keywords.Count)
         {
-            if (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.Text && nextToken.Value == Keywords.Count)
-            {
-                TokenStack.Pop();
+            TokenStack.Pop();
 
-                EatSingleCharacterToken(TokenKind.OpenParen);
+            EatSingleCharacterToken(TokenKind.OpenParen);
 
-                ResourceFieldChainExpression targetCollection = ParseFieldChain(FieldChainRequirements.EndsInToMany, null);
+            ResourceFieldChainExpression targetCollection = ParseFieldChain(FieldChainRequirements.EndsInToMany, null);
 
-                EatSingleCharacterToken(TokenKind.CloseParen);
+            EatSingleCharacterToken(TokenKind.CloseParen);
 
-                return new CountExpression(targetCollection);
-            }
-
-            return null;
+            return new CountExpression(targetCollection);
         }
 
-        protected void EatText(string text)
+        return null;
+    }
+
+    protected void EatText(string text)
+    {
+        if (!TokenStack.TryPop(out Token? token) || token.Kind != TokenKind.Text || token.Value != text)
         {
-            if (!TokenStack.TryPop(out Token? token) || token.Kind != TokenKind.Text || token.Value != text)
-            {
-                throw new QueryParseException($"{text} expected.");
-            }
+            throw new QueryParseException($"{text} expected.");
         }
+    }
 
-        protected void EatSingleCharacterToken(TokenKind kind)
+    protected void EatSingleCharacterToken(TokenKind kind)
+    {
+        if (!TokenStack.TryPop(out Token? token) || token.Kind != kind)
         {
-            if (!TokenStack.TryPop(out Token? token) || token.Kind != kind)
-            {
-                char ch = QueryTokenizer.SingleCharacterToTokenKinds.Single(pair => pair.Value == kind).Key;
-                throw new QueryParseException($"{ch} expected.");
-            }
+            char ch = QueryTokenizer.SingleCharacterToTokenKinds.Single(pair => pair.Value == kind).Key;
+            throw new QueryParseException($"{ch} expected.");
         }
+    }
 
-        protected void AssertTokenStackIsEmpty()
+    protected void AssertTokenStackIsEmpty()
+    {
+        if (TokenStack.Any())
         {
-            if (TokenStack.Any())
-            {
-                throw new QueryParseException("End of expression expected.");
-            }
+            throw new QueryParseException("End of expression expected.");
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryParseException.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryParseException.cs
index 26010e3528..2265ca56da 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryParseException.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryParseException.cs
@@ -1,14 +1,12 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+[PublicAPI]
+public sealed class QueryParseException : Exception
 {
-    [PublicAPI]
-    public sealed class QueryParseException : Exception
+    public QueryParseException(string message)
+        : base(message)
     {
-        public QueryParseException(string message)
-            : base(message)
-        {
-        }
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryStringParameterScopeParser.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryStringParameterScopeParser.cs
index c25ce3a1c3..3cba8e4515 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryStringParameterScopeParser.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryStringParameterScopeParser.cs
@@ -1,78 +1,76 @@
-using System;
 using System.Collections.Immutable;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+[PublicAPI]
+public class QueryStringParameterScopeParser : QueryExpressionParser
 {
-    [PublicAPI]
-    public class QueryStringParameterScopeParser : QueryExpressionParser
+    private readonly FieldChainRequirements _chainRequirements;
+    private readonly Action<ResourceFieldAttribute, ResourceType, string>? _validateSingleFieldCallback;
+    private ResourceType? _resourceTypeInScope;
+
+    public QueryStringParameterScopeParser(FieldChainRequirements chainRequirements,
+        Action<ResourceFieldAttribute, ResourceType, string>? validateSingleFieldCallback = null)
     {
-        private readonly FieldChainRequirements _chainRequirements;
-        private readonly Action<ResourceFieldAttribute, ResourceType, string>? _validateSingleFieldCallback;
-        private ResourceType? _resourceTypeInScope;
+        _chainRequirements = chainRequirements;
+        _validateSingleFieldCallback = validateSingleFieldCallback;
+    }
 
-        public QueryStringParameterScopeParser(FieldChainRequirements chainRequirements,
-            Action<ResourceFieldAttribute, ResourceType, string>? validateSingleFieldCallback = null)
-        {
-            _chainRequirements = chainRequirements;
-            _validateSingleFieldCallback = validateSingleFieldCallback;
-        }
+    public QueryStringParameterScopeExpression Parse(string source, ResourceType resourceTypeInScope)
+    {
+        ArgumentGuard.NotNull(resourceTypeInScope, nameof(resourceTypeInScope));
 
-        public QueryStringParameterScopeExpression Parse(string source, ResourceType resourceTypeInScope)
-        {
-            ArgumentGuard.NotNull(resourceTypeInScope, nameof(resourceTypeInScope));
+        _resourceTypeInScope = resourceTypeInScope;
 
-            _resourceTypeInScope = resourceTypeInScope;
+        Tokenize(source);
 
-            Tokenize(source);
+        QueryStringParameterScopeExpression expression = ParseQueryStringParameterScope();
 
-            QueryStringParameterScopeExpression expression = ParseQueryStringParameterScope();
+        AssertTokenStackIsEmpty();
 
-            AssertTokenStackIsEmpty();
+        return expression;
+    }
 
-            return expression;
+    protected QueryStringParameterScopeExpression ParseQueryStringParameterScope()
+    {
+        if (!TokenStack.TryPop(out Token? token) || token.Kind != TokenKind.Text)
+        {
+            throw new QueryParseException("Parameter name expected.");
         }
 
-        protected QueryStringParameterScopeExpression ParseQueryStringParameterScope()
-        {
-            if (!TokenStack.TryPop(out Token? token) || token.Kind != TokenKind.Text)
-            {
-                throw new QueryParseException("Parameter name expected.");
-            }
+        var name = new LiteralConstantExpression(token.Value!);
 
-            var name = new LiteralConstantExpression(token.Value!);
+        ResourceFieldChainExpression? scope = null;
 
-            ResourceFieldChainExpression? scope = null;
+        if (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.OpenBracket)
+        {
+            TokenStack.Pop();
 
-            if (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.OpenBracket)
-            {
-                TokenStack.Pop();
+            scope = ParseFieldChain(_chainRequirements, null);
 
-                scope = ParseFieldChain(_chainRequirements, null);
+            EatSingleCharacterToken(TokenKind.CloseBracket);
+        }
 
-                EatSingleCharacterToken(TokenKind.CloseBracket);
-            }
+        return new QueryStringParameterScopeExpression(name, scope);
+    }
 
-            return new QueryStringParameterScopeExpression(name, scope);
+    protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
+    {
+        if (chainRequirements == FieldChainRequirements.EndsInToMany)
+        {
+            // The mismatch here (ends-in-to-many being interpreted as entire-chain-must-be-to-many) is intentional.
+            return ChainResolver.ResolveToManyChain(_resourceTypeInScope!, path, _validateSingleFieldCallback);
         }
 
-        protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
+        if (chainRequirements == FieldChainRequirements.IsRelationship)
         {
-            if (chainRequirements == FieldChainRequirements.EndsInToMany)
-            {
-                // The mismatch here (ends-in-to-many being interpreted as entire-chain-must-be-to-many) is intentional.
-                return ChainResolver.ResolveToManyChain(_resourceTypeInScope!, path, _validateSingleFieldCallback);
-            }
-
-            if (chainRequirements == FieldChainRequirements.IsRelationship)
-            {
-                return ChainResolver.ResolveRelationshipChain(_resourceTypeInScope!, path, _validateSingleFieldCallback);
-            }
-
-            throw new InvalidOperationException($"Unexpected combination of chain requirement flags '{chainRequirements}'.");
+            return ChainResolver.ResolveRelationshipChain(_resourceTypeInScope!, path, _validateSingleFieldCallback);
         }
+
+        throw new InvalidOperationException($"Unexpected combination of chain requirement flags '{chainRequirements}'.");
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryTokenizer.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryTokenizer.cs
index 518531902a..6676cae30f 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryTokenizer.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/QueryTokenizer.cs
@@ -1,142 +1,140 @@
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Text;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+[PublicAPI]
+public sealed class QueryTokenizer
 {
-    [PublicAPI]
-    public sealed class QueryTokenizer
-    {
-        public static readonly IReadOnlyDictionary<char, TokenKind> SingleCharacterToTokenKinds = new ReadOnlyDictionary<char, TokenKind>(
-            new Dictionary<char, TokenKind>
-            {
-                ['('] = TokenKind.OpenParen,
-                [')'] = TokenKind.CloseParen,
-                ['['] = TokenKind.OpenBracket,
-                [']'] = TokenKind.CloseBracket,
-                [','] = TokenKind.Comma,
-                [':'] = TokenKind.Colon,
-                ['-'] = TokenKind.Minus
-            });
-
-        private readonly string _source;
-        private readonly StringBuilder _textBuffer = new();
-        private int _offset;
-        private bool _isInQuotedSection;
-
-        public QueryTokenizer(string source)
+    public static readonly IReadOnlyDictionary<char, TokenKind> SingleCharacterToTokenKinds = new ReadOnlyDictionary<char, TokenKind>(
+        new Dictionary<char, TokenKind>
         {
-            ArgumentGuard.NotNull(source, nameof(source));
+            ['('] = TokenKind.OpenParen,
+            [')'] = TokenKind.CloseParen,
+            ['['] = TokenKind.OpenBracket,
+            [']'] = TokenKind.CloseBracket,
+            [','] = TokenKind.Comma,
+            [':'] = TokenKind.Colon,
+            ['-'] = TokenKind.Minus
+        });
+
+    private readonly string _source;
+    private readonly StringBuilder _textBuffer = new();
+    private int _offset;
+    private bool _isInQuotedSection;
+
+    public QueryTokenizer(string source)
+    {
+        ArgumentGuard.NotNull(source, nameof(source));
 
-            _source = source;
-        }
+        _source = source;
+    }
+
+    public IEnumerable<Token> EnumerateTokens()
+    {
+        _textBuffer.Clear();
+        _isInQuotedSection = false;
+        _offset = 0;
 
-        public IEnumerable<Token> EnumerateTokens()
+        while (_offset < _source.Length)
         {
-            _textBuffer.Clear();
-            _isInQuotedSection = false;
-            _offset = 0;
+            char ch = _source[_offset];
 
-            while (_offset < _source.Length)
+            if (ch == '\'')
             {
-                char ch = _source[_offset];
+                if (_isInQuotedSection)
+                {
+                    char? peeked = PeekChar();
+
+                    if (peeked == '\'')
+                    {
+                        _textBuffer.Append(ch);
+                        _offset += 2;
+                        continue;
+                    }
 
-                if (ch == '\'')
+                    _isInQuotedSection = false;
+
+                    Token literalToken = ProduceTokenFromTextBuffer(true)!;
+                    yield return literalToken;
+                }
+                else
                 {
-                    if (_isInQuotedSection)
+                    if (_textBuffer.Length > 0)
                     {
-                        char? peeked = PeekChar();
+                        throw new QueryParseException("Unexpected ' outside text.");
+                    }
 
-                        if (peeked == '\'')
-                        {
-                            _textBuffer.Append(ch);
-                            _offset += 2;
-                            continue;
-                        }
+                    _isInQuotedSection = true;
+                }
+            }
+            else
+            {
+                TokenKind? singleCharacterTokenKind = _isInQuotedSection ? null : TryGetSingleCharacterTokenKind(ch);
 
-                        _isInQuotedSection = false;
+                if (singleCharacterTokenKind != null && !IsMinusInsideText(singleCharacterTokenKind.Value))
+                {
+                    Token? identifierToken = ProduceTokenFromTextBuffer(false);
 
-                        Token literalToken = ProduceTokenFromTextBuffer(true)!;
-                        yield return literalToken;
-                    }
-                    else
+                    if (identifierToken != null)
                     {
-                        if (_textBuffer.Length > 0)
-                        {
-                            throw new QueryParseException("Unexpected ' outside text.");
-                        }
-
-                        _isInQuotedSection = true;
+                        yield return identifierToken;
                     }
+
+                    yield return new Token(singleCharacterTokenKind.Value);
                 }
                 else
                 {
-                    TokenKind? singleCharacterTokenKind = _isInQuotedSection ? null : TryGetSingleCharacterTokenKind(ch);
-
-                    if (singleCharacterTokenKind != null && !IsMinusInsideText(singleCharacterTokenKind.Value))
+                    if (_textBuffer.Length == 0 && ch == ' ' && !_isInQuotedSection)
                     {
-                        Token? identifierToken = ProduceTokenFromTextBuffer(false);
-
-                        if (identifierToken != null)
-                        {
-                            yield return identifierToken;
-                        }
-
-                        yield return new Token(singleCharacterTokenKind.Value);
+                        throw new QueryParseException("Unexpected whitespace.");
                     }
-                    else
-                    {
-                        if (_textBuffer.Length == 0 && ch == ' ' && !_isInQuotedSection)
-                        {
-                            throw new QueryParseException("Unexpected whitespace.");
-                        }
 
-                        _textBuffer.Append(ch);
-                    }
+                    _textBuffer.Append(ch);
                 }
-
-                _offset++;
-            }
-
-            if (_isInQuotedSection)
-            {
-                throw new QueryParseException("' expected.");
             }
 
-            Token? lastToken = ProduceTokenFromTextBuffer(false);
-
-            if (lastToken != null)
-            {
-                yield return lastToken;
-            }
+            _offset++;
         }
 
-        private bool IsMinusInsideText(TokenKind kind)
+        if (_isInQuotedSection)
         {
-            return kind == TokenKind.Minus && _textBuffer.Length > 0;
+            throw new QueryParseException("' expected.");
         }
 
-        private char? PeekChar()
-        {
-            return _offset + 1 < _source.Length ? _source[_offset + 1] : null;
-        }
+        Token? lastToken = ProduceTokenFromTextBuffer(false);
 
-        private static TokenKind? TryGetSingleCharacterTokenKind(char ch)
+        if (lastToken != null)
         {
-            return SingleCharacterToTokenKinds.TryGetValue(ch, out TokenKind tokenKind) ? tokenKind : null;
+            yield return lastToken;
         }
+    }
 
-        private Token? ProduceTokenFromTextBuffer(bool isQuotedText)
-        {
-            if (isQuotedText || _textBuffer.Length > 0)
-            {
-                string text = _textBuffer.ToString();
-                _textBuffer.Clear();
-                return new Token(isQuotedText ? TokenKind.QuotedText : TokenKind.Text, text);
-            }
+    private bool IsMinusInsideText(TokenKind kind)
+    {
+        return kind == TokenKind.Minus && _textBuffer.Length > 0;
+    }
+
+    private char? PeekChar()
+    {
+        return _offset + 1 < _source.Length ? _source[_offset + 1] : null;
+    }
 
-            return null;
+    private static TokenKind? TryGetSingleCharacterTokenKind(char ch)
+    {
+        return SingleCharacterToTokenKinds.TryGetValue(ch, out TokenKind tokenKind) ? tokenKind : null;
+    }
+
+    private Token? ProduceTokenFromTextBuffer(bool isQuotedText)
+    {
+        if (isQuotedText || _textBuffer.Length > 0)
+        {
+            string text = _textBuffer.ToString();
+            _textBuffer.Clear();
+            return new Token(isQuotedText ? TokenKind.QuotedText : TokenKind.Text, text);
         }
+
+        return null;
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/ResourceFieldChainResolver.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/ResourceFieldChainResolver.cs
index 3233ec92d1..33f3643aa8 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/ResourceFieldChainResolver.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/ResourceFieldChainResolver.cs
@@ -1,259 +1,256 @@
-using System;
 using System.Collections.Immutable;
-using System.Linq;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+/// <summary>
+/// Provides helper methods to resolve a chain of fields (relationships and attributes) from the resource graph.
+/// </summary>
+internal sealed class ResourceFieldChainResolver
 {
     /// <summary>
-    /// Provides helper methods to resolve a chain of fields (relationships and attributes) from the resource graph.
+    /// Resolves a chain of relationships that ends in a to-many relationship, for example: blogs.owner.articles.comments
     /// </summary>
-    internal sealed class ResourceFieldChainResolver
+    public IImmutableList<ResourceFieldAttribute> ResolveToManyChain(ResourceType resourceType, string path,
+        Action<ResourceFieldAttribute, ResourceType, string>? validateCallback = null)
     {
-        /// <summary>
-        /// Resolves a chain of relationships that ends in a to-many relationship, for example: blogs.owner.articles.comments
-        /// </summary>
-        public IImmutableList<ResourceFieldAttribute> ResolveToManyChain(ResourceType resourceType, string path,
-            Action<ResourceFieldAttribute, ResourceType, string>? validateCallback = null)
-        {
-            ImmutableArray<ResourceFieldAttribute>.Builder chainBuilder = ImmutableArray.CreateBuilder<ResourceFieldAttribute>();
+        ImmutableArray<ResourceFieldAttribute>.Builder chainBuilder = ImmutableArray.CreateBuilder<ResourceFieldAttribute>();
 
-            string[] publicNameParts = path.Split(".");
-            ResourceType nextResourceType = resourceType;
+        string[] publicNameParts = path.Split(".");
+        ResourceType nextResourceType = resourceType;
 
-            foreach (string publicName in publicNameParts[..^1])
-            {
-                RelationshipAttribute relationship = GetRelationship(publicName, nextResourceType, path);
+        foreach (string publicName in publicNameParts[..^1])
+        {
+            RelationshipAttribute relationship = GetRelationship(publicName, nextResourceType, path);
 
-                validateCallback?.Invoke(relationship, nextResourceType, path);
+            validateCallback?.Invoke(relationship, nextResourceType, path);
 
-                chainBuilder.Add(relationship);
-                nextResourceType = relationship.RightType;
-            }
+            chainBuilder.Add(relationship);
+            nextResourceType = relationship.RightType;
+        }
 
-            string lastName = publicNameParts[^1];
-            RelationshipAttribute lastToManyRelationship = GetToManyRelationship(lastName, nextResourceType, path);
+        string lastName = publicNameParts[^1];
+        RelationshipAttribute lastToManyRelationship = GetToManyRelationship(lastName, nextResourceType, path);
 
-            validateCallback?.Invoke(lastToManyRelationship, nextResourceType, path);
+        validateCallback?.Invoke(lastToManyRelationship, nextResourceType, path);
 
-            chainBuilder.Add(lastToManyRelationship);
-            return chainBuilder.ToImmutable();
-        }
+        chainBuilder.Add(lastToManyRelationship);
+        return chainBuilder.ToImmutable();
+    }
+
+    /// <summary>
+    /// Resolves a chain of relationships.
+    /// <example>
+    /// blogs.articles.comments
+    /// </example>
+    /// <example>
+    /// author.address
+    /// </example>
+    /// <example>
+    /// articles.revisions.author
+    /// </example>
+    /// </summary>
+    public IImmutableList<ResourceFieldAttribute> ResolveRelationshipChain(ResourceType resourceType, string path,
+        Action<RelationshipAttribute, ResourceType, string>? validateCallback = null)
+    {
+        ImmutableArray<ResourceFieldAttribute>.Builder chainBuilder = ImmutableArray.CreateBuilder<ResourceFieldAttribute>();
+        ResourceType nextResourceType = resourceType;
 
-        /// <summary>
-        /// Resolves a chain of relationships.
-        /// <example>
-        /// blogs.articles.comments
-        /// </example>
-        /// <example>
-        /// author.address
-        /// </example>
-        /// <example>
-        /// articles.revisions.author
-        /// </example>
-        /// </summary>
-        public IImmutableList<ResourceFieldAttribute> ResolveRelationshipChain(ResourceType resourceType, string path,
-            Action<RelationshipAttribute, ResourceType, string>? validateCallback = null)
+        foreach (string publicName in path.Split("."))
         {
-            ImmutableArray<ResourceFieldAttribute>.Builder chainBuilder = ImmutableArray.CreateBuilder<ResourceFieldAttribute>();
-            ResourceType nextResourceType = resourceType;
+            RelationshipAttribute relationship = GetRelationship(publicName, nextResourceType, path);
 
-            foreach (string publicName in path.Split("."))
-            {
-                RelationshipAttribute relationship = GetRelationship(publicName, nextResourceType, path);
+            validateCallback?.Invoke(relationship, nextResourceType, path);
 
-                validateCallback?.Invoke(relationship, nextResourceType, path);
+            chainBuilder.Add(relationship);
+            nextResourceType = relationship.RightType;
+        }
 
-                chainBuilder.Add(relationship);
-                nextResourceType = relationship.RightType;
-            }
+        return chainBuilder.ToImmutable();
+    }
 
-            return chainBuilder.ToImmutable();
-        }
+    /// <summary>
+    /// Resolves a chain of to-one relationships that ends in an attribute.
+    /// <example>
+    /// author.address.country.name
+    /// </example>
+    /// <example>name</example>
+    /// </summary>
+    public IImmutableList<ResourceFieldAttribute> ResolveToOneChainEndingInAttribute(ResourceType resourceType, string path,
+        Action<ResourceFieldAttribute, ResourceType, string>? validateCallback = null)
+    {
+        ImmutableArray<ResourceFieldAttribute>.Builder chainBuilder = ImmutableArray.CreateBuilder<ResourceFieldAttribute>();
 
-        /// <summary>
-        /// Resolves a chain of to-one relationships that ends in an attribute.
-        /// <example>
-        /// author.address.country.name
-        /// </example>
-        /// <example>name</example>
-        /// </summary>
-        public IImmutableList<ResourceFieldAttribute> ResolveToOneChainEndingInAttribute(ResourceType resourceType, string path,
-            Action<ResourceFieldAttribute, ResourceType, string>? validateCallback = null)
+        string[] publicNameParts = path.Split(".");
+        ResourceType nextResourceType = resourceType;
+
+        foreach (string publicName in publicNameParts[..^1])
         {
-            ImmutableArray<ResourceFieldAttribute>.Builder chainBuilder = ImmutableArray.CreateBuilder<ResourceFieldAttribute>();
+            RelationshipAttribute toOneRelationship = GetToOneRelationship(publicName, nextResourceType, path);
 
-            string[] publicNameParts = path.Split(".");
-            ResourceType nextResourceType = resourceType;
+            validateCallback?.Invoke(toOneRelationship, nextResourceType, path);
 
-            foreach (string publicName in publicNameParts[..^1])
-            {
-                RelationshipAttribute toOneRelationship = GetToOneRelationship(publicName, nextResourceType, path);
+            chainBuilder.Add(toOneRelationship);
+            nextResourceType = toOneRelationship.RightType;
+        }
 
-                validateCallback?.Invoke(toOneRelationship, nextResourceType, path);
+        string lastName = publicNameParts[^1];
+        AttrAttribute lastAttribute = GetAttribute(lastName, nextResourceType, path);
 
-                chainBuilder.Add(toOneRelationship);
-                nextResourceType = toOneRelationship.RightType;
-            }
+        validateCallback?.Invoke(lastAttribute, nextResourceType, path);
 
-            string lastName = publicNameParts[^1];
-            AttrAttribute lastAttribute = GetAttribute(lastName, nextResourceType, path);
+        chainBuilder.Add(lastAttribute);
+        return chainBuilder.ToImmutable();
+    }
 
-            validateCallback?.Invoke(lastAttribute, nextResourceType, path);
+    /// <summary>
+    /// Resolves a chain of to-one relationships that ends in a to-many relationship.
+    /// <example>
+    /// article.comments
+    /// </example>
+    /// <example>
+    /// comments
+    /// </example>
+    /// </summary>
+    public IImmutableList<ResourceFieldAttribute> ResolveToOneChainEndingInToMany(ResourceType resourceType, string path,
+        Action<ResourceFieldAttribute, ResourceType, string>? validateCallback = null)
+    {
+        ImmutableArray<ResourceFieldAttribute>.Builder chainBuilder = ImmutableArray.CreateBuilder<ResourceFieldAttribute>();
 
-            chainBuilder.Add(lastAttribute);
-            return chainBuilder.ToImmutable();
-        }
+        string[] publicNameParts = path.Split(".");
+        ResourceType nextResourceType = resourceType;
 
-        /// <summary>
-        /// Resolves a chain of to-one relationships that ends in a to-many relationship.
-        /// <example>
-        /// article.comments
-        /// </example>
-        /// <example>
-        /// comments
-        /// </example>
-        /// </summary>
-        public IImmutableList<ResourceFieldAttribute> ResolveToOneChainEndingInToMany(ResourceType resourceType, string path,
-            Action<ResourceFieldAttribute, ResourceType, string>? validateCallback = null)
+        foreach (string publicName in publicNameParts[..^1])
         {
-            ImmutableArray<ResourceFieldAttribute>.Builder chainBuilder = ImmutableArray.CreateBuilder<ResourceFieldAttribute>();
+            RelationshipAttribute toOneRelationship = GetToOneRelationship(publicName, nextResourceType, path);
 
-            string[] publicNameParts = path.Split(".");
-            ResourceType nextResourceType = resourceType;
+            validateCallback?.Invoke(toOneRelationship, nextResourceType, path);
 
-            foreach (string publicName in publicNameParts[..^1])
-            {
-                RelationshipAttribute toOneRelationship = GetToOneRelationship(publicName, nextResourceType, path);
+            chainBuilder.Add(toOneRelationship);
+            nextResourceType = toOneRelationship.RightType;
+        }
 
-                validateCallback?.Invoke(toOneRelationship, nextResourceType, path);
+        string lastName = publicNameParts[^1];
 
-                chainBuilder.Add(toOneRelationship);
-                nextResourceType = toOneRelationship.RightType;
-            }
+        RelationshipAttribute toManyRelationship = GetToManyRelationship(lastName, nextResourceType, path);
 
-            string lastName = publicNameParts[^1];
+        validateCallback?.Invoke(toManyRelationship, nextResourceType, path);
 
-            RelationshipAttribute toManyRelationship = GetToManyRelationship(lastName, nextResourceType, path);
+        chainBuilder.Add(toManyRelationship);
+        return chainBuilder.ToImmutable();
+    }
 
-            validateCallback?.Invoke(toManyRelationship, nextResourceType, path);
+    /// <summary>
+    /// Resolves a chain of to-one relationships that ends in either an attribute or a to-one relationship.
+    /// <example>
+    /// author.address.country.name
+    /// </example>
+    /// <example>
+    /// author.address
+    /// </example>
+    /// </summary>
+    public IImmutableList<ResourceFieldAttribute> ResolveToOneChainEndingInAttributeOrToOne(ResourceType resourceType, string path,
+        Action<ResourceFieldAttribute, ResourceType, string>? validateCallback = null)
+    {
+        ImmutableArray<ResourceFieldAttribute>.Builder chainBuilder = ImmutableArray.CreateBuilder<ResourceFieldAttribute>();
 
-            chainBuilder.Add(toManyRelationship);
-            return chainBuilder.ToImmutable();
-        }
+        string[] publicNameParts = path.Split(".");
+        ResourceType nextResourceType = resourceType;
 
-        /// <summary>
-        /// Resolves a chain of to-one relationships that ends in either an attribute or a to-one relationship.
-        /// <example>
-        /// author.address.country.name
-        /// </example>
-        /// <example>
-        /// author.address
-        /// </example>
-        /// </summary>
-        public IImmutableList<ResourceFieldAttribute> ResolveToOneChainEndingInAttributeOrToOne(ResourceType resourceType, string path,
-            Action<ResourceFieldAttribute, ResourceType, string>? validateCallback = null)
+        foreach (string publicName in publicNameParts[..^1])
         {
-            ImmutableArray<ResourceFieldAttribute>.Builder chainBuilder = ImmutableArray.CreateBuilder<ResourceFieldAttribute>();
-
-            string[] publicNameParts = path.Split(".");
-            ResourceType nextResourceType = resourceType;
+            RelationshipAttribute toOneRelationship = GetToOneRelationship(publicName, nextResourceType, path);
 
-            foreach (string publicName in publicNameParts[..^1])
-            {
-                RelationshipAttribute toOneRelationship = GetToOneRelationship(publicName, nextResourceType, path);
+            validateCallback?.Invoke(toOneRelationship, nextResourceType, path);
 
-                validateCallback?.Invoke(toOneRelationship, nextResourceType, path);
+            chainBuilder.Add(toOneRelationship);
+            nextResourceType = toOneRelationship.RightType;
+        }
 
-                chainBuilder.Add(toOneRelationship);
-                nextResourceType = toOneRelationship.RightType;
-            }
+        string lastName = publicNameParts[^1];
+        ResourceFieldAttribute lastField = GetField(lastName, nextResourceType, path);
 
-            string lastName = publicNameParts[^1];
-            ResourceFieldAttribute lastField = GetField(lastName, nextResourceType, path);
+        if (lastField is HasManyAttribute)
+        {
+            throw new QueryParseException(path == lastName
+                ? $"Field '{lastName}' must be an attribute or a to-one relationship on resource type '{nextResourceType.PublicName}'."
+                : $"Field '{lastName}' in '{path}' must be an attribute or a to-one relationship on resource type '{nextResourceType.PublicName}'.");
+        }
 
-            if (lastField is HasManyAttribute)
-            {
-                throw new QueryParseException(path == lastName
-                    ? $"Field '{lastName}' must be an attribute or a to-one relationship on resource type '{nextResourceType.PublicName}'."
-                    : $"Field '{lastName}' in '{path}' must be an attribute or a to-one relationship on resource type '{nextResourceType.PublicName}'.");
-            }
+        validateCallback?.Invoke(lastField, nextResourceType, path);
 
-            validateCallback?.Invoke(lastField, nextResourceType, path);
+        chainBuilder.Add(lastField);
+        return chainBuilder.ToImmutable();
+    }
 
-            chainBuilder.Add(lastField);
-            return chainBuilder.ToImmutable();
-        }
+    private RelationshipAttribute GetRelationship(string publicName, ResourceType resourceType, string path)
+    {
+        RelationshipAttribute? relationship = resourceType.FindRelationshipByPublicName(publicName);
 
-        private RelationshipAttribute GetRelationship(string publicName, ResourceType resourceType, string path)
+        if (relationship == null)
         {
-            RelationshipAttribute? relationship = resourceType.FindRelationshipByPublicName(publicName);
-
-            if (relationship == null)
-            {
-                throw new QueryParseException(path == publicName
-                    ? $"Relationship '{publicName}' does not exist on resource type '{resourceType.PublicName}'."
-                    : $"Relationship '{publicName}' in '{path}' does not exist on resource type '{resourceType.PublicName}'.");
-            }
-
-            return relationship;
+            throw new QueryParseException(path == publicName
+                ? $"Relationship '{publicName}' does not exist on resource type '{resourceType.PublicName}'."
+                : $"Relationship '{publicName}' in '{path}' does not exist on resource type '{resourceType.PublicName}'.");
         }
 
-        private RelationshipAttribute GetToManyRelationship(string publicName, ResourceType resourceType, string path)
-        {
-            RelationshipAttribute relationship = GetRelationship(publicName, resourceType, path);
+        return relationship;
+    }
 
-            if (relationship is not HasManyAttribute)
-            {
-                throw new QueryParseException(path == publicName
-                    ? $"Relationship '{publicName}' must be a to-many relationship on resource type '{resourceType.PublicName}'."
-                    : $"Relationship '{publicName}' in '{path}' must be a to-many relationship on resource type '{resourceType.PublicName}'.");
-            }
+    private RelationshipAttribute GetToManyRelationship(string publicName, ResourceType resourceType, string path)
+    {
+        RelationshipAttribute relationship = GetRelationship(publicName, resourceType, path);
 
-            return relationship;
+        if (relationship is not HasManyAttribute)
+        {
+            throw new QueryParseException(path == publicName
+                ? $"Relationship '{publicName}' must be a to-many relationship on resource type '{resourceType.PublicName}'."
+                : $"Relationship '{publicName}' in '{path}' must be a to-many relationship on resource type '{resourceType.PublicName}'.");
         }
 
-        private RelationshipAttribute GetToOneRelationship(string publicName, ResourceType resourceType, string path)
-        {
-            RelationshipAttribute relationship = GetRelationship(publicName, resourceType, path);
+        return relationship;
+    }
 
-            if (relationship is not HasOneAttribute)
-            {
-                throw new QueryParseException(path == publicName
-                    ? $"Relationship '{publicName}' must be a to-one relationship on resource type '{resourceType.PublicName}'."
-                    : $"Relationship '{publicName}' in '{path}' must be a to-one relationship on resource type '{resourceType.PublicName}'.");
-            }
+    private RelationshipAttribute GetToOneRelationship(string publicName, ResourceType resourceType, string path)
+    {
+        RelationshipAttribute relationship = GetRelationship(publicName, resourceType, path);
 
-            return relationship;
+        if (relationship is not HasOneAttribute)
+        {
+            throw new QueryParseException(path == publicName
+                ? $"Relationship '{publicName}' must be a to-one relationship on resource type '{resourceType.PublicName}'."
+                : $"Relationship '{publicName}' in '{path}' must be a to-one relationship on resource type '{resourceType.PublicName}'.");
         }
 
-        private AttrAttribute GetAttribute(string publicName, ResourceType resourceType, string path)
-        {
-            AttrAttribute? attribute = resourceType.FindAttributeByPublicName(publicName);
+        return relationship;
+    }
 
-            if (attribute == null)
-            {
-                throw new QueryParseException(path == publicName
-                    ? $"Attribute '{publicName}' does not exist on resource type '{resourceType.PublicName}'."
-                    : $"Attribute '{publicName}' in '{path}' does not exist on resource type '{resourceType.PublicName}'.");
-            }
+    private AttrAttribute GetAttribute(string publicName, ResourceType resourceType, string path)
+    {
+        AttrAttribute? attribute = resourceType.FindAttributeByPublicName(publicName);
 
-            return attribute;
+        if (attribute == null)
+        {
+            throw new QueryParseException(path == publicName
+                ? $"Attribute '{publicName}' does not exist on resource type '{resourceType.PublicName}'."
+                : $"Attribute '{publicName}' in '{path}' does not exist on resource type '{resourceType.PublicName}'.");
         }
 
-        public ResourceFieldAttribute GetField(string publicName, ResourceType resourceType, string path)
-        {
-            ResourceFieldAttribute? field = resourceType.Fields.FirstOrDefault(nextField => nextField.PublicName == publicName);
+        return attribute;
+    }
 
-            if (field == null)
-            {
-                throw new QueryParseException(path == publicName
-                    ? $"Field '{publicName}' does not exist on resource type '{resourceType.PublicName}'."
-                    : $"Field '{publicName}' in '{path}' does not exist on resource type '{resourceType.PublicName}'.");
-            }
+    public ResourceFieldAttribute GetField(string publicName, ResourceType resourceType, string path)
+    {
+        ResourceFieldAttribute? field = resourceType.Fields.FirstOrDefault(nextField => nextField.PublicName == publicName);
 
-            return field;
+        if (field == null)
+        {
+            throw new QueryParseException(path == publicName
+                ? $"Field '{publicName}' does not exist on resource type '{resourceType.PublicName}'."
+                : $"Field '{publicName}' in '{path}' does not exist on resource type '{resourceType.PublicName}'.");
         }
+
+        return field;
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/SortParser.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/SortParser.cs
index a78ec99b66..38a263e063 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/SortParser.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/SortParser.cs
@@ -1,92 +1,89 @@
-using System;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+[PublicAPI]
+public class SortParser : QueryExpressionParser
 {
-    [PublicAPI]
-    public class SortParser : QueryExpressionParser
+    private readonly Action<ResourceFieldAttribute, ResourceType, string>? _validateSingleFieldCallback;
+    private ResourceType? _resourceTypeInScope;
+
+    public SortParser(Action<ResourceFieldAttribute, ResourceType, string>? validateSingleFieldCallback = null)
     {
-        private readonly Action<ResourceFieldAttribute, ResourceType, string>? _validateSingleFieldCallback;
-        private ResourceType? _resourceTypeInScope;
+        _validateSingleFieldCallback = validateSingleFieldCallback;
+    }
 
-        public SortParser(Action<ResourceFieldAttribute, ResourceType, string>? validateSingleFieldCallback = null)
-        {
-            _validateSingleFieldCallback = validateSingleFieldCallback;
-        }
+    public SortExpression Parse(string source, ResourceType resourceTypeInScope)
+    {
+        ArgumentGuard.NotNull(resourceTypeInScope, nameof(resourceTypeInScope));
 
-        public SortExpression Parse(string source, ResourceType resourceTypeInScope)
-        {
-            ArgumentGuard.NotNull(resourceTypeInScope, nameof(resourceTypeInScope));
+        _resourceTypeInScope = resourceTypeInScope;
 
-            _resourceTypeInScope = resourceTypeInScope;
+        Tokenize(source);
 
-            Tokenize(source);
+        SortExpression expression = ParseSort();
 
-            SortExpression expression = ParseSort();
+        AssertTokenStackIsEmpty();
 
-            AssertTokenStackIsEmpty();
+        return expression;
+    }
 
-            return expression;
-        }
+    protected SortExpression ParseSort()
+    {
+        SortElementExpression firstElement = ParseSortElement();
 
-        protected SortExpression ParseSort()
-        {
-            SortElementExpression firstElement = ParseSortElement();
+        ImmutableArray<SortElementExpression>.Builder elementsBuilder = ImmutableArray.CreateBuilder<SortElementExpression>();
+        elementsBuilder.Add(firstElement);
 
-            ImmutableArray<SortElementExpression>.Builder elementsBuilder = ImmutableArray.CreateBuilder<SortElementExpression>();
-            elementsBuilder.Add(firstElement);
+        while (TokenStack.Any())
+        {
+            EatSingleCharacterToken(TokenKind.Comma);
 
-            while (TokenStack.Any())
-            {
-                EatSingleCharacterToken(TokenKind.Comma);
+            SortElementExpression nextElement = ParseSortElement();
+            elementsBuilder.Add(nextElement);
+        }
 
-                SortElementExpression nextElement = ParseSortElement();
-                elementsBuilder.Add(nextElement);
-            }
+        return new SortExpression(elementsBuilder.ToImmutable());
+    }
 
-            return new SortExpression(elementsBuilder.ToImmutable());
-        }
+    protected SortElementExpression ParseSortElement()
+    {
+        bool isAscending = true;
 
-        protected SortElementExpression ParseSortElement()
+        if (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.Minus)
         {
-            bool isAscending = true;
+            TokenStack.Pop();
+            isAscending = false;
+        }
 
-            if (TokenStack.TryPeek(out Token? nextToken) && nextToken.Kind == TokenKind.Minus)
-            {
-                TokenStack.Pop();
-                isAscending = false;
-            }
+        CountExpression? count = TryParseCount();
 
-            CountExpression? count = TryParseCount();
+        if (count != null)
+        {
+            return new SortElementExpression(count, isAscending);
+        }
 
-            if (count != null)
-            {
-                return new SortElementExpression(count, isAscending);
-            }
+        string errorMessage = isAscending ? "-, count function or field name expected." : "Count function or field name expected.";
+        ResourceFieldChainExpression targetAttribute = ParseFieldChain(FieldChainRequirements.EndsInAttribute, errorMessage);
+        return new SortElementExpression(targetAttribute, isAscending);
+    }
 
-            string errorMessage = isAscending ? "-, count function or field name expected." : "Count function or field name expected.";
-            ResourceFieldChainExpression targetAttribute = ParseFieldChain(FieldChainRequirements.EndsInAttribute, errorMessage);
-            return new SortElementExpression(targetAttribute, isAscending);
+    protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
+    {
+        if (chainRequirements == FieldChainRequirements.EndsInToMany)
+        {
+            return ChainResolver.ResolveToOneChainEndingInToMany(_resourceTypeInScope!, path);
         }
 
-        protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
+        if (chainRequirements == FieldChainRequirements.EndsInAttribute)
         {
-            if (chainRequirements == FieldChainRequirements.EndsInToMany)
-            {
-                return ChainResolver.ResolveToOneChainEndingInToMany(_resourceTypeInScope!, path);
-            }
-
-            if (chainRequirements == FieldChainRequirements.EndsInAttribute)
-            {
-                return ChainResolver.ResolveToOneChainEndingInAttribute(_resourceTypeInScope!, path, _validateSingleFieldCallback);
-            }
-
-            throw new InvalidOperationException($"Unexpected combination of chain requirement flags '{chainRequirements}'.");
+            return ChainResolver.ResolveToOneChainEndingInAttribute(_resourceTypeInScope!, path, _validateSingleFieldCallback);
         }
+
+        throw new InvalidOperationException($"Unexpected combination of chain requirement flags '{chainRequirements}'.");
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/SparseFieldSetParser.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/SparseFieldSetParser.cs
index 2a2fa60e5d..b4e54f0c46 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/SparseFieldSetParser.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/SparseFieldSetParser.cs
@@ -1,65 +1,62 @@
-using System;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+[PublicAPI]
+public class SparseFieldSetParser : QueryExpressionParser
 {
-    [PublicAPI]
-    public class SparseFieldSetParser : QueryExpressionParser
+    private readonly Action<ResourceFieldAttribute, ResourceType, string>? _validateSingleFieldCallback;
+    private ResourceType? _resourceType;
+
+    public SparseFieldSetParser(Action<ResourceFieldAttribute, ResourceType, string>? validateSingleFieldCallback = null)
     {
-        private readonly Action<ResourceFieldAttribute, ResourceType, string>? _validateSingleFieldCallback;
-        private ResourceType? _resourceType;
+        _validateSingleFieldCallback = validateSingleFieldCallback;
+    }
 
-        public SparseFieldSetParser(Action<ResourceFieldAttribute, ResourceType, string>? validateSingleFieldCallback = null)
-        {
-            _validateSingleFieldCallback = validateSingleFieldCallback;
-        }
+    public SparseFieldSetExpression? Parse(string source, ResourceType resourceType)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-        public SparseFieldSetExpression? Parse(string source, ResourceType resourceType)
-        {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+        _resourceType = resourceType;
 
-            _resourceType = resourceType;
+        Tokenize(source);
 
-            Tokenize(source);
+        SparseFieldSetExpression? expression = ParseSparseFieldSet();
 
-            SparseFieldSetExpression? expression = ParseSparseFieldSet();
+        AssertTokenStackIsEmpty();
 
-            AssertTokenStackIsEmpty();
+        return expression;
+    }
 
-            return expression;
-        }
+    protected SparseFieldSetExpression? ParseSparseFieldSet()
+    {
+        ImmutableHashSet<ResourceFieldAttribute>.Builder fieldSetBuilder = ImmutableHashSet.CreateBuilder<ResourceFieldAttribute>();
 
-        protected SparseFieldSetExpression? ParseSparseFieldSet()
+        while (TokenStack.Any())
         {
-            ImmutableHashSet<ResourceFieldAttribute>.Builder fieldSetBuilder = ImmutableHashSet.CreateBuilder<ResourceFieldAttribute>();
-
-            while (TokenStack.Any())
+            if (fieldSetBuilder.Count > 0)
             {
-                if (fieldSetBuilder.Count > 0)
-                {
-                    EatSingleCharacterToken(TokenKind.Comma);
-                }
-
-                ResourceFieldChainExpression nextChain = ParseFieldChain(FieldChainRequirements.EndsInAttribute, "Field name expected.");
-                ResourceFieldAttribute nextField = nextChain.Fields.Single();
-                fieldSetBuilder.Add(nextField);
+                EatSingleCharacterToken(TokenKind.Comma);
             }
 
-            return fieldSetBuilder.Any() ? new SparseFieldSetExpression(fieldSetBuilder.ToImmutable()) : null;
+            ResourceFieldChainExpression nextChain = ParseFieldChain(FieldChainRequirements.EndsInAttribute, "Field name expected.");
+            ResourceFieldAttribute nextField = nextChain.Fields.Single();
+            fieldSetBuilder.Add(nextField);
         }
 
-        protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
-        {
-            ResourceFieldAttribute field = ChainResolver.GetField(path, _resourceType!, path);
+        return fieldSetBuilder.Any() ? new SparseFieldSetExpression(fieldSetBuilder.ToImmutable()) : null;
+    }
+
+    protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
+    {
+        ResourceFieldAttribute field = ChainResolver.GetField(path, _resourceType!, path);
 
-            _validateSingleFieldCallback?.Invoke(field, _resourceType!, path);
+        _validateSingleFieldCallback?.Invoke(field, _resourceType!, path);
 
-            return ImmutableArray.Create(field);
-        }
+        return ImmutableArray.Create(field);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/SparseFieldTypeParser.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/SparseFieldTypeParser.cs
index d9c97dd220..e7c96d21d5 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/SparseFieldTypeParser.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/SparseFieldTypeParser.cs
@@ -1,75 +1,73 @@
-using System;
 using System.Collections.Immutable;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+[PublicAPI]
+public class SparseFieldTypeParser : QueryExpressionParser
 {
-    [PublicAPI]
-    public class SparseFieldTypeParser : QueryExpressionParser
-    {
-        private readonly IResourceGraph _resourceGraph;
+    private readonly IResourceGraph _resourceGraph;
 
-        public SparseFieldTypeParser(IResourceGraph resourceGraph)
-        {
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+    public SparseFieldTypeParser(IResourceGraph resourceGraph)
+    {
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
 
-            _resourceGraph = resourceGraph;
-        }
+        _resourceGraph = resourceGraph;
+    }
 
-        public ResourceType Parse(string source)
-        {
-            Tokenize(source);
+    public ResourceType Parse(string source)
+    {
+        Tokenize(source);
 
-            ResourceType resourceType = ParseSparseFieldTarget();
+        ResourceType resourceType = ParseSparseFieldTarget();
 
-            AssertTokenStackIsEmpty();
+        AssertTokenStackIsEmpty();
 
-            return resourceType;
-        }
+        return resourceType;
+    }
 
-        private ResourceType ParseSparseFieldTarget()
+    private ResourceType ParseSparseFieldTarget()
+    {
+        if (!TokenStack.TryPop(out Token? token) || token.Kind != TokenKind.Text)
         {
-            if (!TokenStack.TryPop(out Token? token) || token.Kind != TokenKind.Text)
-            {
-                throw new QueryParseException("Parameter name expected.");
-            }
+            throw new QueryParseException("Parameter name expected.");
+        }
 
-            EatSingleCharacterToken(TokenKind.OpenBracket);
+        EatSingleCharacterToken(TokenKind.OpenBracket);
 
-            ResourceType resourceType = ParseResourceName();
+        ResourceType resourceType = ParseResourceName();
 
-            EatSingleCharacterToken(TokenKind.CloseBracket);
+        EatSingleCharacterToken(TokenKind.CloseBracket);
 
-            return resourceType;
-        }
+        return resourceType;
+    }
 
-        private ResourceType ParseResourceName()
+    private ResourceType ParseResourceName()
+    {
+        if (TokenStack.TryPop(out Token? token) && token.Kind == TokenKind.Text)
         {
-            if (TokenStack.TryPop(out Token? token) && token.Kind == TokenKind.Text)
-            {
-                return GetResourceType(token.Value!);
-            }
-
-            throw new QueryParseException("Resource type expected.");
+            return GetResourceType(token.Value!);
         }
 
-        private ResourceType GetResourceType(string publicName)
-        {
-            ResourceType? resourceType = _resourceGraph.FindResourceType(publicName);
-
-            if (resourceType == null)
-            {
-                throw new QueryParseException($"Resource type '{publicName}' does not exist.");
-            }
+        throw new QueryParseException("Resource type expected.");
+    }
 
-            return resourceType;
-        }
+    private ResourceType GetResourceType(string publicName)
+    {
+        ResourceType? resourceType = _resourceGraph.FindResourceType(publicName);
 
-        protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
+        if (resourceType == null)
         {
-            throw new NotSupportedException();
+            throw new QueryParseException($"Resource type '{publicName}' does not exist.");
         }
+
+        return resourceType;
+    }
+
+    protected override IImmutableList<ResourceFieldAttribute> OnResolveFieldChain(string path, FieldChainRequirements chainRequirements)
+    {
+        throw new NotSupportedException();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/Token.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/Token.cs
index 6965562d44..14b6289b83 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/Token.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/Token.cs
@@ -1,22 +1,21 @@
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+[PublicAPI]
+public sealed class Token
 {
-    [PublicAPI]
-    public sealed class Token
-    {
-        public TokenKind Kind { get; }
-        public string? Value { get; }
+    public TokenKind Kind { get; }
+    public string? Value { get; }
 
-        public Token(TokenKind kind, string? value = null)
-        {
-            Kind = kind;
-            Value = value;
-        }
+    public Token(TokenKind kind, string? value = null)
+    {
+        Kind = kind;
+        Value = value;
+    }
 
-        public override string ToString()
-        {
-            return Value == null ? Kind.ToString() : $"{Kind}: {Value}";
-        }
+    public override string ToString()
+    {
+        return Value == null ? Kind.ToString() : $"{Kind}: {Value}";
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/Parsing/TokenKind.cs b/src/JsonApiDotNetCore/Queries/Internal/Parsing/TokenKind.cs
index 3658c82f18..75b6952f5a 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/Parsing/TokenKind.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/Parsing/TokenKind.cs
@@ -1,15 +1,14 @@
-namespace JsonApiDotNetCore.Queries.Internal.Parsing
+namespace JsonApiDotNetCore.Queries.Internal.Parsing;
+
+public enum TokenKind
 {
-    public enum TokenKind
-    {
-        OpenParen,
-        CloseParen,
-        OpenBracket,
-        CloseBracket,
-        Comma,
-        Colon,
-        Minus,
-        Text,
-        QuotedText
-    }
+    OpenParen,
+    CloseParen,
+    OpenBracket,
+    CloseBracket,
+    Comma,
+    Colon,
+    Minus,
+    Text,
+    QuotedText
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryLayerComposer.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryLayerComposer.cs
index d1a55551de..f7b95c3c86 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/QueryLayerComposer.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/QueryLayerComposer.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Diagnostics;
@@ -9,545 +6,538 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal
+namespace JsonApiDotNetCore.Queries.Internal;
+
+/// <inheritdoc />
+[PublicAPI]
+public class QueryLayerComposer : IQueryLayerComposer
 {
+    private readonly CollectionConverter _collectionConverter = new();
+    private readonly IEnumerable<IQueryConstraintProvider> _constraintProviders;
+    private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
+    private readonly IJsonApiOptions _options;
+    private readonly IPaginationContext _paginationContext;
+    private readonly ITargetedFields _targetedFields;
+    private readonly IEvaluatedIncludeCache _evaluatedIncludeCache;
+    private readonly ISparseFieldSetCache _sparseFieldSetCache;
+
+    public QueryLayerComposer(IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor,
+        IJsonApiOptions options, IPaginationContext paginationContext, ITargetedFields targetedFields, IEvaluatedIncludeCache evaluatedIncludeCache,
+        ISparseFieldSetCache sparseFieldSetCache)
+    {
+        ArgumentGuard.NotNull(constraintProviders, nameof(constraintProviders));
+        ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(paginationContext, nameof(paginationContext));
+        ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
+        ArgumentGuard.NotNull(evaluatedIncludeCache, nameof(evaluatedIncludeCache));
+        ArgumentGuard.NotNull(sparseFieldSetCache, nameof(sparseFieldSetCache));
+
+        _constraintProviders = constraintProviders;
+        _resourceDefinitionAccessor = resourceDefinitionAccessor;
+        _options = options;
+        _paginationContext = paginationContext;
+        _targetedFields = targetedFields;
+        _evaluatedIncludeCache = evaluatedIncludeCache;
+        _sparseFieldSetCache = sparseFieldSetCache;
+    }
+
     /// <inheritdoc />
-    [PublicAPI]
-    public class QueryLayerComposer : IQueryLayerComposer
+    public FilterExpression? GetPrimaryFilterFromConstraints(ResourceType primaryResourceType)
     {
-        private readonly CollectionConverter _collectionConverter = new();
-        private readonly IEnumerable<IQueryConstraintProvider> _constraintProviders;
-        private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
-        private readonly IJsonApiOptions _options;
-        private readonly IPaginationContext _paginationContext;
-        private readonly ITargetedFields _targetedFields;
-        private readonly IEvaluatedIncludeCache _evaluatedIncludeCache;
-        private readonly ISparseFieldSetCache _sparseFieldSetCache;
-
-        public QueryLayerComposer(IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor,
-            IJsonApiOptions options, IPaginationContext paginationContext, ITargetedFields targetedFields, IEvaluatedIncludeCache evaluatedIncludeCache,
-            ISparseFieldSetCache sparseFieldSetCache)
-        {
-            ArgumentGuard.NotNull(constraintProviders, nameof(constraintProviders));
-            ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(paginationContext, nameof(paginationContext));
-            ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
-            ArgumentGuard.NotNull(evaluatedIncludeCache, nameof(evaluatedIncludeCache));
-            ArgumentGuard.NotNull(sparseFieldSetCache, nameof(sparseFieldSetCache));
-
-            _constraintProviders = constraintProviders;
-            _resourceDefinitionAccessor = resourceDefinitionAccessor;
-            _options = options;
-            _paginationContext = paginationContext;
-            _targetedFields = targetedFields;
-            _evaluatedIncludeCache = evaluatedIncludeCache;
-            _sparseFieldSetCache = sparseFieldSetCache;
-        }
+        ExpressionInScope[] constraints = _constraintProviders.SelectMany(provider => provider.GetConstraints()).ToArray();
 
-        /// <inheritdoc />
-        public FilterExpression? GetPrimaryFilterFromConstraints(ResourceType primaryResourceType)
-        {
-            ExpressionInScope[] constraints = _constraintProviders.SelectMany(provider => provider.GetConstraints()).ToArray();
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
 
-            // @formatter:wrap_chained_method_calls chop_always
-            // @formatter:keep_existing_linebreaks true
+        FilterExpression[] filtersInTopScope = constraints
+            .Where(constraint => constraint.Scope == null)
+            .Select(constraint => constraint.Expression)
+            .OfType<FilterExpression>()
+            .ToArray();
 
-            FilterExpression[] filtersInTopScope = constraints
-                .Where(constraint => constraint.Scope == null)
-                .Select(constraint => constraint.Expression)
-                .OfType<FilterExpression>()
-                .ToArray();
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
 
-            // @formatter:keep_existing_linebreaks restore
-            // @formatter:wrap_chained_method_calls restore
+        return GetFilter(filtersInTopScope, primaryResourceType);
+    }
 
-            return GetFilter(filtersInTopScope, primaryResourceType);
-        }
+    /// <inheritdoc />
+    public FilterExpression? GetSecondaryFilterFromConstraints<TId>(TId primaryId, HasManyAttribute hasManyRelationship)
+    {
+        ArgumentGuard.NotNull(hasManyRelationship, nameof(hasManyRelationship));
 
-        /// <inheritdoc />
-        public FilterExpression? GetSecondaryFilterFromConstraints<TId>(TId primaryId, HasManyAttribute hasManyRelationship)
+        if (hasManyRelationship.InverseNavigationProperty == null)
         {
-            ArgumentGuard.NotNull(hasManyRelationship, nameof(hasManyRelationship));
+            return null;
+        }
 
-            if (hasManyRelationship.InverseNavigationProperty == null)
-            {
-                return null;
-            }
+        RelationshipAttribute? inverseRelationship =
+            hasManyRelationship.RightType.FindRelationshipByPropertyName(hasManyRelationship.InverseNavigationProperty.Name);
 
-            RelationshipAttribute? inverseRelationship =
-                hasManyRelationship.RightType.FindRelationshipByPropertyName(hasManyRelationship.InverseNavigationProperty.Name);
+        if (inverseRelationship == null)
+        {
+            return null;
+        }
 
-            if (inverseRelationship == null)
-            {
-                return null;
-            }
+        ExpressionInScope[] constraints = _constraintProviders.SelectMany(provider => provider.GetConstraints()).ToArray();
 
-            ExpressionInScope[] constraints = _constraintProviders.SelectMany(provider => provider.GetConstraints()).ToArray();
+        var secondaryScope = new ResourceFieldChainExpression(hasManyRelationship);
 
-            var secondaryScope = new ResourceFieldChainExpression(hasManyRelationship);
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
 
-            // @formatter:wrap_chained_method_calls chop_always
-            // @formatter:keep_existing_linebreaks true
+        FilterExpression[] filtersInSecondaryScope = constraints
+            .Where(constraint => secondaryScope.Equals(constraint.Scope))
+            .Select(constraint => constraint.Expression)
+            .OfType<FilterExpression>()
+            .ToArray();
 
-            FilterExpression[] filtersInSecondaryScope = constraints
-                .Where(constraint => secondaryScope.Equals(constraint.Scope))
-                .Select(constraint => constraint.Expression)
-                .OfType<FilterExpression>()
-                .ToArray();
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
 
-            // @formatter:keep_existing_linebreaks restore
-            // @formatter:wrap_chained_method_calls restore
+        FilterExpression? primaryFilter = GetFilter(Array.Empty<QueryExpression>(), hasManyRelationship.LeftType);
+        FilterExpression? secondaryFilter = GetFilter(filtersInSecondaryScope, hasManyRelationship.RightType);
 
-            FilterExpression? primaryFilter = GetFilter(Array.Empty<QueryExpression>(), hasManyRelationship.LeftType);
-            FilterExpression? secondaryFilter = GetFilter(filtersInSecondaryScope, hasManyRelationship.RightType);
+        FilterExpression inverseFilter = GetInverseRelationshipFilter(primaryId, hasManyRelationship, inverseRelationship);
 
-            FilterExpression inverseFilter = GetInverseRelationshipFilter(primaryId, hasManyRelationship, inverseRelationship);
+        return LogicalExpression.Compose(LogicalOperator.And, inverseFilter, primaryFilter, secondaryFilter);
+    }
 
-            return LogicalExpression.Compose(LogicalOperator.And, inverseFilter, primaryFilter, secondaryFilter);
-        }
+    private static FilterExpression GetInverseRelationshipFilter<TId>(TId primaryId, HasManyAttribute relationship, RelationshipAttribute inverseRelationship)
+    {
+        return inverseRelationship is HasManyAttribute hasManyInverseRelationship
+            ? GetInverseHasManyRelationshipFilter(primaryId, relationship, hasManyInverseRelationship)
+            : GetInverseHasOneRelationshipFilter(primaryId, relationship, (HasOneAttribute)inverseRelationship);
+    }
 
-        private static FilterExpression GetInverseRelationshipFilter<TId>(TId primaryId, HasManyAttribute relationship,
-            RelationshipAttribute inverseRelationship)
-        {
-            return inverseRelationship is HasManyAttribute hasManyInverseRelationship
-                ? GetInverseHasManyRelationshipFilter(primaryId, relationship, hasManyInverseRelationship)
-                : GetInverseHasOneRelationshipFilter(primaryId, relationship, (HasOneAttribute)inverseRelationship);
-        }
+    private static FilterExpression GetInverseHasOneRelationshipFilter<TId>(TId primaryId, HasManyAttribute relationship, HasOneAttribute inverseRelationship)
+    {
+        AttrAttribute idAttribute = GetIdAttribute(relationship.LeftType);
+        var idChain = new ResourceFieldChainExpression(ImmutableArray.Create<ResourceFieldAttribute>(inverseRelationship, idAttribute));
 
-        private static FilterExpression GetInverseHasOneRelationshipFilter<TId>(TId primaryId, HasManyAttribute relationship,
-            HasOneAttribute inverseRelationship)
-        {
-            AttrAttribute idAttribute = GetIdAttribute(relationship.LeftType);
-            var idChain = new ResourceFieldChainExpression(ImmutableArray.Create<ResourceFieldAttribute>(inverseRelationship, idAttribute));
+        return new ComparisonExpression(ComparisonOperator.Equals, idChain, new LiteralConstantExpression(primaryId!.ToString()!));
+    }
 
-            return new ComparisonExpression(ComparisonOperator.Equals, idChain, new LiteralConstantExpression(primaryId!.ToString()!));
-        }
+    private static FilterExpression GetInverseHasManyRelationshipFilter<TId>(TId primaryId, HasManyAttribute relationship, HasManyAttribute inverseRelationship)
+    {
+        AttrAttribute idAttribute = GetIdAttribute(relationship.LeftType);
+        var idChain = new ResourceFieldChainExpression(ImmutableArray.Create<ResourceFieldAttribute>(idAttribute));
+        var idComparison = new ComparisonExpression(ComparisonOperator.Equals, idChain, new LiteralConstantExpression(primaryId!.ToString()!));
 
-        private static FilterExpression GetInverseHasManyRelationshipFilter<TId>(TId primaryId, HasManyAttribute relationship,
-            HasManyAttribute inverseRelationship)
-        {
-            AttrAttribute idAttribute = GetIdAttribute(relationship.LeftType);
-            var idChain = new ResourceFieldChainExpression(ImmutableArray.Create<ResourceFieldAttribute>(idAttribute));
-            var idComparison = new ComparisonExpression(ComparisonOperator.Equals, idChain, new LiteralConstantExpression(primaryId!.ToString()!));
+        return new HasExpression(new ResourceFieldChainExpression(inverseRelationship), idComparison);
+    }
 
-            return new HasExpression(new ResourceFieldChainExpression(inverseRelationship), idComparison);
-        }
+    /// <inheritdoc />
+    public QueryLayer ComposeFromConstraints(ResourceType requestResourceType)
+    {
+        ArgumentGuard.NotNull(requestResourceType, nameof(requestResourceType));
 
-        /// <inheritdoc />
-        public QueryLayer ComposeFromConstraints(ResourceType requestResourceType)
-        {
-            ArgumentGuard.NotNull(requestResourceType, nameof(requestResourceType));
+        ExpressionInScope[] constraints = _constraintProviders.SelectMany(provider => provider.GetConstraints()).ToArray();
 
-            ExpressionInScope[] constraints = _constraintProviders.SelectMany(provider => provider.GetConstraints()).ToArray();
+        QueryLayer topLayer = ComposeTopLayer(constraints, requestResourceType);
+        topLayer.Include = ComposeChildren(topLayer, constraints);
 
-            QueryLayer topLayer = ComposeTopLayer(constraints, requestResourceType);
-            topLayer.Include = ComposeChildren(topLayer, constraints);
+        _evaluatedIncludeCache.Set(topLayer.Include);
 
-            _evaluatedIncludeCache.Set(topLayer.Include);
+        return topLayer;
+    }
 
-            return topLayer;
-        }
+    private QueryLayer ComposeTopLayer(IEnumerable<ExpressionInScope> constraints, ResourceType resourceType)
+    {
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Top-level query composition");
 
-        private QueryLayer ComposeTopLayer(IEnumerable<ExpressionInScope> constraints, ResourceType resourceType)
-        {
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Top-level query composition");
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
 
-            // @formatter:wrap_chained_method_calls chop_always
-            // @formatter:keep_existing_linebreaks true
+        QueryExpression[] expressionsInTopScope = constraints
+            .Where(constraint => constraint.Scope == null)
+            .Select(constraint => constraint.Expression)
+            .ToArray();
 
-            QueryExpression[] expressionsInTopScope = constraints
-                .Where(constraint => constraint.Scope == null)
-                .Select(constraint => constraint.Expression)
-                .ToArray();
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
 
-            // @formatter:keep_existing_linebreaks restore
-            // @formatter:wrap_chained_method_calls restore
+        PaginationExpression topPagination = GetPagination(expressionsInTopScope, resourceType);
+        _paginationContext.PageSize = topPagination.PageSize;
+        _paginationContext.PageNumber = topPagination.PageNumber;
 
-            PaginationExpression topPagination = GetPagination(expressionsInTopScope, resourceType);
-            _paginationContext.PageSize = topPagination.PageSize;
-            _paginationContext.PageNumber = topPagination.PageNumber;
+        return new QueryLayer(resourceType)
+        {
+            Filter = GetFilter(expressionsInTopScope, resourceType),
+            Sort = GetSort(expressionsInTopScope, resourceType),
+            Pagination = topPagination,
+            Projection = GetProjectionForSparseAttributeSet(resourceType)
+        };
+    }
 
-            return new QueryLayer(resourceType)
-            {
-                Filter = GetFilter(expressionsInTopScope, resourceType),
-                Sort = GetSort(expressionsInTopScope, resourceType),
-                Pagination = ((JsonApiOptions)_options).DisableTopPagination ? null : topPagination,
-                Projection = GetProjectionForSparseAttributeSet(resourceType)
-            };
-        }
+    private IncludeExpression ComposeChildren(QueryLayer topLayer, ICollection<ExpressionInScope> constraints)
+    {
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Nested query composition");
 
-        private IncludeExpression ComposeChildren(QueryLayer topLayer, ICollection<ExpressionInScope> constraints)
-        {
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Nested query composition");
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
 
-            // @formatter:wrap_chained_method_calls chop_always
-            // @formatter:keep_existing_linebreaks true
+        IncludeExpression include = constraints
+            .Where(constraint => constraint.Scope == null)
+            .Select(constraint => constraint.Expression)
+            .OfType<IncludeExpression>()
+            .FirstOrDefault() ?? IncludeExpression.Empty;
 
-            IncludeExpression include = constraints
-                .Where(constraint => constraint.Scope == null)
-                .Select(constraint => constraint.Expression)
-                .OfType<IncludeExpression>()
-                .FirstOrDefault() ?? IncludeExpression.Empty;
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
 
-            // @formatter:keep_existing_linebreaks restore
-            // @formatter:wrap_chained_method_calls restore
+        IImmutableSet<IncludeElementExpression> includeElements = ProcessIncludeSet(include.Elements, topLayer, new List<RelationshipAttribute>(), constraints);
 
-            IImmutableSet<IncludeElementExpression> includeElements =
-                ProcessIncludeSet(include.Elements, topLayer, new List<RelationshipAttribute>(), constraints);
+        return !ReferenceEquals(includeElements, include.Elements)
+            ? includeElements.Any() ? new IncludeExpression(includeElements) : IncludeExpression.Empty
+            : include;
+    }
 
-            return !ReferenceEquals(includeElements, include.Elements)
-                ? includeElements.Any() ? new IncludeExpression(includeElements) : IncludeExpression.Empty
-                : include;
-        }
+    private IImmutableSet<IncludeElementExpression> ProcessIncludeSet(IImmutableSet<IncludeElementExpression> includeElements, QueryLayer parentLayer,
+        ICollection<RelationshipAttribute> parentRelationshipChain, ICollection<ExpressionInScope> constraints)
+    {
+        IImmutableSet<IncludeElementExpression> includeElementsEvaluated = GetIncludeElements(includeElements, parentLayer.ResourceType);
 
-        private IImmutableSet<IncludeElementExpression> ProcessIncludeSet(IImmutableSet<IncludeElementExpression> includeElements, QueryLayer parentLayer,
-            ICollection<RelationshipAttribute> parentRelationshipChain, ICollection<ExpressionInScope> constraints)
-        {
-            IImmutableSet<IncludeElementExpression> includeElementsEvaluated = GetIncludeElements(includeElements, parentLayer.ResourceType);
+        var updatesInChildren = new Dictionary<IncludeElementExpression, IImmutableSet<IncludeElementExpression>>();
 
-            var updatesInChildren = new Dictionary<IncludeElementExpression, IImmutableSet<IncludeElementExpression>>();
+        foreach (IncludeElementExpression includeElement in includeElementsEvaluated)
+        {
+            parentLayer.Projection ??= new Dictionary<ResourceFieldAttribute, QueryLayer?>();
 
-            foreach (IncludeElementExpression includeElement in includeElementsEvaluated)
+            if (!parentLayer.Projection.ContainsKey(includeElement.Relationship))
             {
-                parentLayer.Projection ??= new Dictionary<ResourceFieldAttribute, QueryLayer?>();
-
-                if (!parentLayer.Projection.ContainsKey(includeElement.Relationship))
+                var relationshipChain = new List<RelationshipAttribute>(parentRelationshipChain)
                 {
-                    var relationshipChain = new List<RelationshipAttribute>(parentRelationshipChain)
-                    {
-                        includeElement.Relationship
-                    };
+                    includeElement.Relationship
+                };
 
-                    // @formatter:wrap_chained_method_calls chop_always
-                    // @formatter:keep_existing_linebreaks true
+                // @formatter:wrap_chained_method_calls chop_always
+                // @formatter:keep_existing_linebreaks true
 
-                    QueryExpression[] expressionsInCurrentScope = constraints
-                        .Where(constraint =>
-                            constraint.Scope != null && constraint.Scope.Fields.SequenceEqual(relationshipChain))
-                        .Select(constraint => constraint.Expression)
-                        .ToArray();
+                QueryExpression[] expressionsInCurrentScope = constraints
+                    .Where(constraint =>
+                        constraint.Scope != null && constraint.Scope.Fields.SequenceEqual(relationshipChain))
+                    .Select(constraint => constraint.Expression)
+                    .ToArray();
 
-                    // @formatter:keep_existing_linebreaks restore
-                    // @formatter:wrap_chained_method_calls restore
+                // @formatter:keep_existing_linebreaks restore
+                // @formatter:wrap_chained_method_calls restore
 
-                    ResourceType resourceType = includeElement.Relationship.RightType;
-                    bool isToManyRelationship = includeElement.Relationship is HasManyAttribute;
+                ResourceType resourceType = includeElement.Relationship.RightType;
+                bool isToManyRelationship = includeElement.Relationship is HasManyAttribute;
 
-                    var child = new QueryLayer(resourceType)
-                    {
-                        Filter = isToManyRelationship ? GetFilter(expressionsInCurrentScope, resourceType) : null,
-                        Sort = isToManyRelationship ? GetSort(expressionsInCurrentScope, resourceType) : null,
-                        Pagination = isToManyRelationship
-                            ? ((JsonApiOptions)_options).DisableChildrenPagination ? null : GetPagination(expressionsInCurrentScope, resourceType)
-                            : null,
-                        Projection = GetProjectionForSparseAttributeSet(resourceType)
-                    };
+                var child = new QueryLayer(resourceType)
+                {
+                    Filter = isToManyRelationship ? GetFilter(expressionsInCurrentScope, resourceType) : null,
+                    Sort = isToManyRelationship ? GetSort(expressionsInCurrentScope, resourceType) : null,
+                    Pagination = isToManyRelationship ? GetPagination(expressionsInCurrentScope, resourceType) : null,
+                    Projection = GetProjectionForSparseAttributeSet(resourceType)
+                };
 
-                    parentLayer.Projection.Add(includeElement.Relationship, child);
+                parentLayer.Projection.Add(includeElement.Relationship, child);
 
-                    IImmutableSet<IncludeElementExpression> updatedChildren = ProcessIncludeSet(includeElement.Children, child, relationshipChain, constraints);
+                IImmutableSet<IncludeElementExpression> updatedChildren = ProcessIncludeSet(includeElement.Children, child, relationshipChain, constraints);
 
-                    if (!ReferenceEquals(includeElement.Children, updatedChildren))
-                    {
-                        updatesInChildren.Add(includeElement, updatedChildren);
-                    }
+                if (!ReferenceEquals(includeElement.Children, updatedChildren))
+                {
+                    updatesInChildren.Add(includeElement, updatedChildren);
                 }
             }
-
-            return !updatesInChildren.Any() ? includeElementsEvaluated : ApplyIncludeElementUpdates(includeElementsEvaluated, updatesInChildren);
         }
 
-        private static IImmutableSet<IncludeElementExpression> ApplyIncludeElementUpdates(IImmutableSet<IncludeElementExpression> includeElements,
-            IDictionary<IncludeElementExpression, IImmutableSet<IncludeElementExpression>> updatesInChildren)
-        {
-            ImmutableHashSet<IncludeElementExpression>.Builder newElementsBuilder = ImmutableHashSet.CreateBuilder<IncludeElementExpression>();
-            newElementsBuilder.AddRange(includeElements);
+        return !updatesInChildren.Any() ? includeElementsEvaluated : ApplyIncludeElementUpdates(includeElementsEvaluated, updatesInChildren);
+    }
 
-            foreach ((IncludeElementExpression existingElement, IImmutableSet<IncludeElementExpression> updatedChildren) in updatesInChildren)
-            {
-                newElementsBuilder.Remove(existingElement);
-                newElementsBuilder.Add(new IncludeElementExpression(existingElement.Relationship, updatedChildren));
-            }
+    private static IImmutableSet<IncludeElementExpression> ApplyIncludeElementUpdates(IImmutableSet<IncludeElementExpression> includeElements,
+        IDictionary<IncludeElementExpression, IImmutableSet<IncludeElementExpression>> updatesInChildren)
+    {
+        ImmutableHashSet<IncludeElementExpression>.Builder newElementsBuilder = ImmutableHashSet.CreateBuilder<IncludeElementExpression>();
+        newElementsBuilder.AddRange(includeElements);
 
-            return newElementsBuilder.ToImmutable();
+        foreach ((IncludeElementExpression existingElement, IImmutableSet<IncludeElementExpression> updatedChildren) in updatesInChildren)
+        {
+            newElementsBuilder.Remove(existingElement);
+            newElementsBuilder.Add(new IncludeElementExpression(existingElement.Relationship, updatedChildren));
         }
 
-        /// <inheritdoc />
-        public QueryLayer ComposeForGetById<TId>(TId id, ResourceType primaryResourceType, TopFieldSelection fieldSelection)
-        {
-            ArgumentGuard.NotNull(primaryResourceType, nameof(primaryResourceType));
+        return newElementsBuilder.ToImmutable();
+    }
+
+    /// <inheritdoc />
+    public QueryLayer ComposeForGetById<TId>(TId id, ResourceType primaryResourceType, TopFieldSelection fieldSelection)
+    {
+        ArgumentGuard.NotNull(primaryResourceType, nameof(primaryResourceType));
 
-            AttrAttribute idAttribute = GetIdAttribute(primaryResourceType);
+        AttrAttribute idAttribute = GetIdAttribute(primaryResourceType);
 
-            QueryLayer queryLayer = ComposeFromConstraints(primaryResourceType);
-            queryLayer.Sort = null;
-            queryLayer.Pagination = null;
-            queryLayer.Filter = CreateFilterByIds(id.AsArray(), idAttribute, queryLayer.Filter);
+        QueryLayer queryLayer = ComposeFromConstraints(primaryResourceType);
+        queryLayer.Sort = null;
+        queryLayer.Pagination = null;
+        queryLayer.Filter = CreateFilterByIds(id.AsArray(), idAttribute, queryLayer.Filter);
 
-            if (fieldSelection == TopFieldSelection.OnlyIdAttribute)
+        if (fieldSelection == TopFieldSelection.OnlyIdAttribute)
+        {
+            queryLayer.Projection = new Dictionary<ResourceFieldAttribute, QueryLayer?>
             {
-                queryLayer.Projection = new Dictionary<ResourceFieldAttribute, QueryLayer?>
-                {
-                    [idAttribute] = null
-                };
-            }
-            else if (fieldSelection == TopFieldSelection.WithAllAttributes && queryLayer.Projection != null)
+                [idAttribute] = null
+            };
+        }
+        else if (fieldSelection == TopFieldSelection.WithAllAttributes && queryLayer.Projection != null)
+        {
+            // Discard any top-level ?fields[]= or attribute exclusions from resource definition, because we need the full database row.
+            while (queryLayer.Projection.Any(pair => pair.Key is AttrAttribute))
             {
-                // Discard any top-level ?fields[]= or attribute exclusions from resource definition, because we need the full database row.
-                while (queryLayer.Projection.Any(pair => pair.Key is AttrAttribute))
-                {
-                    queryLayer.Projection.Remove(queryLayer.Projection.First(pair => pair.Key is AttrAttribute));
-                }
+                queryLayer.Projection.Remove(queryLayer.Projection.First(pair => pair.Key is AttrAttribute));
             }
-
-            return queryLayer;
         }
 
-        /// <inheritdoc />
-        public QueryLayer ComposeSecondaryLayerForRelationship(ResourceType secondaryResourceType)
-        {
-            ArgumentGuard.NotNull(secondaryResourceType, nameof(secondaryResourceType));
+        return queryLayer;
+    }
 
-            QueryLayer secondaryLayer = ComposeFromConstraints(secondaryResourceType);
-            secondaryLayer.Projection = GetProjectionForRelationship(secondaryResourceType);
-            secondaryLayer.Include = null;
+    /// <inheritdoc />
+    public QueryLayer ComposeSecondaryLayerForRelationship(ResourceType secondaryResourceType)
+    {
+        ArgumentGuard.NotNull(secondaryResourceType, nameof(secondaryResourceType));
 
-            return secondaryLayer;
-        }
+        QueryLayer secondaryLayer = ComposeFromConstraints(secondaryResourceType);
+        secondaryLayer.Projection = GetProjectionForRelationship(secondaryResourceType);
+        secondaryLayer.Include = null;
 
-        private IDictionary<ResourceFieldAttribute, QueryLayer?> GetProjectionForRelationship(ResourceType secondaryResourceType)
-        {
-            IImmutableSet<AttrAttribute> secondaryAttributeSet = _sparseFieldSetCache.GetIdAttributeSetForRelationshipQuery(secondaryResourceType);
+        return secondaryLayer;
+    }
 
-            return secondaryAttributeSet.ToDictionary(key => (ResourceFieldAttribute)key, _ => (QueryLayer?)null);
-        }
+    private IDictionary<ResourceFieldAttribute, QueryLayer?> GetProjectionForRelationship(ResourceType secondaryResourceType)
+    {
+        IImmutableSet<AttrAttribute> secondaryAttributeSet = _sparseFieldSetCache.GetIdAttributeSetForRelationshipQuery(secondaryResourceType);
 
-        /// <inheritdoc />
-        public QueryLayer WrapLayerForSecondaryEndpoint<TId>(QueryLayer secondaryLayer, ResourceType primaryResourceType, TId primaryId,
-            RelationshipAttribute relationship)
-        {
-            ArgumentGuard.NotNull(secondaryLayer, nameof(secondaryLayer));
-            ArgumentGuard.NotNull(primaryResourceType, nameof(primaryResourceType));
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
+        return secondaryAttributeSet.ToDictionary(key => (ResourceFieldAttribute)key, _ => (QueryLayer?)null);
+    }
 
-            IncludeExpression? innerInclude = secondaryLayer.Include;
-            secondaryLayer.Include = null;
+    /// <inheritdoc />
+    public QueryLayer WrapLayerForSecondaryEndpoint<TId>(QueryLayer secondaryLayer, ResourceType primaryResourceType, TId primaryId,
+        RelationshipAttribute relationship)
+    {
+        ArgumentGuard.NotNull(secondaryLayer, nameof(secondaryLayer));
+        ArgumentGuard.NotNull(primaryResourceType, nameof(primaryResourceType));
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
 
-            IImmutableSet<AttrAttribute> primaryAttributeSet = _sparseFieldSetCache.GetIdAttributeSetForRelationshipQuery(primaryResourceType);
+        IncludeExpression? innerInclude = secondaryLayer.Include;
+        secondaryLayer.Include = null;
 
-            Dictionary<ResourceFieldAttribute, QueryLayer?> primaryProjection =
-                primaryAttributeSet.ToDictionary(key => (ResourceFieldAttribute)key, _ => (QueryLayer?)null);
+        IImmutableSet<AttrAttribute> primaryAttributeSet = _sparseFieldSetCache.GetIdAttributeSetForRelationshipQuery(primaryResourceType);
 
-            primaryProjection[relationship] = secondaryLayer;
+        Dictionary<ResourceFieldAttribute, QueryLayer?> primaryProjection =
+            primaryAttributeSet.ToDictionary(key => (ResourceFieldAttribute)key, _ => (QueryLayer?)null);
 
-            FilterExpression? primaryFilter = GetFilter(Array.Empty<QueryExpression>(), primaryResourceType);
-            AttrAttribute primaryIdAttribute = GetIdAttribute(primaryResourceType);
+        primaryProjection[relationship] = secondaryLayer;
 
-            return new QueryLayer(primaryResourceType)
-            {
-                Include = RewriteIncludeForSecondaryEndpoint(innerInclude, relationship),
-                Filter = CreateFilterByIds(primaryId.AsArray(), primaryIdAttribute, primaryFilter),
-                Projection = primaryProjection
-            };
-        }
+        FilterExpression? primaryFilter = GetFilter(Array.Empty<QueryExpression>(), primaryResourceType);
+        AttrAttribute primaryIdAttribute = GetIdAttribute(primaryResourceType);
 
-        private IncludeExpression RewriteIncludeForSecondaryEndpoint(IncludeExpression? relativeInclude, RelationshipAttribute secondaryRelationship)
+        return new QueryLayer(primaryResourceType)
         {
-            IncludeElementExpression parentElement = relativeInclude != null
-                ? new IncludeElementExpression(secondaryRelationship, relativeInclude.Elements)
-                : new IncludeElementExpression(secondaryRelationship);
+            Include = RewriteIncludeForSecondaryEndpoint(innerInclude, relationship),
+            Filter = CreateFilterByIds(primaryId.AsArray(), primaryIdAttribute, primaryFilter),
+            Projection = primaryProjection
+        };
+    }
 
-            return new IncludeExpression(ImmutableHashSet.Create(parentElement));
-        }
+    private IncludeExpression RewriteIncludeForSecondaryEndpoint(IncludeExpression? relativeInclude, RelationshipAttribute secondaryRelationship)
+    {
+        IncludeElementExpression parentElement = relativeInclude != null
+            ? new IncludeElementExpression(secondaryRelationship, relativeInclude.Elements)
+            : new IncludeElementExpression(secondaryRelationship);
 
-        private FilterExpression? CreateFilterByIds<TId>(IReadOnlyCollection<TId> ids, AttrAttribute idAttribute, FilterExpression? existingFilter)
-        {
-            var idChain = new ResourceFieldChainExpression(idAttribute);
+        return new IncludeExpression(ImmutableHashSet.Create(parentElement));
+    }
 
-            FilterExpression? filter = null;
+    private FilterExpression? CreateFilterByIds<TId>(IReadOnlyCollection<TId> ids, AttrAttribute idAttribute, FilterExpression? existingFilter)
+    {
+        var idChain = new ResourceFieldChainExpression(idAttribute);
 
-            if (ids.Count == 1)
-            {
-                var constant = new LiteralConstantExpression(ids.Single()!.ToString()!);
-                filter = new ComparisonExpression(ComparisonOperator.Equals, idChain, constant);
-            }
-            else if (ids.Count > 1)
-            {
-                ImmutableHashSet<LiteralConstantExpression> constants = ids.Select(id => new LiteralConstantExpression(id!.ToString()!)).ToImmutableHashSet();
-                filter = new AnyExpression(idChain, constants);
-            }
+        FilterExpression? filter = null;
 
-            return LogicalExpression.Compose(LogicalOperator.And, filter, existingFilter);
+        if (ids.Count == 1)
+        {
+            var constant = new LiteralConstantExpression(ids.Single()!.ToString()!);
+            filter = new ComparisonExpression(ComparisonOperator.Equals, idChain, constant);
         }
-
-        /// <inheritdoc />
-        public QueryLayer ComposeForUpdate<TId>(TId id, ResourceType primaryResourceType)
+        else if (ids.Count > 1)
         {
-            ArgumentGuard.NotNull(primaryResourceType, nameof(primaryResourceType));
+            ImmutableHashSet<LiteralConstantExpression> constants = ids.Select(id => new LiteralConstantExpression(id!.ToString()!)).ToImmutableHashSet();
+            filter = new AnyExpression(idChain, constants);
+        }
 
-            IImmutableSet<IncludeElementExpression> includeElements = _targetedFields.Relationships
-                .Select(relationship => new IncludeElementExpression(relationship)).ToImmutableHashSet();
+        return LogicalExpression.Compose(LogicalOperator.And, filter, existingFilter);
+    }
 
-            AttrAttribute primaryIdAttribute = GetIdAttribute(primaryResourceType);
+    /// <inheritdoc />
+    public QueryLayer ComposeForUpdate<TId>(TId id, ResourceType primaryResourceType)
+    {
+        ArgumentGuard.NotNull(primaryResourceType, nameof(primaryResourceType));
 
-            QueryLayer primaryLayer = ComposeTopLayer(Array.Empty<ExpressionInScope>(), primaryResourceType);
-            primaryLayer.Include = includeElements.Any() ? new IncludeExpression(includeElements) : IncludeExpression.Empty;
-            primaryLayer.Sort = null;
-            primaryLayer.Pagination = null;
-            primaryLayer.Filter = CreateFilterByIds(id.AsArray(), primaryIdAttribute, primaryLayer.Filter);
-            primaryLayer.Projection = null;
+        IImmutableSet<IncludeElementExpression> includeElements = _targetedFields.Relationships
+            .Select(relationship => new IncludeElementExpression(relationship)).ToImmutableHashSet();
 
-            return primaryLayer;
-        }
+        AttrAttribute primaryIdAttribute = GetIdAttribute(primaryResourceType);
+
+        QueryLayer primaryLayer = ComposeTopLayer(Array.Empty<ExpressionInScope>(), primaryResourceType);
+        primaryLayer.Include = includeElements.Any() ? new IncludeExpression(includeElements) : IncludeExpression.Empty;
+        primaryLayer.Sort = null;
+        primaryLayer.Pagination = null;
+        primaryLayer.Filter = CreateFilterByIds(id.AsArray(), primaryIdAttribute, primaryLayer.Filter);
+        primaryLayer.Projection = null;
+
+        return primaryLayer;
+    }
 
-        /// <inheritdoc />
-        public IEnumerable<(QueryLayer, RelationshipAttribute)> ComposeForGetTargetedSecondaryResourceIds(IIdentifiable primaryResource)
+    /// <inheritdoc />
+    public IEnumerable<(QueryLayer, RelationshipAttribute)> ComposeForGetTargetedSecondaryResourceIds(IIdentifiable primaryResource)
+    {
+        ArgumentGuard.NotNull(primaryResource, nameof(primaryResource));
+
+        foreach (RelationshipAttribute relationship in _targetedFields.Relationships)
         {
-            ArgumentGuard.NotNull(primaryResource, nameof(primaryResource));
+            object? rightValue = relationship.GetValue(primaryResource);
+            ICollection<IIdentifiable> rightResourceIds = _collectionConverter.ExtractResources(rightValue);
 
-            foreach (RelationshipAttribute relationship in _targetedFields.Relationships)
+            if (rightResourceIds.Any())
             {
-                object? rightValue = relationship.GetValue(primaryResource);
-                ICollection<IIdentifiable> rightResourceIds = _collectionConverter.ExtractResources(rightValue);
-
-                if (rightResourceIds.Any())
-                {
-                    QueryLayer queryLayer = ComposeForGetRelationshipRightIds(relationship, rightResourceIds);
-                    yield return (queryLayer, relationship);
-                }
+                QueryLayer queryLayer = ComposeForGetRelationshipRightIds(relationship, rightResourceIds);
+                yield return (queryLayer, relationship);
             }
         }
+    }
 
-        /// <inheritdoc />
-        public QueryLayer ComposeForGetRelationshipRightIds(RelationshipAttribute relationship, ICollection<IIdentifiable> rightResourceIds)
-        {
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
-            ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
+    /// <inheritdoc />
+    public QueryLayer ComposeForGetRelationshipRightIds(RelationshipAttribute relationship, ICollection<IIdentifiable> rightResourceIds)
+    {
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
+        ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
 
-            AttrAttribute rightIdAttribute = GetIdAttribute(relationship.RightType);
+        AttrAttribute rightIdAttribute = GetIdAttribute(relationship.RightType);
 
-            object[] typedIds = rightResourceIds.Select(resource => resource.GetTypedId()).ToArray();
+        object[] typedIds = rightResourceIds.Select(resource => resource.GetTypedId()).ToArray();
 
-            FilterExpression? baseFilter = GetFilter(Array.Empty<QueryExpression>(), relationship.RightType);
-            FilterExpression? filter = CreateFilterByIds(typedIds, rightIdAttribute, baseFilter);
+        FilterExpression? baseFilter = GetFilter(Array.Empty<QueryExpression>(), relationship.RightType);
+        FilterExpression? filter = CreateFilterByIds(typedIds, rightIdAttribute, baseFilter);
 
-            return new QueryLayer(relationship.RightType)
+        return new QueryLayer(relationship.RightType)
+        {
+            Include = IncludeExpression.Empty,
+            Filter = filter,
+            Projection = new Dictionary<ResourceFieldAttribute, QueryLayer?>
             {
-                Include = IncludeExpression.Empty,
-                Filter = filter,
-                Projection = new Dictionary<ResourceFieldAttribute, QueryLayer?>
-                {
-                    [rightIdAttribute] = null
-                }
-            };
-        }
+                [rightIdAttribute] = null
+            }
+        };
+    }
 
-        /// <inheritdoc />
-        public QueryLayer ComposeForHasMany<TId>(HasManyAttribute hasManyRelationship, TId leftId, ICollection<IIdentifiable> rightResourceIds)
-        {
-            ArgumentGuard.NotNull(hasManyRelationship, nameof(hasManyRelationship));
-            ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
+    /// <inheritdoc />
+    public QueryLayer ComposeForHasMany<TId>(HasManyAttribute hasManyRelationship, TId leftId, ICollection<IIdentifiable> rightResourceIds)
+    {
+        ArgumentGuard.NotNull(hasManyRelationship, nameof(hasManyRelationship));
+        ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
 
-            AttrAttribute leftIdAttribute = GetIdAttribute(hasManyRelationship.LeftType);
-            AttrAttribute rightIdAttribute = GetIdAttribute(hasManyRelationship.RightType);
-            object[] rightTypedIds = rightResourceIds.Select(resource => resource.GetTypedId()).ToArray();
+        AttrAttribute leftIdAttribute = GetIdAttribute(hasManyRelationship.LeftType);
+        AttrAttribute rightIdAttribute = GetIdAttribute(hasManyRelationship.RightType);
+        object[] rightTypedIds = rightResourceIds.Select(resource => resource.GetTypedId()).ToArray();
 
-            FilterExpression? leftFilter = CreateFilterByIds(leftId.AsArray(), leftIdAttribute, null);
-            FilterExpression? rightFilter = CreateFilterByIds(rightTypedIds, rightIdAttribute, null);
+        FilterExpression? leftFilter = CreateFilterByIds(leftId.AsArray(), leftIdAttribute, null);
+        FilterExpression? rightFilter = CreateFilterByIds(rightTypedIds, rightIdAttribute, null);
 
-            return new QueryLayer(hasManyRelationship.LeftType)
+        return new QueryLayer(hasManyRelationship.LeftType)
+        {
+            Include = new IncludeExpression(ImmutableHashSet.Create(new IncludeElementExpression(hasManyRelationship))),
+            Filter = leftFilter,
+            Projection = new Dictionary<ResourceFieldAttribute, QueryLayer?>
             {
-                Include = new IncludeExpression(ImmutableHashSet.Create(new IncludeElementExpression(hasManyRelationship))),
-                Filter = leftFilter,
-                Projection = new Dictionary<ResourceFieldAttribute, QueryLayer?>
+                [hasManyRelationship] = new(hasManyRelationship.RightType)
                 {
-                    [hasManyRelationship] = new(hasManyRelationship.RightType)
+                    Filter = rightFilter,
+                    Projection = new Dictionary<ResourceFieldAttribute, QueryLayer?>
                     {
-                        Filter = rightFilter,
-                        Projection = new Dictionary<ResourceFieldAttribute, QueryLayer?>
-                        {
-                            [rightIdAttribute] = null
-                        }
-                    },
-                    [leftIdAttribute] = null
-                }
-            };
-        }
-
-        protected virtual IImmutableSet<IncludeElementExpression> GetIncludeElements(IImmutableSet<IncludeElementExpression> includeElements,
-            ResourceType resourceType)
-        {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
-
-            return _resourceDefinitionAccessor.OnApplyIncludes(resourceType, includeElements);
-        }
+                        [rightIdAttribute] = null
+                    }
+                },
+                [leftIdAttribute] = null
+            }
+        };
+    }
 
-        protected virtual FilterExpression? GetFilter(IReadOnlyCollection<QueryExpression> expressionsInScope, ResourceType resourceType)
-        {
-            ArgumentGuard.NotNull(expressionsInScope, nameof(expressionsInScope));
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+    protected virtual IImmutableSet<IncludeElementExpression> GetIncludeElements(IImmutableSet<IncludeElementExpression> includeElements,
+        ResourceType resourceType)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            FilterExpression[] filters = expressionsInScope.OfType<FilterExpression>().ToArray();
-            FilterExpression? filter = LogicalExpression.Compose(LogicalOperator.And, filters);
+        return _resourceDefinitionAccessor.OnApplyIncludes(resourceType, includeElements);
+    }
 
-            return _resourceDefinitionAccessor.OnApplyFilter(resourceType, filter);
-        }
+    protected virtual FilterExpression? GetFilter(IReadOnlyCollection<QueryExpression> expressionsInScope, ResourceType resourceType)
+    {
+        ArgumentGuard.NotNull(expressionsInScope, nameof(expressionsInScope));
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-        protected virtual SortExpression GetSort(IReadOnlyCollection<QueryExpression> expressionsInScope, ResourceType resourceType)
-        {
-            ArgumentGuard.NotNull(expressionsInScope, nameof(expressionsInScope));
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+        FilterExpression[] filters = expressionsInScope.OfType<FilterExpression>().ToArray();
+        FilterExpression? filter = LogicalExpression.Compose(LogicalOperator.And, filters);
 
-            SortExpression? sort = expressionsInScope.OfType<SortExpression>().FirstOrDefault();
+        return _resourceDefinitionAccessor.OnApplyFilter(resourceType, filter);
+    }
 
-            sort = _resourceDefinitionAccessor.OnApplySort(resourceType, sort);
+    protected virtual SortExpression GetSort(IReadOnlyCollection<QueryExpression> expressionsInScope, ResourceType resourceType)
+    {
+        ArgumentGuard.NotNull(expressionsInScope, nameof(expressionsInScope));
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            if (sort == null)
-            {
-                AttrAttribute idAttribute = GetIdAttribute(resourceType);
-                var idAscendingSort = new SortElementExpression(new ResourceFieldChainExpression(idAttribute), true);
-                sort = new SortExpression(ImmutableArray.Create(idAscendingSort));
-            }
+        SortExpression? sort = expressionsInScope.OfType<SortExpression>().FirstOrDefault();
 
-            return sort;
-        }
+        sort = _resourceDefinitionAccessor.OnApplySort(resourceType, sort);
 
-        protected virtual PaginationExpression GetPagination(IReadOnlyCollection<QueryExpression> expressionsInScope, ResourceType resourceType)
+        if (sort == null)
         {
-            ArgumentGuard.NotNull(expressionsInScope, nameof(expressionsInScope));
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
-
-            PaginationExpression? pagination = expressionsInScope.OfType<PaginationExpression>().FirstOrDefault();
+            AttrAttribute idAttribute = GetIdAttribute(resourceType);
+            var idAscendingSort = new SortElementExpression(new ResourceFieldChainExpression(idAttribute), true);
+            sort = new SortExpression(ImmutableArray.Create(idAscendingSort));
+        }
 
-            pagination = _resourceDefinitionAccessor.OnApplyPagination(resourceType, pagination);
+        return sort;
+    }
 
-            pagination ??= new PaginationExpression(PageNumber.ValueOne, _options.DefaultPageSize);
+    protected virtual PaginationExpression GetPagination(IReadOnlyCollection<QueryExpression> expressionsInScope, ResourceType resourceType)
+    {
+        ArgumentGuard.NotNull(expressionsInScope, nameof(expressionsInScope));
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            return pagination;
-        }
+        PaginationExpression? pagination = expressionsInScope.OfType<PaginationExpression>().FirstOrDefault();
 
-        protected virtual IDictionary<ResourceFieldAttribute, QueryLayer?>? GetProjectionForSparseAttributeSet(ResourceType resourceType)
-        {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+        pagination = _resourceDefinitionAccessor.OnApplyPagination(resourceType, pagination);
 
-            IImmutableSet<ResourceFieldAttribute> fieldSet = _sparseFieldSetCache.GetSparseFieldSetForQuery(resourceType);
+        pagination ??= new PaginationExpression(PageNumber.ValueOne, _options.DefaultPageSize);
 
-            if (!fieldSet.Any())
-            {
-                return null;
-            }
+        return pagination;
+    }
 
-            HashSet<AttrAttribute> attributeSet = fieldSet.OfType<AttrAttribute>().ToHashSet();
-            AttrAttribute idAttribute = GetIdAttribute(resourceType);
-            attributeSet.Add(idAttribute);
+    protected virtual IDictionary<ResourceFieldAttribute, QueryLayer?>? GetProjectionForSparseAttributeSet(ResourceType resourceType)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            return attributeSet.ToDictionary(key => (ResourceFieldAttribute)key, _ => (QueryLayer?)null);
-        }
+        IImmutableSet<ResourceFieldAttribute> fieldSet = _sparseFieldSetCache.GetSparseFieldSetForQuery(resourceType);
 
-        private static AttrAttribute GetIdAttribute(ResourceType resourceType)
+        if (!fieldSet.Any())
         {
-            return resourceType.GetAttributeByPropertyName(nameof(Identifiable<object>.Id));
+            return null;
         }
+
+        HashSet<AttrAttribute> attributeSet = fieldSet.OfType<AttrAttribute>().ToHashSet();
+        AttrAttribute idAttribute = GetIdAttribute(resourceType);
+        attributeSet.Add(idAttribute);
+
+        return attributeSet.ToDictionary(key => (ResourceFieldAttribute)key, _ => (QueryLayer?)null);
+    }
+
+    private static AttrAttribute GetIdAttribute(ResourceType resourceType)
+    {
+        return resourceType.GetAttributeByPropertyName(nameof(Identifiable<object>.Id));
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/IncludeClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/IncludeClauseBuilder.cs
index 7f4cbc895e..6384600a58 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/IncludeClauseBuilder.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/IncludeClauseBuilder.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
@@ -7,83 +5,82 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
-{
-    /// <summary>
-    /// Transforms <see cref="IncludeExpression" /> into <see cref="EntityFrameworkQueryableExtensions.Include{TEntity, TProperty}" /> calls.
-    /// </summary>
-    [PublicAPI]
-    public class IncludeClauseBuilder : QueryClauseBuilder<object?>
-    {
-        private static readonly IncludeChainConverter IncludeChainConverter = new();
+namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
 
-        private readonly Expression _source;
-        private readonly ResourceType _resourceType;
+/// <summary>
+/// Transforms <see cref="IncludeExpression" /> into <see cref="EntityFrameworkQueryableExtensions.Include{TEntity, TProperty}" /> calls.
+/// </summary>
+[PublicAPI]
+public class IncludeClauseBuilder : QueryClauseBuilder<object?>
+{
+    private static readonly IncludeChainConverter IncludeChainConverter = new();
 
-        public IncludeClauseBuilder(Expression source, LambdaScope lambdaScope, ResourceType resourceType)
-            : base(lambdaScope)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+    private readonly Expression _source;
+    private readonly ResourceType _resourceType;
 
-            _source = source;
-            _resourceType = resourceType;
-        }
+    public IncludeClauseBuilder(Expression source, LambdaScope lambdaScope, ResourceType resourceType)
+        : base(lambdaScope)
+    {
+        ArgumentGuard.NotNull(source, nameof(source));
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-        public Expression ApplyInclude(IncludeExpression include)
-        {
-            ArgumentGuard.NotNull(include, nameof(include));
+        _source = source;
+        _resourceType = resourceType;
+    }
 
-            return Visit(include, null);
-        }
+    public Expression ApplyInclude(IncludeExpression include)
+    {
+        ArgumentGuard.NotNull(include, nameof(include));
 
-        public override Expression VisitInclude(IncludeExpression expression, object? argument)
-        {
-            Expression source = ApplyEagerLoads(_source, _resourceType.EagerLoads, null);
+        return Visit(include, null);
+    }
 
-            foreach (ResourceFieldChainExpression chain in IncludeChainConverter.GetRelationshipChains(expression))
-            {
-                source = ProcessRelationshipChain(chain, source);
-            }
+    public override Expression VisitInclude(IncludeExpression expression, object? argument)
+    {
+        Expression source = ApplyEagerLoads(_source, _resourceType.EagerLoads, null);
 
-            return source;
+        foreach (ResourceFieldChainExpression chain in IncludeChainConverter.GetRelationshipChains(expression))
+        {
+            source = ProcessRelationshipChain(chain, source);
         }
 
-        private Expression ProcessRelationshipChain(ResourceFieldChainExpression chain, Expression source)
-        {
-            string? path = null;
-            Expression result = source;
+        return source;
+    }
 
-            foreach (RelationshipAttribute relationship in chain.Fields.Cast<RelationshipAttribute>())
-            {
-                path = path == null ? relationship.Property.Name : $"{path}.{relationship.Property.Name}";
+    private Expression ProcessRelationshipChain(ResourceFieldChainExpression chain, Expression source)
+    {
+        string? path = null;
+        Expression result = source;
 
-                result = ApplyEagerLoads(result, relationship.RightType.EagerLoads, path);
-            }
+        foreach (RelationshipAttribute relationship in chain.Fields.Cast<RelationshipAttribute>())
+        {
+            path = path == null ? relationship.Property.Name : $"{path}.{relationship.Property.Name}";
 
-            return IncludeExtensionMethodCall(result, path!);
+            result = ApplyEagerLoads(result, relationship.RightType.EagerLoads, path);
         }
 
-        private Expression ApplyEagerLoads(Expression source, IEnumerable<EagerLoadAttribute> eagerLoads, string? pathPrefix)
-        {
-            Expression result = source;
+        return IncludeExtensionMethodCall(result, path!);
+    }
 
-            foreach (EagerLoadAttribute eagerLoad in eagerLoads)
-            {
-                string path = pathPrefix != null ? $"{pathPrefix}.{eagerLoad.Property.Name}" : eagerLoad.Property.Name;
-                result = IncludeExtensionMethodCall(result, path);
+    private Expression ApplyEagerLoads(Expression source, IEnumerable<EagerLoadAttribute> eagerLoads, string? pathPrefix)
+    {
+        Expression result = source;
 
-                result = ApplyEagerLoads(result, eagerLoad.Children, path);
-            }
+        foreach (EagerLoadAttribute eagerLoad in eagerLoads)
+        {
+            string path = pathPrefix != null ? $"{pathPrefix}.{eagerLoad.Property.Name}" : eagerLoad.Property.Name;
+            result = IncludeExtensionMethodCall(result, path);
 
-            return result;
+            result = ApplyEagerLoads(result, eagerLoad.Children, path);
         }
 
-        private Expression IncludeExtensionMethodCall(Expression source, string navigationPropertyPath)
-        {
-            Expression navigationExpression = Expression.Constant(navigationPropertyPath);
+        return result;
+    }
 
-            return Expression.Call(typeof(EntityFrameworkQueryableExtensions), "Include", LambdaScope.Parameter.Type.AsArray(), source, navigationExpression);
-        }
+    private Expression IncludeExtensionMethodCall(Expression source, string navigationPropertyPath)
+    {
+        Expression navigationExpression = Expression.Constant(navigationPropertyPath);
+
+        return Expression.Call(typeof(EntityFrameworkQueryableExtensions), "Include", LambdaScope.Parameter.Type.AsArray(), source, navigationExpression);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaParameterNameFactory.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaParameterNameFactory.cs
index c1050a9d8a..864b71c843 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaParameterNameFactory.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaParameterNameFactory.cs
@@ -1,51 +1,49 @@
-using System.Collections.Generic;
 using Humanizer;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
+namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
+
+/// <summary>
+/// Produces unique names for lambda parameters.
+/// </summary>
+[PublicAPI]
+public sealed class LambdaParameterNameFactory
 {
-    /// <summary>
-    /// Produces unique names for lambda parameters.
-    /// </summary>
-    [PublicAPI]
-    public sealed class LambdaParameterNameFactory
-    {
-        private readonly HashSet<string> _namesInScope = new();
+    private readonly HashSet<string> _namesInScope = new();
 
-        public LambdaParameterNameScope Create(string typeName)
-        {
-            ArgumentGuard.NotNullNorEmpty(typeName, nameof(typeName));
+    public LambdaParameterNameScope Create(string typeName)
+    {
+        ArgumentGuard.NotNullNorEmpty(typeName, nameof(typeName));
 
-            string parameterName = typeName.Camelize();
-            parameterName = EnsureNameIsUnique(parameterName);
+        string parameterName = typeName.Camelize();
+        parameterName = EnsureNameIsUnique(parameterName);
 
-            _namesInScope.Add(parameterName);
-            return new LambdaParameterNameScope(parameterName, this);
-        }
+        _namesInScope.Add(parameterName);
+        return new LambdaParameterNameScope(parameterName, this);
+    }
 
-        private string EnsureNameIsUnique(string name)
+    private string EnsureNameIsUnique(string name)
+    {
+        if (!_namesInScope.Contains(name))
         {
-            if (!_namesInScope.Contains(name))
-            {
-                return name;
-            }
-
-            int counter = 1;
-            string alternativeName;
-
-            do
-            {
-                counter++;
-                alternativeName = name + counter;
-            }
-            while (_namesInScope.Contains(alternativeName));
-
-            return alternativeName;
+            return name;
         }
 
-        public void Release(string parameterName)
+        int counter = 1;
+        string alternativeName;
+
+        do
         {
-            _namesInScope.Remove(parameterName);
+            counter++;
+            alternativeName = name + counter;
         }
+        while (_namesInScope.Contains(alternativeName));
+
+        return alternativeName;
+    }
+
+    public void Release(string parameterName)
+    {
+        _namesInScope.Remove(parameterName);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaParameterNameScope.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaParameterNameScope.cs
index 6d555ed23e..2bad41d310 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaParameterNameScope.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaParameterNameScope.cs
@@ -1,27 +1,25 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
+namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
+
+[PublicAPI]
+public sealed class LambdaParameterNameScope : IDisposable
 {
-    [PublicAPI]
-    public sealed class LambdaParameterNameScope : IDisposable
-    {
-        private readonly LambdaParameterNameFactory _owner;
+    private readonly LambdaParameterNameFactory _owner;
 
-        public string Name { get; }
+    public string Name { get; }
 
-        public LambdaParameterNameScope(string name, LambdaParameterNameFactory owner)
-        {
-            ArgumentGuard.NotNullNorEmpty(name, nameof(name));
-            ArgumentGuard.NotNull(owner, nameof(owner));
+    public LambdaParameterNameScope(string name, LambdaParameterNameFactory owner)
+    {
+        ArgumentGuard.NotNullNorEmpty(name, nameof(name));
+        ArgumentGuard.NotNull(owner, nameof(owner));
 
-            Name = name;
-            _owner = owner;
-        }
+        Name = name;
+        _owner = owner;
+    }
 
-        public void Dispose()
-        {
-            _owner.Release(Name);
-        }
+    public void Dispose()
+    {
+        _owner.Release(Name);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaScope.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaScope.cs
index d80b373e3a..8be9e4263e 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaScope.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaScope.cs
@@ -1,34 +1,32 @@
-using System;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
+namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
+
+/// <summary>
+/// Contains details on a lambda expression, such as the name of the selector "x" in "x => x.Name".
+/// </summary>
+[PublicAPI]
+public sealed class LambdaScope : IDisposable
 {
-    /// <summary>
-    /// Contains details on a lambda expression, such as the name of the selector "x" in "x => x.Name".
-    /// </summary>
-    [PublicAPI]
-    public sealed class LambdaScope : IDisposable
-    {
-        private readonly LambdaParameterNameScope _parameterNameScope;
+    private readonly LambdaParameterNameScope _parameterNameScope;
 
-        public ParameterExpression Parameter { get; }
-        public Expression Accessor { get; }
+    public ParameterExpression Parameter { get; }
+    public Expression Accessor { get; }
 
-        public LambdaScope(LambdaParameterNameFactory nameFactory, Type elementType, Expression? accessorExpression)
-        {
-            ArgumentGuard.NotNull(nameFactory, nameof(nameFactory));
-            ArgumentGuard.NotNull(elementType, nameof(elementType));
+    public LambdaScope(LambdaParameterNameFactory nameFactory, Type elementType, Expression? accessorExpression)
+    {
+        ArgumentGuard.NotNull(nameFactory, nameof(nameFactory));
+        ArgumentGuard.NotNull(elementType, nameof(elementType));
 
-            _parameterNameScope = nameFactory.Create(elementType.Name);
-            Parameter = Expression.Parameter(elementType, _parameterNameScope.Name);
+        _parameterNameScope = nameFactory.Create(elementType.Name);
+        Parameter = Expression.Parameter(elementType, _parameterNameScope.Name);
 
-            Accessor = accessorExpression ?? Parameter;
-        }
+        Accessor = accessorExpression ?? Parameter;
+    }
 
-        public void Dispose()
-        {
-            _parameterNameScope.Dispose();
-        }
+    public void Dispose()
+    {
+        _parameterNameScope.Dispose();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaScopeFactory.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaScopeFactory.cs
index d5b55fec13..3ba7c5aab9 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaScopeFactory.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/LambdaScopeFactory.cs
@@ -1,26 +1,24 @@
-using System;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
+namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
+
+[PublicAPI]
+public sealed class LambdaScopeFactory
 {
-    [PublicAPI]
-    public sealed class LambdaScopeFactory
-    {
-        private readonly LambdaParameterNameFactory _nameFactory;
+    private readonly LambdaParameterNameFactory _nameFactory;
 
-        public LambdaScopeFactory(LambdaParameterNameFactory nameFactory)
-        {
-            ArgumentGuard.NotNull(nameFactory, nameof(nameFactory));
+    public LambdaScopeFactory(LambdaParameterNameFactory nameFactory)
+    {
+        ArgumentGuard.NotNull(nameFactory, nameof(nameFactory));
 
-            _nameFactory = nameFactory;
-        }
+        _nameFactory = nameFactory;
+    }
 
-        public LambdaScope CreateScope(Type elementType, Expression? accessorExpression = null)
-        {
-            ArgumentGuard.NotNull(elementType, nameof(elementType));
+    public LambdaScope CreateScope(Type elementType, Expression? accessorExpression = null)
+    {
+        ArgumentGuard.NotNull(elementType, nameof(elementType));
 
-            return new LambdaScope(_nameFactory, elementType, accessorExpression);
-        }
+        return new LambdaScope(_nameFactory, elementType, accessorExpression);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/OrderClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/OrderClauseBuilder.cs
index e2692b75de..7ae8dd2392 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/OrderClauseBuilder.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/OrderClauseBuilder.cs
@@ -1,75 +1,72 @@
-using System;
-using System.Linq;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries.Expressions;
 
-namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
+namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
+
+/// <summary>
+/// Transforms <see cref="SortExpression" /> into
+/// <see cref="Queryable.OrderBy{TSource, TKey}(IQueryable{TSource}, System.Linq.Expressions.Expression{System.Func{TSource,TKey}})" /> calls.
+/// </summary>
+[PublicAPI]
+public class OrderClauseBuilder : QueryClauseBuilder<Expression?>
 {
-    /// <summary>
-    /// Transforms <see cref="SortExpression" /> into
-    /// <see cref="Queryable.OrderBy{TSource, TKey}(IQueryable{TSource}, System.Linq.Expressions.Expression{System.Func{TSource,TKey}})" /> calls.
-    /// </summary>
-    [PublicAPI]
-    public class OrderClauseBuilder : QueryClauseBuilder<Expression?>
+    private readonly Expression _source;
+    private readonly Type _extensionType;
+
+    public OrderClauseBuilder(Expression source, LambdaScope lambdaScope, Type extensionType)
+        : base(lambdaScope)
     {
-        private readonly Expression _source;
-        private readonly Type _extensionType;
+        ArgumentGuard.NotNull(source, nameof(source));
+        ArgumentGuard.NotNull(extensionType, nameof(extensionType));
 
-        public OrderClauseBuilder(Expression source, LambdaScope lambdaScope, Type extensionType)
-            : base(lambdaScope)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
-            ArgumentGuard.NotNull(extensionType, nameof(extensionType));
+        _source = source;
+        _extensionType = extensionType;
+    }
 
-            _source = source;
-            _extensionType = extensionType;
-        }
+    public Expression ApplyOrderBy(SortExpression expression)
+    {
+        ArgumentGuard.NotNull(expression, nameof(expression));
 
-        public Expression ApplyOrderBy(SortExpression expression)
-        {
-            ArgumentGuard.NotNull(expression, nameof(expression));
+        return Visit(expression, null);
+    }
 
-            return Visit(expression, null);
-        }
+    public override Expression VisitSort(SortExpression expression, Expression? argument)
+    {
+        Expression? sortExpression = null;
 
-        public override Expression VisitSort(SortExpression expression, Expression? argument)
+        foreach (SortElementExpression sortElement in expression.Elements)
         {
-            Expression? sortExpression = null;
-
-            foreach (SortElementExpression sortElement in expression.Elements)
-            {
-                sortExpression = Visit(sortElement, sortExpression);
-            }
-
-            return sortExpression!;
+            sortExpression = Visit(sortElement, sortExpression);
         }
 
-        public override Expression VisitSortElement(SortElementExpression expression, Expression? previousExpression)
-        {
-            Expression body = expression.Count != null ? Visit(expression.Count, null) : Visit(expression.TargetAttribute!, null);
-
-            LambdaExpression lambda = Expression.Lambda(body, LambdaScope.Parameter);
+        return sortExpression!;
+    }
 
-            string operationName = GetOperationName(previousExpression != null, expression.IsAscending);
+    public override Expression VisitSortElement(SortElementExpression expression, Expression? previousExpression)
+    {
+        Expression body = expression.Count != null ? Visit(expression.Count, null) : Visit(expression.TargetAttribute!, null);
 
-            return ExtensionMethodCall(previousExpression ?? _source, operationName, body.Type, lambda);
-        }
+        LambdaExpression lambda = Expression.Lambda(body, LambdaScope.Parameter);
 
-        private static string GetOperationName(bool hasPrecedingSort, bool isAscending)
-        {
-            if (hasPrecedingSort)
-            {
-                return isAscending ? "ThenBy" : "ThenByDescending";
-            }
+        string operationName = GetOperationName(previousExpression != null, expression.IsAscending);
 
-            return isAscending ? "OrderBy" : "OrderByDescending";
-        }
+        return ExtensionMethodCall(previousExpression ?? _source, operationName, body.Type, lambda);
+    }
 
-        private Expression ExtensionMethodCall(Expression source, string operationName, Type keyType, LambdaExpression keySelector)
+    private static string GetOperationName(bool hasPrecedingSort, bool isAscending)
+    {
+        if (hasPrecedingSort)
         {
-            Type[] typeArguments = ArrayFactory.Create(LambdaScope.Parameter.Type, keyType);
-            return Expression.Call(_extensionType, operationName, typeArguments, source, keySelector);
+            return isAscending ? "ThenBy" : "ThenByDescending";
         }
+
+        return isAscending ? "OrderBy" : "OrderByDescending";
+    }
+
+    private Expression ExtensionMethodCall(Expression source, string operationName, Type keyType, LambdaExpression keySelector)
+    {
+        Type[] typeArguments = ArrayFactory.Create(LambdaScope.Parameter.Type, keyType);
+        return Expression.Call(_extensionType, operationName, typeArguments, source, keySelector);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/QueryClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/QueryClauseBuilder.cs
index 60b25fb9a6..bf14c70b6d 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/QueryClauseBuilder.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/QueryClauseBuilder.cs
@@ -1,116 +1,86 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using JsonApiDotNetCore.Queries.Expressions;
 
-namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
-{
-    /// <summary>
-    /// Base class for transforming <see cref="QueryExpression" /> trees into system <see cref="Expression" /> trees.
-    /// </summary>
-    public abstract class QueryClauseBuilder<TArgument> : QueryExpressionVisitor<TArgument, Expression>
-    {
-        protected LambdaScope LambdaScope { get; }
+namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
 
-        protected QueryClauseBuilder(LambdaScope lambdaScope)
-        {
-            ArgumentGuard.NotNull(lambdaScope, nameof(lambdaScope));
+/// <summary>
+/// Base class for transforming <see cref="QueryExpression" /> trees into system <see cref="Expression" /> trees.
+/// </summary>
+public abstract class QueryClauseBuilder<TArgument> : QueryExpressionVisitor<TArgument, Expression>
+{
+    protected LambdaScope LambdaScope { get; }
 
-            LambdaScope = lambdaScope;
-        }
+    protected QueryClauseBuilder(LambdaScope lambdaScope)
+    {
+        ArgumentGuard.NotNull(lambdaScope, nameof(lambdaScope));
 
-        public override Expression VisitCount(CountExpression expression, TArgument argument)
-        {
-            Expression collectionExpression = Visit(expression.TargetCollection, argument);
+        LambdaScope = lambdaScope;
+    }
 
-            Expression? propertyExpression = GetCollectionCount(collectionExpression);
+    public override Expression VisitCount(CountExpression expression, TArgument argument)
+    {
+        Expression collectionExpression = Visit(expression.TargetCollection, argument);
 
-            if (propertyExpression == null)
-            {
-                throw new InvalidOperationException($"Field '{expression.TargetCollection}' must be a collection.");
-            }
+        Expression? propertyExpression = GetCollectionCount(collectionExpression);
 
-            return propertyExpression;
+        if (propertyExpression == null)
+        {
+            throw new InvalidOperationException($"Field '{expression.TargetCollection}' must be a collection.");
         }
 
-        private static Expression? GetCollectionCount(Expression? collectionExpression)
-        {
-            if (collectionExpression != null)
-            {
-                var properties = new HashSet<PropertyInfo>(collectionExpression.Type.GetProperties());
+        return propertyExpression;
+    }
 
-                if (collectionExpression.Type.IsInterface)
-                {
-                    foreach (PropertyInfo item in collectionExpression.Type.GetInterfaces().SelectMany(@interface => @interface.GetProperties()))
-                    {
-                        properties.Add(item);
-                    }
-                }
+    private static Expression? GetCollectionCount(Expression? collectionExpression)
+    {
+        if (collectionExpression != null)
+        {
+            var properties = new HashSet<PropertyInfo>(collectionExpression.Type.GetProperties());
 
-                foreach (PropertyInfo property in properties)
+            if (collectionExpression.Type.IsInterface)
+            {
+                foreach (PropertyInfo item in collectionExpression.Type.GetInterfaces().SelectMany(@interface => @interface.GetProperties()))
                 {
-                    if (property.Name is "Count" or "Length")
-                    {
-                        return Expression.Property(collectionExpression, property);
-                    }
+                    properties.Add(item);
                 }
             }
 
-            return null;
-        }
-
-        public override Expression VisitResourceFieldChain(ResourceFieldChainExpression expression, TArgument argument)
-        {
-            string[] components = expression.Fields.Select(field => field.Property.Name).ToArray();
-
-            return CreatePropertyExpressionFromComponents(LambdaScope.Accessor, components);
-        }
-
-        private static MemberExpression CreatePropertyExpressionFromComponents(Expression source, IEnumerable<string> components)
-        {
-            MemberExpression? property = null;
-
-            foreach (string propertyName in components)
+            foreach (PropertyInfo property in properties)
             {
-                Type parentType = property == null ? source.Type : property.Type;
-
-                if (parentType.GetProperty(propertyName) == null)
+                if (property.Name is "Count" or "Length")
                 {
-                    throw new InvalidOperationException($"Type '{parentType.Name}' does not contain a property named '{propertyName}'.");
+                    return Expression.Property(collectionExpression, property);
                 }
-
-                property = property == null ? Expression.Property(source, propertyName) : Expression.Property(property, propertyName);
             }
-
-            return property!;
         }
 
-        protected Expression CreateTupleAccessExpressionForConstant(object? value, Type type)
-        {
-            // To enable efficient query plan caching, inline constants (that vary per request) should be converted into query parameters.
-            // https://stackoverflow.com/questions/54075758/building-a-parameterized-entityframework-core-expression
+        return null;
+    }
 
-            // This method can be used to change a query like:
-            //   SELECT ... FROM ... WHERE x."Age" = 3
-            // into:
-            //   SELECT ... FROM ... WHERE x."Age" = @p0
+    public override Expression VisitResourceFieldChain(ResourceFieldChainExpression expression, TArgument argument)
+    {
+        string[] components = expression.Fields.Select(field => field.Property.Name).ToArray();
 
-            // The code below builds the next expression for a type T that is unknown at compile time:
-            //   Expression.Property(Expression.Constant(Tuple.Create<T>(value)), "Item1")
-            // Which represents the next C# code:
-            //   Tuple.Create<T>(value).Item1;
+        return CreatePropertyExpressionFromComponents(LambdaScope.Accessor, components);
+    }
 
-            MethodInfo tupleCreateMethod = typeof(Tuple).GetMethods()
-                .Single(method => method.Name == "Create" && method.IsGenericMethod && method.GetGenericArguments().Length == 1);
+    private static MemberExpression CreatePropertyExpressionFromComponents(Expression source, IEnumerable<string> components)
+    {
+        MemberExpression? property = null;
 
-            MethodInfo constructedTupleCreateMethod = tupleCreateMethod.MakeGenericMethod(type);
+        foreach (string propertyName in components)
+        {
+            Type parentType = property == null ? source.Type : property.Type;
 
-            ConstantExpression constantExpression = Expression.Constant(value, type);
+            if (parentType.GetProperty(propertyName) == null)
+            {
+                throw new InvalidOperationException($"Type '{parentType.Name}' does not contain a property named '{propertyName}'.");
+            }
 
-            MethodCallExpression tupleCreateCall = Expression.Call(constructedTupleCreateMethod, constantExpression);
-            return Expression.Property(tupleCreateCall, "Item1");
+            property = property == null ? Expression.Property(source, propertyName) : Expression.Property(property, propertyName);
         }
+
+        return property!;
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/QueryableBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/QueryableBuilder.cs
index 99036e5d1d..7ce50c02f1 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/QueryableBuilder.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/QueryableBuilder.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
@@ -8,113 +6,112 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.EntityFrameworkCore.Metadata;
 
-namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
+namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
+
+/// <summary>
+/// Drives conversion from <see cref="QueryLayer" /> into system <see cref="Expression" /> trees.
+/// </summary>
+[PublicAPI]
+public class QueryableBuilder
 {
-    /// <summary>
-    /// Drives conversion from <see cref="QueryLayer" /> into system <see cref="Expression" /> trees.
-    /// </summary>
-    [PublicAPI]
-    public class QueryableBuilder
+    private readonly Expression _source;
+    private readonly Type _elementType;
+    private readonly Type _extensionType;
+    private readonly LambdaParameterNameFactory _nameFactory;
+    private readonly IResourceFactory _resourceFactory;
+    private readonly IModel _entityModel;
+    private readonly LambdaScopeFactory _lambdaScopeFactory;
+
+    public QueryableBuilder(Expression source, Type elementType, Type extensionType, LambdaParameterNameFactory nameFactory, IResourceFactory resourceFactory,
+        IModel entityModel, LambdaScopeFactory? lambdaScopeFactory = null)
     {
-        private readonly Expression _source;
-        private readonly Type _elementType;
-        private readonly Type _extensionType;
-        private readonly LambdaParameterNameFactory _nameFactory;
-        private readonly IResourceFactory _resourceFactory;
-        private readonly IModel _entityModel;
-        private readonly LambdaScopeFactory _lambdaScopeFactory;
-
-        public QueryableBuilder(Expression source, Type elementType, Type extensionType, LambdaParameterNameFactory nameFactory,
-            IResourceFactory resourceFactory, IModel entityModel, LambdaScopeFactory? lambdaScopeFactory = null)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
-            ArgumentGuard.NotNull(elementType, nameof(elementType));
-            ArgumentGuard.NotNull(extensionType, nameof(extensionType));
-            ArgumentGuard.NotNull(nameFactory, nameof(nameFactory));
-            ArgumentGuard.NotNull(resourceFactory, nameof(resourceFactory));
-            ArgumentGuard.NotNull(entityModel, nameof(entityModel));
-
-            _source = source;
-            _elementType = elementType;
-            _extensionType = extensionType;
-            _nameFactory = nameFactory;
-            _resourceFactory = resourceFactory;
-            _entityModel = entityModel;
-            _lambdaScopeFactory = lambdaScopeFactory ?? new LambdaScopeFactory(_nameFactory);
-        }
-
-        public virtual Expression ApplyQuery(QueryLayer layer)
-        {
-            ArgumentGuard.NotNull(layer, nameof(layer));
-
-            Expression expression = _source;
-
-            if (layer.Include != null)
-            {
-                expression = ApplyInclude(expression, layer.Include, layer.ResourceType);
-            }
-
-            if (layer.Filter != null)
-            {
-                expression = ApplyFilter(expression, layer.Filter);
-            }
-
-            if (layer.Sort != null)
-            {
-                expression = ApplySort(expression, layer.Sort);
-            }
+        ArgumentGuard.NotNull(source, nameof(source));
+        ArgumentGuard.NotNull(elementType, nameof(elementType));
+        ArgumentGuard.NotNull(extensionType, nameof(extensionType));
+        ArgumentGuard.NotNull(nameFactory, nameof(nameFactory));
+        ArgumentGuard.NotNull(resourceFactory, nameof(resourceFactory));
+        ArgumentGuard.NotNull(entityModel, nameof(entityModel));
+
+        _source = source;
+        _elementType = elementType;
+        _extensionType = extensionType;
+        _nameFactory = nameFactory;
+        _resourceFactory = resourceFactory;
+        _entityModel = entityModel;
+        _lambdaScopeFactory = lambdaScopeFactory ?? new LambdaScopeFactory(_nameFactory);
+    }
 
-            if (layer.Pagination != null)
-            {
-                expression = ApplyPagination(expression, layer.Pagination);
-            }
+    public virtual Expression ApplyQuery(QueryLayer layer)
+    {
+        ArgumentGuard.NotNull(layer, nameof(layer));
 
-            if (!layer.Projection.IsNullOrEmpty())
-            {
-                expression = ApplyProjection(expression, layer.Projection, layer.ResourceType);
-            }
+        Expression expression = _source;
 
-            return expression;
+        if (layer.Include != null)
+        {
+            expression = ApplyInclude(expression, layer.Include, layer.ResourceType);
         }
 
-        protected virtual Expression ApplyInclude(Expression source, IncludeExpression include, ResourceType resourceType)
+        if (layer.Filter != null)
         {
-            using LambdaScope lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
-
-            var builder = new IncludeClauseBuilder(source, lambdaScope, resourceType);
-            return builder.ApplyInclude(include);
+            expression = ApplyFilter(expression, layer.Filter);
         }
 
-        protected virtual Expression ApplyFilter(Expression source, FilterExpression filter)
+        if (layer.Sort != null)
         {
-            using LambdaScope lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
-
-            var builder = new WhereClauseBuilder(source, lambdaScope, _extensionType, _nameFactory);
-            return builder.ApplyWhere(filter);
+            expression = ApplySort(expression, layer.Sort);
         }
 
-        protected virtual Expression ApplySort(Expression source, SortExpression sort)
+        if (layer.Pagination != null)
         {
-            using LambdaScope lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
-
-            var builder = new OrderClauseBuilder(source, lambdaScope, _extensionType);
-            return builder.ApplyOrderBy(sort);
+            expression = ApplyPagination(expression, layer.Pagination);
         }
 
-        protected virtual Expression ApplyPagination(Expression source, PaginationExpression pagination)
+        if (!layer.Projection.IsNullOrEmpty())
         {
-            using LambdaScope lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
-
-            var builder = new SkipTakeClauseBuilder(source, lambdaScope, _extensionType);
-            return builder.ApplySkipTake(pagination);
+            expression = ApplyProjection(expression, layer.Projection, layer.ResourceType);
         }
 
-        protected virtual Expression ApplyProjection(Expression source, IDictionary<ResourceFieldAttribute, QueryLayer?> projection, ResourceType resourceType)
-        {
-            using LambdaScope lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
+        return expression;
+    }
 
-            var builder = new SelectClauseBuilder(source, lambdaScope, _entityModel, _extensionType, _nameFactory, _resourceFactory);
-            return builder.ApplySelect(projection, resourceType);
-        }
+    protected virtual Expression ApplyInclude(Expression source, IncludeExpression include, ResourceType resourceType)
+    {
+        using LambdaScope lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
+
+        var builder = new IncludeClauseBuilder(source, lambdaScope, resourceType);
+        return builder.ApplyInclude(include);
+    }
+
+    protected virtual Expression ApplyFilter(Expression source, FilterExpression filter)
+    {
+        using LambdaScope lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
+
+        var builder = new WhereClauseBuilder(source, lambdaScope, _extensionType, _nameFactory);
+        return builder.ApplyWhere(filter);
+    }
+
+    protected virtual Expression ApplySort(Expression source, SortExpression sort)
+    {
+        using LambdaScope lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
+
+        var builder = new OrderClauseBuilder(source, lambdaScope, _extensionType);
+        return builder.ApplyOrderBy(sort);
+    }
+
+    protected virtual Expression ApplyPagination(Expression source, PaginationExpression pagination)
+    {
+        using LambdaScope lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
+
+        var builder = new SkipTakeClauseBuilder(source, lambdaScope, _extensionType);
+        return builder.ApplySkipTake(pagination);
+    }
+
+    protected virtual Expression ApplyProjection(Expression source, IDictionary<ResourceFieldAttribute, QueryLayer?> projection, ResourceType resourceType)
+    {
+        using LambdaScope lambdaScope = _lambdaScopeFactory.CreateScope(_elementType);
+
+        var builder = new SelectClauseBuilder(source, lambdaScope, _entityModel, _extensionType, _nameFactory, _resourceFactory);
+        return builder.ApplySelect(projection, resourceType);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs
index c34b92c0dc..3931cdc180 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SelectClauseBuilder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
 using JetBrains.Annotations;
@@ -8,233 +5,231 @@
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 
-namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
+namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
+
+/// <summary>
+/// Transforms <see cref="SparseFieldSetExpression" /> into
+/// <see cref="Queryable.Select{TSource, TKey}(IQueryable{TSource}, System.Linq.Expressions.Expression{System.Func{TSource,TKey}})" /> calls.
+/// </summary>
+[PublicAPI]
+public class SelectClauseBuilder : QueryClauseBuilder<object>
 {
-    /// <summary>
-    /// Transforms <see cref="SparseFieldSetExpression" /> into
-    /// <see cref="Queryable.Select{TSource, TKey}(IQueryable{TSource}, System.Linq.Expressions.Expression{System.Func{TSource,TKey}})" /> calls.
-    /// </summary>
-    [PublicAPI]
-    public class SelectClauseBuilder : QueryClauseBuilder<object>
+    private static readonly CollectionConverter CollectionConverter = new();
+    private static readonly ConstantExpression NullConstant = Expression.Constant(null);
+
+    private readonly Expression _source;
+    private readonly IModel _entityModel;
+    private readonly Type _extensionType;
+    private readonly LambdaParameterNameFactory _nameFactory;
+    private readonly IResourceFactory _resourceFactory;
+
+    public SelectClauseBuilder(Expression source, LambdaScope lambdaScope, IModel entityModel, Type extensionType, LambdaParameterNameFactory nameFactory,
+        IResourceFactory resourceFactory)
+        : base(lambdaScope)
     {
-        private static readonly CollectionConverter CollectionConverter = new();
-        private static readonly ConstantExpression NullConstant = Expression.Constant(null);
-
-        private readonly Expression _source;
-        private readonly IModel _entityModel;
-        private readonly Type _extensionType;
-        private readonly LambdaParameterNameFactory _nameFactory;
-        private readonly IResourceFactory _resourceFactory;
-
-        public SelectClauseBuilder(Expression source, LambdaScope lambdaScope, IModel entityModel, Type extensionType, LambdaParameterNameFactory nameFactory,
-            IResourceFactory resourceFactory)
-            : base(lambdaScope)
+        ArgumentGuard.NotNull(source, nameof(source));
+        ArgumentGuard.NotNull(entityModel, nameof(entityModel));
+        ArgumentGuard.NotNull(extensionType, nameof(extensionType));
+        ArgumentGuard.NotNull(nameFactory, nameof(nameFactory));
+        ArgumentGuard.NotNull(resourceFactory, nameof(resourceFactory));
+
+        _source = source;
+        _entityModel = entityModel;
+        _extensionType = extensionType;
+        _nameFactory = nameFactory;
+        _resourceFactory = resourceFactory;
+    }
+
+    public Expression ApplySelect(IDictionary<ResourceFieldAttribute, QueryLayer?> selectors, ResourceType resourceType)
+    {
+        ArgumentGuard.NotNull(selectors, nameof(selectors));
+
+        if (!selectors.Any())
         {
-            ArgumentGuard.NotNull(source, nameof(source));
-            ArgumentGuard.NotNull(entityModel, nameof(entityModel));
-            ArgumentGuard.NotNull(extensionType, nameof(extensionType));
-            ArgumentGuard.NotNull(nameFactory, nameof(nameFactory));
-            ArgumentGuard.NotNull(resourceFactory, nameof(resourceFactory));
-
-            _source = source;
-            _entityModel = entityModel;
-            _extensionType = extensionType;
-            _nameFactory = nameFactory;
-            _resourceFactory = resourceFactory;
+            return _source;
         }
 
-        public Expression ApplySelect(IDictionary<ResourceFieldAttribute, QueryLayer?> selectors, ResourceType resourceType)
-        {
-            ArgumentGuard.NotNull(selectors, nameof(selectors));
+        Expression bodyInitializer = CreateLambdaBodyInitializer(selectors, resourceType, LambdaScope, false);
 
-            if (!selectors.Any())
-            {
-                return _source;
-            }
+        LambdaExpression lambda = Expression.Lambda(bodyInitializer, LambdaScope.Parameter);
+
+        return SelectExtensionMethodCall(_source, LambdaScope.Parameter.Type, lambda);
+    }
 
-            Expression bodyInitializer = CreateLambdaBodyInitializer(selectors, resourceType, LambdaScope, false);
+    private Expression CreateLambdaBodyInitializer(IDictionary<ResourceFieldAttribute, QueryLayer?> selectors, ResourceType resourceType,
+        LambdaScope lambdaScope, bool lambdaAccessorRequiresTestForNull)
+    {
+        ICollection<PropertySelector> propertySelectors = ToPropertySelectors(selectors, resourceType, lambdaScope.Accessor.Type);
 
-            LambdaExpression lambda = Expression.Lambda(bodyInitializer, LambdaScope.Parameter);
+        MemberBinding[] propertyAssignments =
+            propertySelectors.Select(selector => CreatePropertyAssignment(selector, lambdaScope)).Cast<MemberBinding>().ToArray();
 
-            return SelectExtensionMethodCall(_source, LambdaScope.Parameter.Type, lambda);
-        }
+        NewExpression newExpression = _resourceFactory.CreateNewExpression(lambdaScope.Accessor.Type);
+        Expression memberInit = Expression.MemberInit(newExpression, propertyAssignments);
 
-        private Expression CreateLambdaBodyInitializer(IDictionary<ResourceFieldAttribute, QueryLayer?> selectors, ResourceType resourceType,
-            LambdaScope lambdaScope, bool lambdaAccessorRequiresTestForNull)
+        if (!lambdaAccessorRequiresTestForNull)
         {
-            ICollection<PropertySelector> propertySelectors = ToPropertySelectors(selectors, resourceType, lambdaScope.Accessor.Type);
+            return memberInit;
+        }
 
-            MemberBinding[] propertyAssignments =
-                propertySelectors.Select(selector => CreatePropertyAssignment(selector, lambdaScope)).Cast<MemberBinding>().ToArray();
+        return TestForNull(lambdaScope.Accessor, memberInit);
+    }
 
-            NewExpression newExpression = _resourceFactory.CreateNewExpression(lambdaScope.Accessor.Type);
-            Expression memberInit = Expression.MemberInit(newExpression, propertyAssignments);
+    private ICollection<PropertySelector> ToPropertySelectors(IDictionary<ResourceFieldAttribute, QueryLayer?> resourceFieldSelectors,
+        ResourceType resourceType, Type elementType)
+    {
+        var propertySelectors = new Dictionary<PropertyInfo, PropertySelector>();
 
-            if (!lambdaAccessorRequiresTestForNull)
-            {
-                return memberInit;
-            }
+        // If a read-only attribute is selected, its calculated value likely depends on another property, so select all properties.
+        bool includesReadOnlyAttribute = resourceFieldSelectors.Any(selector =>
+            selector.Key is AttrAttribute attribute && attribute.Property.SetMethod == null);
 
-            return TestForNull(lambdaScope.Accessor, memberInit);
-        }
+        // Only selecting relationships implicitly means to select all attributes too.
+        bool containsOnlyRelationships = resourceFieldSelectors.All(selector => selector.Key is RelationshipAttribute);
 
-        private ICollection<PropertySelector> ToPropertySelectors(IDictionary<ResourceFieldAttribute, QueryLayer?> resourceFieldSelectors,
-            ResourceType resourceType, Type elementType)
+        if (includesReadOnlyAttribute || containsOnlyRelationships)
         {
-            var propertySelectors = new Dictionary<PropertyInfo, PropertySelector>();
-
-            // If a read-only attribute is selected, its calculated value likely depends on another property, so select all properties.
-            bool includesReadOnlyAttribute = resourceFieldSelectors.Any(selector =>
-                selector.Key is AttrAttribute attribute && attribute.Property.SetMethod == null);
+            IncludeAllProperties(elementType, propertySelectors);
+        }
 
-            // Only selecting relationships implicitly means to select all attributes too.
-            bool containsOnlyRelationships = resourceFieldSelectors.All(selector => selector.Key is RelationshipAttribute);
+        IncludeFieldSelection(resourceFieldSelectors, propertySelectors);
 
-            if (includesReadOnlyAttribute || containsOnlyRelationships)
-            {
-                IncludeAllProperties(elementType, propertySelectors);
-            }
+        IncludeEagerLoads(resourceType, propertySelectors);
 
-            IncludeFieldSelection(resourceFieldSelectors, propertySelectors);
+        return propertySelectors.Values;
+    }
 
-            IncludeEagerLoads(resourceType, propertySelectors);
+    private void IncludeAllProperties(Type elementType, Dictionary<PropertyInfo, PropertySelector> propertySelectors)
+    {
+        IEntityType entityModel = _entityModel.GetEntityTypes().Single(type => type.ClrType == elementType);
+        IEnumerable<IProperty> entityProperties = entityModel.GetProperties().Where(property => !property.IsShadowProperty()).ToArray();
 
-            return propertySelectors.Values;
+        foreach (IProperty entityProperty in entityProperties)
+        {
+            var propertySelector = new PropertySelector(entityProperty.PropertyInfo!);
+            IncludeWritableProperty(propertySelector, propertySelectors);
         }
+    }
 
-        private void IncludeAllProperties(Type elementType, Dictionary<PropertyInfo, PropertySelector> propertySelectors)
+    private static void IncludeFieldSelection(IDictionary<ResourceFieldAttribute, QueryLayer?> resourceFieldSelectors,
+        Dictionary<PropertyInfo, PropertySelector> propertySelectors)
+    {
+        foreach ((ResourceFieldAttribute resourceField, QueryLayer? queryLayer) in resourceFieldSelectors)
         {
-            IEntityType entityModel = _entityModel.GetEntityTypes().Single(type => type.ClrType == elementType);
-            IEnumerable<IProperty> entityProperties = entityModel.GetProperties().Where(property => !property.IsShadowProperty()).ToArray();
-
-            foreach (IProperty entityProperty in entityProperties)
-            {
-                var propertySelector = new PropertySelector(entityProperty.PropertyInfo);
-                IncludeWritableProperty(propertySelector, propertySelectors);
-            }
+            var propertySelector = new PropertySelector(resourceField.Property, queryLayer);
+            IncludeWritableProperty(propertySelector, propertySelectors);
         }
+    }
 
-        private static void IncludeFieldSelection(IDictionary<ResourceFieldAttribute, QueryLayer?> resourceFieldSelectors,
-            Dictionary<PropertyInfo, PropertySelector> propertySelectors)
+    private static void IncludeWritableProperty(PropertySelector propertySelector, Dictionary<PropertyInfo, PropertySelector> propertySelectors)
+    {
+        if (propertySelector.Property.SetMethod != null)
         {
-            foreach ((ResourceFieldAttribute resourceField, QueryLayer? queryLayer) in resourceFieldSelectors)
-            {
-                var propertySelector = new PropertySelector(resourceField.Property, queryLayer);
-                IncludeWritableProperty(propertySelector, propertySelectors);
-            }
+            propertySelectors[propertySelector.Property] = propertySelector;
         }
+    }
 
-        private static void IncludeWritableProperty(PropertySelector propertySelector, Dictionary<PropertyInfo, PropertySelector> propertySelectors)
+    private static void IncludeEagerLoads(ResourceType resourceType, Dictionary<PropertyInfo, PropertySelector> propertySelectors)
+    {
+        foreach (EagerLoadAttribute eagerLoad in resourceType.EagerLoads)
         {
-            if (propertySelector.Property.SetMethod != null)
+            var propertySelector = new PropertySelector(eagerLoad.Property);
+
+            // When an entity navigation property is decorated with both EagerLoadAttribute and RelationshipAttribute,
+            // it may already exist with a sub-layer. So do not overwrite in that case.
+            if (!propertySelectors.ContainsKey(propertySelector.Property))
             {
                 propertySelectors[propertySelector.Property] = propertySelector;
             }
         }
+    }
 
-        private static void IncludeEagerLoads(ResourceType resourceType, Dictionary<PropertyInfo, PropertySelector> propertySelectors)
-        {
-            foreach (EagerLoadAttribute eagerLoad in resourceType.EagerLoads)
-            {
-                var propertySelector = new PropertySelector(eagerLoad.Property);
-
-                // When an entity navigation property is decorated with both EagerLoadAttribute and RelationshipAttribute,
-                // it may already exist with a sub-layer. So do not overwrite in that case.
-                if (!propertySelectors.ContainsKey(propertySelector.Property))
-                {
-                    propertySelectors[propertySelector.Property] = propertySelector;
-                }
-            }
-        }
+    private MemberAssignment CreatePropertyAssignment(PropertySelector selector, LambdaScope lambdaScope)
+    {
+        MemberExpression propertyAccess = Expression.Property(lambdaScope.Accessor, selector.Property);
 
-        private MemberAssignment CreatePropertyAssignment(PropertySelector selector, LambdaScope lambdaScope)
+        Expression assignmentRightHandSide = propertyAccess;
+
+        if (selector.NextLayer != null)
         {
-            MemberExpression propertyAccess = Expression.Property(lambdaScope.Accessor, selector.Property);
+            var lambdaScopeFactory = new LambdaScopeFactory(_nameFactory);
 
-            Expression assignmentRightHandSide = propertyAccess;
+            assignmentRightHandSide = CreateAssignmentRightHandSideForLayer(selector.NextLayer, lambdaScope, propertyAccess,
+                selector.Property, lambdaScopeFactory);
+        }
 
-            if (selector.NextLayer != null)
-            {
-                var lambdaScopeFactory = new LambdaScopeFactory(_nameFactory);
+        return Expression.Bind(selector.Property, assignmentRightHandSide);
+    }
 
-                assignmentRightHandSide = CreateAssignmentRightHandSideForLayer(selector.NextLayer, lambdaScope, propertyAccess,
-                    selector.Property, lambdaScopeFactory);
-            }
+    private Expression CreateAssignmentRightHandSideForLayer(QueryLayer layer, LambdaScope outerLambdaScope, MemberExpression propertyAccess,
+        PropertyInfo selectorPropertyInfo, LambdaScopeFactory lambdaScopeFactory)
+    {
+        Type? collectionElementType = CollectionConverter.FindCollectionElementType(selectorPropertyInfo.PropertyType);
+        Type bodyElementType = collectionElementType ?? selectorPropertyInfo.PropertyType;
 
-            return Expression.Bind(selector.Property, assignmentRightHandSide);
+        if (collectionElementType != null)
+        {
+            return CreateCollectionInitializer(outerLambdaScope, selectorPropertyInfo, bodyElementType, layer, lambdaScopeFactory);
         }
 
-        private Expression CreateAssignmentRightHandSideForLayer(QueryLayer layer, LambdaScope outerLambdaScope, MemberExpression propertyAccess,
-            PropertyInfo selectorPropertyInfo, LambdaScopeFactory lambdaScopeFactory)
+        if (layer.Projection.IsNullOrEmpty())
         {
-            Type? collectionElementType = CollectionConverter.FindCollectionElementType(selectorPropertyInfo.PropertyType);
-            Type bodyElementType = collectionElementType ?? selectorPropertyInfo.PropertyType;
+            return propertyAccess;
+        }
 
-            if (collectionElementType != null)
-            {
-                return CreateCollectionInitializer(outerLambdaScope, selectorPropertyInfo, bodyElementType, layer, lambdaScopeFactory);
-            }
+        using LambdaScope scope = lambdaScopeFactory.CreateScope(bodyElementType, propertyAccess);
+        return CreateLambdaBodyInitializer(layer.Projection, layer.ResourceType, scope, true);
+    }
 
-            if (layer.Projection.IsNullOrEmpty())
-            {
-                return propertyAccess;
-            }
+    private Expression CreateCollectionInitializer(LambdaScope lambdaScope, PropertyInfo collectionProperty, Type elementType, QueryLayer layer,
+        LambdaScopeFactory lambdaScopeFactory)
+    {
+        MemberExpression propertyExpression = Expression.Property(lambdaScope.Accessor, collectionProperty);
 
-            using LambdaScope scope = lambdaScopeFactory.CreateScope(bodyElementType, propertyAccess);
-            return CreateLambdaBodyInitializer(layer.Projection, layer.ResourceType, scope, true);
-        }
+        var builder = new QueryableBuilder(propertyExpression, elementType, typeof(Enumerable), _nameFactory, _resourceFactory, _entityModel,
+            lambdaScopeFactory);
 
-        private Expression CreateCollectionInitializer(LambdaScope lambdaScope, PropertyInfo collectionProperty, Type elementType, QueryLayer layer,
-            LambdaScopeFactory lambdaScopeFactory)
-        {
-            MemberExpression propertyExpression = Expression.Property(lambdaScope.Accessor, collectionProperty);
+        Expression layerExpression = builder.ApplyQuery(layer);
+
+        string operationName = CollectionConverter.TypeCanContainHashSet(collectionProperty.PropertyType) ? "ToHashSet" : "ToList";
+        return CopyCollectionExtensionMethodCall(layerExpression, operationName, elementType);
+    }
 
-            var builder = new QueryableBuilder(propertyExpression, elementType, typeof(Enumerable), _nameFactory, _resourceFactory, _entityModel,
-                lambdaScopeFactory);
+    private static Expression TestForNull(Expression expressionToTest, Expression ifFalseExpression)
+    {
+        BinaryExpression equalsNull = Expression.Equal(expressionToTest, NullConstant);
+        return Expression.Condition(equalsNull, Expression.Convert(NullConstant, expressionToTest.Type), ifFalseExpression);
+    }
 
-            Expression layerExpression = builder.ApplyQuery(layer);
+    private static Expression CopyCollectionExtensionMethodCall(Expression source, string operationName, Type elementType)
+    {
+        return Expression.Call(typeof(Enumerable), operationName, elementType.AsArray(), source);
+    }
 
-            string operationName = CollectionConverter.TypeCanContainHashSet(collectionProperty.PropertyType) ? "ToHashSet" : "ToList";
-            return CopyCollectionExtensionMethodCall(layerExpression, operationName, elementType);
-        }
+    private Expression SelectExtensionMethodCall(Expression source, Type elementType, Expression selectorBody)
+    {
+        Type[] typeArguments = ArrayFactory.Create(elementType, elementType);
+        return Expression.Call(_extensionType, "Select", typeArguments, source, selectorBody);
+    }
 
-        private static Expression TestForNull(Expression expressionToTest, Expression ifFalseExpression)
-        {
-            BinaryExpression equalsNull = Expression.Equal(expressionToTest, NullConstant);
-            return Expression.Condition(equalsNull, Expression.Convert(NullConstant, expressionToTest.Type), ifFalseExpression);
-        }
+    private sealed class PropertySelector
+    {
+        public PropertyInfo Property { get; }
+        public QueryLayer? NextLayer { get; }
 
-        private static Expression CopyCollectionExtensionMethodCall(Expression source, string operationName, Type elementType)
+        public PropertySelector(PropertyInfo property, QueryLayer? nextLayer = null)
         {
-            return Expression.Call(typeof(Enumerable), operationName, elementType.AsArray(), source);
-        }
+            ArgumentGuard.NotNull(property, nameof(property));
 
-        private Expression SelectExtensionMethodCall(Expression source, Type elementType, Expression selectorBody)
-        {
-            Type[] typeArguments = ArrayFactory.Create(elementType, elementType);
-            return Expression.Call(_extensionType, "Select", typeArguments, source, selectorBody);
+            Property = property;
+            NextLayer = nextLayer;
         }
 
-        private sealed class PropertySelector
+        public override string ToString()
         {
-            public PropertyInfo Property { get; }
-            public QueryLayer? NextLayer { get; }
-
-            public PropertySelector(PropertyInfo property, QueryLayer? nextLayer = null)
-            {
-                ArgumentGuard.NotNull(property, nameof(property));
-
-                Property = property;
-                NextLayer = nextLayer;
-            }
-
-            public override string ToString()
-            {
-                return $"Property: {(NextLayer != null ? $"{Property.Name}..." : Property.Name)}";
-            }
+            return $"Property: {(NextLayer != null ? $"{Property.Name}..." : Property.Name)}";
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SkipTakeClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SkipTakeClauseBuilder.cs
index ce02edb368..4bb9bfd6f5 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SkipTakeClauseBuilder.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/SkipTakeClauseBuilder.cs
@@ -1,61 +1,59 @@
-using System;
-using System.Linq;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries.Expressions;
 
-namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
+namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
+
+/// <summary>
+/// Transforms <see cref="PaginationExpression" /> into <see cref="Queryable.Skip{TSource}" /> and
+/// <see cref="Queryable.Take{TSource}(IQueryable{TSource},int)" /> calls.
+/// </summary>
+[PublicAPI]
+public class SkipTakeClauseBuilder : QueryClauseBuilder<object?>
 {
-    /// <summary>
-    /// Transforms <see cref="PaginationExpression" /> into <see cref="Queryable.Skip{TSource}" /> and <see cref="Queryable.Take{TSource}" /> calls.
-    /// </summary>
-    [PublicAPI]
-    public class SkipTakeClauseBuilder : QueryClauseBuilder<object?>
+    private readonly Expression _source;
+    private readonly Type _extensionType;
+
+    public SkipTakeClauseBuilder(Expression source, LambdaScope lambdaScope, Type extensionType)
+        : base(lambdaScope)
     {
-        private readonly Expression _source;
-        private readonly Type _extensionType;
+        ArgumentGuard.NotNull(source, nameof(source));
+        ArgumentGuard.NotNull(extensionType, nameof(extensionType));
 
-        public SkipTakeClauseBuilder(Expression source, LambdaScope lambdaScope, Type extensionType)
-            : base(lambdaScope)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
-            ArgumentGuard.NotNull(extensionType, nameof(extensionType));
+        _source = source;
+        _extensionType = extensionType;
+    }
 
-            _source = source;
-            _extensionType = extensionType;
-        }
+    public Expression ApplySkipTake(PaginationExpression expression)
+    {
+        ArgumentGuard.NotNull(expression, nameof(expression));
 
-        public Expression ApplySkipTake(PaginationExpression expression)
-        {
-            ArgumentGuard.NotNull(expression, nameof(expression));
+        return Visit(expression, null);
+    }
 
-            return Visit(expression, null);
-        }
+    public override Expression VisitPagination(PaginationExpression expression, object? argument)
+    {
+        Expression skipTakeExpression = _source;
 
-        public override Expression VisitPagination(PaginationExpression expression, object? argument)
+        if (expression.PageSize != null)
         {
-            Expression skipTakeExpression = _source;
+            int skipValue = (expression.PageNumber.OneBasedValue - 1) * expression.PageSize.Value;
 
-            if (expression.PageSize != null)
+            if (skipValue > 0)
             {
-                int skipValue = (expression.PageNumber.OneBasedValue - 1) * expression.PageSize.Value;
-
-                if (skipValue > 0)
-                {
-                    skipTakeExpression = ExtensionMethodCall(skipTakeExpression, "Skip", skipValue);
-                }
-
-                skipTakeExpression = ExtensionMethodCall(skipTakeExpression, "Take", expression.PageSize.Value);
+                skipTakeExpression = ExtensionMethodCall(skipTakeExpression, "Skip", skipValue);
             }
 
-            return skipTakeExpression;
+            skipTakeExpression = ExtensionMethodCall(skipTakeExpression, "Take", expression.PageSize.Value);
         }
 
-        private Expression ExtensionMethodCall(Expression source, string operationName, int value)
-        {
-            Expression constant = CreateTupleAccessExpressionForConstant(value, typeof(int));
+        return skipTakeExpression;
+    }
 
-            return Expression.Call(_extensionType, operationName, LambdaScope.Parameter.Type.AsArray(), source, constant);
-        }
+    private Expression ExtensionMethodCall(Expression source, string operationName, int value)
+    {
+        Expression constant = value.CreateTupleAccessExpressionForConstant(typeof(int));
+
+        return Expression.Call(_extensionType, operationName, LambdaScope.Parameter.Type.AsArray(), source, constant);
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/WhereClauseBuilder.cs b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/WhereClauseBuilder.cs
index fcb934d0f9..e34da3a495 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/WhereClauseBuilder.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/QueryableBuilding/WhereClauseBuilder.cs
@@ -1,291 +1,287 @@
-using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Errors;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources.Internal;
 
-namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding
+namespace JsonApiDotNetCore.Queries.Internal.QueryableBuilding;
+
+/// <summary>
+/// Transforms <see cref="FilterExpression" /> into
+/// <see cref="Queryable.Where{TSource}(IQueryable{TSource}, System.Linq.Expressions.Expression{System.Func{TSource,bool}})" /> calls.
+/// </summary>
+[PublicAPI]
+public class WhereClauseBuilder : QueryClauseBuilder<Type?>
 {
-    /// <summary>
-    /// Transforms <see cref="FilterExpression" /> into
-    /// <see cref="Queryable.Where{TSource}(IQueryable{TSource}, System.Linq.Expressions.Expression{System.Func{TSource,bool}})" /> calls.
-    /// </summary>
-    [PublicAPI]
-    public class WhereClauseBuilder : QueryClauseBuilder<Type?>
+    private static readonly CollectionConverter CollectionConverter = new();
+    private static readonly ConstantExpression NullConstant = Expression.Constant(null);
+
+    private readonly Expression _source;
+    private readonly Type _extensionType;
+    private readonly LambdaParameterNameFactory _nameFactory;
+
+    public WhereClauseBuilder(Expression source, LambdaScope lambdaScope, Type extensionType, LambdaParameterNameFactory nameFactory)
+        : base(lambdaScope)
     {
-        private static readonly CollectionConverter CollectionConverter = new();
-        private static readonly ConstantExpression NullConstant = Expression.Constant(null);
+        ArgumentGuard.NotNull(source, nameof(source));
+        ArgumentGuard.NotNull(extensionType, nameof(extensionType));
+        ArgumentGuard.NotNull(nameFactory, nameof(nameFactory));
 
-        private readonly Expression _source;
-        private readonly Type _extensionType;
-        private readonly LambdaParameterNameFactory _nameFactory;
+        _source = source;
+        _extensionType = extensionType;
+        _nameFactory = nameFactory;
+    }
 
-        public WhereClauseBuilder(Expression source, LambdaScope lambdaScope, Type extensionType, LambdaParameterNameFactory nameFactory)
-            : base(lambdaScope)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
-            ArgumentGuard.NotNull(extensionType, nameof(extensionType));
-            ArgumentGuard.NotNull(nameFactory, nameof(nameFactory));
+    public Expression ApplyWhere(FilterExpression filter)
+    {
+        ArgumentGuard.NotNull(filter, nameof(filter));
 
-            _source = source;
-            _extensionType = extensionType;
-            _nameFactory = nameFactory;
-        }
+        LambdaExpression lambda = GetPredicateLambda(filter);
 
-        public Expression ApplyWhere(FilterExpression filter)
-        {
-            ArgumentGuard.NotNull(filter, nameof(filter));
+        return WhereExtensionMethodCall(lambda);
+    }
 
-            LambdaExpression lambda = GetPredicateLambda(filter);
+    private LambdaExpression GetPredicateLambda(FilterExpression filter)
+    {
+        Expression body = Visit(filter, null);
+        return Expression.Lambda(body, LambdaScope.Parameter);
+    }
 
-            return WhereExtensionMethodCall(lambda);
-        }
+    private Expression WhereExtensionMethodCall(LambdaExpression predicate)
+    {
+        return Expression.Call(_extensionType, "Where", LambdaScope.Parameter.Type.AsArray(), _source, predicate);
+    }
 
-        private LambdaExpression GetPredicateLambda(FilterExpression filter)
-        {
-            Expression body = Visit(filter, null);
-            return Expression.Lambda(body, LambdaScope.Parameter);
-        }
+    public override Expression VisitHas(HasExpression expression, Type? argument)
+    {
+        Expression property = Visit(expression.TargetCollection, argument);
 
-        private Expression WhereExtensionMethodCall(LambdaExpression predicate)
-        {
-            return Expression.Call(_extensionType, "Where", LambdaScope.Parameter.Type.AsArray(), _source, predicate);
-        }
+        Type? elementType = CollectionConverter.FindCollectionElementType(property.Type);
 
-        public override Expression VisitHas(HasExpression expression, Type? argument)
+        if (elementType == null)
         {
-            Expression property = Visit(expression.TargetCollection, argument);
+            throw new InvalidOperationException("Expression must be a collection.");
+        }
 
-            Type? elementType = CollectionConverter.FindCollectionElementType(property.Type);
+        Expression? predicate = null;
 
-            if (elementType == null)
-            {
-                throw new InvalidOperationException("Expression must be a collection.");
-            }
+        if (expression.Filter != null)
+        {
+            var lambdaScopeFactory = new LambdaScopeFactory(_nameFactory);
+            using LambdaScope lambdaScope = lambdaScopeFactory.CreateScope(elementType);
 
-            Expression? predicate = null;
+            var builder = new WhereClauseBuilder(property, lambdaScope, typeof(Enumerable), _nameFactory);
+            predicate = builder.GetPredicateLambda(expression.Filter);
+        }
 
-            if (expression.Filter != null)
-            {
-                var lambdaScopeFactory = new LambdaScopeFactory(_nameFactory);
-                using LambdaScope lambdaScope = lambdaScopeFactory.CreateScope(elementType);
+        return AnyExtensionMethodCall(elementType, property, predicate);
+    }
 
-                var builder = new WhereClauseBuilder(property, lambdaScope, typeof(Enumerable), _nameFactory);
-                predicate = builder.GetPredicateLambda(expression.Filter);
-            }
+    private static MethodCallExpression AnyExtensionMethodCall(Type elementType, Expression source, Expression? predicate)
+    {
+        return predicate != null
+            ? Expression.Call(typeof(Enumerable), "Any", elementType.AsArray(), source, predicate)
+            : Expression.Call(typeof(Enumerable), "Any", elementType.AsArray(), source);
+    }
 
-            return AnyExtensionMethodCall(elementType, property, predicate);
-        }
+    public override Expression VisitMatchText(MatchTextExpression expression, Type? argument)
+    {
+        Expression property = Visit(expression.TargetAttribute, argument);
 
-        private static MethodCallExpression AnyExtensionMethodCall(Type elementType, Expression source, Expression? predicate)
+        if (property.Type != typeof(string))
         {
-            return predicate != null
-                ? Expression.Call(typeof(Enumerable), "Any", elementType.AsArray(), source, predicate)
-                : Expression.Call(typeof(Enumerable), "Any", elementType.AsArray(), source);
+            throw new InvalidOperationException("Expression must be a string.");
         }
 
-        public override Expression VisitMatchText(MatchTextExpression expression, Type? argument)
-        {
-            Expression property = Visit(expression.TargetAttribute, argument);
-
-            if (property.Type != typeof(string))
-            {
-                throw new InvalidOperationException("Expression must be a string.");
-            }
-
-            Expression text = Visit(expression.TextValue, property.Type);
-
-            if (expression.MatchKind == TextMatchKind.StartsWith)
-            {
-                return Expression.Call(property, "StartsWith", null, text);
-            }
+        Expression text = Visit(expression.TextValue, property.Type);
 
-            if (expression.MatchKind == TextMatchKind.EndsWith)
-            {
-                return Expression.Call(property, "EndsWith", null, text);
-            }
-
-            return Expression.Call(property, "Contains", null, text);
+        if (expression.MatchKind == TextMatchKind.StartsWith)
+        {
+            return Expression.Call(property, "StartsWith", null, text);
         }
 
-        public override Expression VisitAny(AnyExpression expression, Type? argument)
+        if (expression.MatchKind == TextMatchKind.EndsWith)
         {
-            Expression property = Visit(expression.TargetAttribute, argument);
+            return Expression.Call(property, "EndsWith", null, text);
+        }
 
-            var valueList = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(property.Type))!;
+        return Expression.Call(property, "Contains", null, text);
+    }
 
-            foreach (LiteralConstantExpression constant in expression.Constants)
-            {
-                object? value = ConvertTextToTargetType(constant.Value, property.Type);
-                valueList.Add(value);
-            }
+    public override Expression VisitAny(AnyExpression expression, Type? argument)
+    {
+        Expression property = Visit(expression.TargetAttribute, argument);
 
-            ConstantExpression collection = Expression.Constant(valueList);
-            return ContainsExtensionMethodCall(collection, property);
-        }
+        var valueList = (IList)Activator.CreateInstance(typeof(List<>).MakeGenericType(property.Type))!;
 
-        private static Expression ContainsExtensionMethodCall(Expression collection, Expression value)
+        foreach (LiteralConstantExpression constant in expression.Constants)
         {
-            return Expression.Call(typeof(Enumerable), "Contains", value.Type.AsArray(), collection, value);
+            object? value = ConvertTextToTargetType(constant.Value, property.Type);
+            valueList.Add(value);
         }
 
-        public override Expression VisitLogical(LogicalExpression expression, Type? argument)
-        {
-            var termQueue = new Queue<Expression>(expression.Terms.Select(filter => Visit(filter, argument)));
+        ConstantExpression collection = Expression.Constant(valueList);
+        return ContainsExtensionMethodCall(collection, property);
+    }
 
-            if (expression.Operator == LogicalOperator.And)
-            {
-                return Compose(termQueue, Expression.AndAlso);
-            }
+    private static Expression ContainsExtensionMethodCall(Expression collection, Expression value)
+    {
+        return Expression.Call(typeof(Enumerable), "Contains", value.Type.AsArray(), collection, value);
+    }
 
-            if (expression.Operator == LogicalOperator.Or)
-            {
-                return Compose(termQueue, Expression.OrElse);
-            }
+    public override Expression VisitLogical(LogicalExpression expression, Type? argument)
+    {
+        var termQueue = new Queue<Expression>(expression.Terms.Select(filter => Visit(filter, argument)));
 
-            throw new InvalidOperationException($"Unknown logical operator '{expression.Operator}'.");
+        if (expression.Operator == LogicalOperator.And)
+        {
+            return Compose(termQueue, Expression.AndAlso);
         }
 
-        private static BinaryExpression Compose(Queue<Expression> argumentQueue, Func<Expression, Expression, BinaryExpression> applyOperator)
+        if (expression.Operator == LogicalOperator.Or)
         {
-            Expression left = argumentQueue.Dequeue();
-            Expression right = argumentQueue.Dequeue();
+            return Compose(termQueue, Expression.OrElse);
+        }
 
-            BinaryExpression tempExpression = applyOperator(left, right);
+        throw new InvalidOperationException($"Unknown logical operator '{expression.Operator}'.");
+    }
 
-            while (argumentQueue.Any())
-            {
-                Expression nextArgument = argumentQueue.Dequeue();
-                tempExpression = applyOperator(tempExpression, nextArgument);
-            }
+    private static BinaryExpression Compose(Queue<Expression> argumentQueue, Func<Expression, Expression, BinaryExpression> applyOperator)
+    {
+        Expression left = argumentQueue.Dequeue();
+        Expression right = argumentQueue.Dequeue();
 
-            return tempExpression;
-        }
+        BinaryExpression tempExpression = applyOperator(left, right);
 
-        public override Expression VisitNot(NotExpression expression, Type? argument)
+        while (argumentQueue.Any())
         {
-            Expression child = Visit(expression.Child, argument);
-            return Expression.Not(child);
+            Expression nextArgument = argumentQueue.Dequeue();
+            tempExpression = applyOperator(tempExpression, nextArgument);
         }
 
-        public override Expression VisitComparison(ComparisonExpression expression, Type? argument)
-        {
-            Type commonType = ResolveCommonType(expression.Left, expression.Right);
+        return tempExpression;
+    }
 
-            Expression left = WrapInConvert(Visit(expression.Left, commonType), commonType);
-            Expression right = WrapInConvert(Visit(expression.Right, commonType), commonType);
+    public override Expression VisitNot(NotExpression expression, Type? argument)
+    {
+        Expression child = Visit(expression.Child, argument);
+        return Expression.Not(child);
+    }
 
-            switch (expression.Operator)
-            {
-                case ComparisonOperator.Equals:
-                {
-                    return Expression.Equal(left, right);
-                }
-                case ComparisonOperator.LessThan:
-                {
-                    return Expression.LessThan(left, right);
-                }
-                case ComparisonOperator.LessOrEqual:
-                {
-                    return Expression.LessThanOrEqual(left, right);
-                }
-                case ComparisonOperator.GreaterThan:
-                {
-                    return Expression.GreaterThan(left, right);
-                }
-                case ComparisonOperator.GreaterOrEqual:
-                {
-                    return Expression.GreaterThanOrEqual(left, right);
-                }
-            }
+    public override Expression VisitComparison(ComparisonExpression expression, Type? argument)
+    {
+        Type commonType = ResolveCommonType(expression.Left, expression.Right);
 
-            throw new InvalidOperationException($"Unknown comparison operator '{expression.Operator}'.");
-        }
+        Expression left = WrapInConvert(Visit(expression.Left, commonType), commonType);
+        Expression right = WrapInConvert(Visit(expression.Right, commonType), commonType);
 
-        private Type ResolveCommonType(QueryExpression left, QueryExpression right)
+        switch (expression.Operator)
         {
-            Type leftType = ResolveFixedType(left);
-
-            if (RuntimeTypeConverter.CanContainNull(leftType))
+            case ComparisonOperator.Equals:
             {
-                return leftType;
+                return Expression.Equal(left, right);
             }
-
-            if (right is NullConstantExpression)
+            case ComparisonOperator.LessThan:
             {
-                return typeof(Nullable<>).MakeGenericType(leftType);
+                return Expression.LessThan(left, right);
             }
-
-            Type? rightType = TryResolveFixedType(right);
-
-            if (rightType != null && RuntimeTypeConverter.CanContainNull(rightType))
+            case ComparisonOperator.LessOrEqual:
             {
-                return rightType;
+                return Expression.LessThanOrEqual(left, right);
             }
+            case ComparisonOperator.GreaterThan:
+            {
+                return Expression.GreaterThan(left, right);
+            }
+            case ComparisonOperator.GreaterOrEqual:
+            {
+                return Expression.GreaterThanOrEqual(left, right);
+            }
+        }
+
+        throw new InvalidOperationException($"Unknown comparison operator '{expression.Operator}'.");
+    }
+
+    private Type ResolveCommonType(QueryExpression left, QueryExpression right)
+    {
+        Type leftType = ResolveFixedType(left);
 
+        if (RuntimeTypeConverter.CanContainNull(leftType))
+        {
             return leftType;
         }
 
-        private Type ResolveFixedType(QueryExpression expression)
+        if (right is NullConstantExpression)
         {
-            Expression result = Visit(expression, null);
-            return result.Type;
+            return typeof(Nullable<>).MakeGenericType(leftType);
         }
 
-        private Type? TryResolveFixedType(QueryExpression expression)
+        Type? rightType = TryResolveFixedType(right);
+
+        if (rightType != null && RuntimeTypeConverter.CanContainNull(rightType))
         {
-            if (expression is CountExpression)
-            {
-                return typeof(int);
-            }
+            return rightType;
+        }
 
-            if (expression is ResourceFieldChainExpression chain)
-            {
-                Expression child = Visit(chain, null);
-                return child.Type;
-            }
+        return leftType;
+    }
 
-            return null;
-        }
+    private Type ResolveFixedType(QueryExpression expression)
+    {
+        Expression result = Visit(expression, null);
+        return result.Type;
+    }
 
-        private static Expression WrapInConvert(Expression expression, Type? targetType)
+    private Type? TryResolveFixedType(QueryExpression expression)
+    {
+        if (expression is CountExpression)
         {
-            try
-            {
-                return targetType != null && expression.Type != targetType ? Expression.Convert(expression, targetType) : expression;
-            }
-            catch (InvalidOperationException exception)
-            {
-                throw new InvalidQueryException("Query creation failed due to incompatible types.", exception);
-            }
+            return typeof(int);
         }
 
-        public override Expression VisitNullConstant(NullConstantExpression expression, Type? expressionType)
+        if (expression is ResourceFieldChainExpression chain)
         {
-            return NullConstant;
+            Expression child = Visit(chain, null);
+            return child.Type;
         }
 
-        public override Expression VisitLiteralConstant(LiteralConstantExpression expression, Type? expressionType)
-        {
-            object? convertedValue = expressionType != null ? ConvertTextToTargetType(expression.Value, expressionType) : expression.Value;
+        return null;
+    }
 
-            return CreateTupleAccessExpressionForConstant(convertedValue, expressionType ?? typeof(string));
+    private static Expression WrapInConvert(Expression expression, Type? targetType)
+    {
+        try
+        {
+            return targetType != null && expression.Type != targetType ? Expression.Convert(expression, targetType) : expression;
+        }
+        catch (InvalidOperationException exception)
+        {
+            throw new InvalidQueryException("Query creation failed due to incompatible types.", exception);
         }
+    }
+
+    public override Expression VisitNullConstant(NullConstantExpression expression, Type? expressionType)
+    {
+        return NullConstant;
+    }
+
+    public override Expression VisitLiteralConstant(LiteralConstantExpression expression, Type? expressionType)
+    {
+        object? convertedValue = expressionType != null ? ConvertTextToTargetType(expression.Value, expressionType) : expression.Value;
+
+        return convertedValue.CreateTupleAccessExpressionForConstant(expressionType ?? typeof(string));
+    }
 
-        private static object? ConvertTextToTargetType(string text, Type targetType)
+    private static object? ConvertTextToTargetType(string text, Type targetType)
+    {
+        try
         {
-            try
-            {
-                return RuntimeTypeConverter.ConvertType(text, targetType);
-            }
-            catch (FormatException exception)
-            {
-                throw new InvalidQueryException("Query creation failed due to incompatible types.", exception);
-            }
+            return RuntimeTypeConverter.ConvertType(text, targetType);
+        }
+        catch (FormatException exception)
+        {
+            throw new InvalidQueryException("Query creation failed due to incompatible types.", exception);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/SparseFieldSetCache.cs b/src/JsonApiDotNetCore/Queries/Internal/SparseFieldSetCache.cs
index 2915882d10..0cad7968c4 100644
--- a/src/JsonApiDotNetCore/Queries/Internal/SparseFieldSetCache.cs
+++ b/src/JsonApiDotNetCore/Queries/Internal/SparseFieldSetCache.cs
@@ -1,172 +1,165 @@
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries.Internal
+namespace JsonApiDotNetCore.Queries.Internal;
+
+/// <inheritdoc />
+public sealed class SparseFieldSetCache : ISparseFieldSetCache
 {
-    /// <inheritdoc />
-    public sealed class SparseFieldSetCache : ISparseFieldSetCache
-    {
-        private static readonly ConcurrentDictionary<ResourceType, SparseFieldSetExpression> ViewableFieldSetCache = new();
+    private static readonly ConcurrentDictionary<ResourceType, SparseFieldSetExpression> ViewableFieldSetCache = new();
 
-        private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
-        private readonly Lazy<IDictionary<ResourceType, IImmutableSet<ResourceFieldAttribute>>> _lazySourceTable;
-        private readonly IDictionary<ResourceType, IImmutableSet<ResourceFieldAttribute>> _visitedTable;
+    private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
+    private readonly Lazy<IDictionary<ResourceType, IImmutableSet<ResourceFieldAttribute>>> _lazySourceTable;
+    private readonly IDictionary<ResourceType, IImmutableSet<ResourceFieldAttribute>> _visitedTable;
 
-        public SparseFieldSetCache(IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor)
-        {
-            ArgumentGuard.NotNull(constraintProviders, nameof(constraintProviders));
-            ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
+    public SparseFieldSetCache(IEnumerable<IQueryConstraintProvider> constraintProviders, IResourceDefinitionAccessor resourceDefinitionAccessor)
+    {
+        ArgumentGuard.NotNull(constraintProviders, nameof(constraintProviders));
+        ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
 
-            _resourceDefinitionAccessor = resourceDefinitionAccessor;
-            _lazySourceTable = new Lazy<IDictionary<ResourceType, IImmutableSet<ResourceFieldAttribute>>>(() => BuildSourceTable(constraintProviders));
-            _visitedTable = new Dictionary<ResourceType, IImmutableSet<ResourceFieldAttribute>>();
-        }
+        _resourceDefinitionAccessor = resourceDefinitionAccessor;
+        _lazySourceTable = new Lazy<IDictionary<ResourceType, IImmutableSet<ResourceFieldAttribute>>>(() => BuildSourceTable(constraintProviders));
+        _visitedTable = new Dictionary<ResourceType, IImmutableSet<ResourceFieldAttribute>>();
+    }
 
-        private static IDictionary<ResourceType, IImmutableSet<ResourceFieldAttribute>> BuildSourceTable(
-            IEnumerable<IQueryConstraintProvider> constraintProviders)
-        {
-            // @formatter:wrap_chained_method_calls chop_always
-            // @formatter:keep_existing_linebreaks true
+    private static IDictionary<ResourceType, IImmutableSet<ResourceFieldAttribute>> BuildSourceTable(IEnumerable<IQueryConstraintProvider> constraintProviders)
+    {
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
 
-            KeyValuePair<ResourceType, SparseFieldSetExpression>[] sparseFieldTables = constraintProviders
-                .SelectMany(provider => provider.GetConstraints())
-                .Where(constraint => constraint.Scope == null)
-                .Select(constraint => constraint.Expression)
-                .OfType<SparseFieldTableExpression>()
-                .Select(expression => expression.Table)
-                .SelectMany(table => table)
-                .ToArray();
+        KeyValuePair<ResourceType, SparseFieldSetExpression>[] sparseFieldTables = constraintProviders
+            .SelectMany(provider => provider.GetConstraints())
+            .Where(constraint => constraint.Scope == null)
+            .Select(constraint => constraint.Expression)
+            .OfType<SparseFieldTableExpression>()
+            .Select(expression => expression.Table)
+            .SelectMany(table => table)
+            .ToArray();
 
-            // @formatter:keep_existing_linebreaks restore
-            // @formatter:wrap_chained_method_calls restore
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
 
-            var mergedTable = new Dictionary<ResourceType, ImmutableHashSet<ResourceFieldAttribute>.Builder>();
+        var mergedTable = new Dictionary<ResourceType, ImmutableHashSet<ResourceFieldAttribute>.Builder>();
 
-            foreach ((ResourceType resourceType, SparseFieldSetExpression sparseFieldSet) in sparseFieldTables)
+        foreach ((ResourceType resourceType, SparseFieldSetExpression sparseFieldSet) in sparseFieldTables)
+        {
+            if (!mergedTable.ContainsKey(resourceType))
             {
-                if (!mergedTable.ContainsKey(resourceType))
-                {
-                    mergedTable[resourceType] = ImmutableHashSet.CreateBuilder<ResourceFieldAttribute>();
-                }
-
-                AddSparseFieldsToSet(sparseFieldSet.Fields, mergedTable[resourceType]);
+                mergedTable[resourceType] = ImmutableHashSet.CreateBuilder<ResourceFieldAttribute>();
             }
 
-            return mergedTable.ToDictionary(pair => pair.Key, pair => (IImmutableSet<ResourceFieldAttribute>)pair.Value.ToImmutable());
+            AddSparseFieldsToSet(sparseFieldSet.Fields, mergedTable[resourceType]);
         }
 
-        private static void AddSparseFieldsToSet(IImmutableSet<ResourceFieldAttribute> sparseFieldsToAdd,
-            ImmutableHashSet<ResourceFieldAttribute>.Builder sparseFieldSetBuilder)
+        return mergedTable.ToDictionary(pair => pair.Key, pair => (IImmutableSet<ResourceFieldAttribute>)pair.Value.ToImmutable());
+    }
+
+    private static void AddSparseFieldsToSet(IImmutableSet<ResourceFieldAttribute> sparseFieldsToAdd,
+        ImmutableHashSet<ResourceFieldAttribute>.Builder sparseFieldSetBuilder)
+    {
+        foreach (ResourceFieldAttribute field in sparseFieldsToAdd)
         {
-            foreach (ResourceFieldAttribute field in sparseFieldsToAdd)
-            {
-                sparseFieldSetBuilder.Add(field);
-            }
+            sparseFieldSetBuilder.Add(field);
         }
+    }
 
-        /// <inheritdoc />
-        public IImmutableSet<ResourceFieldAttribute> GetSparseFieldSetForQuery(ResourceType resourceType)
+    /// <inheritdoc />
+    public IImmutableSet<ResourceFieldAttribute> GetSparseFieldSetForQuery(ResourceType resourceType)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+
+        if (!_visitedTable.ContainsKey(resourceType))
         {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+            SparseFieldSetExpression? inputExpression = _lazySourceTable.Value.TryGetValue(resourceType, out IImmutableSet<ResourceFieldAttribute>? inputFields)
+                ? new SparseFieldSetExpression(inputFields)
+                : null;
 
-            if (!_visitedTable.ContainsKey(resourceType))
-            {
-                SparseFieldSetExpression? inputExpression =
-                    _lazySourceTable.Value.TryGetValue(resourceType, out IImmutableSet<ResourceFieldAttribute>? inputFields)
-                        ? new SparseFieldSetExpression(inputFields)
-                        : null;
+            SparseFieldSetExpression? outputExpression = _resourceDefinitionAccessor.OnApplySparseFieldSet(resourceType, inputExpression);
 
-                SparseFieldSetExpression? outputExpression = _resourceDefinitionAccessor.OnApplySparseFieldSet(resourceType, inputExpression);
+            IImmutableSet<ResourceFieldAttribute> outputFields = outputExpression == null
+                ? ImmutableHashSet<ResourceFieldAttribute>.Empty
+                : outputExpression.Fields;
 
-                IImmutableSet<ResourceFieldAttribute> outputFields = outputExpression == null
-                    ? ImmutableHashSet<ResourceFieldAttribute>.Empty
-                    : outputExpression.Fields;
+            _visitedTable[resourceType] = outputFields;
+        }
 
-                _visitedTable[resourceType] = outputFields;
-            }
+        return _visitedTable[resourceType];
+    }
 
-            return _visitedTable[resourceType];
-        }
+    /// <inheritdoc />
+    public IImmutableSet<AttrAttribute> GetIdAttributeSetForRelationshipQuery(ResourceType resourceType)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-        /// <inheritdoc />
-        public IImmutableSet<AttrAttribute> GetIdAttributeSetForRelationshipQuery(ResourceType resourceType)
-        {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+        AttrAttribute idAttribute = resourceType.GetAttributeByPropertyName(nameof(Identifiable<object>.Id));
+        var inputExpression = new SparseFieldSetExpression(ImmutableHashSet.Create<ResourceFieldAttribute>(idAttribute));
 
-            AttrAttribute idAttribute = resourceType.GetAttributeByPropertyName(nameof(Identifiable<object>.Id));
-            var inputExpression = new SparseFieldSetExpression(ImmutableHashSet.Create<ResourceFieldAttribute>(idAttribute));
+        // Intentionally not cached, as we are fetching ID only (ignoring any sparse fieldset that came from query string).
+        SparseFieldSetExpression? outputExpression = _resourceDefinitionAccessor.OnApplySparseFieldSet(resourceType, inputExpression);
 
-            // Intentionally not cached, as we are fetching ID only (ignoring any sparse fieldset that came from query string).
-            SparseFieldSetExpression? outputExpression = _resourceDefinitionAccessor.OnApplySparseFieldSet(resourceType, inputExpression);
+        ImmutableHashSet<AttrAttribute> outputAttributes = outputExpression == null
+            ? ImmutableHashSet<AttrAttribute>.Empty
+            : outputExpression.Fields.OfType<AttrAttribute>().ToImmutableHashSet();
 
-            ImmutableHashSet<AttrAttribute> outputAttributes = outputExpression == null
-                ? ImmutableHashSet<AttrAttribute>.Empty
-                : outputExpression.Fields.OfType<AttrAttribute>().ToImmutableHashSet();
+        outputAttributes = outputAttributes.Add(idAttribute);
+        return outputAttributes;
+    }
 
-            outputAttributes = outputAttributes.Add(idAttribute);
-            return outputAttributes;
-        }
+    /// <inheritdoc />
+    public IImmutableSet<ResourceFieldAttribute> GetSparseFieldSetForSerializer(ResourceType resourceType)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-        /// <inheritdoc />
-        public IImmutableSet<ResourceFieldAttribute> GetSparseFieldSetForSerializer(ResourceType resourceType)
+        if (!_visitedTable.ContainsKey(resourceType))
         {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+            SparseFieldSetExpression inputExpression = _lazySourceTable.Value.TryGetValue(resourceType, out IImmutableSet<ResourceFieldAttribute>? inputFields)
+                ? new SparseFieldSetExpression(inputFields)
+                : GetCachedViewableFieldSet(resourceType);
 
-            if (!_visitedTable.ContainsKey(resourceType))
-            {
-                SparseFieldSetExpression inputExpression =
-                    _lazySourceTable.Value.TryGetValue(resourceType, out IImmutableSet<ResourceFieldAttribute>? inputFields)
-                        ? new SparseFieldSetExpression(inputFields)
-                        : GetCachedViewableFieldSet(resourceType);
+            SparseFieldSetExpression? outputExpression = _resourceDefinitionAccessor.OnApplySparseFieldSet(resourceType, inputExpression);
 
-                SparseFieldSetExpression? outputExpression = _resourceDefinitionAccessor.OnApplySparseFieldSet(resourceType, inputExpression);
+            IImmutableSet<ResourceFieldAttribute> outputFields = outputExpression == null
+                ? GetCachedViewableFieldSet(resourceType).Fields
+                : inputExpression.Fields.Intersect(outputExpression.Fields);
 
-                IImmutableSet<ResourceFieldAttribute> outputFields = outputExpression == null
-                    ? GetCachedViewableFieldSet(resourceType).Fields
-                    : inputExpression.Fields.Intersect(outputExpression.Fields);
+            _visitedTable[resourceType] = outputFields;
+        }
 
-                _visitedTable[resourceType] = outputFields;
-            }
+        return _visitedTable[resourceType];
+    }
 
-            return _visitedTable[resourceType];
+    private static SparseFieldSetExpression GetCachedViewableFieldSet(ResourceType resourceType)
+    {
+        if (!ViewableFieldSetCache.TryGetValue(resourceType, out SparseFieldSetExpression? fieldSet))
+        {
+            IImmutableSet<ResourceFieldAttribute> viewableFields = GetViewableFields(resourceType);
+            fieldSet = new SparseFieldSetExpression(viewableFields);
+            ViewableFieldSetCache[resourceType] = fieldSet;
         }
 
-        private static SparseFieldSetExpression GetCachedViewableFieldSet(ResourceType resourceType)
-        {
-            if (!ViewableFieldSetCache.TryGetValue(resourceType, out SparseFieldSetExpression? fieldSet))
-            {
-                IImmutableSet<ResourceFieldAttribute> viewableFields = GetViewableFields(resourceType);
-                fieldSet = new SparseFieldSetExpression(viewableFields);
-                ViewableFieldSetCache[resourceType] = fieldSet;
-            }
+        return fieldSet;
+    }
 
-            return fieldSet;
-        }
+    private static IImmutableSet<ResourceFieldAttribute> GetViewableFields(ResourceType resourceType)
+    {
+        ImmutableHashSet<ResourceFieldAttribute>.Builder fieldSetBuilder = ImmutableHashSet.CreateBuilder<ResourceFieldAttribute>();
 
-        private static IImmutableSet<ResourceFieldAttribute> GetViewableFields(ResourceType resourceType)
+        foreach (AttrAttribute attribute in resourceType.Attributes.Where(attr => attr.Capabilities.HasFlag(AttrCapabilities.AllowView)))
         {
-            ImmutableHashSet<ResourceFieldAttribute>.Builder fieldSetBuilder = ImmutableHashSet.CreateBuilder<ResourceFieldAttribute>();
-
-            foreach (AttrAttribute attribute in resourceType.Attributes.Where(attr => attr.Capabilities.HasFlag(AttrCapabilities.AllowView)))
-            {
-                fieldSetBuilder.Add(attribute);
-            }
+            fieldSetBuilder.Add(attribute);
+        }
 
-            fieldSetBuilder.AddRange(resourceType.Relationships);
+        fieldSetBuilder.AddRange(resourceType.Relationships);
 
-            return fieldSetBuilder.ToImmutable();
-        }
+        return fieldSetBuilder.ToImmutable();
+    }
 
-        public void Reset()
-        {
-            _visitedTable.Clear();
-        }
+    public void Reset()
+    {
+        _visitedTable.Clear();
     }
 }
diff --git a/src/JsonApiDotNetCore/Queries/Internal/SystemExpressionExtensions.cs b/src/JsonApiDotNetCore/Queries/Internal/SystemExpressionExtensions.cs
new file mode 100644
index 0000000000..a314d5f20a
--- /dev/null
+++ b/src/JsonApiDotNetCore/Queries/Internal/SystemExpressionExtensions.cs
@@ -0,0 +1,33 @@
+using System.Linq.Expressions;
+using System.Reflection;
+
+namespace JsonApiDotNetCore.Queries.Internal;
+
+internal static class SystemExpressionExtensions
+{
+    public static Expression CreateTupleAccessExpressionForConstant(this object? value, Type type)
+    {
+        // To enable efficient query plan caching, inline constants (that vary per request) should be converted into query parameters.
+        // https://stackoverflow.com/questions/54075758/building-a-parameterized-entityframework-core-expression
+
+        // This method can be used to change a query like:
+        //   SELECT ... FROM ... WHERE x."Age" = 3
+        // into:
+        //   SELECT ... FROM ... WHERE x."Age" = @p0
+
+        // The code below builds the next expression for a type T that is unknown at compile time:
+        //   Expression.Property(Expression.Constant(Tuple.Create<T>(value)), "Item1")
+        // Which represents the next C# code:
+        //   Tuple.Create<T>(value).Item1;
+
+        MethodInfo tupleCreateUnboundMethod = typeof(Tuple).GetMethods()
+            .Single(method => method.Name == "Create" && method.IsGenericMethod && method.GetGenericArguments().Length == 1);
+
+        MethodInfo tupleCreateClosedMethod = tupleCreateUnboundMethod.MakeGenericMethod(type);
+
+        ConstantExpression constantExpression = Expression.Constant(value, type);
+
+        MethodCallExpression tupleCreateCall = Expression.Call(tupleCreateClosedMethod, constantExpression);
+        return Expression.Property(tupleCreateCall, "Item1");
+    }
+}
diff --git a/src/JsonApiDotNetCore/Queries/PaginationContext.cs b/src/JsonApiDotNetCore/Queries/PaginationContext.cs
index 466659fe22..6dfa698044 100644
--- a/src/JsonApiDotNetCore/Queries/PaginationContext.cs
+++ b/src/JsonApiDotNetCore/Queries/PaginationContext.cs
@@ -1,25 +1,23 @@
-using System;
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCore.Queries
+namespace JsonApiDotNetCore.Queries;
+
+/// <inheritdoc />
+internal sealed class PaginationContext : IPaginationContext
 {
     /// <inheritdoc />
-    internal sealed class PaginationContext : IPaginationContext
-    {
-        /// <inheritdoc />
-        public PageNumber PageNumber { get; set; } = PageNumber.ValueOne;
+    public PageNumber PageNumber { get; set; } = PageNumber.ValueOne;
 
-        /// <inheritdoc />
-        public PageSize? PageSize { get; set; }
+    /// <inheritdoc />
+    public PageSize? PageSize { get; set; }
 
-        /// <inheritdoc />
-        public bool IsPageFull { get; set; }
+    /// <inheritdoc />
+    public bool IsPageFull { get; set; }
 
-        /// <inheritdoc />
-        public int? TotalResourceCount { get; set; }
+    /// <inheritdoc />
+    public int? TotalResourceCount { get; set; }
 
-        /// <inheritdoc />
-        public int? TotalPageCount =>
-            TotalResourceCount == null || PageSize == null ? null : (int?)Math.Ceiling((decimal)TotalResourceCount.Value / PageSize.Value);
-    }
+    /// <inheritdoc />
+    public int? TotalPageCount =>
+        TotalResourceCount == null || PageSize == null ? null : (int?)Math.Ceiling((decimal)TotalResourceCount.Value / PageSize.Value);
 }
diff --git a/src/JsonApiDotNetCore/Queries/QueryLayer.cs b/src/JsonApiDotNetCore/Queries/QueryLayer.cs
index 9d32ca89d9..be1d657cfe 100644
--- a/src/JsonApiDotNetCore/Queries/QueryLayer.cs
+++ b/src/JsonApiDotNetCore/Queries/QueryLayer.cs
@@ -1,126 +1,123 @@
-using System;
-using System.Collections.Generic;
 using System.Text;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Queries
+namespace JsonApiDotNetCore.Queries;
+
+/// <summary>
+/// A nested data structure that contains <see cref="QueryExpression" /> constraints per resource type.
+/// </summary>
+[PublicAPI]
+public sealed class QueryLayer
 {
-    /// <summary>
-    /// A nested data structure that contains <see cref="QueryExpression" /> constraints per resource type.
-    /// </summary>
-    [PublicAPI]
-    public sealed class QueryLayer
-    {
-        public ResourceType ResourceType { get; }
+    public ResourceType ResourceType { get; }
 
-        public IncludeExpression? Include { get; set; }
-        public FilterExpression? Filter { get; set; }
-        public SortExpression? Sort { get; set; }
-        public PaginationExpression? Pagination { get; set; }
-        public IDictionary<ResourceFieldAttribute, QueryLayer?>? Projection { get; set; }
+    public IncludeExpression? Include { get; set; }
+    public FilterExpression? Filter { get; set; }
+    public SortExpression? Sort { get; set; }
+    public PaginationExpression? Pagination { get; set; }
+    public IDictionary<ResourceFieldAttribute, QueryLayer?>? Projection { get; set; }
 
-        public QueryLayer(ResourceType resourceType)
-        {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+    public QueryLayer(ResourceType resourceType)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            ResourceType = resourceType;
-        }
+        ResourceType = resourceType;
+    }
 
-        public override string ToString()
-        {
-            var builder = new StringBuilder();
+    public override string ToString()
+    {
+        var builder = new StringBuilder();
 
-            var writer = new IndentingStringWriter(builder);
-            WriteLayer(writer, this);
+        var writer = new IndentingStringWriter(builder);
+        WriteLayer(writer, this);
 
-            return builder.ToString();
-        }
+        return builder.ToString();
+    }
 
-        private static void WriteLayer(IndentingStringWriter writer, QueryLayer layer, string? prefix = null)
+    private static void WriteLayer(IndentingStringWriter writer, QueryLayer layer, string? prefix = null)
+    {
+        writer.WriteLine($"{prefix}{nameof(QueryLayer)}<{layer.ResourceType.ClrType.Name}>");
+
+        using (writer.Indent())
         {
-            writer.WriteLine($"{prefix}{nameof(QueryLayer)}<{layer.ResourceType.ClrType.Name}>");
+            if (layer.Include != null)
+            {
+                writer.WriteLine($"{nameof(Include)}: {layer.Include}");
+            }
 
-            using (writer.Indent())
+            if (layer.Filter != null)
             {
-                if (layer.Include != null)
-                {
-                    writer.WriteLine($"{nameof(Include)}: {layer.Include}");
-                }
+                writer.WriteLine($"{nameof(Filter)}: {layer.Filter}");
+            }
 
-                if (layer.Filter != null)
-                {
-                    writer.WriteLine($"{nameof(Filter)}: {layer.Filter}");
-                }
+            if (layer.Sort != null)
+            {
+                writer.WriteLine($"{nameof(Sort)}: {layer.Sort}");
+            }
 
-                if (layer.Sort != null)
-                {
-                    writer.WriteLine($"{nameof(Sort)}: {layer.Sort}");
-                }
+            if (layer.Pagination != null)
+            {
+                writer.WriteLine($"{nameof(Pagination)}: {layer.Pagination}");
+            }
 
-                if (layer.Pagination != null)
-                {
-                    writer.WriteLine($"{nameof(Pagination)}: {layer.Pagination}");
-                }
+            if (!layer.Projection.IsNullOrEmpty())
+            {
+                writer.WriteLine(nameof(Projection));
 
-                if (!layer.Projection.IsNullOrEmpty())
+                using (writer.Indent())
                 {
-                    writer.WriteLine(nameof(Projection));
-
-                    using (writer.Indent())
+                    foreach ((ResourceFieldAttribute field, QueryLayer? nextLayer) in layer.Projection)
                     {
-                        foreach ((ResourceFieldAttribute field, QueryLayer? nextLayer) in layer.Projection)
+                        if (nextLayer == null)
+                        {
+                            writer.WriteLine(field.ToString());
+                        }
+                        else
                         {
-                            if (nextLayer == null)
-                            {
-                                writer.WriteLine(field.ToString());
-                            }
-                            else
-                            {
-                                WriteLayer(writer, nextLayer, $"{field.PublicName}: ");
-                            }
+                            WriteLayer(writer, nextLayer, $"{field.PublicName}: ");
                         }
                     }
                 }
             }
         }
+    }
+
+    private sealed class IndentingStringWriter : IDisposable
+    {
+        private readonly StringBuilder _builder;
+        private int _indentDepth;
 
-        private sealed class IndentingStringWriter : IDisposable
+        public IndentingStringWriter(StringBuilder builder)
         {
-            private readonly StringBuilder _builder;
-            private int _indentDepth;
+            _builder = builder;
+        }
 
-            public IndentingStringWriter(StringBuilder builder)
+        public void WriteLine(string? line)
+        {
+            if (_indentDepth > 0)
             {
-                _builder = builder;
+                _builder.Append(new string(' ', _indentDepth * 2));
             }
 
-            public void WriteLine(string? line)
-            {
-                if (_indentDepth > 0)
-                {
-                    _builder.Append(new string(' ', _indentDepth * 2));
-                }
-
-                _builder.AppendLine(line);
-            }
+            _builder.AppendLine(line);
+        }
 
-            public IndentingStringWriter Indent()
-            {
-                WriteLine("{");
-                _indentDepth++;
-                return this;
-            }
+        public IndentingStringWriter Indent()
+        {
+            WriteLine("{");
+            _indentDepth++;
+            return this;
+        }
 
-            public void Dispose()
+        public void Dispose()
+        {
+            if (_indentDepth > 0)
             {
-                if (_indentDepth > 0)
-                {
-                    _indentDepth--;
-                    WriteLine("}");
-                }
+                _indentDepth--;
+                WriteLine("}");
             }
         }
     }
diff --git a/src/JsonApiDotNetCore/Queries/TopFieldSelection.cs b/src/JsonApiDotNetCore/Queries/TopFieldSelection.cs
index d5203ff537..d2ebabde52 100644
--- a/src/JsonApiDotNetCore/Queries/TopFieldSelection.cs
+++ b/src/JsonApiDotNetCore/Queries/TopFieldSelection.cs
@@ -1,23 +1,22 @@
-namespace JsonApiDotNetCore.Queries
+namespace JsonApiDotNetCore.Queries;
+
+/// <summary>
+/// Indicates how to override sparse fieldset selection coming from constraints.
+/// </summary>
+public enum TopFieldSelection
 {
     /// <summary>
-    /// Indicates how to override sparse fieldset selection coming from constraints.
+    /// Preserves the existing selection of attributes and/or relationships.
     /// </summary>
-    public enum TopFieldSelection
-    {
-        /// <summary>
-        /// Preserves the existing selection of attributes and/or relationships.
-        /// </summary>
-        PreserveExisting,
+    PreserveExisting,
 
-        /// <summary>
-        /// Preserves included relationships, but selects all resource attributes.
-        /// </summary>
-        WithAllAttributes,
+    /// <summary>
+    /// Preserves included relationships, but selects all resource attributes.
+    /// </summary>
+    WithAllAttributes,
 
-        /// <summary>
-        /// Discards any included relationships and selects only resource ID.
-        /// </summary>
-        OnlyIdAttribute
-    }
+    /// <summary>
+    /// Discards any included relationships and selects only resource ID.
+    /// </summary>
+    OnlyIdAttribute
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/IFilterQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/IFilterQueryStringParameterReader.cs
index 49caf84786..b9a7fb8c6b 100644
--- a/src/JsonApiDotNetCore/QueryStrings/IFilterQueryStringParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/IFilterQueryStringParameterReader.cs
@@ -1,13 +1,12 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries;
 
-namespace JsonApiDotNetCore.QueryStrings
+namespace JsonApiDotNetCore.QueryStrings;
+
+/// <summary>
+/// Reads the 'filter' query string parameter and produces a set of query constraints from it.
+/// </summary>
+[PublicAPI]
+public interface IFilterQueryStringParameterReader : IQueryStringParameterReader, IQueryConstraintProvider
 {
-    /// <summary>
-    /// Reads the 'filter' query string parameter and produces a set of query constraints from it.
-    /// </summary>
-    [PublicAPI]
-    public interface IFilterQueryStringParameterReader : IQueryStringParameterReader, IQueryConstraintProvider
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/IIncludeQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/IIncludeQueryStringParameterReader.cs
index e348f3635c..1993d249fc 100644
--- a/src/JsonApiDotNetCore/QueryStrings/IIncludeQueryStringParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/IIncludeQueryStringParameterReader.cs
@@ -1,13 +1,12 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries;
 
-namespace JsonApiDotNetCore.QueryStrings
+namespace JsonApiDotNetCore.QueryStrings;
+
+/// <summary>
+/// Reads the 'include' query string parameter and produces a set of query constraints from it.
+/// </summary>
+[PublicAPI]
+public interface IIncludeQueryStringParameterReader : IQueryStringParameterReader, IQueryConstraintProvider
 {
-    /// <summary>
-    /// Reads the 'include' query string parameter and produces a set of query constraints from it.
-    /// </summary>
-    [PublicAPI]
-    public interface IIncludeQueryStringParameterReader : IQueryStringParameterReader, IQueryConstraintProvider
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/IPaginationQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/IPaginationQueryStringParameterReader.cs
index c41f417435..198bff6ff8 100644
--- a/src/JsonApiDotNetCore/QueryStrings/IPaginationQueryStringParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/IPaginationQueryStringParameterReader.cs
@@ -1,13 +1,12 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries;
 
-namespace JsonApiDotNetCore.QueryStrings
+namespace JsonApiDotNetCore.QueryStrings;
+
+/// <summary>
+/// Reads the 'page' query string parameter and produces a set of query constraints from it.
+/// </summary>
+[PublicAPI]
+public interface IPaginationQueryStringParameterReader : IQueryStringParameterReader, IQueryConstraintProvider
 {
-    /// <summary>
-    /// Reads the 'page' query string parameter and produces a set of query constraints from it.
-    /// </summary>
-    [PublicAPI]
-    public interface IPaginationQueryStringParameterReader : IQueryStringParameterReader, IQueryConstraintProvider
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/IQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/IQueryStringParameterReader.cs
index ebfdac0976..d4aa74df03 100644
--- a/src/JsonApiDotNetCore/QueryStrings/IQueryStringParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/IQueryStringParameterReader.cs
@@ -1,31 +1,30 @@
 using JsonApiDotNetCore.Controllers.Annotations;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCore.QueryStrings
+namespace JsonApiDotNetCore.QueryStrings;
+
+/// <summary>
+/// The interface to implement for processing a specific type of query string parameter.
+/// </summary>
+public interface IQueryStringParameterReader
 {
     /// <summary>
-    /// The interface to implement for processing a specific type of query string parameter.
+    /// Indicates whether this reader supports empty query string parameter values.
     /// </summary>
-    public interface IQueryStringParameterReader
-    {
-        /// <summary>
-        /// Indicates whether this reader supports empty query string parameter values.
-        /// </summary>
-        bool AllowEmptyValue { get; }
+    bool AllowEmptyValue { get; }
 
-        /// <summary>
-        /// Indicates whether usage of this query string parameter is blocked using <see cref="DisableQueryStringAttribute" /> on a controller.
-        /// </summary>
-        bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute);
+    /// <summary>
+    /// Indicates whether usage of this query string parameter is blocked using <see cref="DisableQueryStringAttribute" /> on a controller.
+    /// </summary>
+    bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute);
 
-        /// <summary>
-        /// Indicates whether this reader can handle the specified query string parameter.
-        /// </summary>
-        bool CanRead(string parameterName);
+    /// <summary>
+    /// Indicates whether this reader can handle the specified query string parameter.
+    /// </summary>
+    bool CanRead(string parameterName);
 
-        /// <summary>
-        /// Reads the value of the query string parameter.
-        /// </summary>
-        void Read(string parameterName, StringValues parameterValue);
-    }
+    /// <summary>
+    /// Reads the value of the query string parameter.
+    /// </summary>
+    void Read(string parameterName, StringValues parameterValue);
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/IQueryStringReader.cs b/src/JsonApiDotNetCore/QueryStrings/IQueryStringReader.cs
index 04d3ffe26f..935785658b 100644
--- a/src/JsonApiDotNetCore/QueryStrings/IQueryStringReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/IQueryStringReader.cs
@@ -1,18 +1,17 @@
 using JsonApiDotNetCore.Controllers.Annotations;
 
-namespace JsonApiDotNetCore.QueryStrings
+namespace JsonApiDotNetCore.QueryStrings;
+
+/// <summary>
+/// Reads and processes the various query string parameters for a HTTP request.
+/// </summary>
+public interface IQueryStringReader
 {
     /// <summary>
-    /// Reads and processes the various query string parameters for a HTTP request.
+    /// Reads and processes the key/value pairs from the request query string.
     /// </summary>
-    public interface IQueryStringReader
-    {
-        /// <summary>
-        /// Reads and processes the key/value pairs from the request query string.
-        /// </summary>
-        /// <param name="disableQueryStringAttribute">
-        /// The <see cref="DisableQueryStringAttribute" /> if set on the controller that is targeted by the current request.
-        /// </param>
-        void ReadAll(DisableQueryStringAttribute? disableQueryStringAttribute);
-    }
+    /// <param name="disableQueryStringAttribute">
+    /// The <see cref="DisableQueryStringAttribute" /> if set on the controller that is targeted by the current request.
+    /// </param>
+    void ReadAll(DisableQueryStringAttribute? disableQueryStringAttribute);
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/IRequestQueryStringAccessor.cs b/src/JsonApiDotNetCore/QueryStrings/IRequestQueryStringAccessor.cs
index 52a5a5eace..60b7a460a8 100644
--- a/src/JsonApiDotNetCore/QueryStrings/IRequestQueryStringAccessor.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/IRequestQueryStringAccessor.cs
@@ -1,12 +1,11 @@
 using Microsoft.AspNetCore.Http;
 
-namespace JsonApiDotNetCore.QueryStrings
+namespace JsonApiDotNetCore.QueryStrings;
+
+/// <summary>
+/// Provides access to the query string of a URL in a HTTP request.
+/// </summary>
+public interface IRequestQueryStringAccessor
 {
-    /// <summary>
-    /// Provides access to the query string of a URL in a HTTP request.
-    /// </summary>
-    public interface IRequestQueryStringAccessor
-    {
-        IQueryCollection Query { get; }
-    }
+    IQueryCollection Query { get; }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/IResourceDefinitionQueryableParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/IResourceDefinitionQueryableParameterReader.cs
index baea3e2938..9ef114e4b3 100644
--- a/src/JsonApiDotNetCore/QueryStrings/IResourceDefinitionQueryableParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/IResourceDefinitionQueryableParameterReader.cs
@@ -2,14 +2,13 @@
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.QueryStrings
+namespace JsonApiDotNetCore.QueryStrings;
+
+/// <summary>
+/// Reads custom query string parameters for which handlers on <see cref="IResourceDefinition{TResource,TId}" /> are registered and produces a set of
+/// query constraints from it.
+/// </summary>
+[PublicAPI]
+public interface IResourceDefinitionQueryableParameterReader : IQueryStringParameterReader, IQueryConstraintProvider
 {
-    /// <summary>
-    /// Reads custom query string parameters for which handlers on <see cref="IResourceDefinition{TResource,TId}" /> are registered and produces a set of
-    /// query constraints from it.
-    /// </summary>
-    [PublicAPI]
-    public interface IResourceDefinitionQueryableParameterReader : IQueryStringParameterReader, IQueryConstraintProvider
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/ISortQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/ISortQueryStringParameterReader.cs
index 1fe5f4cb51..5cb221a399 100644
--- a/src/JsonApiDotNetCore/QueryStrings/ISortQueryStringParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/ISortQueryStringParameterReader.cs
@@ -1,13 +1,12 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries;
 
-namespace JsonApiDotNetCore.QueryStrings
+namespace JsonApiDotNetCore.QueryStrings;
+
+/// <summary>
+/// Reads the 'sort' query string parameter and produces a set of query constraints from it.
+/// </summary>
+[PublicAPI]
+public interface ISortQueryStringParameterReader : IQueryStringParameterReader, IQueryConstraintProvider
 {
-    /// <summary>
-    /// Reads the 'sort' query string parameter and produces a set of query constraints from it.
-    /// </summary>
-    [PublicAPI]
-    public interface ISortQueryStringParameterReader : IQueryStringParameterReader, IQueryConstraintProvider
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/ISparseFieldSetQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/ISparseFieldSetQueryStringParameterReader.cs
index 7a307f1f40..e943121ecc 100644
--- a/src/JsonApiDotNetCore/QueryStrings/ISparseFieldSetQueryStringParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/ISparseFieldSetQueryStringParameterReader.cs
@@ -1,13 +1,12 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries;
 
-namespace JsonApiDotNetCore.QueryStrings
+namespace JsonApiDotNetCore.QueryStrings;
+
+/// <summary>
+/// Reads the 'fields' query string parameter and produces a set of query constraints from it.
+/// </summary>
+[PublicAPI]
+public interface ISparseFieldSetQueryStringParameterReader : IQueryStringParameterReader, IQueryConstraintProvider
 {
-    /// <summary>
-    /// Reads the 'fields' query string parameter and produces a set of query constraints from it.
-    /// </summary>
-    [PublicAPI]
-    public interface ISparseFieldSetQueryStringParameterReader : IQueryStringParameterReader, IQueryConstraintProvider
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/FilterQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/Internal/FilterQueryStringParameterReader.cs
index 30d1e5d904..4fcd3e63d9 100644
--- a/src/JsonApiDotNetCore/QueryStrings/Internal/FilterQueryStringParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/Internal/FilterQueryStringParameterReader.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers.Annotations;
@@ -14,168 +11,166 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCore.QueryStrings.Internal
+namespace JsonApiDotNetCore.QueryStrings.Internal;
+
+[PublicAPI]
+public class FilterQueryStringParameterReader : QueryStringParameterReader, IFilterQueryStringParameterReader
 {
-    [PublicAPI]
-    public class FilterQueryStringParameterReader : QueryStringParameterReader, IFilterQueryStringParameterReader
-    {
-        private static readonly LegacyFilterNotationConverter LegacyConverter = new();
+    private static readonly LegacyFilterNotationConverter LegacyConverter = new();
 
-        private readonly IJsonApiOptions _options;
-        private readonly QueryStringParameterScopeParser _scopeParser;
-        private readonly FilterParser _filterParser;
-        private readonly ImmutableArray<FilterExpression>.Builder _filtersInGlobalScope = ImmutableArray.CreateBuilder<FilterExpression>();
-        private readonly Dictionary<ResourceFieldChainExpression, ImmutableArray<FilterExpression>.Builder> _filtersPerScope = new();
+    private readonly IJsonApiOptions _options;
+    private readonly QueryStringParameterScopeParser _scopeParser;
+    private readonly FilterParser _filterParser;
+    private readonly ImmutableArray<FilterExpression>.Builder _filtersInGlobalScope = ImmutableArray.CreateBuilder<FilterExpression>();
+    private readonly Dictionary<ResourceFieldChainExpression, ImmutableArray<FilterExpression>.Builder> _filtersPerScope = new();
 
-        private string? _lastParameterName;
+    private string? _lastParameterName;
 
-        public bool AllowEmptyValue => false;
+    public bool AllowEmptyValue => false;
 
-        public FilterQueryStringParameterReader(IJsonApiRequest request, IResourceGraph resourceGraph, IResourceFactory resourceFactory,
-            IJsonApiOptions options)
-            : base(request, resourceGraph)
-        {
-            ArgumentGuard.NotNull(options, nameof(options));
+    public FilterQueryStringParameterReader(IJsonApiRequest request, IResourceGraph resourceGraph, IResourceFactory resourceFactory, IJsonApiOptions options)
+        : base(request, resourceGraph)
+    {
+        ArgumentGuard.NotNull(options, nameof(options));
 
-            _options = options;
-            _scopeParser = new QueryStringParameterScopeParser(FieldChainRequirements.EndsInToMany);
-            _filterParser = new FilterParser(resourceFactory, ValidateSingleField);
-        }
+        _options = options;
+        _scopeParser = new QueryStringParameterScopeParser(FieldChainRequirements.EndsInToMany);
+        _filterParser = new FilterParser(resourceFactory, ValidateSingleField);
+    }
 
-        protected void ValidateSingleField(ResourceFieldAttribute field, ResourceType resourceType, string path)
+    protected void ValidateSingleField(ResourceFieldAttribute field, ResourceType resourceType, string path)
+    {
+        if (field is AttrAttribute attribute && !attribute.Capabilities.HasFlag(AttrCapabilities.AllowFilter))
         {
-            if (field is AttrAttribute attribute && !attribute.Capabilities.HasFlag(AttrCapabilities.AllowFilter))
-            {
-                throw new InvalidQueryStringParameterException(_lastParameterName!, "Filtering on the requested attribute is not allowed.",
-                    $"Filtering on attribute '{attribute.PublicName}' is not allowed.");
-            }
+            throw new InvalidQueryStringParameterException(_lastParameterName!, "Filtering on the requested attribute is not allowed.",
+                $"Filtering on attribute '{attribute.PublicName}' is not allowed.");
         }
+    }
 
-        /// <inheritdoc />
-        public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
-        {
-            ArgumentGuard.NotNull(disableQueryStringAttribute, nameof(disableQueryStringAttribute));
+    /// <inheritdoc />
+    public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
+    {
+        ArgumentGuard.NotNull(disableQueryStringAttribute, nameof(disableQueryStringAttribute));
 
-            return !IsAtomicOperationsRequest && !disableQueryStringAttribute.ContainsParameter(JsonApiQueryStringParameters.Filter);
-        }
+        return !IsAtomicOperationsRequest && !disableQueryStringAttribute.ContainsParameter(JsonApiQueryStringParameters.Filter);
+    }
 
-        /// <inheritdoc />
-        public virtual bool CanRead(string parameterName)
-        {
-            ArgumentGuard.NotNullNorEmpty(parameterName, nameof(parameterName));
+    /// <inheritdoc />
+    public virtual bool CanRead(string parameterName)
+    {
+        ArgumentGuard.NotNullNorEmpty(parameterName, nameof(parameterName));
 
-            bool isNested = parameterName.StartsWith("filter[", StringComparison.Ordinal) && parameterName.EndsWith("]", StringComparison.Ordinal);
-            return parameterName == "filter" || isNested;
-        }
+        bool isNested = parameterName.StartsWith("filter[", StringComparison.Ordinal) && parameterName.EndsWith("]", StringComparison.Ordinal);
+        return parameterName == "filter" || isNested;
+    }
 
-        /// <inheritdoc />
-        public virtual void Read(string parameterName, StringValues parameterValue)
-        {
-            _lastParameterName = parameterName;
+    /// <inheritdoc />
+    public virtual void Read(string parameterName, StringValues parameterValue)
+    {
+        _lastParameterName = parameterName;
 
-            foreach (string value in parameterValue.SelectMany(ExtractParameterValue))
-            {
-                ReadSingleValue(parameterName, value);
-            }
+        foreach (string value in parameterValue.SelectMany(ExtractParameterValue))
+        {
+            ReadSingleValue(parameterName, value);
         }
+    }
 
-        private IEnumerable<string> ExtractParameterValue(string parameterValue)
+    private IEnumerable<string> ExtractParameterValue(string parameterValue)
+    {
+        if (_options.EnableLegacyFilterNotation)
         {
-            if (_options.EnableLegacyFilterNotation)
+            foreach (string condition in LegacyConverter.ExtractConditions(parameterValue))
             {
-                foreach (string condition in LegacyConverter.ExtractConditions(parameterValue))
-                {
-                    yield return condition;
-                }
-            }
-            else
-            {
-                yield return parameterValue;
+                yield return condition;
             }
         }
-
-        private void ReadSingleValue(string parameterName, string parameterValue)
+        else
         {
-            try
-            {
-                string name = parameterName;
-                string value = parameterValue;
-
-                if (_options.EnableLegacyFilterNotation)
-                {
-                    (name, value) = LegacyConverter.Convert(name, value);
-                }
-
-                ResourceFieldChainExpression? scope = GetScope(name);
-                FilterExpression filter = GetFilter(value, scope);
-
-                StoreFilterInScope(filter, scope);
-            }
-            catch (QueryParseException exception)
-            {
-                throw new InvalidQueryStringParameterException(_lastParameterName!, "The specified filter is invalid.", exception.Message, exception);
-            }
+            yield return parameterValue;
         }
+    }
 
-        private ResourceFieldChainExpression? GetScope(string parameterName)
+    private void ReadSingleValue(string parameterName, string parameterValue)
+    {
+        try
         {
-            QueryStringParameterScopeExpression parameterScope = _scopeParser.Parse(parameterName, RequestResourceType);
+            string name = parameterName;
+            string value = parameterValue;
 
-            if (parameterScope.Scope == null)
+            if (_options.EnableLegacyFilterNotation)
             {
-                AssertIsCollectionRequest();
+                (name, value) = LegacyConverter.Convert(name, value);
             }
 
-            return parameterScope.Scope;
-        }
+            ResourceFieldChainExpression? scope = GetScope(name);
+            FilterExpression filter = GetFilter(value, scope);
 
-        private FilterExpression GetFilter(string parameterValue, ResourceFieldChainExpression? scope)
+            StoreFilterInScope(filter, scope);
+        }
+        catch (QueryParseException exception)
         {
-            ResourceType resourceTypeInScope = GetResourceTypeForScope(scope);
-            return _filterParser.Parse(parameterValue, resourceTypeInScope);
+            throw new InvalidQueryStringParameterException(_lastParameterName!, "The specified filter is invalid.", exception.Message, exception);
         }
+    }
 
-        private void StoreFilterInScope(FilterExpression filter, ResourceFieldChainExpression? scope)
-        {
-            if (scope == null)
-            {
-                _filtersInGlobalScope.Add(filter);
-            }
-            else
-            {
-                if (!_filtersPerScope.ContainsKey(scope))
-                {
-                    _filtersPerScope[scope] = ImmutableArray.CreateBuilder<FilterExpression>();
-                }
+    private ResourceFieldChainExpression? GetScope(string parameterName)
+    {
+        QueryStringParameterScopeExpression parameterScope = _scopeParser.Parse(parameterName, RequestResourceType);
 
-                _filtersPerScope[scope].Add(filter);
-            }
+        if (parameterScope.Scope == null)
+        {
+            AssertIsCollectionRequest();
         }
 
-        /// <inheritdoc />
-        public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
+        return parameterScope.Scope;
+    }
+
+    private FilterExpression GetFilter(string parameterValue, ResourceFieldChainExpression? scope)
+    {
+        ResourceType resourceTypeInScope = GetResourceTypeForScope(scope);
+        return _filterParser.Parse(parameterValue, resourceTypeInScope);
+    }
+
+    private void StoreFilterInScope(FilterExpression filter, ResourceFieldChainExpression? scope)
+    {
+        if (scope == null)
         {
-            return EnumerateFiltersInScopes().ToArray();
+            _filtersInGlobalScope.Add(filter);
         }
-
-        private IEnumerable<ExpressionInScope> EnumerateFiltersInScopes()
+        else
         {
-            if (_filtersInGlobalScope.Any())
+            if (!_filtersPerScope.ContainsKey(scope))
             {
-                FilterExpression filter = MergeFilters(_filtersInGlobalScope.ToImmutable());
-                yield return new ExpressionInScope(null, filter);
+                _filtersPerScope[scope] = ImmutableArray.CreateBuilder<FilterExpression>();
             }
 
-            foreach ((ResourceFieldChainExpression scope, ImmutableArray<FilterExpression>.Builder filtersBuilder) in _filtersPerScope)
-            {
-                FilterExpression filter = MergeFilters(filtersBuilder.ToImmutable());
-                yield return new ExpressionInScope(scope, filter);
-            }
+            _filtersPerScope[scope].Add(filter);
         }
+    }
 
-        private static FilterExpression MergeFilters(IImmutableList<FilterExpression> filters)
+    /// <inheritdoc />
+    public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
+    {
+        return EnumerateFiltersInScopes().ToArray();
+    }
+
+    private IEnumerable<ExpressionInScope> EnumerateFiltersInScopes()
+    {
+        if (_filtersInGlobalScope.Any())
+        {
+            FilterExpression filter = MergeFilters(_filtersInGlobalScope.ToImmutable());
+            yield return new ExpressionInScope(null, filter);
+        }
+
+        foreach ((ResourceFieldChainExpression scope, ImmutableArray<FilterExpression>.Builder filtersBuilder) in _filtersPerScope)
         {
-            return filters.Count > 1 ? new LogicalExpression(LogicalOperator.Or, filters) : filters.First();
+            FilterExpression filter = MergeFilters(filtersBuilder.ToImmutable());
+            yield return new ExpressionInScope(scope, filter);
         }
     }
+
+    private static FilterExpression MergeFilters(IImmutableList<FilterExpression> filters)
+    {
+        return filters.Count > 1 ? new LogicalExpression(LogicalOperator.Or, filters) : filters.First();
+    }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/IncludeQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/Internal/IncludeQueryStringParameterReader.cs
index f5e98b9a20..51b815c2ef 100644
--- a/src/JsonApiDotNetCore/QueryStrings/Internal/IncludeQueryStringParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/Internal/IncludeQueryStringParameterReader.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers.Annotations;
@@ -10,81 +9,80 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCore.QueryStrings.Internal
+namespace JsonApiDotNetCore.QueryStrings.Internal;
+
+[PublicAPI]
+public class IncludeQueryStringParameterReader : QueryStringParameterReader, IIncludeQueryStringParameterReader
 {
-    [PublicAPI]
-    public class IncludeQueryStringParameterReader : QueryStringParameterReader, IIncludeQueryStringParameterReader
-    {
-        private readonly IJsonApiOptions _options;
-        private readonly IncludeParser _includeParser;
+    private readonly IJsonApiOptions _options;
+    private readonly IncludeParser _includeParser;
 
-        private IncludeExpression? _includeExpression;
-        private string? _lastParameterName;
+    private IncludeExpression? _includeExpression;
+    private string? _lastParameterName;
 
-        public bool AllowEmptyValue => false;
+    public bool AllowEmptyValue => false;
 
-        public IncludeQueryStringParameterReader(IJsonApiRequest request, IResourceGraph resourceGraph, IJsonApiOptions options)
-            : base(request, resourceGraph)
-        {
-            ArgumentGuard.NotNull(options, nameof(options));
+    public IncludeQueryStringParameterReader(IJsonApiRequest request, IResourceGraph resourceGraph, IJsonApiOptions options)
+        : base(request, resourceGraph)
+    {
+        ArgumentGuard.NotNull(options, nameof(options));
 
-            _options = options;
-            _includeParser = new IncludeParser(ValidateSingleRelationship);
-        }
+        _options = options;
+        _includeParser = new IncludeParser(ValidateSingleRelationship);
+    }
 
-        protected void ValidateSingleRelationship(RelationshipAttribute relationship, ResourceType resourceType, string path)
+    protected void ValidateSingleRelationship(RelationshipAttribute relationship, ResourceType resourceType, string path)
+    {
+        if (!relationship.CanInclude)
         {
-            if (!relationship.CanInclude)
-            {
-                throw new InvalidQueryStringParameterException(_lastParameterName!, "Including the requested relationship is not allowed.",
-                    path == relationship.PublicName
-                        ? $"Including the relationship '{relationship.PublicName}' on '{resourceType.PublicName}' is not allowed."
-                        : $"Including the relationship '{relationship.PublicName}' in '{path}' on '{resourceType.PublicName}' is not allowed.");
-            }
+            throw new InvalidQueryStringParameterException(_lastParameterName!, "Including the requested relationship is not allowed.",
+                path == relationship.PublicName
+                    ? $"Including the relationship '{relationship.PublicName}' on '{resourceType.PublicName}' is not allowed."
+                    : $"Including the relationship '{relationship.PublicName}' in '{path}' on '{resourceType.PublicName}' is not allowed.");
         }
+    }
 
-        /// <inheritdoc />
-        public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
-        {
-            ArgumentGuard.NotNull(disableQueryStringAttribute, nameof(disableQueryStringAttribute));
+    /// <inheritdoc />
+    public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
+    {
+        ArgumentGuard.NotNull(disableQueryStringAttribute, nameof(disableQueryStringAttribute));
 
-            return !IsAtomicOperationsRequest && !disableQueryStringAttribute.ContainsParameter(JsonApiQueryStringParameters.Include);
-        }
+        return !IsAtomicOperationsRequest && !disableQueryStringAttribute.ContainsParameter(JsonApiQueryStringParameters.Include);
+    }
 
-        /// <inheritdoc />
-        public virtual bool CanRead(string parameterName)
-        {
-            return parameterName == "include";
-        }
+    /// <inheritdoc />
+    public virtual bool CanRead(string parameterName)
+    {
+        return parameterName == "include";
+    }
 
-        /// <inheritdoc />
-        public virtual void Read(string parameterName, StringValues parameterValue)
-        {
-            _lastParameterName = parameterName;
+    /// <inheritdoc />
+    public virtual void Read(string parameterName, StringValues parameterValue)
+    {
+        _lastParameterName = parameterName;
 
-            try
-            {
-                _includeExpression = GetInclude(parameterValue);
-            }
-            catch (QueryParseException exception)
-            {
-                throw new InvalidQueryStringParameterException(parameterName, "The specified include is invalid.", exception.Message, exception);
-            }
+        try
+        {
+            _includeExpression = GetInclude(parameterValue);
         }
-
-        private IncludeExpression GetInclude(string parameterValue)
+        catch (QueryParseException exception)
         {
-            return _includeParser.Parse(parameterValue, RequestResourceType, _options.MaximumIncludeDepth);
+            throw new InvalidQueryStringParameterException(parameterName, "The specified include is invalid.", exception.Message, exception);
         }
+    }
 
-        /// <inheritdoc />
-        public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
-        {
-            ExpressionInScope expressionInScope = _includeExpression != null
-                ? new ExpressionInScope(null, _includeExpression)
-                : new ExpressionInScope(null, IncludeExpression.Empty);
+    private IncludeExpression GetInclude(string parameterValue)
+    {
+        return _includeParser.Parse(parameterValue, RequestResourceType, _options.MaximumIncludeDepth);
+    }
 
-            return expressionInScope.AsArray();
-        }
+    /// <inheritdoc />
+    public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
+    {
+        ExpressionInScope expressionInScope = _includeExpression != null
+            ? new ExpressionInScope(null, _includeExpression)
+            : new ExpressionInScope(null, IncludeExpression.Empty);
+
+        return expressionInScope.AsArray();
     }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/LegacyFilterNotationConverter.cs b/src/JsonApiDotNetCore/QueryStrings/Internal/LegacyFilterNotationConverter.cs
index 0b47e4427b..68d4555e26 100644
--- a/src/JsonApiDotNetCore/QueryStrings/Internal/LegacyFilterNotationConverter.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/Internal/LegacyFilterNotationConverter.cs
@@ -1,142 +1,138 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries.Internal.Parsing;
 
-namespace JsonApiDotNetCore.QueryStrings.Internal
+namespace JsonApiDotNetCore.QueryStrings.Internal;
+
+[PublicAPI]
+public sealed class LegacyFilterNotationConverter
 {
-    [PublicAPI]
-    public sealed class LegacyFilterNotationConverter
-    {
-        private const string ParameterNamePrefix = "filter[";
-        private const string ParameterNameSuffix = "]";
-        private const string OutputParameterName = "filter";
+    private const string ParameterNamePrefix = "filter[";
+    private const string ParameterNameSuffix = "]";
+    private const string OutputParameterName = "filter";
 
-        private const string ExpressionPrefix = "expr:";
-        private const string NotEqualsPrefix = "ne:";
-        private const string InPrefix = "in:";
-        private const string NotInPrefix = "nin:";
+    private const string ExpressionPrefix = "expr:";
+    private const string NotEqualsPrefix = "ne:";
+    private const string InPrefix = "in:";
+    private const string NotInPrefix = "nin:";
+
+    private static readonly Dictionary<string, string> PrefixConversionTable = new()
+    {
+        ["eq:"] = Keywords.Equals,
+        ["lt:"] = Keywords.LessThan,
+        ["le:"] = Keywords.LessOrEqual,
+        ["gt:"] = Keywords.GreaterThan,
+        ["ge:"] = Keywords.GreaterOrEqual,
+        ["like:"] = Keywords.Contains
+    };
+
+    public IEnumerable<string> ExtractConditions(string parameterValue)
+    {
+        ArgumentGuard.NotNullNorEmpty(parameterValue, nameof(parameterValue));
 
-        private static readonly Dictionary<string, string> PrefixConversionTable = new()
+        if (parameterValue.StartsWith(ExpressionPrefix, StringComparison.Ordinal) || parameterValue.StartsWith(InPrefix, StringComparison.Ordinal) ||
+            parameterValue.StartsWith(NotInPrefix, StringComparison.Ordinal))
         {
-            ["eq:"] = Keywords.Equals,
-            ["lt:"] = Keywords.LessThan,
-            ["le:"] = Keywords.LessOrEqual,
-            ["gt:"] = Keywords.GreaterThan,
-            ["ge:"] = Keywords.GreaterOrEqual,
-            ["like:"] = Keywords.Contains
-        };
-
-        public IEnumerable<string> ExtractConditions(string parameterValue)
+            yield return parameterValue;
+        }
+        else
         {
-            ArgumentGuard.NotNullNorEmpty(parameterValue, nameof(parameterValue));
-
-            if (parameterValue.StartsWith(ExpressionPrefix, StringComparison.Ordinal) || parameterValue.StartsWith(InPrefix, StringComparison.Ordinal) ||
-                parameterValue.StartsWith(NotInPrefix, StringComparison.Ordinal))
+            foreach (string condition in parameterValue.Split(','))
             {
-                yield return parameterValue;
-            }
-            else
-            {
-                foreach (string condition in parameterValue.Split(','))
-                {
-                    yield return condition;
-                }
+                yield return condition;
             }
         }
+    }
 
-        public (string parameterName, string parameterValue) Convert(string parameterName, string parameterValue)
-        {
-            ArgumentGuard.NotNullNorEmpty(parameterName, nameof(parameterName));
-            ArgumentGuard.NotNullNorEmpty(parameterValue, nameof(parameterValue));
-
-            if (parameterValue.StartsWith(ExpressionPrefix, StringComparison.Ordinal))
-            {
-                string expression = parameterValue[ExpressionPrefix.Length..];
-                return (parameterName, expression);
-            }
+    public (string parameterName, string parameterValue) Convert(string parameterName, string parameterValue)
+    {
+        ArgumentGuard.NotNullNorEmpty(parameterName, nameof(parameterName));
+        ArgumentGuard.NotNullNorEmpty(parameterValue, nameof(parameterValue));
 
-            string attributeName = ExtractAttributeName(parameterName);
+        if (parameterValue.StartsWith(ExpressionPrefix, StringComparison.Ordinal))
+        {
+            string expression = parameterValue[ExpressionPrefix.Length..];
+            return (parameterName, expression);
+        }
 
-            foreach ((string prefix, string keyword) in PrefixConversionTable)
-            {
-                if (parameterValue.StartsWith(prefix, StringComparison.Ordinal))
-                {
-                    string value = parameterValue[prefix.Length..];
-                    string escapedValue = EscapeQuotes(value);
-                    string expression = $"{keyword}({attributeName},'{escapedValue}')";
-
-                    return (OutputParameterName, expression);
-                }
-            }
+        string attributeName = ExtractAttributeName(parameterName);
 
-            if (parameterValue.StartsWith(NotEqualsPrefix, StringComparison.Ordinal))
+        foreach ((string prefix, string keyword) in PrefixConversionTable)
+        {
+            if (parameterValue.StartsWith(prefix, StringComparison.Ordinal))
             {
-                string value = parameterValue[NotEqualsPrefix.Length..];
+                string value = parameterValue[prefix.Length..];
                 string escapedValue = EscapeQuotes(value);
-                string expression = $"{Keywords.Not}({Keywords.Equals}({attributeName},'{escapedValue}'))";
+                string expression = $"{keyword}({attributeName},'{escapedValue}')";
 
                 return (OutputParameterName, expression);
             }
+        }
 
-            if (parameterValue.StartsWith(InPrefix, StringComparison.Ordinal))
-            {
-                string[] valueParts = parameterValue[InPrefix.Length..].Split(",");
-                string valueList = $"'{string.Join("','", valueParts)}'";
-                string expression = $"{Keywords.Any}({attributeName},{valueList})";
-
-                return (OutputParameterName, expression);
-            }
+        if (parameterValue.StartsWith(NotEqualsPrefix, StringComparison.Ordinal))
+        {
+            string value = parameterValue[NotEqualsPrefix.Length..];
+            string escapedValue = EscapeQuotes(value);
+            string expression = $"{Keywords.Not}({Keywords.Equals}({attributeName},'{escapedValue}'))";
 
-            if (parameterValue.StartsWith(NotInPrefix, StringComparison.Ordinal))
-            {
-                string[] valueParts = parameterValue[NotInPrefix.Length..].Split(",");
-                string valueList = $"'{string.Join("','", valueParts)}'";
-                string expression = $"{Keywords.Not}({Keywords.Any}({attributeName},{valueList}))";
+            return (OutputParameterName, expression);
+        }
 
-                return (OutputParameterName, expression);
-            }
+        if (parameterValue.StartsWith(InPrefix, StringComparison.Ordinal))
+        {
+            string[] valueParts = parameterValue[InPrefix.Length..].Split(",");
+            string valueList = $"'{string.Join("','", valueParts)}'";
+            string expression = $"{Keywords.Any}({attributeName},{valueList})";
 
-            if (parameterValue == "isnull:")
-            {
-                string expression = $"{Keywords.Equals}({attributeName},null)";
-                return (OutputParameterName, expression);
-            }
+            return (OutputParameterName, expression);
+        }
 
-            if (parameterValue == "isnotnull:")
-            {
-                string expression = $"{Keywords.Not}({Keywords.Equals}({attributeName},null))";
-                return (OutputParameterName, expression);
-            }
+        if (parameterValue.StartsWith(NotInPrefix, StringComparison.Ordinal))
+        {
+            string[] valueParts = parameterValue[NotInPrefix.Length..].Split(",");
+            string valueList = $"'{string.Join("','", valueParts)}'";
+            string expression = $"{Keywords.Not}({Keywords.Any}({attributeName},{valueList}))";
 
-            {
-                string escapedValue = EscapeQuotes(parameterValue);
-                string expression = $"{Keywords.Equals}({attributeName},'{escapedValue}')";
+            return (OutputParameterName, expression);
+        }
 
-                return (OutputParameterName, expression);
-            }
+        if (parameterValue == "isnull:")
+        {
+            string expression = $"{Keywords.Equals}({attributeName},null)";
+            return (OutputParameterName, expression);
         }
 
-        private static string ExtractAttributeName(string parameterName)
+        if (parameterValue == "isnotnull:")
         {
-            if (parameterName.StartsWith(ParameterNamePrefix, StringComparison.Ordinal) &&
-                parameterName.EndsWith(ParameterNameSuffix, StringComparison.Ordinal))
-            {
-                string attributeName = parameterName.Substring(ParameterNamePrefix.Length,
-                    parameterName.Length - ParameterNamePrefix.Length - ParameterNameSuffix.Length);
+            string expression = $"{Keywords.Not}({Keywords.Equals}({attributeName},null))";
+            return (OutputParameterName, expression);
+        }
 
-                if (attributeName.Length > 0)
-                {
-                    return attributeName;
-                }
-            }
+        {
+            string escapedValue = EscapeQuotes(parameterValue);
+            string expression = $"{Keywords.Equals}({attributeName},'{escapedValue}')";
 
-            throw new QueryParseException("Expected field name between brackets in filter parameter name.");
+            return (OutputParameterName, expression);
         }
+    }
 
-        private static string EscapeQuotes(string text)
+    private static string ExtractAttributeName(string parameterName)
+    {
+        if (parameterName.StartsWith(ParameterNamePrefix, StringComparison.Ordinal) && parameterName.EndsWith(ParameterNameSuffix, StringComparison.Ordinal))
         {
-            return text.Replace("'", "''");
+            string attributeName = parameterName.Substring(ParameterNamePrefix.Length,
+                parameterName.Length - ParameterNamePrefix.Length - ParameterNameSuffix.Length);
+
+            if (attributeName.Length > 0)
+            {
+                return attributeName;
+            }
         }
+
+        throw new QueryParseException("Expected field name between brackets in filter parameter name.");
+    }
+
+    private static string EscapeQuotes(string text)
+    {
+        return text.Replace("'", "''");
     }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/PaginationQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/Internal/PaginationQueryStringParameterReader.cs
index 023a4a67bd..743faee492 100644
--- a/src/JsonApiDotNetCore/QueryStrings/Internal/PaginationQueryStringParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/Internal/PaginationQueryStringParameterReader.cs
@@ -1,6 +1,4 @@
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers.Annotations;
@@ -11,201 +9,200 @@
 using JsonApiDotNetCore.Queries.Internal.Parsing;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCore.QueryStrings.Internal
+namespace JsonApiDotNetCore.QueryStrings.Internal;
+
+[PublicAPI]
+public class PaginationQueryStringParameterReader : QueryStringParameterReader, IPaginationQueryStringParameterReader
 {
-    [PublicAPI]
-    public class PaginationQueryStringParameterReader : QueryStringParameterReader, IPaginationQueryStringParameterReader
-    {
-        private const string PageSizeParameterName = "page[size]";
-        private const string PageNumberParameterName = "page[number]";
+    private const string PageSizeParameterName = "page[size]";
+    private const string PageNumberParameterName = "page[number]";
 
-        private readonly IJsonApiOptions _options;
-        private readonly PaginationParser _paginationParser;
+    private readonly IJsonApiOptions _options;
+    private readonly PaginationParser _paginationParser;
 
-        private PaginationQueryStringValueExpression? _pageSizeConstraint;
-        private PaginationQueryStringValueExpression? _pageNumberConstraint;
+    private PaginationQueryStringValueExpression? _pageSizeConstraint;
+    private PaginationQueryStringValueExpression? _pageNumberConstraint;
 
-        public bool AllowEmptyValue => false;
+    public bool AllowEmptyValue => false;
 
-        public PaginationQueryStringParameterReader(IJsonApiRequest request, IResourceGraph resourceGraph, IJsonApiOptions options)
-            : base(request, resourceGraph)
-        {
-            ArgumentGuard.NotNull(options, nameof(options));
+    public PaginationQueryStringParameterReader(IJsonApiRequest request, IResourceGraph resourceGraph, IJsonApiOptions options)
+        : base(request, resourceGraph)
+    {
+        ArgumentGuard.NotNull(options, nameof(options));
 
-            _options = options;
-            _paginationParser = new PaginationParser();
-        }
+        _options = options;
+        _paginationParser = new PaginationParser();
+    }
 
-        /// <inheritdoc />
-        public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
-        {
-            ArgumentGuard.NotNull(disableQueryStringAttribute, nameof(disableQueryStringAttribute));
+    /// <inheritdoc />
+    public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
+    {
+        ArgumentGuard.NotNull(disableQueryStringAttribute, nameof(disableQueryStringAttribute));
 
-            return !IsAtomicOperationsRequest && !disableQueryStringAttribute.ContainsParameter(JsonApiQueryStringParameters.Page);
-        }
+        return !IsAtomicOperationsRequest && !disableQueryStringAttribute.ContainsParameter(JsonApiQueryStringParameters.Page);
+    }
 
-        /// <inheritdoc />
-        public virtual bool CanRead(string parameterName)
-        {
-            return parameterName is PageSizeParameterName or PageNumberParameterName;
-        }
+    /// <inheritdoc />
+    public virtual bool CanRead(string parameterName)
+    {
+        return parameterName is PageSizeParameterName or PageNumberParameterName;
+    }
 
-        /// <inheritdoc />
-        public virtual void Read(string parameterName, StringValues parameterValue)
+    /// <inheritdoc />
+    public virtual void Read(string parameterName, StringValues parameterValue)
+    {
+        try
         {
-            try
+            PaginationQueryStringValueExpression constraint = GetPageConstraint(parameterValue);
+
+            if (constraint.Elements.Any(element => element.Scope == null))
+            {
+                AssertIsCollectionRequest();
+            }
+
+            if (parameterName == PageSizeParameterName)
             {
-                PaginationQueryStringValueExpression constraint = GetPageConstraint(parameterValue);
-
-                if (constraint.Elements.Any(element => element.Scope == null))
-                {
-                    AssertIsCollectionRequest();
-                }
-
-                if (parameterName == PageSizeParameterName)
-                {
-                    ValidatePageSize(constraint);
-                    _pageSizeConstraint = constraint;
-                }
-                else
-                {
-                    ValidatePageNumber(constraint);
-                    _pageNumberConstraint = constraint;
-                }
+                ValidatePageSize(constraint);
+                _pageSizeConstraint = constraint;
             }
-            catch (QueryParseException exception)
+            else
             {
-                throw new InvalidQueryStringParameterException(parameterName, "The specified paging is invalid.", exception.Message, exception);
+                ValidatePageNumber(constraint);
+                _pageNumberConstraint = constraint;
             }
         }
-
-        private PaginationQueryStringValueExpression GetPageConstraint(string parameterValue)
+        catch (QueryParseException exception)
         {
-            return _paginationParser.Parse(parameterValue, RequestResourceType);
+            throw new InvalidQueryStringParameterException(parameterName, "The specified paging is invalid.", exception.Message, exception);
         }
+    }
 
-        protected virtual void ValidatePageSize(PaginationQueryStringValueExpression constraint)
+    private PaginationQueryStringValueExpression GetPageConstraint(string parameterValue)
+    {
+        return _paginationParser.Parse(parameterValue, RequestResourceType);
+    }
+
+    protected virtual void ValidatePageSize(PaginationQueryStringValueExpression constraint)
+    {
+        if (_options.MaximumPageSize != null)
         {
-            if (_options.MaximumPageSize != null)
+            if (constraint.Elements.Any(element => element.Value > _options.MaximumPageSize.Value))
             {
-                if (constraint.Elements.Any(element => element.Value > _options.MaximumPageSize.Value))
-                {
-                    throw new QueryParseException($"Page size cannot be higher than {_options.MaximumPageSize}.");
-                }
-
-                if (constraint.Elements.Any(element => element.Value == 0))
-                {
-                    throw new QueryParseException("Page size cannot be unconstrained.");
-                }
+                throw new QueryParseException($"Page size cannot be higher than {_options.MaximumPageSize}.");
             }
 
-            if (constraint.Elements.Any(element => element.Value < 0))
+            if (constraint.Elements.Any(element => element.Value == 0))
             {
-                throw new QueryParseException("Page size cannot be negative.");
+                throw new QueryParseException("Page size cannot be unconstrained.");
             }
         }
 
-        [AssertionMethod]
-        protected virtual void ValidatePageNumber(PaginationQueryStringValueExpression constraint)
+        if (constraint.Elements.Any(element => element.Value < 0))
         {
-            if (_options.MaximumPageNumber != null && constraint.Elements.Any(element => element.Value > _options.MaximumPageNumber.OneBasedValue))
-            {
-                throw new QueryParseException($"Page number cannot be higher than {_options.MaximumPageNumber}.");
-            }
-
-            if (constraint.Elements.Any(element => element.Value < 1))
-            {
-                throw new QueryParseException("Page number cannot be negative or zero.");
-            }
+            throw new QueryParseException("Page size cannot be negative.");
         }
+    }
 
-        /// <inheritdoc />
-        public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
+    [AssertionMethod]
+    protected virtual void ValidatePageNumber(PaginationQueryStringValueExpression constraint)
+    {
+        if (_options.MaximumPageNumber != null && constraint.Elements.Any(element => element.Value > _options.MaximumPageNumber.OneBasedValue))
         {
-            var paginationState = new PaginationState();
-
-            foreach (PaginationElementQueryStringValueExpression element in _pageSizeConstraint?.Elements ??
-                ImmutableArray<PaginationElementQueryStringValueExpression>.Empty)
-            {
-                MutablePaginationEntry entry = paginationState.ResolveEntryInScope(element.Scope);
-                entry.PageSize = element.Value == 0 ? null : new PageSize(element.Value);
-                entry.HasSetPageSize = true;
-            }
+            throw new QueryParseException($"Page number cannot be higher than {_options.MaximumPageNumber}.");
+        }
 
-            foreach (PaginationElementQueryStringValueExpression element in _pageNumberConstraint?.Elements ??
-                ImmutableArray<PaginationElementQueryStringValueExpression>.Empty)
-            {
-                MutablePaginationEntry entry = paginationState.ResolveEntryInScope(element.Scope);
-                entry.PageNumber = new PageNumber(element.Value);
-            }
+        if (constraint.Elements.Any(element => element.Value < 1))
+        {
+            throw new QueryParseException("Page number cannot be negative or zero.");
+        }
+    }
 
-            paginationState.ApplyOptions(_options);
+    /// <inheritdoc />
+    public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
+    {
+        var paginationState = new PaginationState();
 
-            return paginationState.GetExpressionsInScope();
+        foreach (PaginationElementQueryStringValueExpression element in _pageSizeConstraint?.Elements ??
+            ImmutableArray<PaginationElementQueryStringValueExpression>.Empty)
+        {
+            MutablePaginationEntry entry = paginationState.ResolveEntryInScope(element.Scope);
+            entry.PageSize = element.Value == 0 ? null : new PageSize(element.Value);
+            entry.HasSetPageSize = true;
         }
 
-        private sealed class PaginationState
+        foreach (PaginationElementQueryStringValueExpression element in _pageNumberConstraint?.Elements ??
+            ImmutableArray<PaginationElementQueryStringValueExpression>.Empty)
         {
-            private readonly MutablePaginationEntry _globalScope = new();
-            private readonly Dictionary<ResourceFieldChainExpression, MutablePaginationEntry> _nestedScopes = new();
+            MutablePaginationEntry entry = paginationState.ResolveEntryInScope(element.Scope);
+            entry.PageNumber = new PageNumber(element.Value);
+        }
 
-            public MutablePaginationEntry ResolveEntryInScope(ResourceFieldChainExpression? scope)
-            {
-                if (scope == null)
-                {
-                    return _globalScope;
-                }
+        paginationState.ApplyOptions(_options);
 
-                if (!_nestedScopes.ContainsKey(scope))
-                {
-                    _nestedScopes.Add(scope, new MutablePaginationEntry());
-                }
+        return paginationState.GetExpressionsInScope();
+    }
 
-                return _nestedScopes[scope];
-            }
+    private sealed class PaginationState
+    {
+        private readonly MutablePaginationEntry _globalScope = new();
+        private readonly Dictionary<ResourceFieldChainExpression, MutablePaginationEntry> _nestedScopes = new();
 
-            public void ApplyOptions(IJsonApiOptions options)
+        public MutablePaginationEntry ResolveEntryInScope(ResourceFieldChainExpression? scope)
+        {
+            if (scope == null)
             {
-                ApplyOptionsInEntry(_globalScope, options);
-
-                foreach ((_, MutablePaginationEntry entry) in _nestedScopes)
-                {
-                    ApplyOptionsInEntry(entry, options);
-                }
+                return _globalScope;
             }
 
-            private void ApplyOptionsInEntry(MutablePaginationEntry entry, IJsonApiOptions options)
+            if (!_nestedScopes.ContainsKey(scope))
             {
-                if (!entry.HasSetPageSize)
-                {
-                    entry.PageSize = options.DefaultPageSize;
-                }
-
-                entry.PageNumber ??= PageNumber.ValueOne;
+                _nestedScopes.Add(scope, new MutablePaginationEntry());
             }
 
-            public IReadOnlyCollection<ExpressionInScope> GetExpressionsInScope()
+            return _nestedScopes[scope];
+        }
+
+        public void ApplyOptions(IJsonApiOptions options)
+        {
+            ApplyOptionsInEntry(_globalScope, options);
+
+            foreach ((_, MutablePaginationEntry entry) in _nestedScopes)
             {
-                return EnumerateExpressionsInScope().ToArray();
+                ApplyOptionsInEntry(entry, options);
             }
+        }
 
-            private IEnumerable<ExpressionInScope> EnumerateExpressionsInScope()
+        private void ApplyOptionsInEntry(MutablePaginationEntry entry, IJsonApiOptions options)
+        {
+            if (!entry.HasSetPageSize)
             {
-                yield return new ExpressionInScope(null, new PaginationExpression(_globalScope.PageNumber!, _globalScope.PageSize));
-
-                foreach ((ResourceFieldChainExpression scope, MutablePaginationEntry entry) in _nestedScopes)
-                {
-                    yield return new ExpressionInScope(scope, new PaginationExpression(entry.PageNumber!, entry.PageSize));
-                }
+                entry.PageSize = options.DefaultPageSize;
             }
+
+            entry.PageNumber ??= PageNumber.ValueOne;
         }
 
-        private sealed class MutablePaginationEntry
+        public IReadOnlyCollection<ExpressionInScope> GetExpressionsInScope()
         {
-            public PageSize? PageSize { get; set; }
-            public bool HasSetPageSize { get; set; }
+            return EnumerateExpressionsInScope().ToArray();
+        }
 
-            public PageNumber? PageNumber { get; set; }
+        private IEnumerable<ExpressionInScope> EnumerateExpressionsInScope()
+        {
+            yield return new ExpressionInScope(null, new PaginationExpression(_globalScope.PageNumber!, _globalScope.PageSize));
+
+            foreach ((ResourceFieldChainExpression scope, MutablePaginationEntry entry) in _nestedScopes)
+            {
+                yield return new ExpressionInScope(scope, new PaginationExpression(entry.PageNumber!, entry.PageSize));
+            }
         }
     }
+
+    private sealed class MutablePaginationEntry
+    {
+        public PageSize? PageSize { get; set; }
+        public bool HasSetPageSize { get; set; }
+
+        public PageNumber? PageNumber { get; set; }
+    }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/QueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/Internal/QueryStringParameterReader.cs
index 4513f8e23a..103429aa81 100644
--- a/src/JsonApiDotNetCore/QueryStrings/Internal/QueryStringParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/Internal/QueryStringParameterReader.cs
@@ -4,51 +4,50 @@
 using JsonApiDotNetCore.Queries.Internal.Parsing;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.QueryStrings.Internal
+namespace JsonApiDotNetCore.QueryStrings.Internal;
+
+public abstract class QueryStringParameterReader
 {
-    public abstract class QueryStringParameterReader
-    {
-        private readonly IResourceGraph _resourceGraph;
-        private readonly bool _isCollectionRequest;
+    private readonly IResourceGraph _resourceGraph;
+    private readonly bool _isCollectionRequest;
 
-        protected ResourceType RequestResourceType { get; }
-        protected bool IsAtomicOperationsRequest { get; }
+    protected ResourceType RequestResourceType { get; }
+    protected bool IsAtomicOperationsRequest { get; }
 
-        protected QueryStringParameterReader(IJsonApiRequest request, IResourceGraph resourceGraph)
-        {
-            ArgumentGuard.NotNull(request, nameof(request));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-
-            _resourceGraph = resourceGraph;
-            _isCollectionRequest = request.IsCollection;
-            // There are currently no query string readers that work with operations, so non-nullable for convenience.
-            RequestResourceType = (request.SecondaryResourceType ?? request.PrimaryResourceType)!;
-            IsAtomicOperationsRequest = request.Kind == EndpointKind.AtomicOperations;
-        }
+    protected QueryStringParameterReader(IJsonApiRequest request, IResourceGraph resourceGraph)
+    {
+        ArgumentGuard.NotNull(request, nameof(request));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+
+        _resourceGraph = resourceGraph;
+        _isCollectionRequest = request.IsCollection;
+        // There are currently no query string readers that work with operations, so non-nullable for convenience.
+        RequestResourceType = (request.SecondaryResourceType ?? request.PrimaryResourceType)!;
+        IsAtomicOperationsRequest = request.Kind == EndpointKind.AtomicOperations;
+    }
 
-        protected ResourceType GetResourceTypeForScope(ResourceFieldChainExpression? scope)
+    protected ResourceType GetResourceTypeForScope(ResourceFieldChainExpression? scope)
+    {
+        if (scope == null)
         {
-            if (scope == null)
-            {
-                return RequestResourceType;
-            }
-
-            ResourceFieldAttribute lastField = scope.Fields[^1];
+            return RequestResourceType;
+        }
 
-            if (lastField is RelationshipAttribute relationship)
-            {
-                return relationship.RightType;
-            }
+        ResourceFieldAttribute lastField = scope.Fields[^1];
 
-            return _resourceGraph.GetResourceType(lastField.Property.PropertyType);
+        if (lastField is RelationshipAttribute relationship)
+        {
+            return relationship.RightType;
         }
 
-        protected void AssertIsCollectionRequest()
+        return _resourceGraph.GetResourceType(lastField.Property.PropertyType);
+    }
+
+    protected void AssertIsCollectionRequest()
+    {
+        if (!_isCollectionRequest)
         {
-            if (!_isCollectionRequest)
-            {
-                throw new QueryParseException("This query string parameter can only be used on a collection of resources (not on a single resource).");
-            }
+            throw new QueryParseException("This query string parameter can only be used on a collection of resources (not on a single resource).");
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/QueryStringReader.cs b/src/JsonApiDotNetCore/QueryStrings/Internal/QueryStringReader.cs
index 52bfa648fe..78e6fe9e92 100644
--- a/src/JsonApiDotNetCore/QueryStrings/Internal/QueryStringReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/Internal/QueryStringReader.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers.Annotations;
@@ -9,68 +6,67 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCore.QueryStrings.Internal
+namespace JsonApiDotNetCore.QueryStrings.Internal;
+
+/// <inheritdoc />
+[PublicAPI]
+public class QueryStringReader : IQueryStringReader
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public class QueryStringReader : IQueryStringReader
+    private readonly IJsonApiOptions _options;
+    private readonly IRequestQueryStringAccessor _queryStringAccessor;
+    private readonly IEnumerable<IQueryStringParameterReader> _parameterReaders;
+    private readonly ILogger<QueryStringReader> _logger;
+
+    public QueryStringReader(IJsonApiOptions options, IRequestQueryStringAccessor queryStringAccessor,
+        IEnumerable<IQueryStringParameterReader> parameterReaders, ILoggerFactory loggerFactory)
     {
-        private readonly IJsonApiOptions _options;
-        private readonly IRequestQueryStringAccessor _queryStringAccessor;
-        private readonly IEnumerable<IQueryStringParameterReader> _parameterReaders;
-        private readonly ILogger<QueryStringReader> _logger;
+        ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(queryStringAccessor, nameof(queryStringAccessor));
+        ArgumentGuard.NotNull(parameterReaders, nameof(parameterReaders));
 
-        public QueryStringReader(IJsonApiOptions options, IRequestQueryStringAccessor queryStringAccessor,
-            IEnumerable<IQueryStringParameterReader> parameterReaders, ILoggerFactory loggerFactory)
-        {
-            ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(queryStringAccessor, nameof(queryStringAccessor));
-            ArgumentGuard.NotNull(parameterReaders, nameof(parameterReaders));
+        _options = options;
+        _queryStringAccessor = queryStringAccessor;
+        _parameterReaders = parameterReaders;
+        _logger = loggerFactory.CreateLogger<QueryStringReader>();
+    }
 
-            _options = options;
-            _queryStringAccessor = queryStringAccessor;
-            _parameterReaders = parameterReaders;
-            _logger = loggerFactory.CreateLogger<QueryStringReader>();
-        }
+    /// <inheritdoc />
+    public virtual void ReadAll(DisableQueryStringAttribute? disableQueryStringAttribute)
+    {
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Parse query string");
 
-        /// <inheritdoc />
-        public virtual void ReadAll(DisableQueryStringAttribute? disableQueryStringAttribute)
-        {
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Parse query string");
+        DisableQueryStringAttribute disableQueryStringAttributeNotNull = disableQueryStringAttribute ?? DisableQueryStringAttribute.Empty;
 
-            DisableQueryStringAttribute disableQueryStringAttributeNotNull = disableQueryStringAttribute ?? DisableQueryStringAttribute.Empty;
+        foreach ((string parameterName, StringValues parameterValue) in _queryStringAccessor.Query)
+        {
+            IQueryStringParameterReader? reader = _parameterReaders.FirstOrDefault(nextReader => nextReader.CanRead(parameterName));
 
-            foreach ((string parameterName, StringValues parameterValue) in _queryStringAccessor.Query)
+            if (reader != null)
             {
-                IQueryStringParameterReader? reader = _parameterReaders.FirstOrDefault(nextReader => nextReader.CanRead(parameterName));
+                _logger.LogDebug($"Query string parameter '{parameterName}' with value '{parameterValue}' was accepted by {reader.GetType().Name}.");
 
-                if (reader != null)
+                if (!reader.AllowEmptyValue && string.IsNullOrEmpty(parameterValue))
                 {
-                    _logger.LogDebug($"Query string parameter '{parameterName}' with value '{parameterValue}' was accepted by {reader.GetType().Name}.");
-
-                    if (!reader.AllowEmptyValue && string.IsNullOrEmpty(parameterValue))
-                    {
-                        throw new InvalidQueryStringParameterException(parameterName, "Missing query string parameter value.",
-                            $"Missing value for '{parameterName}' query string parameter.");
-                    }
-
-                    if (!reader.IsEnabled(disableQueryStringAttributeNotNull))
-                    {
-                        throw new InvalidQueryStringParameterException(parameterName,
-                            "Usage of one or more query string parameters is not allowed at the requested endpoint.",
-                            $"The parameter '{parameterName}' cannot be used at this endpoint.");
-                    }
-
-                    reader.Read(parameterName, parameterValue);
-                    _logger.LogDebug($"Query string parameter '{parameterName}' was successfully read.");
+                    throw new InvalidQueryStringParameterException(parameterName, "Missing query string parameter value.",
+                        $"Missing value for '{parameterName}' query string parameter.");
                 }
-                else if (!_options.AllowUnknownQueryStringParameters)
+
+                if (!reader.IsEnabled(disableQueryStringAttributeNotNull))
                 {
-                    throw new InvalidQueryStringParameterException(parameterName, "Unknown query string parameter.",
-                        $"Query string parameter '{parameterName}' is unknown. Set '{nameof(IJsonApiOptions.AllowUnknownQueryStringParameters)}' " +
-                        "to 'true' in options to ignore unknown parameters.");
+                    throw new InvalidQueryStringParameterException(parameterName,
+                        "Usage of one or more query string parameters is not allowed at the requested endpoint.",
+                        $"The parameter '{parameterName}' cannot be used at this endpoint.");
                 }
+
+                reader.Read(parameterName, parameterValue);
+                _logger.LogDebug($"Query string parameter '{parameterName}' was successfully read.");
+            }
+            else if (!_options.AllowUnknownQueryStringParameters)
+            {
+                throw new InvalidQueryStringParameterException(parameterName, "Unknown query string parameter.",
+                    $"Query string parameter '{parameterName}' is unknown. Set '{nameof(IJsonApiOptions.AllowUnknownQueryStringParameters)}' " +
+                    "to 'true' in options to ignore unknown parameters.");
             }
         }
     }
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/RequestQueryStringAccessor.cs b/src/JsonApiDotNetCore/QueryStrings/Internal/RequestQueryStringAccessor.cs
index 1ca5fa55f5..2492f01001 100644
--- a/src/JsonApiDotNetCore/QueryStrings/Internal/RequestQueryStringAccessor.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/Internal/RequestQueryStringAccessor.cs
@@ -1,31 +1,29 @@
-using System;
 using Microsoft.AspNetCore.Http;
 
-namespace JsonApiDotNetCore.QueryStrings.Internal
+namespace JsonApiDotNetCore.QueryStrings.Internal;
+
+/// <inheritdoc />
+internal sealed class RequestQueryStringAccessor : IRequestQueryStringAccessor
 {
-    /// <inheritdoc />
-    internal sealed class RequestQueryStringAccessor : IRequestQueryStringAccessor
-    {
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public IQueryCollection Query
+    public IQueryCollection Query
+    {
+        get
         {
-            get
+            if (_httpContextAccessor.HttpContext == null)
             {
-                if (_httpContextAccessor.HttpContext == null)
-                {
-                    throw new InvalidOperationException("An active HTTP request is required.");
-                }
-
-                return _httpContextAccessor.HttpContext.Request.Query;
+                throw new InvalidOperationException("An active HTTP request is required.");
             }
+
+            return _httpContextAccessor.HttpContext.Request.Query;
         }
+    }
 
-        public RequestQueryStringAccessor(IHttpContextAccessor httpContextAccessor)
-        {
-            ArgumentGuard.NotNull(httpContextAccessor, nameof(httpContextAccessor));
+    public RequestQueryStringAccessor(IHttpContextAccessor httpContextAccessor)
+    {
+        ArgumentGuard.NotNull(httpContextAccessor, nameof(httpContextAccessor));
 
-            _httpContextAccessor = httpContextAccessor;
-        }
+        _httpContextAccessor = httpContextAccessor;
     }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/ResourceDefinitionQueryableParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/Internal/ResourceDefinitionQueryableParameterReader.cs
index bc53a9ed4d..51c5de0583 100644
--- a/src/JsonApiDotNetCore/QueryStrings/Internal/ResourceDefinitionQueryableParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/Internal/ResourceDefinitionQueryableParameterReader.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Controllers.Annotations;
 using JsonApiDotNetCore.Errors;
@@ -9,71 +7,70 @@
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCore.QueryStrings.Internal
-{
-    /// <inheritdoc />
-    [PublicAPI]
-    public class ResourceDefinitionQueryableParameterReader : IResourceDefinitionQueryableParameterReader
-    {
-        private readonly IJsonApiRequest _request;
-        private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
-        private readonly List<ExpressionInScope> _constraints = new();
-
-        public bool AllowEmptyValue => false;
+namespace JsonApiDotNetCore.QueryStrings.Internal;
 
-        public ResourceDefinitionQueryableParameterReader(IJsonApiRequest request, IResourceDefinitionAccessor resourceDefinitionAccessor)
-        {
-            ArgumentGuard.NotNull(request, nameof(request));
-            ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
+/// <inheritdoc />
+[PublicAPI]
+public class ResourceDefinitionQueryableParameterReader : IResourceDefinitionQueryableParameterReader
+{
+    private readonly IJsonApiRequest _request;
+    private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
+    private readonly List<ExpressionInScope> _constraints = new();
 
-            _request = request;
-            _resourceDefinitionAccessor = resourceDefinitionAccessor;
-        }
+    public bool AllowEmptyValue => false;
 
-        /// <inheritdoc />
-        public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
-        {
-            return true;
-        }
+    public ResourceDefinitionQueryableParameterReader(IJsonApiRequest request, IResourceDefinitionAccessor resourceDefinitionAccessor)
+    {
+        ArgumentGuard.NotNull(request, nameof(request));
+        ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
 
-        /// <inheritdoc />
-        public virtual bool CanRead(string parameterName)
-        {
-            if (_request.Kind == EndpointKind.AtomicOperations)
-            {
-                return false;
-            }
+        _request = request;
+        _resourceDefinitionAccessor = resourceDefinitionAccessor;
+    }
 
-            object? queryableHandler = GetQueryableHandler(parameterName);
-            return queryableHandler != null;
-        }
+    /// <inheritdoc />
+    public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
+    {
+        return true;
+    }
 
-        /// <inheritdoc />
-        public virtual void Read(string parameterName, StringValues parameterValue)
+    /// <inheritdoc />
+    public virtual bool CanRead(string parameterName)
+    {
+        if (_request.Kind == EndpointKind.AtomicOperations)
         {
-            object queryableHandler = GetQueryableHandler(parameterName)!;
-            var expressionInScope = new ExpressionInScope(null, new QueryableHandlerExpression(queryableHandler, parameterValue));
-            _constraints.Add(expressionInScope);
+            return false;
         }
 
-        private object? GetQueryableHandler(string parameterName)
-        {
-            Type resourceClrType = (_request.SecondaryResourceType ?? _request.PrimaryResourceType)!.ClrType;
-            object? handler = _resourceDefinitionAccessor.GetQueryableHandlerForQueryStringParameter(resourceClrType, parameterName);
+        object? queryableHandler = GetQueryableHandler(parameterName);
+        return queryableHandler != null;
+    }
 
-            if (handler != null && _request.Kind != EndpointKind.Primary)
-            {
-                throw new InvalidQueryStringParameterException(parameterName, "Custom query string parameters cannot be used on nested resource endpoints.",
-                    $"Query string parameter '{parameterName}' cannot be used on a nested resource endpoint.");
-            }
+    /// <inheritdoc />
+    public virtual void Read(string parameterName, StringValues parameterValue)
+    {
+        object queryableHandler = GetQueryableHandler(parameterName)!;
+        var expressionInScope = new ExpressionInScope(null, new QueryableHandlerExpression(queryableHandler, parameterValue));
+        _constraints.Add(expressionInScope);
+    }
 
-            return handler;
-        }
+    private object? GetQueryableHandler(string parameterName)
+    {
+        Type resourceClrType = (_request.SecondaryResourceType ?? _request.PrimaryResourceType)!.ClrType;
+        object? handler = _resourceDefinitionAccessor.GetQueryableHandlerForQueryStringParameter(resourceClrType, parameterName);
 
-        /// <inheritdoc />
-        public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
+        if (handler != null && _request.Kind != EndpointKind.Primary)
         {
-            return _constraints;
+            throw new InvalidQueryStringParameterException(parameterName, "Custom query string parameters cannot be used on nested resource endpoints.",
+                $"Query string parameter '{parameterName}' cannot be used on a nested resource endpoint.");
         }
+
+        return handler;
+    }
+
+    /// <inheritdoc />
+    public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
+    {
+        return _constraints;
     }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/SortQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/Internal/SortQueryStringParameterReader.cs
index d231f176f5..5fa60e7f66 100644
--- a/src/JsonApiDotNetCore/QueryStrings/Internal/SortQueryStringParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/Internal/SortQueryStringParameterReader.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers.Annotations;
@@ -11,92 +9,91 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCore.QueryStrings.Internal
+namespace JsonApiDotNetCore.QueryStrings.Internal;
+
+[PublicAPI]
+public class SortQueryStringParameterReader : QueryStringParameterReader, ISortQueryStringParameterReader
 {
-    [PublicAPI]
-    public class SortQueryStringParameterReader : QueryStringParameterReader, ISortQueryStringParameterReader
-    {
-        private readonly QueryStringParameterScopeParser _scopeParser;
-        private readonly SortParser _sortParser;
-        private readonly List<ExpressionInScope> _constraints = new();
-        private string? _lastParameterName;
+    private readonly QueryStringParameterScopeParser _scopeParser;
+    private readonly SortParser _sortParser;
+    private readonly List<ExpressionInScope> _constraints = new();
+    private string? _lastParameterName;
 
-        public bool AllowEmptyValue => false;
+    public bool AllowEmptyValue => false;
 
-        public SortQueryStringParameterReader(IJsonApiRequest request, IResourceGraph resourceGraph)
-            : base(request, resourceGraph)
-        {
-            _scopeParser = new QueryStringParameterScopeParser(FieldChainRequirements.EndsInToMany);
-            _sortParser = new SortParser(ValidateSingleField);
-        }
+    public SortQueryStringParameterReader(IJsonApiRequest request, IResourceGraph resourceGraph)
+        : base(request, resourceGraph)
+    {
+        _scopeParser = new QueryStringParameterScopeParser(FieldChainRequirements.EndsInToMany);
+        _sortParser = new SortParser(ValidateSingleField);
+    }
 
-        protected void ValidateSingleField(ResourceFieldAttribute field, ResourceType resourceType, string path)
+    protected void ValidateSingleField(ResourceFieldAttribute field, ResourceType resourceType, string path)
+    {
+        if (field is AttrAttribute attribute && !attribute.Capabilities.HasFlag(AttrCapabilities.AllowSort))
         {
-            if (field is AttrAttribute attribute && !attribute.Capabilities.HasFlag(AttrCapabilities.AllowSort))
-            {
-                throw new InvalidQueryStringParameterException(_lastParameterName!, "Sorting on the requested attribute is not allowed.",
-                    $"Sorting on attribute '{attribute.PublicName}' is not allowed.");
-            }
+            throw new InvalidQueryStringParameterException(_lastParameterName!, "Sorting on the requested attribute is not allowed.",
+                $"Sorting on attribute '{attribute.PublicName}' is not allowed.");
         }
+    }
 
-        /// <inheritdoc />
-        public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
-        {
-            ArgumentGuard.NotNull(disableQueryStringAttribute, nameof(disableQueryStringAttribute));
+    /// <inheritdoc />
+    public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
+    {
+        ArgumentGuard.NotNull(disableQueryStringAttribute, nameof(disableQueryStringAttribute));
 
-            return !IsAtomicOperationsRequest && !disableQueryStringAttribute.ContainsParameter(JsonApiQueryStringParameters.Sort);
-        }
+        return !IsAtomicOperationsRequest && !disableQueryStringAttribute.ContainsParameter(JsonApiQueryStringParameters.Sort);
+    }
 
-        /// <inheritdoc />
-        public virtual bool CanRead(string parameterName)
-        {
-            ArgumentGuard.NotNullNorEmpty(parameterName, nameof(parameterName));
+    /// <inheritdoc />
+    public virtual bool CanRead(string parameterName)
+    {
+        ArgumentGuard.NotNullNorEmpty(parameterName, nameof(parameterName));
 
-            bool isNested = parameterName.StartsWith("sort[", StringComparison.Ordinal) && parameterName.EndsWith("]", StringComparison.Ordinal);
-            return parameterName == "sort" || isNested;
-        }
+        bool isNested = parameterName.StartsWith("sort[", StringComparison.Ordinal) && parameterName.EndsWith("]", StringComparison.Ordinal);
+        return parameterName == "sort" || isNested;
+    }
 
-        /// <inheritdoc />
-        public virtual void Read(string parameterName, StringValues parameterValue)
-        {
-            _lastParameterName = parameterName;
-
-            try
-            {
-                ResourceFieldChainExpression? scope = GetScope(parameterName);
-                SortExpression sort = GetSort(parameterValue, scope);
-
-                var expressionInScope = new ExpressionInScope(scope, sort);
-                _constraints.Add(expressionInScope);
-            }
-            catch (QueryParseException exception)
-            {
-                throw new InvalidQueryStringParameterException(parameterName, "The specified sort is invalid.", exception.Message, exception);
-            }
-        }
+    /// <inheritdoc />
+    public virtual void Read(string parameterName, StringValues parameterValue)
+    {
+        _lastParameterName = parameterName;
 
-        private ResourceFieldChainExpression? GetScope(string parameterName)
+        try
         {
-            QueryStringParameterScopeExpression parameterScope = _scopeParser.Parse(parameterName, RequestResourceType);
-
-            if (parameterScope.Scope == null)
-            {
-                AssertIsCollectionRequest();
-            }
+            ResourceFieldChainExpression? scope = GetScope(parameterName);
+            SortExpression sort = GetSort(parameterValue, scope);
 
-            return parameterScope.Scope;
+            var expressionInScope = new ExpressionInScope(scope, sort);
+            _constraints.Add(expressionInScope);
         }
-
-        private SortExpression GetSort(string parameterValue, ResourceFieldChainExpression? scope)
+        catch (QueryParseException exception)
         {
-            ResourceType resourceTypeInScope = GetResourceTypeForScope(scope);
-            return _sortParser.Parse(parameterValue, resourceTypeInScope);
+            throw new InvalidQueryStringParameterException(parameterName, "The specified sort is invalid.", exception.Message, exception);
         }
+    }
+
+    private ResourceFieldChainExpression? GetScope(string parameterName)
+    {
+        QueryStringParameterScopeExpression parameterScope = _scopeParser.Parse(parameterName, RequestResourceType);
 
-        /// <inheritdoc />
-        public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
+        if (parameterScope.Scope == null)
         {
-            return _constraints;
+            AssertIsCollectionRequest();
         }
+
+        return parameterScope.Scope;
+    }
+
+    private SortExpression GetSort(string parameterValue, ResourceFieldChainExpression? scope)
+    {
+        ResourceType resourceTypeInScope = GetResourceTypeForScope(scope);
+        return _sortParser.Parse(parameterValue, resourceTypeInScope);
+    }
+
+    /// <inheritdoc />
+    public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
+    {
+        return _constraints;
     }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/Internal/SparseFieldSetQueryStringParameterReader.cs b/src/JsonApiDotNetCore/QueryStrings/Internal/SparseFieldSetQueryStringParameterReader.cs
index 07ba665f18..d8f1e858ea 100644
--- a/src/JsonApiDotNetCore/QueryStrings/Internal/SparseFieldSetQueryStringParameterReader.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/Internal/SparseFieldSetQueryStringParameterReader.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers.Annotations;
@@ -14,97 +11,96 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCore.QueryStrings.Internal
+namespace JsonApiDotNetCore.QueryStrings.Internal;
+
+[PublicAPI]
+public class SparseFieldSetQueryStringParameterReader : QueryStringParameterReader, ISparseFieldSetQueryStringParameterReader
 {
-    [PublicAPI]
-    public class SparseFieldSetQueryStringParameterReader : QueryStringParameterReader, ISparseFieldSetQueryStringParameterReader
-    {
-        private readonly SparseFieldTypeParser _sparseFieldTypeParser;
-        private readonly SparseFieldSetParser _sparseFieldSetParser;
+    private readonly SparseFieldTypeParser _sparseFieldTypeParser;
+    private readonly SparseFieldSetParser _sparseFieldSetParser;
 
-        private readonly ImmutableDictionary<ResourceType, SparseFieldSetExpression>.Builder _sparseFieldTableBuilder =
-            ImmutableDictionary.CreateBuilder<ResourceType, SparseFieldSetExpression>();
+    private readonly ImmutableDictionary<ResourceType, SparseFieldSetExpression>.Builder _sparseFieldTableBuilder =
+        ImmutableDictionary.CreateBuilder<ResourceType, SparseFieldSetExpression>();
 
-        private string? _lastParameterName;
+    private string? _lastParameterName;
 
-        /// <inheritdoc />
-        bool IQueryStringParameterReader.AllowEmptyValue => true;
+    /// <inheritdoc />
+    bool IQueryStringParameterReader.AllowEmptyValue => true;
 
-        public SparseFieldSetQueryStringParameterReader(IJsonApiRequest request, IResourceGraph resourceGraph)
-            : base(request, resourceGraph)
-        {
-            _sparseFieldTypeParser = new SparseFieldTypeParser(resourceGraph);
-            _sparseFieldSetParser = new SparseFieldSetParser(ValidateSingleField);
-        }
+    public SparseFieldSetQueryStringParameterReader(IJsonApiRequest request, IResourceGraph resourceGraph)
+        : base(request, resourceGraph)
+    {
+        _sparseFieldTypeParser = new SparseFieldTypeParser(resourceGraph);
+        _sparseFieldSetParser = new SparseFieldSetParser(ValidateSingleField);
+    }
 
-        protected void ValidateSingleField(ResourceFieldAttribute field, ResourceType resourceType, string path)
+    protected void ValidateSingleField(ResourceFieldAttribute field, ResourceType resourceType, string path)
+    {
+        if (field is AttrAttribute attribute && !attribute.Capabilities.HasFlag(AttrCapabilities.AllowView))
         {
-            if (field is AttrAttribute attribute && !attribute.Capabilities.HasFlag(AttrCapabilities.AllowView))
-            {
-                throw new InvalidQueryStringParameterException(_lastParameterName!, "Retrieving the requested attribute is not allowed.",
-                    $"Retrieving the attribute '{attribute.PublicName}' is not allowed.");
-            }
+            throw new InvalidQueryStringParameterException(_lastParameterName!, "Retrieving the requested attribute is not allowed.",
+                $"Retrieving the attribute '{attribute.PublicName}' is not allowed.");
         }
+    }
 
-        /// <inheritdoc />
-        public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
-        {
-            ArgumentGuard.NotNull(disableQueryStringAttribute, nameof(disableQueryStringAttribute));
+    /// <inheritdoc />
+    public virtual bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
+    {
+        ArgumentGuard.NotNull(disableQueryStringAttribute, nameof(disableQueryStringAttribute));
 
-            return !IsAtomicOperationsRequest && !disableQueryStringAttribute.ContainsParameter(JsonApiQueryStringParameters.Fields);
-        }
+        return !IsAtomicOperationsRequest && !disableQueryStringAttribute.ContainsParameter(JsonApiQueryStringParameters.Fields);
+    }
 
-        /// <inheritdoc />
-        public virtual bool CanRead(string parameterName)
-        {
-            ArgumentGuard.NotNullNorEmpty(parameterName, nameof(parameterName));
+    /// <inheritdoc />
+    public virtual bool CanRead(string parameterName)
+    {
+        ArgumentGuard.NotNullNorEmpty(parameterName, nameof(parameterName));
 
-            return parameterName.StartsWith("fields[", StringComparison.Ordinal) && parameterName.EndsWith("]", StringComparison.Ordinal);
-        }
+        return parameterName.StartsWith("fields[", StringComparison.Ordinal) && parameterName.EndsWith("]", StringComparison.Ordinal);
+    }
 
-        /// <inheritdoc />
-        public virtual void Read(string parameterName, StringValues parameterValue)
-        {
-            _lastParameterName = parameterName;
-
-            try
-            {
-                ResourceType targetResourceType = GetSparseFieldType(parameterName);
-                SparseFieldSetExpression sparseFieldSet = GetSparseFieldSet(parameterValue, targetResourceType);
-
-                _sparseFieldTableBuilder[targetResourceType] = sparseFieldSet;
-            }
-            catch (QueryParseException exception)
-            {
-                throw new InvalidQueryStringParameterException(parameterName, "The specified fieldset is invalid.", exception.Message, exception);
-            }
-        }
+    /// <inheritdoc />
+    public virtual void Read(string parameterName, StringValues parameterValue)
+    {
+        _lastParameterName = parameterName;
 
-        private ResourceType GetSparseFieldType(string parameterName)
+        try
         {
-            return _sparseFieldTypeParser.Parse(parameterName);
-        }
+            ResourceType targetResourceType = GetSparseFieldType(parameterName);
+            SparseFieldSetExpression sparseFieldSet = GetSparseFieldSet(parameterValue, targetResourceType);
 
-        private SparseFieldSetExpression GetSparseFieldSet(string parameterValue, ResourceType resourceType)
+            _sparseFieldTableBuilder[targetResourceType] = sparseFieldSet;
+        }
+        catch (QueryParseException exception)
         {
-            SparseFieldSetExpression? sparseFieldSet = _sparseFieldSetParser.Parse(parameterValue, resourceType);
+            throw new InvalidQueryStringParameterException(parameterName, "The specified fieldset is invalid.", exception.Message, exception);
+        }
+    }
 
-            if (sparseFieldSet == null)
-            {
-                // We add ID on an incoming empty fieldset, so that callers can distinguish between no fieldset and an empty one.
-                AttrAttribute idAttribute = resourceType.GetAttributeByPropertyName(nameof(Identifiable<object>.Id));
-                return new SparseFieldSetExpression(ImmutableHashSet.Create<ResourceFieldAttribute>(idAttribute));
-            }
+    private ResourceType GetSparseFieldType(string parameterName)
+    {
+        return _sparseFieldTypeParser.Parse(parameterName);
+    }
 
-            return sparseFieldSet;
-        }
+    private SparseFieldSetExpression GetSparseFieldSet(string parameterValue, ResourceType resourceType)
+    {
+        SparseFieldSetExpression? sparseFieldSet = _sparseFieldSetParser.Parse(parameterValue, resourceType);
 
-        /// <inheritdoc />
-        public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
+        if (sparseFieldSet == null)
         {
-            return _sparseFieldTableBuilder.Any()
-                ? new ExpressionInScope(null, new SparseFieldTableExpression(_sparseFieldTableBuilder.ToImmutable())).AsArray()
-                : Array.Empty<ExpressionInScope>();
+            // We add ID on an incoming empty fieldset, so that callers can distinguish between no fieldset and an empty one.
+            AttrAttribute idAttribute = resourceType.GetAttributeByPropertyName(nameof(Identifiable<object>.Id));
+            return new SparseFieldSetExpression(ImmutableHashSet.Create<ResourceFieldAttribute>(idAttribute));
         }
+
+        return sparseFieldSet;
+    }
+
+    /// <inheritdoc />
+    public virtual IReadOnlyCollection<ExpressionInScope> GetConstraints()
+    {
+        return _sparseFieldTableBuilder.Any()
+            ? new ExpressionInScope(null, new SparseFieldTableExpression(_sparseFieldTableBuilder.ToImmutable())).AsArray()
+            : Array.Empty<ExpressionInScope>();
     }
 }
diff --git a/src/JsonApiDotNetCore/QueryStrings/JsonApiQueryStringParameters.cs b/src/JsonApiDotNetCore/QueryStrings/JsonApiQueryStringParameters.cs
index 9c220686ac..c1f59ceab6 100644
--- a/src/JsonApiDotNetCore/QueryStrings/JsonApiQueryStringParameters.cs
+++ b/src/JsonApiDotNetCore/QueryStrings/JsonApiQueryStringParameters.cs
@@ -1,20 +1,18 @@
-using System;
 using JsonApiDotNetCore.Controllers.Annotations;
 
-namespace JsonApiDotNetCore.QueryStrings
+namespace JsonApiDotNetCore.QueryStrings;
+
+/// <summary>
+/// Lists query string parameters used by <see cref="DisableQueryStringAttribute" />.
+/// </summary>
+[Flags]
+public enum JsonApiQueryStringParameters
 {
-    /// <summary>
-    /// Lists query string parameters used by <see cref="DisableQueryStringAttribute" />.
-    /// </summary>
-    [Flags]
-    public enum JsonApiQueryStringParameters
-    {
-        None = 0,
-        Filter = 1,
-        Sort = 2,
-        Include = 4,
-        Page = 8,
-        Fields = 16,
-        All = Filter | Sort | Include | Page | Fields
-    }
+    None = 0,
+    Filter = 1,
+    Sort = 2,
+    Include = 4,
+    Page = 8,
+    Fields = 16,
+    All = Filter | Sort | Include | Page | Fields
 }
diff --git a/src/JsonApiDotNetCore/Repositories/DataStoreUpdateException.cs b/src/JsonApiDotNetCore/Repositories/DataStoreUpdateException.cs
index 4ba6b8fc3b..e823b50077 100644
--- a/src/JsonApiDotNetCore/Repositories/DataStoreUpdateException.cs
+++ b/src/JsonApiDotNetCore/Repositories/DataStoreUpdateException.cs
@@ -1,17 +1,15 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Repositories
+namespace JsonApiDotNetCore.Repositories;
+
+/// <summary>
+/// The error that is thrown when the underlying data store is unable to persist changes.
+/// </summary>
+[PublicAPI]
+public sealed class DataStoreUpdateException : Exception
 {
-    /// <summary>
-    /// The error that is thrown when the underlying data store is unable to persist changes.
-    /// </summary>
-    [PublicAPI]
-    public sealed class DataStoreUpdateException : Exception
+    public DataStoreUpdateException(Exception? innerException)
+        : base("Failed to persist changes in the underlying data store.", innerException)
     {
-        public DataStoreUpdateException(Exception? innerException)
-            : base("Failed to persist changes in the underlying data store.", innerException)
-        {
-        }
     }
 }
diff --git a/src/JsonApiDotNetCore/Repositories/DbContextExtensions.cs b/src/JsonApiDotNetCore/Repositories/DbContextExtensions.cs
index 6fec658c4e..e9a9488b7b 100644
--- a/src/JsonApiDotNetCore/Repositories/DbContextExtensions.cs
+++ b/src/JsonApiDotNetCore/Repositories/DbContextExtensions.cs
@@ -1,63 +1,60 @@
-using System;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 
-namespace JsonApiDotNetCore.Repositories
+namespace JsonApiDotNetCore.Repositories;
+
+[PublicAPI]
+public static class DbContextExtensions
 {
-    [PublicAPI]
-    public static class DbContextExtensions
+    /// <summary>
+    /// If not already tracked, attaches the specified resource to the change tracker in <see cref="EntityState.Unchanged" /> state.
+    /// </summary>
+    public static IIdentifiable GetTrackedOrAttach(this DbContext dbContext, IIdentifiable resource)
     {
-        /// <summary>
-        /// If not already tracked, attaches the specified resource to the change tracker in <see cref="EntityState.Unchanged" /> state.
-        /// </summary>
-        public static IIdentifiable GetTrackedOrAttach(this DbContext dbContext, IIdentifiable resource)
-        {
-            ArgumentGuard.NotNull(dbContext, nameof(dbContext));
-            ArgumentGuard.NotNull(resource, nameof(resource));
-
-            var trackedIdentifiable = (IIdentifiable?)dbContext.GetTrackedIdentifiable(resource);
+        ArgumentGuard.NotNull(dbContext, nameof(dbContext));
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-            if (trackedIdentifiable == null)
-            {
-                dbContext.Entry(resource).State = EntityState.Unchanged;
-                trackedIdentifiable = resource;
-            }
+        var trackedIdentifiable = (IIdentifiable?)dbContext.GetTrackedIdentifiable(resource);
 
-            return trackedIdentifiable;
+        if (trackedIdentifiable == null)
+        {
+            dbContext.Entry(resource).State = EntityState.Unchanged;
+            trackedIdentifiable = resource;
         }
 
-        /// <summary>
-        /// Searches the change tracker for an entity that matches the type and ID of <paramref name="identifiable" />.
-        /// </summary>
-        public static object? GetTrackedIdentifiable(this DbContext dbContext, IIdentifiable identifiable)
-        {
-            ArgumentGuard.NotNull(dbContext, nameof(dbContext));
-            ArgumentGuard.NotNull(identifiable, nameof(identifiable));
+        return trackedIdentifiable;
+    }
 
-            Type resourceClrType = identifiable.GetType();
-            string? stringId = identifiable.StringId;
+    /// <summary>
+    /// Searches the change tracker for an entity that matches the type and ID of <paramref name="identifiable" />.
+    /// </summary>
+    public static object? GetTrackedIdentifiable(this DbContext dbContext, IIdentifiable identifiable)
+    {
+        ArgumentGuard.NotNull(dbContext, nameof(dbContext));
+        ArgumentGuard.NotNull(identifiable, nameof(identifiable));
 
-            EntityEntry? entityEntry = dbContext.ChangeTracker.Entries().FirstOrDefault(entry => IsResource(entry, resourceClrType, stringId));
+        Type resourceClrType = identifiable.GetType();
+        string? stringId = identifiable.StringId;
 
-            return entityEntry?.Entity;
-        }
+        EntityEntry? entityEntry = dbContext.ChangeTracker.Entries().FirstOrDefault(entry => IsResource(entry, resourceClrType, stringId));
 
-        private static bool IsResource(EntityEntry entry, Type resourceClrType, string? stringId)
-        {
-            return entry.Entity.GetType() == resourceClrType && ((IIdentifiable)entry.Entity).StringId == stringId;
-        }
+        return entityEntry?.Entity;
+    }
 
-        /// <summary>
-        /// Detaches all entities from the change tracker.
-        /// </summary>
-        public static void ResetChangeTracker(this DbContext dbContext)
-        {
-            ArgumentGuard.NotNull(dbContext, nameof(dbContext));
+    private static bool IsResource(EntityEntry entry, Type resourceClrType, string? stringId)
+    {
+        return entry.Entity.GetType() == resourceClrType && ((IIdentifiable)entry.Entity).StringId == stringId;
+    }
 
-            dbContext.ChangeTracker.Clear();
-        }
+    /// <summary>
+    /// Detaches all entities from the change tracker.
+    /// </summary>
+    public static void ResetChangeTracker(this DbContext dbContext)
+    {
+        ArgumentGuard.NotNull(dbContext, nameof(dbContext));
+
+        dbContext.ChangeTracker.Clear();
     }
 }
diff --git a/src/JsonApiDotNetCore/Repositories/DbContextResolver.cs b/src/JsonApiDotNetCore/Repositories/DbContextResolver.cs
index 61dfcb388d..c8013a5f0a 100644
--- a/src/JsonApiDotNetCore/Repositories/DbContextResolver.cs
+++ b/src/JsonApiDotNetCore/Repositories/DbContextResolver.cs
@@ -1,30 +1,29 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCore.Repositories
+namespace JsonApiDotNetCore.Repositories;
+
+/// <inheritdoc />
+[PublicAPI]
+public sealed class DbContextResolver<TDbContext> : IDbContextResolver
+    where TDbContext : DbContext
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public sealed class DbContextResolver<TDbContext> : IDbContextResolver
-        where TDbContext : DbContext
-    {
-        private readonly TDbContext _dbContext;
+    private readonly TDbContext _dbContext;
 
-        public DbContextResolver(TDbContext dbContext)
-        {
-            ArgumentGuard.NotNull(dbContext, nameof(dbContext));
+    public DbContextResolver(TDbContext dbContext)
+    {
+        ArgumentGuard.NotNull(dbContext, nameof(dbContext));
 
-            _dbContext = dbContext;
-        }
+        _dbContext = dbContext;
+    }
 
-        public DbContext GetContext()
-        {
-            return _dbContext;
-        }
+    public DbContext GetContext()
+    {
+        return _dbContext;
+    }
 
-        public TDbContext GetTypedContext()
-        {
-            return _dbContext;
-        }
+    public TDbContext GetTypedContext()
+    {
+        return _dbContext;
     }
 }
diff --git a/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs b/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs
index 2092f8935a..52c07c5244 100644
--- a/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs
+++ b/src/JsonApiDotNetCore/Repositories/EntityFrameworkCoreRepository.cs
@@ -1,11 +1,6 @@
-using System;
 using System.Collections;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.Linq;
 using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Diagnostics;
@@ -21,560 +16,559 @@
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCore.Repositories
+namespace JsonApiDotNetCore.Repositories;
+
+/// <summary>
+/// Implements the foundational Repository layer in the JsonApiDotNetCore architecture that uses Entity Framework Core.
+/// </summary>
+[PublicAPI]
+public class EntityFrameworkCoreRepository<TResource, TId> : IResourceRepository<TResource, TId>, IRepositorySupportsTransaction
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Implements the foundational Repository layer in the JsonApiDotNetCore architecture that uses Entity Framework Core.
-    /// </summary>
-    [PublicAPI]
-    public class EntityFrameworkCoreRepository<TResource, TId> : IResourceRepository<TResource, TId>, IRepositorySupportsTransaction
-        where TResource : class, IIdentifiable<TId>
+    private readonly CollectionConverter _collectionConverter = new();
+    private readonly ITargetedFields _targetedFields;
+    private readonly DbContext _dbContext;
+    private readonly IResourceGraph _resourceGraph;
+    private readonly IResourceFactory _resourceFactory;
+    private readonly IEnumerable<IQueryConstraintProvider> _constraintProviders;
+    private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
+    private readonly TraceLogWriter<EntityFrameworkCoreRepository<TResource, TId>> _traceWriter;
+
+    /// <inheritdoc />
+    public virtual string? TransactionId => _dbContext.Database.CurrentTransaction?.TransactionId.ToString();
+
+    public EntityFrameworkCoreRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
+        IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
+        IResourceDefinitionAccessor resourceDefinitionAccessor)
     {
-        private readonly CollectionConverter _collectionConverter = new();
-        private readonly ITargetedFields _targetedFields;
-        private readonly DbContext _dbContext;
-        private readonly IResourceGraph _resourceGraph;
-        private readonly IResourceFactory _resourceFactory;
-        private readonly IEnumerable<IQueryConstraintProvider> _constraintProviders;
-        private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
-        private readonly TraceLogWriter<EntityFrameworkCoreRepository<TResource, TId>> _traceWriter;
-
-        /// <inheritdoc />
-        public virtual string? TransactionId => _dbContext.Database.CurrentTransaction?.TransactionId.ToString();
-
-        public EntityFrameworkCoreRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
-            IResourceDefinitionAccessor resourceDefinitionAccessor)
-        {
-            ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
-            ArgumentGuard.NotNull(dbContextResolver, nameof(dbContextResolver));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-            ArgumentGuard.NotNull(resourceFactory, nameof(resourceFactory));
-            ArgumentGuard.NotNull(constraintProviders, nameof(constraintProviders));
-            ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
-            ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
-
-            _targetedFields = targetedFields;
-            _dbContext = dbContextResolver.GetContext();
-            _resourceGraph = resourceGraph;
-            _resourceFactory = resourceFactory;
-            _constraintProviders = constraintProviders;
-            _resourceDefinitionAccessor = resourceDefinitionAccessor;
-            _traceWriter = new TraceLogWriter<EntityFrameworkCoreRepository<TResource, TId>>(loggerFactory);
-        }
+        ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
+        ArgumentGuard.NotNull(dbContextResolver, nameof(dbContextResolver));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        ArgumentGuard.NotNull(resourceFactory, nameof(resourceFactory));
+        ArgumentGuard.NotNull(constraintProviders, nameof(constraintProviders));
+        ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
+        ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
+
+        _targetedFields = targetedFields;
+        _dbContext = dbContextResolver.GetContext();
+        _resourceGraph = resourceGraph;
+        _resourceFactory = resourceFactory;
+        _constraintProviders = constraintProviders;
+        _resourceDefinitionAccessor = resourceDefinitionAccessor;
+        _traceWriter = new TraceLogWriter<EntityFrameworkCoreRepository<TResource, TId>>(loggerFactory);
+    }
 
-        /// <inheritdoc />
-        public virtual async Task<IReadOnlyCollection<TResource>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task<IReadOnlyCollection<TResource>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                queryLayer
-            });
+            queryLayer
+        });
 
-            ArgumentGuard.NotNull(queryLayer, nameof(queryLayer));
+        ArgumentGuard.NotNull(queryLayer, nameof(queryLayer));
 
-            using (CodeTimingSessionManager.Current.Measure("Repository - Get resource(s)"))
-            {
-                IQueryable<TResource> query = ApplyQueryLayer(queryLayer);
+        using (CodeTimingSessionManager.Current.Measure("Repository - Get resource(s)"))
+        {
+            IQueryable<TResource> query = ApplyQueryLayer(queryLayer);
 
-                using (CodeTimingSessionManager.Current.Measure("Execute SQL (data)", MeasurementSettings.ExcludeDatabaseInPercentages))
-                {
-                    return await query.ToListAsync(cancellationToken);
-                }
+            using (CodeTimingSessionManager.Current.Measure("Execute SQL (data)", MeasurementSettings.ExcludeDatabaseInPercentages))
+            {
+                return await query.ToListAsync(cancellationToken);
             }
         }
+    }
 
-        /// <inheritdoc />
-        public virtual async Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                filter
-            });
+            filter
+        });
 
-            using (CodeTimingSessionManager.Current.Measure("Repository - Count resources"))
-            {
-                ResourceType resourceType = _resourceGraph.GetResourceType<TResource>();
+        using (CodeTimingSessionManager.Current.Measure("Repository - Count resources"))
+        {
+            ResourceType resourceType = _resourceGraph.GetResourceType<TResource>();
 
-                var layer = new QueryLayer(resourceType)
-                {
-                    Filter = filter
-                };
+            var layer = new QueryLayer(resourceType)
+            {
+                Filter = filter
+            };
 
-                IQueryable<TResource> query = ApplyQueryLayer(layer);
+            IQueryable<TResource> query = ApplyQueryLayer(layer);
 
-                using (CodeTimingSessionManager.Current.Measure("Execute SQL (count)", MeasurementSettings.ExcludeDatabaseInPercentages))
-                {
-                    return await query.CountAsync(cancellationToken);
-                }
+            using (CodeTimingSessionManager.Current.Measure("Execute SQL (count)", MeasurementSettings.ExcludeDatabaseInPercentages))
+            {
+                return await query.CountAsync(cancellationToken);
             }
         }
+    }
 
-        protected virtual IQueryable<TResource> ApplyQueryLayer(QueryLayer queryLayer)
+    protected virtual IQueryable<TResource> ApplyQueryLayer(QueryLayer queryLayer)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                queryLayer
-            });
+            queryLayer
+        });
 
-            ArgumentGuard.NotNull(queryLayer, nameof(queryLayer));
+        ArgumentGuard.NotNull(queryLayer, nameof(queryLayer));
 
-            using (CodeTimingSessionManager.Current.Measure("Convert QueryLayer to System.Expression"))
-            {
-                IQueryable<TResource> source = GetAll();
+        using (CodeTimingSessionManager.Current.Measure("Convert QueryLayer to System.Expression"))
+        {
+            IQueryable<TResource> source = GetAll();
 
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                QueryableHandlerExpression[] queryableHandlers = _constraintProviders
-                    .SelectMany(provider => provider.GetConstraints())
-                    .Where(expressionInScope => expressionInScope.Scope == null)
-                    .Select(expressionInScope => expressionInScope.Expression)
-                    .OfType<QueryableHandlerExpression>()
-                    .ToArray();
+            QueryableHandlerExpression[] queryableHandlers = _constraintProviders
+                .SelectMany(provider => provider.GetConstraints())
+                .Where(expressionInScope => expressionInScope.Scope == null)
+                .Select(expressionInScope => expressionInScope.Expression)
+                .OfType<QueryableHandlerExpression>()
+                .ToArray();
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                foreach (QueryableHandlerExpression queryableHandler in queryableHandlers)
-                {
-                    source = queryableHandler.Apply(source);
-                }
+            foreach (QueryableHandlerExpression queryableHandler in queryableHandlers)
+            {
+                source = queryableHandler.Apply(source);
+            }
 
-                var nameFactory = new LambdaParameterNameFactory();
+            var nameFactory = new LambdaParameterNameFactory();
 
-                var builder = new QueryableBuilder(source.Expression, source.ElementType, typeof(Queryable), nameFactory, _resourceFactory, _dbContext.Model);
+            var builder = new QueryableBuilder(source.Expression, source.ElementType, typeof(Queryable), nameFactory, _resourceFactory, _dbContext.Model);
 
-                Expression expression = builder.ApplyQuery(queryLayer);
+            Expression expression = builder.ApplyQuery(queryLayer);
 
-                using (CodeTimingSessionManager.Current.Measure("Convert System.Expression to IQueryable"))
-                {
-                    return source.Provider.CreateQuery<TResource>(expression);
-                }
+            using (CodeTimingSessionManager.Current.Measure("Convert System.Expression to IQueryable"))
+            {
+                return source.Provider.CreateQuery<TResource>(expression);
             }
         }
+    }
 
-        protected virtual IQueryable<TResource> GetAll()
-        {
-            return _dbContext.Set<TResource>();
-        }
+    protected virtual IQueryable<TResource> GetAll()
+    {
+        return _dbContext.Set<TResource>();
+    }
 
-        /// <inheritdoc />
-        public virtual Task<TResource> GetForCreateAsync(TId id, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual Task<TResource> GetForCreateAsync(TId id, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                id
-            });
+            id
+        });
 
-            var resource = _resourceFactory.CreateInstance<TResource>();
-            resource.Id = id;
+        var resource = _resourceFactory.CreateInstance<TResource>();
+        resource.Id = id;
 
-            return Task.FromResult(resource);
-        }
+        return Task.FromResult(resource);
+    }
 
-        /// <inheritdoc />
-        public virtual async Task CreateAsync(TResource resourceFromRequest, TResource resourceForDatabase, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task CreateAsync(TResource resourceFromRequest, TResource resourceForDatabase, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                resourceFromRequest,
-                resourceForDatabase
-            });
+            resourceFromRequest,
+            resourceForDatabase
+        });
 
-            ArgumentGuard.NotNull(resourceFromRequest, nameof(resourceFromRequest));
-            ArgumentGuard.NotNull(resourceForDatabase, nameof(resourceForDatabase));
+        ArgumentGuard.NotNull(resourceFromRequest, nameof(resourceFromRequest));
+        ArgumentGuard.NotNull(resourceForDatabase, nameof(resourceForDatabase));
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Create resource");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Create resource");
 
-            foreach (RelationshipAttribute relationship in _targetedFields.Relationships)
-            {
-                object? rightValue = relationship.GetValue(resourceFromRequest);
+        foreach (RelationshipAttribute relationship in _targetedFields.Relationships)
+        {
+            object? rightValue = relationship.GetValue(resourceFromRequest);
 
-                object? rightValueEvaluated = await VisitSetRelationshipAsync(resourceForDatabase, relationship, rightValue, WriteOperationKind.CreateResource,
-                    cancellationToken);
+            object? rightValueEvaluated = await VisitSetRelationshipAsync(resourceForDatabase, relationship, rightValue, WriteOperationKind.CreateResource,
+                cancellationToken);
 
-                await UpdateRelationshipAsync(relationship, resourceForDatabase, rightValueEvaluated, cancellationToken);
-            }
+            await UpdateRelationshipAsync(relationship, resourceForDatabase, rightValueEvaluated, cancellationToken);
+        }
 
-            foreach (AttrAttribute attribute in _targetedFields.Attributes)
-            {
-                attribute.SetValue(resourceForDatabase, attribute.GetValue(resourceFromRequest));
-            }
+        foreach (AttrAttribute attribute in _targetedFields.Attributes)
+        {
+            attribute.SetValue(resourceForDatabase, attribute.GetValue(resourceFromRequest));
+        }
 
-            await _resourceDefinitionAccessor.OnWritingAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
+        await _resourceDefinitionAccessor.OnWritingAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
 
-            DbSet<TResource> dbSet = _dbContext.Set<TResource>();
-            await dbSet.AddAsync(resourceForDatabase, cancellationToken);
+        DbSet<TResource> dbSet = _dbContext.Set<TResource>();
+        await dbSet.AddAsync(resourceForDatabase, cancellationToken);
 
-            await SaveChangesAsync(cancellationToken);
+        await SaveChangesAsync(cancellationToken);
 
-            await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
+        await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
 
-            _dbContext.ResetChangeTracker();
-        }
+        _dbContext.ResetChangeTracker();
+    }
 
-        private async Task<object?> VisitSetRelationshipAsync(TResource leftResource, RelationshipAttribute relationship, object? rightValue,
-            WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    private async Task<object?> VisitSetRelationshipAsync(TResource leftResource, RelationshipAttribute relationship, object? rightValue,
+        WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (relationship is HasOneAttribute hasOneRelationship)
         {
-            if (relationship is HasOneAttribute hasOneRelationship)
-            {
-                return await _resourceDefinitionAccessor.OnSetToOneRelationshipAsync(leftResource, hasOneRelationship, (IIdentifiable?)rightValue,
-                    writeOperation, cancellationToken);
-            }
-
-            if (relationship is HasManyAttribute hasManyRelationship)
-            {
-                HashSet<IIdentifiable> rightResourceIdSet = _collectionConverter.ExtractResources(rightValue).ToHashSet(IdentifiableComparer.Instance);
+            return await _resourceDefinitionAccessor.OnSetToOneRelationshipAsync(leftResource, hasOneRelationship, (IIdentifiable?)rightValue, writeOperation,
+                cancellationToken);
+        }
 
-                await _resourceDefinitionAccessor.OnSetToManyRelationshipAsync(leftResource, hasManyRelationship, rightResourceIdSet, writeOperation,
-                    cancellationToken);
+        if (relationship is HasManyAttribute hasManyRelationship)
+        {
+            HashSet<IIdentifiable> rightResourceIdSet = _collectionConverter.ExtractResources(rightValue).ToHashSet(IdentifiableComparer.Instance);
 
-                return rightResourceIdSet;
-            }
+            await _resourceDefinitionAccessor.OnSetToManyRelationshipAsync(leftResource, hasManyRelationship, rightResourceIdSet, writeOperation,
+                cancellationToken);
 
-            return rightValue;
+            return rightResourceIdSet;
         }
 
-        /// <inheritdoc />
-        public virtual async Task<TResource?> GetForUpdateAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
+        return rightValue;
+    }
+
+    /// <inheritdoc />
+    public virtual async Task<TResource?> GetForUpdateAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                queryLayer
-            });
+            queryLayer
+        });
 
-            ArgumentGuard.NotNull(queryLayer, nameof(queryLayer));
+        ArgumentGuard.NotNull(queryLayer, nameof(queryLayer));
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Get resource for update");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Get resource for update");
 
-            IReadOnlyCollection<TResource> resources = await GetAsync(queryLayer, cancellationToken);
-            return resources.FirstOrDefault();
-        }
+        IReadOnlyCollection<TResource> resources = await GetAsync(queryLayer, cancellationToken);
+        return resources.FirstOrDefault();
+    }
 
-        /// <inheritdoc />
-        public virtual async Task UpdateAsync(TResource resourceFromRequest, TResource resourceFromDatabase, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task UpdateAsync(TResource resourceFromRequest, TResource resourceFromDatabase, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                resourceFromRequest,
-                resourceFromDatabase
-            });
+            resourceFromRequest,
+            resourceFromDatabase
+        });
 
-            ArgumentGuard.NotNull(resourceFromRequest, nameof(resourceFromRequest));
-            ArgumentGuard.NotNull(resourceFromDatabase, nameof(resourceFromDatabase));
+        ArgumentGuard.NotNull(resourceFromRequest, nameof(resourceFromRequest));
+        ArgumentGuard.NotNull(resourceFromDatabase, nameof(resourceFromDatabase));
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Update resource");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Update resource");
 
-            foreach (RelationshipAttribute relationship in _targetedFields.Relationships)
-            {
-                object? rightValue = relationship.GetValue(resourceFromRequest);
+        foreach (RelationshipAttribute relationship in _targetedFields.Relationships)
+        {
+            object? rightValue = relationship.GetValue(resourceFromRequest);
 
-                object? rightValueEvaluated = await VisitSetRelationshipAsync(resourceFromDatabase, relationship, rightValue, WriteOperationKind.UpdateResource,
-                    cancellationToken);
+            object? rightValueEvaluated = await VisitSetRelationshipAsync(resourceFromDatabase, relationship, rightValue, WriteOperationKind.UpdateResource,
+                cancellationToken);
 
-                AssertIsNotClearingRequiredToOneRelationship(relationship, resourceFromDatabase, rightValueEvaluated);
+            AssertIsNotClearingRequiredToOneRelationship(relationship, resourceFromDatabase, rightValueEvaluated);
 
-                await UpdateRelationshipAsync(relationship, resourceFromDatabase, rightValueEvaluated, cancellationToken);
-            }
+            await UpdateRelationshipAsync(relationship, resourceFromDatabase, rightValueEvaluated, cancellationToken);
+        }
 
-            foreach (AttrAttribute attribute in _targetedFields.Attributes)
-            {
-                attribute.SetValue(resourceFromDatabase, attribute.GetValue(resourceFromRequest));
-            }
+        foreach (AttrAttribute attribute in _targetedFields.Attributes)
+        {
+            attribute.SetValue(resourceFromDatabase, attribute.GetValue(resourceFromRequest));
+        }
 
-            await _resourceDefinitionAccessor.OnWritingAsync(resourceFromDatabase, WriteOperationKind.UpdateResource, cancellationToken);
+        await _resourceDefinitionAccessor.OnWritingAsync(resourceFromDatabase, WriteOperationKind.UpdateResource, cancellationToken);
 
-            await SaveChangesAsync(cancellationToken);
+        await SaveChangesAsync(cancellationToken);
 
-            await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceFromDatabase, WriteOperationKind.UpdateResource, cancellationToken);
+        await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceFromDatabase, WriteOperationKind.UpdateResource, cancellationToken);
 
-            _dbContext.ResetChangeTracker();
-        }
+        _dbContext.ResetChangeTracker();
+    }
 
-        protected void AssertIsNotClearingRequiredToOneRelationship(RelationshipAttribute relationship, TResource leftResource, object? rightValue)
+    protected void AssertIsNotClearingRequiredToOneRelationship(RelationshipAttribute relationship, TResource leftResource, object? rightValue)
+    {
+        if (relationship is HasOneAttribute)
         {
-            if (relationship is HasOneAttribute)
-            {
-                INavigation? navigation = GetNavigation(relationship);
-                bool isRelationshipRequired = navigation?.ForeignKey?.IsRequired ?? false;
+            INavigation? navigation = GetNavigation(relationship);
+            bool isRelationshipRequired = navigation?.ForeignKey.IsRequired ?? false;
 
-                bool isClearingRelationship = rightValue == null;
+            bool isClearingRelationship = rightValue == null;
 
-                if (isRelationshipRequired && isClearingRelationship)
-                {
-                    string resourceName = _resourceGraph.GetResourceType<TResource>().PublicName;
-                    throw new CannotClearRequiredRelationshipException(relationship.PublicName, leftResource.StringId!, resourceName);
-                }
+            if (isRelationshipRequired && isClearingRelationship)
+            {
+                string resourceName = _resourceGraph.GetResourceType<TResource>().PublicName;
+                throw new CannotClearRequiredRelationshipException(relationship.PublicName, leftResource.StringId!, resourceName);
             }
         }
+    }
 
-        /// <inheritdoc />
-        public virtual async Task DeleteAsync(TId id, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task DeleteAsync(TId id, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                id
-            });
+            id
+        });
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Delete resource");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Delete resource");
 
-            // This enables OnWritingAsync() to fetch the resource, which adds it to the change tracker.
-            // If so, we'll reuse the tracked resource instead of this placeholder resource.
-            var placeholderResource = _resourceFactory.CreateInstance<TResource>();
-            placeholderResource.Id = id;
+        // This enables OnWritingAsync() to fetch the resource, which adds it to the change tracker.
+        // If so, we'll reuse the tracked resource instead of this placeholder resource.
+        var placeholderResource = _resourceFactory.CreateInstance<TResource>();
+        placeholderResource.Id = id;
 
-            await _resourceDefinitionAccessor.OnWritingAsync(placeholderResource, WriteOperationKind.DeleteResource, cancellationToken);
+        await _resourceDefinitionAccessor.OnWritingAsync(placeholderResource, WriteOperationKind.DeleteResource, cancellationToken);
 
-            var resourceTracked = (TResource)_dbContext.GetTrackedOrAttach(placeholderResource);
+        var resourceTracked = (TResource)_dbContext.GetTrackedOrAttach(placeholderResource);
 
-            foreach (RelationshipAttribute relationship in _resourceGraph.GetResourceType<TResource>().Relationships)
+        foreach (RelationshipAttribute relationship in _resourceGraph.GetResourceType<TResource>().Relationships)
+        {
+            // Loads the data of the relationship, if in Entity Framework Core it is configured in such a way that loading
+            // the related entities into memory is required for successfully executing the selected deletion behavior.
+            if (RequiresLoadOfRelationshipForDeletion(relationship))
             {
-                // Loads the data of the relationship, if in Entity Framework Core it is configured in such a way that loading
-                // the related entities into memory is required for successfully executing the selected deletion behavior.
-                if (RequiresLoadOfRelationshipForDeletion(relationship))
-                {
-                    NavigationEntry navigation = GetNavigationEntry(resourceTracked, relationship);
-                    await navigation.LoadAsync(cancellationToken);
-                }
+                NavigationEntry navigation = GetNavigationEntry(resourceTracked, relationship);
+                await navigation.LoadAsync(cancellationToken);
             }
+        }
 
-            _dbContext.Remove(resourceTracked);
+        _dbContext.Remove(resourceTracked);
 
-            await SaveChangesAsync(cancellationToken);
+        await SaveChangesAsync(cancellationToken);
 
-            await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceTracked, WriteOperationKind.DeleteResource, cancellationToken);
-        }
+        await _resourceDefinitionAccessor.OnWriteSucceededAsync(resourceTracked, WriteOperationKind.DeleteResource, cancellationToken);
+    }
 
-        private NavigationEntry GetNavigationEntry(TResource resource, RelationshipAttribute relationship)
-        {
-            EntityEntry<TResource> entityEntry = _dbContext.Entry(resource);
+    private NavigationEntry GetNavigationEntry(TResource resource, RelationshipAttribute relationship)
+    {
+        EntityEntry<TResource> entityEntry = _dbContext.Entry(resource);
 
-            switch (relationship)
+        switch (relationship)
+        {
+            case HasOneAttribute hasOneRelationship:
+            {
+                return entityEntry.Reference(hasOneRelationship.Property.Name);
+            }
+            case HasManyAttribute hasManyRelationship:
+            {
+                return entityEntry.Collection(hasManyRelationship.Property.Name);
+            }
+            default:
             {
-                case HasOneAttribute hasOneRelationship:
-                {
-                    return entityEntry.Reference(hasOneRelationship.Property.Name);
-                }
-                case HasManyAttribute hasManyRelationship:
-                {
-                    return entityEntry.Collection(hasManyRelationship.Property.Name);
-                }
-                default:
-                {
-                    throw new InvalidOperationException($"Unknown relationship type '{relationship.GetType().Name}'.");
-                }
+                throw new InvalidOperationException($"Unknown relationship type '{relationship.GetType().Name}'.");
             }
         }
+    }
 
-        private bool RequiresLoadOfRelationshipForDeletion(RelationshipAttribute relationship)
-        {
-            INavigation? navigation = GetNavigation(relationship);
-            bool isClearOfForeignKeyRequired = navigation?.ForeignKey.DeleteBehavior == DeleteBehavior.ClientSetNull;
+    private bool RequiresLoadOfRelationshipForDeletion(RelationshipAttribute relationship)
+    {
+        INavigation? navigation = GetNavigation(relationship);
+        bool isClearOfForeignKeyRequired = navigation?.ForeignKey.DeleteBehavior == DeleteBehavior.ClientSetNull;
 
-            bool hasForeignKeyAtLeftSide = HasForeignKeyAtLeftSide(relationship, navigation);
+        bool hasForeignKeyAtLeftSide = HasForeignKeyAtLeftSide(relationship, navigation);
 
-            return isClearOfForeignKeyRequired && !hasForeignKeyAtLeftSide;
-        }
+        return isClearOfForeignKeyRequired && !hasForeignKeyAtLeftSide;
+    }
 
-        private INavigation? GetNavigation(RelationshipAttribute relationship)
-        {
-            IEntityType? entityType = _dbContext.Model.FindEntityType(typeof(TResource));
-            return entityType?.FindNavigation(relationship.Property.Name);
-        }
+    private INavigation? GetNavigation(RelationshipAttribute relationship)
+    {
+        IEntityType? entityType = _dbContext.Model.FindEntityType(typeof(TResource));
+        return entityType?.FindNavigation(relationship.Property.Name);
+    }
 
-        private bool HasForeignKeyAtLeftSide(RelationshipAttribute relationship, INavigation? navigation)
-        {
-            return relationship is HasOneAttribute && navigation is { IsOnDependent: true };
-        }
+    private bool HasForeignKeyAtLeftSide(RelationshipAttribute relationship, INavigation? navigation)
+    {
+        return relationship is HasOneAttribute && navigation is { IsOnDependent: true };
+    }
 
-        /// <inheritdoc />
-        public virtual async Task SetRelationshipAsync(TResource leftResource, object? rightValue, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task SetRelationshipAsync(TResource leftResource, object? rightValue, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                leftResource,
-                rightValue
-            });
+            leftResource,
+            rightValue
+        });
 
-            ArgumentGuard.NotNull(leftResource, nameof(leftResource));
+        ArgumentGuard.NotNull(leftResource, nameof(leftResource));
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Set relationship");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Set relationship");
 
-            RelationshipAttribute relationship = _targetedFields.Relationships.Single();
+        RelationshipAttribute relationship = _targetedFields.Relationships.Single();
 
-            object? rightValueEvaluated =
-                await VisitSetRelationshipAsync(leftResource, relationship, rightValue, WriteOperationKind.SetRelationship, cancellationToken);
+        object? rightValueEvaluated =
+            await VisitSetRelationshipAsync(leftResource, relationship, rightValue, WriteOperationKind.SetRelationship, cancellationToken);
 
-            AssertIsNotClearingRequiredToOneRelationship(relationship, leftResource, rightValueEvaluated);
+        AssertIsNotClearingRequiredToOneRelationship(relationship, leftResource, rightValueEvaluated);
 
-            await UpdateRelationshipAsync(relationship, leftResource, rightValueEvaluated, cancellationToken);
+        await UpdateRelationshipAsync(relationship, leftResource, rightValueEvaluated, cancellationToken);
 
-            await _resourceDefinitionAccessor.OnWritingAsync(leftResource, WriteOperationKind.SetRelationship, cancellationToken);
+        await _resourceDefinitionAccessor.OnWritingAsync(leftResource, WriteOperationKind.SetRelationship, cancellationToken);
 
-            await SaveChangesAsync(cancellationToken);
+        await SaveChangesAsync(cancellationToken);
 
-            await _resourceDefinitionAccessor.OnWriteSucceededAsync(leftResource, WriteOperationKind.SetRelationship, cancellationToken);
-        }
+        await _resourceDefinitionAccessor.OnWriteSucceededAsync(leftResource, WriteOperationKind.SetRelationship, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public virtual async Task AddToToManyRelationshipAsync(TId leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task AddToToManyRelationshipAsync(TId leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                leftId,
-                rightResourceIds
-            });
+            leftId,
+            rightResourceIds
+        });
 
-            ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
+        ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Add to to-many relationship");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Add to to-many relationship");
 
-            var relationship = (HasManyAttribute)_targetedFields.Relationships.Single();
+        var relationship = (HasManyAttribute)_targetedFields.Relationships.Single();
 
-            await _resourceDefinitionAccessor.OnAddToRelationshipAsync<TResource, TId>(leftId, relationship, rightResourceIds, cancellationToken);
+        await _resourceDefinitionAccessor.OnAddToRelationshipAsync<TResource, TId>(leftId, relationship, rightResourceIds, cancellationToken);
 
-            if (rightResourceIds.Any())
-            {
-                var leftPlaceholderResource = _resourceFactory.CreateInstance<TResource>();
-                leftPlaceholderResource.Id = leftId;
+        if (rightResourceIds.Any())
+        {
+            var leftPlaceholderResource = _resourceFactory.CreateInstance<TResource>();
+            leftPlaceholderResource.Id = leftId;
 
-                var leftResourceTracked = (TResource)_dbContext.GetTrackedOrAttach(leftPlaceholderResource);
+            var leftResourceTracked = (TResource)_dbContext.GetTrackedOrAttach(leftPlaceholderResource);
 
-                await UpdateRelationshipAsync(relationship, leftResourceTracked, rightResourceIds, cancellationToken);
+            await UpdateRelationshipAsync(relationship, leftResourceTracked, rightResourceIds, cancellationToken);
 
-                await _resourceDefinitionAccessor.OnWritingAsync(leftResourceTracked, WriteOperationKind.AddToRelationship, cancellationToken);
+            await _resourceDefinitionAccessor.OnWritingAsync(leftResourceTracked, WriteOperationKind.AddToRelationship, cancellationToken);
 
-                await SaveChangesAsync(cancellationToken);
+            await SaveChangesAsync(cancellationToken);
 
-                await _resourceDefinitionAccessor.OnWriteSucceededAsync(leftResourceTracked, WriteOperationKind.AddToRelationship, cancellationToken);
-            }
+            await _resourceDefinitionAccessor.OnWriteSucceededAsync(leftResourceTracked, WriteOperationKind.AddToRelationship, cancellationToken);
         }
+    }
 
-        /// <inheritdoc />
-        public virtual async Task RemoveFromToManyRelationshipAsync(TResource leftResource, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task RemoveFromToManyRelationshipAsync(TResource leftResource, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                leftResource,
-                rightResourceIds
-            });
+            leftResource,
+            rightResourceIds
+        });
 
-            ArgumentGuard.NotNull(leftResource, nameof(leftResource));
-            ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
+        ArgumentGuard.NotNull(leftResource, nameof(leftResource));
+        ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Remove from to-many relationship");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Remove from to-many relationship");
 
-            var relationship = (HasManyAttribute)_targetedFields.Relationships.Single();
-            HashSet<IIdentifiable> rightResourceIdsToRemove = rightResourceIds.ToHashSet(IdentifiableComparer.Instance);
+        var relationship = (HasManyAttribute)_targetedFields.Relationships.Single();
+        HashSet<IIdentifiable> rightResourceIdsToRemove = rightResourceIds.ToHashSet(IdentifiableComparer.Instance);
 
-            await _resourceDefinitionAccessor.OnRemoveFromRelationshipAsync(leftResource, relationship, rightResourceIdsToRemove, cancellationToken);
+        await _resourceDefinitionAccessor.OnRemoveFromRelationshipAsync(leftResource, relationship, rightResourceIdsToRemove, cancellationToken);
 
-            if (rightResourceIdsToRemove.Any())
-            {
-                var leftResourceTracked = (TResource)_dbContext.GetTrackedOrAttach(leftResource);
+        if (rightResourceIdsToRemove.Any())
+        {
+            var leftResourceTracked = (TResource)_dbContext.GetTrackedOrAttach(leftResource);
 
-                // Make Entity Framework Core believe any additional resources added from ResourceDefinition already exist in database.
-                IIdentifiable[] extraResourceIdsToRemove = rightResourceIdsToRemove.Where(rightId => !rightResourceIds.Contains(rightId)).ToArray();
+            // Make Entity Framework Core believe any additional resources added from ResourceDefinition already exist in database.
+            IIdentifiable[] extraResourceIdsToRemove = rightResourceIdsToRemove.Where(rightId => !rightResourceIds.Contains(rightId)).ToArray();
 
-                object? rightValueStored = relationship.GetValue(leftResource);
+            object? rightValueStored = relationship.GetValue(leftResource);
 
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                IIdentifiable[] rightResourceIdsStored = _collectionConverter
-                    .ExtractResources(rightValueStored)
-                    .Concat(extraResourceIdsToRemove)
-                    .Select(rightResource => _dbContext.GetTrackedOrAttach(rightResource))
-                    .ToArray();
+            IIdentifiable[] rightResourceIdsStored = _collectionConverter
+                .ExtractResources(rightValueStored)
+                .Concat(extraResourceIdsToRemove)
+                .Select(rightResource => _dbContext.GetTrackedOrAttach(rightResource))
+                .ToArray();
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                rightValueStored = _collectionConverter.CopyToTypedCollection(rightResourceIdsStored, relationship.Property.PropertyType);
-                relationship.SetValue(leftResource, rightValueStored);
+            rightValueStored = _collectionConverter.CopyToTypedCollection(rightResourceIdsStored, relationship.Property.PropertyType);
+            relationship.SetValue(leftResource, rightValueStored);
 
-                MarkRelationshipAsLoaded(leftResource, relationship);
+            MarkRelationshipAsLoaded(leftResource, relationship);
 
-                HashSet<IIdentifiable> rightResourceIdsToStore = rightResourceIdsStored.ToHashSet(IdentifiableComparer.Instance);
-                rightResourceIdsToStore.ExceptWith(rightResourceIdsToRemove);
+            HashSet<IIdentifiable> rightResourceIdsToStore = rightResourceIdsStored.ToHashSet(IdentifiableComparer.Instance);
+            rightResourceIdsToStore.ExceptWith(rightResourceIdsToRemove);
 
-                if (!rightResourceIdsToStore.SetEquals(rightResourceIdsStored))
-                {
-                    AssertIsNotClearingRequiredToOneRelationship(relationship, leftResourceTracked, rightResourceIdsToStore);
+            if (!rightResourceIdsToStore.SetEquals(rightResourceIdsStored))
+            {
+                AssertIsNotClearingRequiredToOneRelationship(relationship, leftResourceTracked, rightResourceIdsToStore);
 
-                    await UpdateRelationshipAsync(relationship, leftResourceTracked, rightResourceIdsToStore, cancellationToken);
+                await UpdateRelationshipAsync(relationship, leftResourceTracked, rightResourceIdsToStore, cancellationToken);
 
-                    await _resourceDefinitionAccessor.OnWritingAsync(leftResourceTracked, WriteOperationKind.RemoveFromRelationship, cancellationToken);
+                await _resourceDefinitionAccessor.OnWritingAsync(leftResourceTracked, WriteOperationKind.RemoveFromRelationship, cancellationToken);
 
-                    await SaveChangesAsync(cancellationToken);
+                await SaveChangesAsync(cancellationToken);
 
-                    await _resourceDefinitionAccessor.OnWriteSucceededAsync(leftResourceTracked, WriteOperationKind.RemoveFromRelationship, cancellationToken);
-                }
+                await _resourceDefinitionAccessor.OnWriteSucceededAsync(leftResourceTracked, WriteOperationKind.RemoveFromRelationship, cancellationToken);
             }
         }
+    }
 
-        private void MarkRelationshipAsLoaded(TResource leftResource, RelationshipAttribute relationship)
-        {
-            EntityEntry<TResource> leftEntry = _dbContext.Entry(leftResource);
-            CollectionEntry rightCollectionEntry = leftEntry.Collection(relationship.Property.Name);
-            rightCollectionEntry.IsLoaded = true;
-        }
+    private void MarkRelationshipAsLoaded(TResource leftResource, RelationshipAttribute relationship)
+    {
+        EntityEntry<TResource> leftEntry = _dbContext.Entry(leftResource);
+        CollectionEntry rightCollectionEntry = leftEntry.Collection(relationship.Property.Name);
+        rightCollectionEntry.IsLoaded = true;
+    }
+
+    protected async Task UpdateRelationshipAsync(RelationshipAttribute relationship, TResource leftResource, object? valueToAssign,
+        CancellationToken cancellationToken)
+    {
+        object? trackedValueToAssign = EnsureRelationshipValueToAssignIsTracked(valueToAssign, relationship.Property.PropertyType);
 
-        protected async Task UpdateRelationshipAsync(RelationshipAttribute relationship, TResource leftResource, object? valueToAssign,
-            CancellationToken cancellationToken)
+        if (RequireLoadOfInverseRelationship(relationship, trackedValueToAssign))
         {
-            object? trackedValueToAssign = EnsureRelationshipValueToAssignIsTracked(valueToAssign, relationship.Property.PropertyType);
+            EntityEntry entityEntry = _dbContext.Entry(trackedValueToAssign);
+            string inversePropertyName = relationship.InverseNavigationProperty!.Name;
 
-            if (RequireLoadOfInverseRelationship(relationship, trackedValueToAssign))
-            {
-                EntityEntry entityEntry = _dbContext.Entry(trackedValueToAssign);
-                string inversePropertyName = relationship.InverseNavigationProperty!.Name;
+            await entityEntry.Reference(inversePropertyName).LoadAsync(cancellationToken);
+        }
 
-                await entityEntry.Reference(inversePropertyName).LoadAsync(cancellationToken);
-            }
+        relationship.SetValue(leftResource, trackedValueToAssign);
+    }
 
-            relationship.SetValue(leftResource, trackedValueToAssign);
+    private object? EnsureRelationshipValueToAssignIsTracked(object? rightValue, Type relationshipPropertyType)
+    {
+        if (rightValue == null)
+        {
+            return null;
         }
 
-        private object? EnsureRelationshipValueToAssignIsTracked(object? rightValue, Type relationshipPropertyType)
-        {
-            if (rightValue == null)
-            {
-                return null;
-            }
+        ICollection<IIdentifiable> rightResources = _collectionConverter.ExtractResources(rightValue);
+        IIdentifiable[] rightResourcesTracked = rightResources.Select(rightResource => _dbContext.GetTrackedOrAttach(rightResource)).ToArray();
 
-            ICollection<IIdentifiable> rightResources = _collectionConverter.ExtractResources(rightValue);
-            IIdentifiable[] rightResourcesTracked = rightResources.Select(rightResource => _dbContext.GetTrackedOrAttach(rightResource)).ToArray();
+        return rightValue is IEnumerable
+            ? _collectionConverter.CopyToTypedCollection(rightResourcesTracked, relationshipPropertyType)
+            : rightResourcesTracked.Single();
+    }
 
-            return rightValue is IEnumerable
-                ? _collectionConverter.CopyToTypedCollection(rightResourcesTracked, relationshipPropertyType)
-                : rightResourcesTracked.Single();
-        }
+    private bool RequireLoadOfInverseRelationship(RelationshipAttribute relationship, [NotNullWhen(true)] object? trackedValueToAssign)
+    {
+        // See https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/502.
+        return trackedValueToAssign != null && relationship is HasOneAttribute { IsOneToOne: true };
+    }
 
-        private bool RequireLoadOfInverseRelationship(RelationshipAttribute relationship, [NotNullWhen(true)] object? trackedValueToAssign)
-        {
-            // See https://github.com/json-api-dotnet/JsonApiDotNetCore/issues/502.
-            return trackedValueToAssign != null && relationship is HasOneAttribute { IsOneToOne: true };
-        }
+    protected virtual async Task SaveChangesAsync(CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
 
-        protected virtual async Task SaveChangesAsync(CancellationToken cancellationToken)
+        try
         {
-            cancellationToken.ThrowIfCancellationRequested();
-
-            try
-            {
-                using IDisposable _ = CodeTimingSessionManager.Current.Measure("Persist EF Core changes", MeasurementSettings.ExcludeDatabaseInPercentages);
+            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Persist EF Core changes", MeasurementSettings.ExcludeDatabaseInPercentages);
 
-                await _dbContext.SaveChangesAsync(cancellationToken);
-            }
-            catch (Exception exception) when (exception is DbUpdateException or InvalidOperationException)
-            {
-                _dbContext.ResetChangeTracker();
+            await _dbContext.SaveChangesAsync(cancellationToken);
+        }
+        catch (Exception exception) when (exception is DbUpdateException or InvalidOperationException)
+        {
+            _dbContext.ResetChangeTracker();
 
-                throw new DataStoreUpdateException(exception);
-            }
+            throw new DataStoreUpdateException(exception);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Repositories/IDbContextResolver.cs b/src/JsonApiDotNetCore/Repositories/IDbContextResolver.cs
index 0a38f2dfcc..f137e8f453 100644
--- a/src/JsonApiDotNetCore/Repositories/IDbContextResolver.cs
+++ b/src/JsonApiDotNetCore/Repositories/IDbContextResolver.cs
@@ -1,12 +1,11 @@
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCore.Repositories
+namespace JsonApiDotNetCore.Repositories;
+
+/// <summary>
+/// Provides a method to resolve a <see cref="DbContext" />.
+/// </summary>
+public interface IDbContextResolver
 {
-    /// <summary>
-    /// Provides a method to resolve a <see cref="DbContext" />.
-    /// </summary>
-    public interface IDbContextResolver
-    {
-        DbContext GetContext();
-    }
+    DbContext GetContext();
 }
diff --git a/src/JsonApiDotNetCore/Repositories/IRepositorySupportsTransaction.cs b/src/JsonApiDotNetCore/Repositories/IRepositorySupportsTransaction.cs
index 0344e3cbf9..aac80d11df 100644
--- a/src/JsonApiDotNetCore/Repositories/IRepositorySupportsTransaction.cs
+++ b/src/JsonApiDotNetCore/Repositories/IRepositorySupportsTransaction.cs
@@ -1,16 +1,15 @@
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Repositories
+namespace JsonApiDotNetCore.Repositories;
+
+/// <summary>
+/// Used to indicate that an <see cref="IResourceRepository{TResource, TId}" /> supports execution inside a transaction.
+/// </summary>
+[PublicAPI]
+public interface IRepositorySupportsTransaction
 {
     /// <summary>
-    /// Used to indicate that an <see cref="IResourceRepository{TResource, TId}" /> supports execution inside a transaction.
+    /// Identifies the currently active transaction.
     /// </summary>
-    [PublicAPI]
-    public interface IRepositorySupportsTransaction
-    {
-        /// <summary>
-        /// Identifies the currently active transaction.
-        /// </summary>
-        string? TransactionId { get; }
-    }
+    string? TransactionId { get; }
 }
diff --git a/src/JsonApiDotNetCore/Repositories/IResourceReadRepository.cs b/src/JsonApiDotNetCore/Repositories/IResourceReadRepository.cs
index 1b8a69d6bc..1be60d3825 100644
--- a/src/JsonApiDotNetCore/Repositories/IResourceReadRepository.cs
+++ b/src/JsonApiDotNetCore/Repositories/IResourceReadRepository.cs
@@ -1,34 +1,30 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Repositories
+namespace JsonApiDotNetCore.Repositories;
+
+/// <summary>
+/// Groups read operations.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+[PublicAPI]
+public interface IResourceReadRepository<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
     /// <summary>
-    /// Groups read operations.
+    /// Executes a read query using the specified constraints and returns the collection of matching resources.
     /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    [PublicAPI]
-    public interface IResourceReadRepository<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Executes a read query using the specified constraints and returns the collection of matching resources.
-        /// </summary>
-        Task<IReadOnlyCollection<TResource>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken);
+    Task<IReadOnlyCollection<TResource>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Executes a read query using the specified filter and returns the count of matching resources.
-        /// </summary>
-        Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Executes a read query using the specified filter and returns the count of matching resources.
+    /// </summary>
+    Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/Repositories/IResourceRepository.cs b/src/JsonApiDotNetCore/Repositories/IResourceRepository.cs
index 4f20bcaca1..26b7c4513e 100644
--- a/src/JsonApiDotNetCore/Repositories/IResourceRepository.cs
+++ b/src/JsonApiDotNetCore/Repositories/IResourceRepository.cs
@@ -1,20 +1,19 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Repositories
+namespace JsonApiDotNetCore.Repositories;
+
+/// <summary>
+/// Represents the foundational Resource Repository layer in the JsonApiDotNetCore architecture that provides data access to an underlying store.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+[PublicAPI]
+public interface IResourceRepository<TResource, in TId> : IResourceReadRepository<TResource, TId>, IResourceWriteRepository<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Represents the foundational Resource Repository layer in the JsonApiDotNetCore architecture that provides data access to an underlying store.
-    /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    [PublicAPI]
-    public interface IResourceRepository<TResource, in TId> : IResourceReadRepository<TResource, TId>, IResourceWriteRepository<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Repositories/IResourceRepositoryAccessor.cs b/src/JsonApiDotNetCore/Repositories/IResourceRepositoryAccessor.cs
index a2897a237d..9654365121 100644
--- a/src/JsonApiDotNetCore/Repositories/IResourceRepositoryAccessor.cs
+++ b/src/JsonApiDotNetCore/Repositories/IResourceRepositoryAccessor.cs
@@ -1,80 +1,76 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Repositories
+namespace JsonApiDotNetCore.Repositories;
+
+/// <summary>
+/// Retrieves an <see cref="IResourceRepository{TResource,TId}" /> instance from the D/I container and invokes a method on it.
+/// </summary>
+public interface IResourceRepositoryAccessor
 {
     /// <summary>
-    /// Retrieves an <see cref="IResourceRepository{TResource,TId}" /> instance from the D/I container and invokes a method on it.
+    /// Invokes <see cref="IResourceReadRepository{TResource,TId}.GetAsync" />.
     /// </summary>
-    public interface IResourceRepositoryAccessor
-    {
-        /// <summary>
-        /// Invokes <see cref="IResourceReadRepository{TResource,TId}.GetAsync" />.
-        /// </summary>
-        Task<IReadOnlyCollection<TResource>> GetAsync<TResource>(QueryLayer queryLayer, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable;
+    Task<IReadOnlyCollection<TResource>> GetAsync<TResource>(QueryLayer queryLayer, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable;
 
-        /// <summary>
-        /// Invokes <see cref="IResourceReadRepository{TResource,TId}.GetAsync" /> for the specified resource type.
-        /// </summary>
-        Task<IReadOnlyCollection<IIdentifiable>> GetAsync(ResourceType resourceType, QueryLayer queryLayer, CancellationToken cancellationToken);
+    /// <summary>
+    /// Invokes <see cref="IResourceReadRepository{TResource,TId}.GetAsync" /> for the specified resource type.
+    /// </summary>
+    Task<IReadOnlyCollection<IIdentifiable>> GetAsync(ResourceType resourceType, QueryLayer queryLayer, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Invokes <see cref="IResourceReadRepository{TResource,TId}.CountAsync" /> for the specified resource type.
-        /// </summary>
-        Task<int> CountAsync(ResourceType resourceType, FilterExpression? filter, CancellationToken cancellationToken);
+    /// <summary>
+    /// Invokes <see cref="IResourceReadRepository{TResource,TId}.CountAsync" /> for the specified resource type.
+    /// </summary>
+    Task<int> CountAsync(ResourceType resourceType, FilterExpression? filter, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.GetForCreateAsync" />.
-        /// </summary>
-        Task<TResource> GetForCreateAsync<TResource, TId>(TId id, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable<TId>;
+    /// <summary>
+    /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.GetForCreateAsync" />.
+    /// </summary>
+    Task<TResource> GetForCreateAsync<TResource, TId>(TId id, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable<TId>;
 
-        /// <summary>
-        /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.CreateAsync" />.
-        /// </summary>
-        Task CreateAsync<TResource>(TResource resourceFromRequest, TResource resourceForDatabase, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable;
+    /// <summary>
+    /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.CreateAsync" />.
+    /// </summary>
+    Task CreateAsync<TResource>(TResource resourceFromRequest, TResource resourceForDatabase, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable;
 
-        /// <summary>
-        /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.GetForUpdateAsync" />.
-        /// </summary>
-        Task<TResource?> GetForUpdateAsync<TResource>(QueryLayer queryLayer, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable;
+    /// <summary>
+    /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.GetForUpdateAsync" />.
+    /// </summary>
+    Task<TResource?> GetForUpdateAsync<TResource>(QueryLayer queryLayer, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable;
 
-        /// <summary>
-        /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.UpdateAsync" />.
-        /// </summary>
-        Task UpdateAsync<TResource>(TResource resourceFromRequest, TResource resourceFromDatabase, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable;
+    /// <summary>
+    /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.UpdateAsync" />.
+    /// </summary>
+    Task UpdateAsync<TResource>(TResource resourceFromRequest, TResource resourceFromDatabase, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable;
 
-        /// <summary>
-        /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.DeleteAsync" /> for the specified resource type.
-        /// </summary>
-        Task DeleteAsync<TResource, TId>(TId id, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable<TId>;
+    /// <summary>
+    /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.DeleteAsync" /> for the specified resource type.
+    /// </summary>
+    Task DeleteAsync<TResource, TId>(TId id, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable<TId>;
 
-        /// <summary>
-        /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.SetRelationshipAsync" />.
-        /// </summary>
-        Task SetRelationshipAsync<TResource>(TResource leftResource, object? rightValue, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable;
+    /// <summary>
+    /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.SetRelationshipAsync" />.
+    /// </summary>
+    Task SetRelationshipAsync<TResource>(TResource leftResource, object? rightValue, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable;
 
-        /// <summary>
-        /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.AddToToManyRelationshipAsync" /> for the specified resource type.
-        /// </summary>
-        Task AddToToManyRelationshipAsync<TResource, TId>(TId leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable<TId>;
+    /// <summary>
+    /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.AddToToManyRelationshipAsync" /> for the specified resource type.
+    /// </summary>
+    Task AddToToManyRelationshipAsync<TResource, TId>(TId leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable<TId>;
 
-        /// <summary>
-        /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.RemoveFromToManyRelationshipAsync" />.
-        /// </summary>
-        Task RemoveFromToManyRelationshipAsync<TResource>(TResource leftResource, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable;
-    }
+    /// <summary>
+    /// Invokes <see cref="IResourceWriteRepository{TResource,TId}.RemoveFromToManyRelationshipAsync" />.
+    /// </summary>
+    Task RemoveFromToManyRelationshipAsync<TResource>(TResource leftResource, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable;
 }
diff --git a/src/JsonApiDotNetCore/Repositories/IResourceWriteRepository.cs b/src/JsonApiDotNetCore/Repositories/IResourceWriteRepository.cs
index 06a94748a0..ca0186d5b5 100644
--- a/src/JsonApiDotNetCore/Repositories/IResourceWriteRepository.cs
+++ b/src/JsonApiDotNetCore/Repositories/IResourceWriteRepository.cs
@@ -1,66 +1,62 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Repositories
+namespace JsonApiDotNetCore.Repositories;
+
+/// <summary>
+/// Groups write operations.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+[PublicAPI]
+public interface IResourceWriteRepository<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
     /// <summary>
-    /// Groups write operations.
+    /// Creates a new resource instance, in preparation for <see cref="CreateAsync" />.
     /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    [PublicAPI]
-    public interface IResourceWriteRepository<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Creates a new resource instance, in preparation for <see cref="CreateAsync" />.
-        /// </summary>
-        /// <remarks>
-        /// This method can be overridden to assign resource-specific required relationships.
-        /// </remarks>
-        Task<TResource> GetForCreateAsync(TId id, CancellationToken cancellationToken);
+    /// <remarks>
+    /// This method can be overridden to assign resource-specific required relationships.
+    /// </remarks>
+    Task<TResource> GetForCreateAsync(TId id, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Creates a new resource in the underlying data store.
-        /// </summary>
-        Task CreateAsync(TResource resourceFromRequest, TResource resourceForDatabase, CancellationToken cancellationToken);
+    /// <summary>
+    /// Creates a new resource in the underlying data store.
+    /// </summary>
+    Task CreateAsync(TResource resourceFromRequest, TResource resourceForDatabase, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Retrieves a resource with all of its attributes, including the set of targeted relationships, in preparation for <see cref="UpdateAsync" />.
-        /// </summary>
-        Task<TResource?> GetForUpdateAsync(QueryLayer queryLayer, CancellationToken cancellationToken);
+    /// <summary>
+    /// Retrieves a resource with all of its attributes, including the set of targeted relationships, in preparation for <see cref="UpdateAsync" />.
+    /// </summary>
+    Task<TResource?> GetForUpdateAsync(QueryLayer queryLayer, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Updates the attributes and relationships of an existing resource in the underlying data store.
-        /// </summary>
-        Task UpdateAsync(TResource resourceFromRequest, TResource resourceFromDatabase, CancellationToken cancellationToken);
+    /// <summary>
+    /// Updates the attributes and relationships of an existing resource in the underlying data store.
+    /// </summary>
+    Task UpdateAsync(TResource resourceFromRequest, TResource resourceFromDatabase, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Deletes an existing resource from the underlying data store.
-        /// </summary>
-        Task DeleteAsync(TId id, CancellationToken cancellationToken);
+    /// <summary>
+    /// Deletes an existing resource from the underlying data store.
+    /// </summary>
+    Task DeleteAsync(TId id, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Performs a complete replacement of the relationship in the underlying data store.
-        /// </summary>
-        Task SetRelationshipAsync(TResource leftResource, object? rightValue, CancellationToken cancellationToken);
+    /// <summary>
+    /// Performs a complete replacement of the relationship in the underlying data store.
+    /// </summary>
+    Task SetRelationshipAsync(TResource leftResource, object? rightValue, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Adds resources to a to-many relationship in the underlying data store.
-        /// </summary>
-        Task AddToToManyRelationshipAsync(TId leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken);
+    /// <summary>
+    /// Adds resources to a to-many relationship in the underlying data store.
+    /// </summary>
+    Task AddToToManyRelationshipAsync(TId leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Removes resources from a to-many relationship in the underlying data store.
-        /// </summary>
-        Task RemoveFromToManyRelationshipAsync(TResource leftResource, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Removes resources from a to-many relationship in the underlying data store.
+    /// </summary>
+    Task RemoveFromToManyRelationshipAsync(TResource leftResource, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/Repositories/ResourceRepositoryAccessor.cs b/src/JsonApiDotNetCore/Repositories/ResourceRepositoryAccessor.cs
index 806e4dc700..0ba96126a1 100644
--- a/src/JsonApiDotNetCore/Repositories/ResourceRepositoryAccessor.cs
+++ b/src/JsonApiDotNetCore/Repositories/ResourceRepositoryAccessor.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Errors;
@@ -11,155 +7,154 @@
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace JsonApiDotNetCore.Repositories
+namespace JsonApiDotNetCore.Repositories;
+
+/// <inheritdoc />
+[PublicAPI]
+public class ResourceRepositoryAccessor : IResourceRepositoryAccessor
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public class ResourceRepositoryAccessor : IResourceRepositoryAccessor
+    private readonly IServiceProvider _serviceProvider;
+    private readonly IResourceGraph _resourceGraph;
+    private readonly IJsonApiRequest _request;
+
+    public ResourceRepositoryAccessor(IServiceProvider serviceProvider, IResourceGraph resourceGraph, IJsonApiRequest request)
     {
-        private readonly IServiceProvider _serviceProvider;
-        private readonly IResourceGraph _resourceGraph;
-        private readonly IJsonApiRequest _request;
+        ArgumentGuard.NotNull(serviceProvider, nameof(serviceProvider));
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        ArgumentGuard.NotNull(request, nameof(request));
 
-        public ResourceRepositoryAccessor(IServiceProvider serviceProvider, IResourceGraph resourceGraph, IJsonApiRequest request)
-        {
-            ArgumentGuard.NotNull(serviceProvider, nameof(serviceProvider));
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-            ArgumentGuard.NotNull(request, nameof(request));
+        _serviceProvider = serviceProvider;
+        _resourceGraph = resourceGraph;
+        _request = request;
+    }
 
-            _serviceProvider = serviceProvider;
-            _resourceGraph = resourceGraph;
-            _request = request;
-        }
+    /// <inheritdoc />
+    public async Task<IReadOnlyCollection<TResource>> GetAsync<TResource>(QueryLayer queryLayer, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable
+    {
+        dynamic repository = ResolveReadRepository(typeof(TResource));
+        return (IReadOnlyCollection<TResource>)await repository.GetAsync(queryLayer, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public async Task<IReadOnlyCollection<TResource>> GetAsync<TResource>(QueryLayer queryLayer, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable
-        {
-            dynamic repository = ResolveReadRepository(typeof(TResource));
-            return (IReadOnlyCollection<TResource>)await repository.GetAsync(queryLayer, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task<IReadOnlyCollection<IIdentifiable>> GetAsync(ResourceType resourceType, QueryLayer queryLayer, CancellationToken cancellationToken)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-        /// <inheritdoc />
-        public async Task<IReadOnlyCollection<IIdentifiable>> GetAsync(ResourceType resourceType, QueryLayer queryLayer, CancellationToken cancellationToken)
-        {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+        dynamic repository = ResolveReadRepository(resourceType);
+        return (IReadOnlyCollection<IIdentifiable>)await repository.GetAsync(queryLayer, cancellationToken);
+    }
 
-            dynamic repository = ResolveReadRepository(resourceType);
-            return (IReadOnlyCollection<IIdentifiable>)await repository.GetAsync(queryLayer, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task<int> CountAsync(ResourceType resourceType, FilterExpression? filter, CancellationToken cancellationToken)
+    {
+        dynamic repository = ResolveReadRepository(resourceType);
+        return (int)await repository.CountAsync(filter, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public async Task<int> CountAsync(ResourceType resourceType, FilterExpression? filter, CancellationToken cancellationToken)
-        {
-            dynamic repository = ResolveReadRepository(resourceType);
-            return (int)await repository.CountAsync(filter, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task<TResource> GetForCreateAsync<TResource, TId>(TId id, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable<TId>
+    {
+        dynamic repository = GetWriteRepository(typeof(TResource));
+        return await repository.GetForCreateAsync(id, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public async Task<TResource> GetForCreateAsync<TResource, TId>(TId id, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable<TId>
-        {
-            dynamic repository = GetWriteRepository(typeof(TResource));
-            return await repository.GetForCreateAsync(id, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task CreateAsync<TResource>(TResource resourceFromRequest, TResource resourceForDatabase, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable
+    {
+        dynamic repository = GetWriteRepository(typeof(TResource));
+        await repository.CreateAsync(resourceFromRequest, resourceForDatabase, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public async Task CreateAsync<TResource>(TResource resourceFromRequest, TResource resourceForDatabase, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable
-        {
-            dynamic repository = GetWriteRepository(typeof(TResource));
-            await repository.CreateAsync(resourceFromRequest, resourceForDatabase, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task<TResource?> GetForUpdateAsync<TResource>(QueryLayer queryLayer, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable
+    {
+        dynamic repository = GetWriteRepository(typeof(TResource));
+        return await repository.GetForUpdateAsync(queryLayer, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public async Task<TResource?> GetForUpdateAsync<TResource>(QueryLayer queryLayer, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable
-        {
-            dynamic repository = GetWriteRepository(typeof(TResource));
-            return await repository.GetForUpdateAsync(queryLayer, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task UpdateAsync<TResource>(TResource resourceFromRequest, TResource resourceFromDatabase, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable
+    {
+        dynamic repository = GetWriteRepository(typeof(TResource));
+        await repository.UpdateAsync(resourceFromRequest, resourceFromDatabase, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public async Task UpdateAsync<TResource>(TResource resourceFromRequest, TResource resourceFromDatabase, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable
-        {
-            dynamic repository = GetWriteRepository(typeof(TResource));
-            await repository.UpdateAsync(resourceFromRequest, resourceFromDatabase, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task DeleteAsync<TResource, TId>(TId id, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable<TId>
+    {
+        dynamic repository = GetWriteRepository(typeof(TResource));
+        await repository.DeleteAsync(id, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public async Task DeleteAsync<TResource, TId>(TId id, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable<TId>
-        {
-            dynamic repository = GetWriteRepository(typeof(TResource));
-            await repository.DeleteAsync(id, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task SetRelationshipAsync<TResource>(TResource leftResource, object? rightValue, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable
+    {
+        dynamic repository = GetWriteRepository(typeof(TResource));
+        await repository.SetRelationshipAsync(leftResource, rightValue, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public async Task SetRelationshipAsync<TResource>(TResource leftResource, object? rightValue, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable
-        {
-            dynamic repository = GetWriteRepository(typeof(TResource));
-            await repository.SetRelationshipAsync(leftResource, rightValue, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task AddToToManyRelationshipAsync<TResource, TId>(TId leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable<TId>
+    {
+        dynamic repository = GetWriteRepository(typeof(TResource));
+        await repository.AddToToManyRelationshipAsync(leftId, rightResourceIds, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public async Task AddToToManyRelationshipAsync<TResource, TId>(TId leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable<TId>
-        {
-            dynamic repository = GetWriteRepository(typeof(TResource));
-            await repository.AddToToManyRelationshipAsync(leftId, rightResourceIds, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task RemoveFromToManyRelationshipAsync<TResource>(TResource leftResource, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable
+    {
+        dynamic repository = GetWriteRepository(typeof(TResource));
+        await repository.RemoveFromToManyRelationshipAsync(leftResource, rightResourceIds, cancellationToken);
+    }
 
-        /// <inheritdoc />
-        public async Task RemoveFromToManyRelationshipAsync<TResource>(TResource leftResource, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable
-        {
-            dynamic repository = GetWriteRepository(typeof(TResource));
-            await repository.RemoveFromToManyRelationshipAsync(leftResource, rightResourceIds, cancellationToken);
-        }
+    protected object ResolveReadRepository(Type resourceClrType)
+    {
+        ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
+        return ResolveReadRepository(resourceType);
+    }
 
-        protected object ResolveReadRepository(Type resourceClrType)
-        {
-            ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
-            return ResolveReadRepository(resourceType);
-        }
+    protected virtual object ResolveReadRepository(ResourceType resourceType)
+    {
+        Type resourceDefinitionType = typeof(IResourceReadRepository<,>).MakeGenericType(resourceType.ClrType, resourceType.IdentityClrType);
+        return _serviceProvider.GetRequiredService(resourceDefinitionType);
+    }
 
-        protected virtual object ResolveReadRepository(ResourceType resourceType)
-        {
-            Type resourceDefinitionType = typeof(IResourceReadRepository<,>).MakeGenericType(resourceType.ClrType, resourceType.IdentityClrType);
-            return _serviceProvider.GetRequiredService(resourceDefinitionType);
-        }
+    private object GetWriteRepository(Type resourceClrType)
+    {
+        object writeRepository = ResolveWriteRepository(resourceClrType);
 
-        private object GetWriteRepository(Type resourceClrType)
+        if (_request.TransactionId != null)
         {
-            object writeRepository = ResolveWriteRepository(resourceClrType);
-
-            if (_request.TransactionId != null)
+            if (writeRepository is not IRepositorySupportsTransaction repository)
             {
-                if (writeRepository is not IRepositorySupportsTransaction repository)
-                {
-                    ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
-                    throw new MissingTransactionSupportException(resourceType.PublicName);
-                }
-
-                if (repository.TransactionId != _request.TransactionId)
-                {
-                    throw new NonParticipatingTransactionException();
-                }
+                ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
+                throw new MissingTransactionSupportException(resourceType.PublicName);
             }
 
-            return writeRepository;
+            if (repository.TransactionId != _request.TransactionId)
+            {
+                throw new NonParticipatingTransactionException();
+            }
         }
 
-        protected virtual object ResolveWriteRepository(Type resourceClrType)
-        {
-            ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
+        return writeRepository;
+    }
 
-            Type resourceDefinitionType = typeof(IResourceWriteRepository<,>).MakeGenericType(resourceType.ClrType, resourceType.IdentityClrType);
-            return _serviceProvider.GetRequiredService(resourceDefinitionType);
-        }
+    protected virtual object ResolveWriteRepository(Type resourceClrType)
+    {
+        ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
+
+        Type resourceDefinitionType = typeof(IResourceWriteRepository<,>).MakeGenericType(resourceType.ClrType, resourceType.IdentityClrType);
+        return _serviceProvider.GetRequiredService(resourceDefinitionType);
     }
 }
diff --git a/src/JsonApiDotNetCore/Resources/Annotations/AttrAttribute.cs b/src/JsonApiDotNetCore/Resources/Annotations/AttrAttribute.cs
deleted file mode 100644
index 79ffbbed3d..0000000000
--- a/src/JsonApiDotNetCore/Resources/Annotations/AttrAttribute.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System;
-using JetBrains.Annotations;
-
-namespace JsonApiDotNetCore.Resources.Annotations
-{
-    /// <summary>
-    /// Used to expose a property on a resource class as a JSON:API attribute (https://jsonapi.org/format/#document-resource-object-attributes).
-    /// </summary>
-    [PublicAPI]
-    [AttributeUsage(AttributeTargets.Property)]
-    public sealed class AttrAttribute : ResourceFieldAttribute
-    {
-        private AttrCapabilities? _capabilities;
-
-        internal bool HasExplicitCapabilities => _capabilities != null;
-
-        /// <summary>
-        /// The set of capabilities that are allowed to be performed on this attribute. When not explicitly assigned, the configured default set of capabilities
-        /// is used.
-        /// </summary>
-        /// <example>
-        /// <code>
-        /// public class Author : Identifiable
-        /// {
-        ///     [Attr(Capabilities = AttrCapabilities.AllowFilter | AttrCapabilities.AllowSort)]
-        ///     public string Name { get; set; }
-        /// }
-        /// </code>
-        /// </example>
-        public AttrCapabilities Capabilities
-        {
-            get => _capabilities ?? default;
-            set => _capabilities = value;
-        }
-
-        public override bool Equals(object? obj)
-        {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
-
-            var other = (AttrAttribute)obj;
-
-            return Capabilities == other.Capabilities && base.Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(Capabilities, base.GetHashCode());
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/Annotations/AttrCapabilities.cs b/src/JsonApiDotNetCore/Resources/Annotations/AttrCapabilities.cs
deleted file mode 100644
index 9eb93c9377..0000000000
--- a/src/JsonApiDotNetCore/Resources/Annotations/AttrCapabilities.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-
-namespace JsonApiDotNetCore.Resources.Annotations
-{
-    /// <summary>
-    /// Indicates capabilities that can be performed on an <see cref="AttrAttribute" />.
-    /// </summary>
-    [Flags]
-    public enum AttrCapabilities
-    {
-        None = 0,
-
-        /// <summary>
-        /// Whether or not GET requests can retrieve the attribute. Attempts to retrieve when disabled will return an HTTP 400 response.
-        /// </summary>
-        AllowView = 1,
-
-        /// <summary>
-        /// Whether or not POST requests can assign the attribute value. Attempts to assign when disabled will return an HTTP 422 response.
-        /// </summary>
-        AllowCreate = 2,
-
-        /// <summary>
-        /// Whether or not PATCH requests can update the attribute value. Attempts to update when disabled will return an HTTP 422 response.
-        /// </summary>
-        AllowChange = 4,
-
-        /// <summary>
-        /// Whether or not an attribute can be filtered on via a query string parameter. Attempts to filter when disabled will return an HTTP 400 response.
-        /// </summary>
-        AllowFilter = 8,
-
-        /// <summary>
-        /// Whether or not an attribute can be sorted on via a query string parameter. Attempts to sort when disabled will return an HTTP 400 response.
-        /// </summary>
-        AllowSort = 16,
-
-        All = AllowView | AllowCreate | AllowChange | AllowFilter | AllowSort
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/Annotations/EagerLoadAttribute.cs b/src/JsonApiDotNetCore/Resources/Annotations/EagerLoadAttribute.cs
deleted file mode 100644
index bc81116763..0000000000
--- a/src/JsonApiDotNetCore/Resources/Annotations/EagerLoadAttribute.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using JetBrains.Annotations;
-
-namespace JsonApiDotNetCore.Resources.Annotations
-{
-    /// <summary>
-    /// Used to unconditionally load a related entity that is not exposed as a JSON:API relationship.
-    /// </summary>
-    /// <remarks>
-    /// This is intended for calculated properties that are exposed as JSON:API attributes, which depend on a related entity to always be loaded.
-    /// <example><![CDATA[
-    /// public class User : Identifiable
-    /// {
-    ///     [Attr(AttrCapabilities.AllowFilter | AttrCapabilities.AllowSort)]
-    ///     [NotMapped]
-    ///     public string DisplayName => Name.First + " " + Name.Last;
-    /// 
-    ///     [EagerLoad]
-    ///     public Name Name { get; set; }
-    /// }
-    /// 
-    /// public class Name // not exposed as resource, only database table
-    /// {
-    ///     public string First { get; set; }
-    ///     public string Last { get; set; }
-    /// }
-    /// 
-    /// public class Blog : Identifiable
-    /// {
-    ///     [HasOne]
-    ///     public User Author { get; set; }
-    /// }
-    /// ]]></example>
-    /// </remarks>
-    [PublicAPI]
-    [AttributeUsage(AttributeTargets.Property)]
-    public sealed class EagerLoadAttribute : Attribute
-    {
-        // These properties are definitely assigned after building the resource graph, which is why they are declared as non-nullable.
-
-        public PropertyInfo Property { get; internal set; } = null!;
-
-        public IReadOnlyCollection<EagerLoadAttribute> Children { get; internal set; } = null!;
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/Annotations/HasManyAttribute.cs b/src/JsonApiDotNetCore/Resources/Annotations/HasManyAttribute.cs
deleted file mode 100644
index 0adb22cb77..0000000000
--- a/src/JsonApiDotNetCore/Resources/Annotations/HasManyAttribute.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System;
-using System.Threading;
-using JetBrains.Annotations;
-
-namespace JsonApiDotNetCore.Resources.Annotations
-{
-    /// <summary>
-    /// Used to expose a property on a resource class as a JSON:API to-many relationship
-    /// (https://jsonapi.org/format/#document-resource-object-relationships).
-    /// </summary>
-    /// <example>
-    /// <code><![CDATA[
-    /// public class Author : Identifiable
-    /// {
-    ///     [HasMany]
-    ///     public ISet<Article> Articles { get; set; }
-    /// }
-    /// ]]></code>
-    /// </example>
-    [PublicAPI]
-    [AttributeUsage(AttributeTargets.Property)]
-    public sealed class HasManyAttribute : RelationshipAttribute
-    {
-        private readonly Lazy<bool> _lazyIsManyToMany;
-
-        /// <summary>
-        /// Inspects <see cref="RelationshipAttribute.InverseNavigationProperty" /> to determine if this is a many-to-many relationship.
-        /// </summary>
-        internal bool IsManyToMany => _lazyIsManyToMany.Value;
-
-        public HasManyAttribute()
-        {
-            _lazyIsManyToMany = new Lazy<bool>(EvaluateIsManyToMany, LazyThreadSafetyMode.PublicationOnly);
-        }
-
-        private bool EvaluateIsManyToMany()
-        {
-            if (InverseNavigationProperty != null)
-            {
-                Type? elementType = CollectionConverter.FindCollectionElementType(InverseNavigationProperty.PropertyType);
-                return elementType != null;
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/Annotations/HasOneAttribute.cs b/src/JsonApiDotNetCore/Resources/Annotations/HasOneAttribute.cs
deleted file mode 100644
index 05e9483260..0000000000
--- a/src/JsonApiDotNetCore/Resources/Annotations/HasOneAttribute.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using System;
-using System.Threading;
-using JetBrains.Annotations;
-
-namespace JsonApiDotNetCore.Resources.Annotations
-{
-    /// <summary>
-    /// Used to expose a property on a resource class as a JSON:API to-one relationship (https://jsonapi.org/format/#document-resource-object-relationships).
-    /// </summary>
-    /// <example>
-    /// <code><![CDATA[
-    /// public class Article : Identifiable
-    /// {
-    ///     [HasOne]
-    ///     public Author Author { get; set; }
-    /// }
-    /// ]]></code>
-    /// </example>
-    [PublicAPI]
-    [AttributeUsage(AttributeTargets.Property)]
-    public sealed class HasOneAttribute : RelationshipAttribute
-    {
-        private readonly Lazy<bool> _lazyIsOneToOne;
-
-        /// <summary>
-        /// Inspects <see cref="RelationshipAttribute.InverseNavigationProperty" /> to determine if this is a one-to-one relationship.
-        /// </summary>
-        internal bool IsOneToOne => _lazyIsOneToOne.Value;
-
-        public HasOneAttribute()
-        {
-            _lazyIsOneToOne = new Lazy<bool>(EvaluateIsOneToOne, LazyThreadSafetyMode.PublicationOnly);
-        }
-
-        private bool EvaluateIsOneToOne()
-        {
-            if (InverseNavigationProperty != null)
-            {
-                Type? elementType = CollectionConverter.FindCollectionElementType(InverseNavigationProperty.PropertyType);
-                return elementType == null;
-            }
-
-            return false;
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/Annotations/LinkTypes.cs b/src/JsonApiDotNetCore/Resources/Annotations/LinkTypes.cs
deleted file mode 100644
index d655a8b882..0000000000
--- a/src/JsonApiDotNetCore/Resources/Annotations/LinkTypes.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-
-namespace JsonApiDotNetCore.Resources.Annotations
-{
-    [Flags]
-    public enum LinkTypes
-    {
-        Self = 1 << 0,
-        Related = 1 << 1,
-        Paging = 1 << 2,
-        NotConfigured = 1 << 3,
-        None = 1 << 4,
-        All = Self | Related | Paging
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/Annotations/RelationshipAttribute.cs b/src/JsonApiDotNetCore/Resources/Annotations/RelationshipAttribute.cs
deleted file mode 100644
index 6324766f96..0000000000
--- a/src/JsonApiDotNetCore/Resources/Annotations/RelationshipAttribute.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-using System;
-using System.Reflection;
-using JetBrains.Annotations;
-using JsonApiDotNetCore.Configuration;
-
-// ReSharper disable NonReadonlyMemberInGetHashCode
-
-namespace JsonApiDotNetCore.Resources.Annotations
-{
-    /// <summary>
-    /// Used to expose a property on a resource class as a JSON:API relationship (https://jsonapi.org/format/#document-resource-object-relationships).
-    /// </summary>
-    [PublicAPI]
-    public abstract class RelationshipAttribute : ResourceFieldAttribute
-    {
-        private protected static readonly CollectionConverter CollectionConverter = new();
-
-        /// <summary>
-        /// The CLR type in which this relationship is declared.
-        /// </summary>
-        internal Type? LeftClrType { get; set; }
-
-        /// <summary>
-        /// The CLR type this relationship points to. In the case of a <see cref="HasManyAttribute" /> relationship, this value will be the collection element
-        /// type.
-        /// </summary>
-        /// <example>
-        /// <code><![CDATA[
-        /// public ISet<Tag> Tags { get; set; } // RightClrType: typeof(Tag)
-        /// ]]></code>
-        /// </example>
-        internal Type? RightClrType { get; set; }
-
-        /// <summary>
-        /// The <see cref="PropertyInfo" /> of the Entity Framework Core inverse navigation, which may or may not exist. Even if it exists, it may not be exposed
-        /// as a JSON:API relationship.
-        /// </summary>
-        /// <example>
-        /// <code><![CDATA[
-        /// public class Article : Identifiable
-        /// {
-        ///     [HasOne] // InverseNavigationProperty: Person.Articles
-        ///     public Person Owner { get; set; }
-        /// }
-        /// 
-        /// public class Person : Identifiable
-        /// {
-        ///     [HasMany] // InverseNavigationProperty: Article.Owner
-        ///     public ICollection<Article> Articles { get; set; }
-        /// }
-        /// ]]></code>
-        /// </example>
-        public PropertyInfo? InverseNavigationProperty { get; set; }
-
-        /// <summary>
-        /// The containing resource type in which this relationship is declared.
-        /// </summary>
-        public ResourceType LeftType { get; internal set; } = null!;
-
-        /// <summary>
-        /// The resource type this relationship points to. In the case of a <see cref="HasManyAttribute" /> relationship, this value will be the collection
-        /// element type.
-        /// </summary>
-        public ResourceType RightType { get; internal set; } = null!;
-
-        /// <summary>
-        /// Configures which links to show in the <see cref="Serialization.Objects.RelationshipLinks" /> object for this relationship. Defaults to
-        /// <see cref="LinkTypes.NotConfigured" />, which falls back to <see cref="ResourceLinksAttribute.RelationshipLinks" /> and then falls back to
-        /// <see cref="IJsonApiOptions.RelationshipLinks" />.
-        /// </summary>
-        public LinkTypes Links { get; set; } = LinkTypes.NotConfigured;
-
-        /// <summary>
-        /// Whether or not this relationship can be included using the
-        /// <c>
-        /// ?include=publicName
-        /// </c>
-        /// query string parameter. This is <c>true</c> by default.
-        /// </summary>
-        public bool CanInclude { get; set; } = true;
-
-        public override bool Equals(object? obj)
-        {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
-
-            var other = (RelationshipAttribute)obj;
-
-            return LeftClrType == other.LeftClrType && RightClrType == other.RightClrType && Links == other.Links && CanInclude == other.CanInclude &&
-                base.Equals(other);
-        }
-
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(LeftClrType, RightClrType, Links, CanInclude, base.GetHashCode());
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/Annotations/ResourceAttribute.cs b/src/JsonApiDotNetCore/Resources/Annotations/ResourceAttribute.cs
deleted file mode 100644
index 501d085d57..0000000000
--- a/src/JsonApiDotNetCore/Resources/Annotations/ResourceAttribute.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;
-using JetBrains.Annotations;
-
-namespace JsonApiDotNetCore.Resources.Annotations
-{
-    /// <summary>
-    /// When put on a resource class, overrides the convention-based resource name.
-    /// </summary>
-    [PublicAPI]
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface)]
-    public sealed class ResourceAttribute : Attribute
-    {
-        /// <summary>
-        /// The publicly exposed name of this resource type. When not explicitly assigned, the configured naming convention is applied on the pluralized resource
-        /// class name.
-        /// </summary>
-        public string PublicName { get; }
-
-        public ResourceAttribute(string publicName)
-        {
-            ArgumentGuard.NotNullNorEmpty(publicName, nameof(publicName));
-
-            PublicName = publicName;
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/Annotations/ResourceFieldAttribute.cs b/src/JsonApiDotNetCore/Resources/Annotations/ResourceFieldAttribute.cs
deleted file mode 100644
index 8463689301..0000000000
--- a/src/JsonApiDotNetCore/Resources/Annotations/ResourceFieldAttribute.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-using System;
-using System.Reflection;
-using JetBrains.Annotations;
-
-// ReSharper disable NonReadonlyMemberInGetHashCode
-
-namespace JsonApiDotNetCore.Resources.Annotations
-{
-    /// <summary>
-    /// Used to expose a property on a resource class as a JSON:API field (attribute or relationship). See
-    /// https://jsonapi.org/format/#document-resource-object-fields.
-    /// </summary>
-    [PublicAPI]
-    public abstract class ResourceFieldAttribute : Attribute
-    {
-        // These are definitely assigned after building the resource graph, which is why their public equivalents are declared as non-nullable.
-        private string? _publicName;
-        private PropertyInfo? _property;
-
-        /// <summary>
-        /// The publicly exposed name of this JSON:API field. When not explicitly assigned, the configured naming convention is applied on the property name.
-        /// </summary>
-        public string PublicName
-        {
-            get => _publicName!;
-            set
-            {
-                if (string.IsNullOrWhiteSpace(value))
-                {
-                    throw new ArgumentException("Exposed name cannot be null, empty or contain only whitespace.", nameof(value));
-                }
-
-                _publicName = value;
-            }
-        }
-
-        /// <summary>
-        /// The resource property that this attribute is declared on.
-        /// </summary>
-        public PropertyInfo Property
-        {
-            get => _property!;
-            internal set
-            {
-                ArgumentGuard.NotNull(value, nameof(value));
-                _property = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the value of this field on the specified resource instance. Throws if the property is write-only or if the field does not belong to the
-        /// specified resource instance.
-        /// </summary>
-        public object? GetValue(object resource)
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
-
-            if (Property.GetMethod == null)
-            {
-                throw new InvalidOperationException($"Property '{Property.DeclaringType?.Name}.{Property.Name}' is write-only.");
-            }
-
-            try
-            {
-                return Property.GetValue(resource);
-            }
-            catch (TargetException exception)
-            {
-                throw new InvalidOperationException(
-                    $"Unable to get property value of '{Property.DeclaringType!.Name}.{Property.Name}' on instance of type '{resource.GetType().Name}'.",
-                    exception);
-            }
-        }
-
-        /// <summary>
-        /// Sets the value of this field on the specified resource instance. Throws if the property is read-only or if the field does not belong to the specified
-        /// resource instance.
-        /// </summary>
-        public void SetValue(object resource, object? newValue)
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
-
-            if (Property.SetMethod == null)
-            {
-                throw new InvalidOperationException($"Property '{Property.DeclaringType?.Name}.{Property.Name}' is read-only.");
-            }
-
-            try
-            {
-                Property.SetValue(resource, newValue);
-            }
-            catch (TargetException exception)
-            {
-                throw new InvalidOperationException(
-                    $"Unable to set property value of '{Property.DeclaringType!.Name}.{Property.Name}' on instance of type '{resource.GetType().Name}'.",
-                    exception);
-            }
-        }
-
-        public override string? ToString()
-        {
-            return _publicName ?? (_property != null ? _property.Name : base.ToString());
-        }
-
-        public override bool Equals(object? obj)
-        {
-            if (ReferenceEquals(this, obj))
-            {
-                return true;
-            }
-
-            if (obj is null || GetType() != obj.GetType())
-            {
-                return false;
-            }
-
-            var other = (ResourceFieldAttribute)obj;
-
-            return _publicName == other._publicName && _property == other._property;
-        }
-
-        public override int GetHashCode()
-        {
-            return HashCode.Combine(_publicName, _property);
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/Annotations/ResourceLinksAttribute.cs b/src/JsonApiDotNetCore/Resources/Annotations/ResourceLinksAttribute.cs
deleted file mode 100644
index f4d3a1ffc7..0000000000
--- a/src/JsonApiDotNetCore/Resources/Annotations/ResourceLinksAttribute.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using JetBrains.Annotations;
-using JsonApiDotNetCore.Configuration;
-
-namespace JsonApiDotNetCore.Resources.Annotations
-{
-    /// <summary>
-    /// When put on a resource class, overrides global configuration for which links to render.
-    /// </summary>
-    [PublicAPI]
-    [AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Interface)]
-    public sealed class ResourceLinksAttribute : Attribute
-    {
-        /// <summary>
-        /// Configures which links to show in the <see cref="Serialization.Objects.TopLevelLinks" /> object for this resource type. Defaults to
-        /// <see cref="LinkTypes.NotConfigured" />, which falls back to <see cref="IJsonApiOptions.TopLevelLinks" />.
-        /// </summary>
-        public LinkTypes TopLevelLinks { get; set; } = LinkTypes.NotConfigured;
-
-        /// <summary>
-        /// Configures which links to show in the <see cref="Serialization.Objects.ResourceLinks" /> object for this resource type. Defaults to
-        /// <see cref="LinkTypes.NotConfigured" />, which falls back to <see cref="IJsonApiOptions.ResourceLinks" />.
-        /// </summary>
-        public LinkTypes ResourceLinks { get; set; } = LinkTypes.NotConfigured;
-
-        /// <summary>
-        /// Configures which links to show in the <see cref="Serialization.Objects.RelationshipLinks" /> object for all relationships of this resource type.
-        /// Defaults to <see cref="LinkTypes.NotConfigured" />, which falls back to <see cref="IJsonApiOptions.RelationshipLinks" />. This can be overruled per
-        /// relationship by setting <see cref="RelationshipAttribute.Links" />.
-        /// </summary>
-        public LinkTypes RelationshipLinks { get; set; } = LinkTypes.NotConfigured;
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/IIdentifiable.cs b/src/JsonApiDotNetCore/Resources/IIdentifiable.cs
deleted file mode 100644
index ee1f73942a..0000000000
--- a/src/JsonApiDotNetCore/Resources/IIdentifiable.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-namespace JsonApiDotNetCore.Resources
-{
-    /// <summary>
-    /// Defines the basic contract for a JSON:API resource. All resource classes must implement <see cref="IIdentifiable{TId}" />.
-    /// </summary>
-    public interface IIdentifiable
-    {
-        /// <summary>
-        /// The value for element 'id' in a JSON:API request or response.
-        /// </summary>
-        string? StringId { get; set; }
-
-        /// <summary>
-        /// The value for element 'lid' in a JSON:API request.
-        /// </summary>
-        string? LocalId { get; set; }
-    }
-
-    /// <summary>
-    /// When implemented by a class, indicates to JsonApiDotNetCore that the class represents a JSON:API resource.
-    /// </summary>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    public interface IIdentifiable<TId> : IIdentifiable
-    {
-        /// <summary>
-        /// The typed identifier as used by the underlying data store (usually numeric or Guid).
-        /// </summary>
-        TId Id { get; set; }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/IResourceChangeTracker.cs b/src/JsonApiDotNetCore/Resources/IResourceChangeTracker.cs
index df16dc603f..1f69735f92 100644
--- a/src/JsonApiDotNetCore/Resources/IResourceChangeTracker.cs
+++ b/src/JsonApiDotNetCore/Resources/IResourceChangeTracker.cs
@@ -1,34 +1,33 @@
-namespace JsonApiDotNetCore.Resources
+namespace JsonApiDotNetCore.Resources;
+
+/// <summary>
+/// Used to determine whether additional changes to a resource (side effects), not specified in a POST or PATCH request, have been applied.
+/// </summary>
+public interface IResourceChangeTracker<in TResource>
+    where TResource : class, IIdentifiable
 {
     /// <summary>
-    /// Used to determine whether additional changes to a resource (side effects), not specified in a POST or PATCH request, have been applied.
+    /// Sets the exposed resource attributes as stored in database, before applying the PATCH operation. For POST operations, this sets exposed resource
+    /// attributes to their default value.
     /// </summary>
-    public interface IResourceChangeTracker<in TResource>
-        where TResource : class, IIdentifiable
-    {
-        /// <summary>
-        /// Sets the exposed resource attributes as stored in database, before applying the PATCH operation. For POST operations, this sets exposed resource
-        /// attributes to their default value.
-        /// </summary>
-        void SetInitiallyStoredAttributeValues(TResource resource);
+    void SetInitiallyStoredAttributeValues(TResource resource);
 
-        /// <summary>
-        /// Sets the (subset of) exposed resource attributes from the POST or PATCH request.
-        /// </summary>
-        void SetRequestAttributeValues(TResource resource);
+    /// <summary>
+    /// Sets the (subset of) exposed resource attributes from the POST or PATCH request.
+    /// </summary>
+    void SetRequestAttributeValues(TResource resource);
 
-        /// <summary>
-        /// Sets the exposed resource attributes as stored in database, after applying the POST or PATCH operation.
-        /// </summary>
-        void SetFinallyStoredAttributeValues(TResource resource);
+    /// <summary>
+    /// Sets the exposed resource attributes as stored in database, after applying the POST or PATCH operation.
+    /// </summary>
+    void SetFinallyStoredAttributeValues(TResource resource);
 
-        /// <summary>
-        /// Validates if any exposed resource attributes that were not in the POST or PATCH request have been changed. And validates if the values from the
-        /// request are stored without modification.
-        /// </summary>
-        /// <returns>
-        /// <c>true</c> if the attribute values from the POST or PATCH request were the only changes; <c>false</c>, otherwise.
-        /// </returns>
-        bool HasImplicitChanges();
-    }
+    /// <summary>
+    /// Validates if any exposed resource attributes that were not in the POST or PATCH request have been changed. And validates if the values from the
+    /// request are stored without modification.
+    /// </summary>
+    /// <returns>
+    /// <c>true</c> if the attribute values from the POST or PATCH request were the only changes; <c>false</c>, otherwise.
+    /// </returns>
+    bool HasImplicitChanges();
 }
diff --git a/src/JsonApiDotNetCore/Resources/IResourceDefinition.cs b/src/JsonApiDotNetCore/Resources/IResourceDefinition.cs
index 9eed0aaa16..1a61868de5 100644
--- a/src/JsonApiDotNetCore/Resources/IResourceDefinition.cs
+++ b/src/JsonApiDotNetCore/Resources/IResourceDefinition.cs
@@ -1,330 +1,325 @@
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Resources
+namespace JsonApiDotNetCore.Resources;
+
+/// <summary>
+/// Provides an extensibility point to add business logic that is resource-oriented instead of endpoint-oriented.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+[PublicAPI]
+public interface IResourceDefinition<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
     /// <summary>
-    /// Provides an extensibility point to add business logic that is resource-oriented instead of endpoint-oriented.
+    /// Enables to extend, replace or remove includes that are being applied on this resource type.
     /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    [PublicAPI]
-    public interface IResourceDefinition<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Enables to extend, replace or remove includes that are being applied on this resource type.
-        /// </summary>
-        /// <param name="existingIncludes">
-        /// An optional existing set of includes, coming from query string. Never <c>null</c>, but may be empty.
-        /// </param>
-        /// <returns>
-        /// The new set of includes. Return an empty collection to remove all inclusions (never return <c>null</c>).
-        /// </returns>
-        IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes);
+    /// <param name="existingIncludes">
+    /// An optional existing set of includes, coming from query string. Never <c>null</c>, but may be empty.
+    /// </param>
+    /// <returns>
+    /// The new set of includes. Return an empty collection to remove all inclusions (never return <c>null</c>).
+    /// </returns>
+    IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes);
 
-        /// <summary>
-        /// Enables to extend, replace or remove a filter that is being applied on a set of this resource type.
-        /// </summary>
-        /// <param name="existingFilter">
-        /// An optional existing filter, coming from query string. Can be <c>null</c>.
-        /// </param>
-        /// <returns>
-        /// The new filter, or <c>null</c> to disable the existing filter.
-        /// </returns>
-        FilterExpression? OnApplyFilter(FilterExpression? existingFilter);
+    /// <summary>
+    /// Enables to extend, replace or remove a filter that is being applied on a set of this resource type.
+    /// </summary>
+    /// <param name="existingFilter">
+    /// An optional existing filter, coming from query string. Can be <c>null</c>.
+    /// </param>
+    /// <returns>
+    /// The new filter, or <c>null</c> to disable the existing filter.
+    /// </returns>
+    FilterExpression? OnApplyFilter(FilterExpression? existingFilter);
 
-        /// <summary>
-        /// Enables to extend, replace or remove a sort order that is being applied on a set of this resource type. Tip: Use
-        /// <see cref="JsonApiResourceDefinition{TResource, TId}.CreateSortExpressionFromLambda" /> to build from a lambda expression.
-        /// </summary>
-        /// <param name="existingSort">
-        /// An optional existing sort order, coming from query string. Can be <c>null</c>.
-        /// </param>
-        /// <returns>
-        /// The new sort order, or <c>null</c> to disable the existing sort order and sort by ID.
-        /// </returns>
-        SortExpression? OnApplySort(SortExpression? existingSort);
+    /// <summary>
+    /// Enables to extend, replace or remove a sort order that is being applied on a set of this resource type. Tip: Use
+    /// <see cref="JsonApiResourceDefinition{TResource, TId}.CreateSortExpressionFromLambda" /> to build from a lambda expression.
+    /// </summary>
+    /// <param name="existingSort">
+    /// An optional existing sort order, coming from query string. Can be <c>null</c>.
+    /// </param>
+    /// <returns>
+    /// The new sort order, or <c>null</c> to disable the existing sort order and sort by ID.
+    /// </returns>
+    SortExpression? OnApplySort(SortExpression? existingSort);
 
-        /// <summary>
-        /// Enables to extend, replace or remove pagination that is being applied on a set of this resource type.
-        /// </summary>
-        /// <param name="existingPagination">
-        /// An optional existing pagination, coming from query string. Can be <c>null</c>.
-        /// </param>
-        /// <returns>
-        /// The changed pagination, or <c>null</c> to use the first page with default size from options. To disable paging, set
-        /// <see cref="PaginationExpression.PageSize" /> to <c>null</c>.
-        /// </returns>
-        PaginationExpression? OnApplyPagination(PaginationExpression? existingPagination);
+    /// <summary>
+    /// Enables to extend, replace or remove pagination that is being applied on a set of this resource type.
+    /// </summary>
+    /// <param name="existingPagination">
+    /// An optional existing pagination, coming from query string. Can be <c>null</c>.
+    /// </param>
+    /// <returns>
+    /// The changed pagination, or <c>null</c> to use the first page with default size from options. To disable paging, set
+    /// <see cref="PaginationExpression.PageSize" /> to <c>null</c>.
+    /// </returns>
+    PaginationExpression? OnApplyPagination(PaginationExpression? existingPagination);
 
-        /// <summary>
-        /// Enables to extend, replace or remove a sparse fieldset that is being applied on a set of this resource type. Tip: Use
-        /// <see cref="SparseFieldSetExpressionExtensions.Including{TResource}" /> and <see cref="SparseFieldSetExpressionExtensions.Excluding{TResource}" /> to
-        /// safely change the fieldset without worrying about nulls.
-        /// </summary>
-        /// <remarks>
-        /// This method executes twice for a single request: first to select which fields to retrieve from the data store and then to select which fields to
-        /// serialize. Including extra fields from this method will retrieve them, but not include them in the json output. This enables you to expose calculated
-        /// properties whose value depends on a field that is not in the sparse fieldset.
-        /// </remarks>
-        /// <param name="existingSparseFieldSet">
-        /// The incoming sparse fieldset from query string. At query execution time, this is <c>null</c> if the query string contains no sparse fieldset. At
-        /// serialization time, this contains all viewable fields if the query string contains no sparse fieldset.
-        /// </param>
-        /// <returns>
-        /// The new sparse fieldset, or <c>null</c> to discard the existing sparse fieldset and select all viewable fields.
-        /// </returns>
-        SparseFieldSetExpression? OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet);
+    /// <summary>
+    /// Enables to extend, replace or remove a sparse fieldset that is being applied on a set of this resource type. Tip: Use
+    /// <see cref="SparseFieldSetExpressionExtensions.Including{TResource}" /> and <see cref="SparseFieldSetExpressionExtensions.Excluding{TResource}" /> to
+    /// safely change the fieldset without worrying about nulls.
+    /// </summary>
+    /// <remarks>
+    /// This method executes twice for a single request: first to select which fields to retrieve from the data store and then to select which fields to
+    /// serialize. Including extra fields from this method will retrieve them, but not include them in the json output. This enables you to expose calculated
+    /// properties whose value depends on a field that is not in the sparse fieldset.
+    /// </remarks>
+    /// <param name="existingSparseFieldSet">
+    /// The incoming sparse fieldset from query string. At query execution time, this is <c>null</c> if the query string contains no sparse fieldset. At
+    /// serialization time, this contains all viewable fields if the query string contains no sparse fieldset.
+    /// </param>
+    /// <returns>
+    /// The new sparse fieldset, or <c>null</c> to discard the existing sparse fieldset and select all viewable fields.
+    /// </returns>
+    SparseFieldSetExpression? OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet);
 
-        /// <summary>
-        /// Enables to adapt the Entity Framework Core <see cref="IQueryable{T}" /> query, based on custom query string parameters. Note this only works on
-        /// primary resource requests, such as /articles, but not on /blogs/1/articles or /blogs?include=articles.
-        /// </summary>
-        /// <example>
-        /// <code><![CDATA[
-        /// protected override QueryStringParameterHandlers OnRegisterQueryableHandlersForQueryStringParameters()
-        /// {
-        ///     return new QueryStringParameterHandlers
-        ///     {
-        ///         ["isActive"] = (source, parameterValue) => source
-        ///             .Include(model => model.Children)
-        ///             .Where(model => model.LastUpdateTime > DateTime.Now.AddMonths(-1)),
-        ///         ["isHighRisk"] = FilterByHighRisk
-        ///     };
-        /// }
-        /// 
-        /// private static IQueryable<Model> FilterByHighRisk(IQueryable<Model> source, StringValues parameterValue)
-        /// {
-        ///     bool isFilterOnHighRisk = bool.Parse(parameterValue);
-        ///     return isFilterOnHighRisk ? source.Where(model => model.RiskLevel >= 5) : source.Where(model => model.RiskLevel < 5);
-        /// }
-        /// ]]></code>
-        /// </example>
+    /// <summary>
+    /// Enables to adapt the Entity Framework Core <see cref="IQueryable{T}" /> query, based on custom query string parameters. Note this only works on
+    /// primary resource requests, such as /articles, but not on /blogs/1/articles or /blogs?include=articles.
+    /// </summary>
+    /// <example>
+    /// <code><![CDATA[
+    /// protected override QueryStringParameterHandlers OnRegisterQueryableHandlersForQueryStringParameters()
+    /// {
+    ///     return new QueryStringParameterHandlers
+    ///     {
+    ///         ["isActive"] = (source, parameterValue) => source
+    ///             .Include(model => model.Children)
+    ///             .Where(model => model.LastUpdateTime > DateTime.Now.AddMonths(-1)),
+    ///         ["isHighRisk"] = FilterByHighRisk
+    ///     };
+    /// }
+    /// 
+    /// private static IQueryable<Model> FilterByHighRisk(IQueryable<Model> source, StringValues parameterValue)
+    /// {
+    ///     bool isFilterOnHighRisk = bool.Parse(parameterValue);
+    ///     return isFilterOnHighRisk ? source.Where(model => model.RiskLevel >= 5) : source.Where(model => model.RiskLevel < 5);
+    /// }
+    /// ]]></code>
+    /// </example>
 #pragma warning disable AV1130 // Return type in method signature should be a collection interface instead of a concrete type
-        QueryStringParameterHandlers<TResource>? OnRegisterQueryableHandlersForQueryStringParameters();
+    QueryStringParameterHandlers<TResource>? OnRegisterQueryableHandlersForQueryStringParameters();
 #pragma warning restore AV1130 // Return type in method signature should be a collection interface instead of a concrete type
 
-        /// <summary>
-        /// Enables to add JSON:API meta information, specific to this resource.
-        /// </summary>
-        IDictionary<string, object?>? GetMeta(TResource resource);
+    /// <summary>
+    /// Enables to add JSON:API meta information, specific to this resource.
+    /// </summary>
+    IDictionary<string, object?>? GetMeta(TResource resource);
 
-        /// <summary>
-        /// Executes after the original version of the resource has been retrieved from the underlying data store, as part of a write request.
-        /// <para>
-        /// Implementing this method enables to perform validations and make changes to <paramref name="resource" />, before the fields from the request are
-        /// copied into it.
-        /// </para>
-        /// <para>
-        /// For POST resource requests, this method is typically used to assign property default values or to set required relationships by side-loading the
-        /// related resources and linking them.
-        /// </para>
-        /// </summary>
-        /// <param name="resource">
-        /// The original resource retrieved from the underlying data store, or a freshly instantiated resource in case of a POST resource request.
-        /// </param>
-        /// <param name="writeOperation">
-        /// Identifies the logical write operation for which this method was called. Possible values: <see cref="WriteOperationKind.CreateResource" />,
-        /// <see cref="WriteOperationKind.UpdateResource" /> and <see cref="WriteOperationKind.SetRelationship" />. Note this intentionally excludes
-        /// <see cref="WriteOperationKind.DeleteResource" />, <see cref="WriteOperationKind.AddToRelationship" /> and
-        /// <see cref="WriteOperationKind.RemoveFromRelationship" />, because for those endpoints no resource is retrieved upfront.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        Task OnPrepareWriteAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken);
+    /// <summary>
+    /// Executes after the original version of the resource has been retrieved from the underlying data store, as part of a write request.
+    /// <para>
+    /// Implementing this method enables to perform validations and make changes to <paramref name="resource" />, before the fields from the request are
+    /// copied into it.
+    /// </para>
+    /// <para>
+    /// For POST resource requests, this method is typically used to assign property default values or to set required relationships by side-loading the
+    /// related resources and linking them.
+    /// </para>
+    /// </summary>
+    /// <param name="resource">
+    /// The original resource retrieved from the underlying data store, or a freshly instantiated resource in case of a POST resource request.
+    /// </param>
+    /// <param name="writeOperation">
+    /// Identifies the logical write operation for which this method was called. Possible values: <see cref="WriteOperationKind.CreateResource" />,
+    /// <see cref="WriteOperationKind.UpdateResource" /> and <see cref="WriteOperationKind.SetRelationship" />. Note this intentionally excludes
+    /// <see cref="WriteOperationKind.DeleteResource" />, <see cref="WriteOperationKind.AddToRelationship" /> and
+    /// <see cref="WriteOperationKind.RemoveFromRelationship" />, because for those endpoints no resource is retrieved upfront.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    Task OnPrepareWriteAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Executes before setting (or clearing) the resource at the right side of a to-one relationship.
-        /// <para>
-        /// Implementing this method enables to perform validations and change <paramref name="rightResourceId" />, before the relationship is updated.
-        /// </para>
-        /// </summary>
-        /// <param name="leftResource">
-        /// The original resource as retrieved from the underlying data store. The indication "left" specifies that <paramref name="hasOneRelationship" /> is
-        /// declared on <typeparamref name="TResource" />.
-        /// </param>
-        /// <param name="hasOneRelationship">
-        /// The to-one relationship being set.
-        /// </param>
-        /// <param name="rightResourceId">
-        /// The new resource identifier (or <c>null</c> to clear the relationship), coming from the request.
-        /// </param>
-        /// <param name="writeOperation">
-        /// Identifies the logical write operation for which this method was called. Possible values: <see cref="WriteOperationKind.CreateResource" />,
-        /// <see cref="WriteOperationKind.UpdateResource" /> and <see cref="WriteOperationKind.SetRelationship" />.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        /// <returns>
-        /// The replacement resource identifier, or <c>null</c> to clear the relationship. Returns <paramref name="rightResourceId" /> by default.
-        /// </returns>
-        Task<IIdentifiable?> OnSetToOneRelationshipAsync(TResource leftResource, HasOneAttribute hasOneRelationship, IIdentifiable? rightResourceId,
-            WriteOperationKind writeOperation, CancellationToken cancellationToken);
+    /// <summary>
+    /// Executes before setting (or clearing) the resource at the right side of a to-one relationship.
+    /// <para>
+    /// Implementing this method enables to perform validations and change <paramref name="rightResourceId" />, before the relationship is updated.
+    /// </para>
+    /// </summary>
+    /// <param name="leftResource">
+    /// The original resource as retrieved from the underlying data store. The indication "left" specifies that <paramref name="hasOneRelationship" /> is
+    /// declared on <typeparamref name="TResource" />.
+    /// </param>
+    /// <param name="hasOneRelationship">
+    /// The to-one relationship being set.
+    /// </param>
+    /// <param name="rightResourceId">
+    /// The new resource identifier (or <c>null</c> to clear the relationship), coming from the request.
+    /// </param>
+    /// <param name="writeOperation">
+    /// Identifies the logical write operation for which this method was called. Possible values: <see cref="WriteOperationKind.CreateResource" />,
+    /// <see cref="WriteOperationKind.UpdateResource" /> and <see cref="WriteOperationKind.SetRelationship" />.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    /// <returns>
+    /// The replacement resource identifier, or <c>null</c> to clear the relationship. Returns <paramref name="rightResourceId" /> by default.
+    /// </returns>
+    Task<IIdentifiable?> OnSetToOneRelationshipAsync(TResource leftResource, HasOneAttribute hasOneRelationship, IIdentifiable? rightResourceId,
+        WriteOperationKind writeOperation, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Executes before setting the resources at the right side of a to-many relationship. This replaces on existing set.
-        /// <para>
-        /// Implementing this method enables to perform validations and make changes to <paramref name="rightResourceIds" />, before the relationship is updated.
-        /// </para>
-        /// </summary>
-        /// <param name="leftResource">
-        /// The original resource as retrieved from the underlying data store. The indication "left" specifies that <paramref name="hasManyRelationship" /> is
-        /// declared on <typeparamref name="TResource" />.
-        /// </param>
-        /// <param name="hasManyRelationship">
-        /// The to-many relationship being set.
-        /// </param>
-        /// <param name="rightResourceIds">
-        /// The set of resource identifiers to replace any existing set with, coming from the request.
-        /// </param>
-        /// <param name="writeOperation">
-        /// Identifies the logical write operation for which this method was called. Possible values: <see cref="WriteOperationKind.CreateResource" />,
-        /// <see cref="WriteOperationKind.UpdateResource" /> and <see cref="WriteOperationKind.SetRelationship" />.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        Task OnSetToManyRelationshipAsync(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            WriteOperationKind writeOperation, CancellationToken cancellationToken);
+    /// <summary>
+    /// Executes before setting the resources at the right side of a to-many relationship. This replaces on existing set.
+    /// <para>
+    /// Implementing this method enables to perform validations and make changes to <paramref name="rightResourceIds" />, before the relationship is updated.
+    /// </para>
+    /// </summary>
+    /// <param name="leftResource">
+    /// The original resource as retrieved from the underlying data store. The indication "left" specifies that <paramref name="hasManyRelationship" /> is
+    /// declared on <typeparamref name="TResource" />.
+    /// </param>
+    /// <param name="hasManyRelationship">
+    /// The to-many relationship being set.
+    /// </param>
+    /// <param name="rightResourceIds">
+    /// The set of resource identifiers to replace any existing set with, coming from the request.
+    /// </param>
+    /// <param name="writeOperation">
+    /// Identifies the logical write operation for which this method was called. Possible values: <see cref="WriteOperationKind.CreateResource" />,
+    /// <see cref="WriteOperationKind.UpdateResource" /> and <see cref="WriteOperationKind.SetRelationship" />.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    Task OnSetToManyRelationshipAsync(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        WriteOperationKind writeOperation, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Executes before adding resources to the right side of a to-many relationship, as part of a POST relationship request.
-        /// <para>
-        /// Implementing this method enables to perform validations and make changes to <paramref name="rightResourceIds" />, before the relationship is updated.
-        /// </para>
-        /// </summary>
-        /// <param name="leftResourceId">
-        /// Identifier of the left resource. The indication "left" specifies that <paramref name="hasManyRelationship" /> is declared on
-        /// <typeparamref name="TResource" />.
-        /// </param>
-        /// <param name="hasManyRelationship">
-        /// The to-many relationship being added to.
-        /// </param>
-        /// <param name="rightResourceIds">
-        /// The set of resource identifiers to add to the to-many relationship, coming from the request.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        Task OnAddToRelationshipAsync(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken);
+    /// <summary>
+    /// Executes before adding resources to the right side of a to-many relationship, as part of a POST relationship request.
+    /// <para>
+    /// Implementing this method enables to perform validations and make changes to <paramref name="rightResourceIds" />, before the relationship is updated.
+    /// </para>
+    /// </summary>
+    /// <param name="leftResourceId">
+    /// Identifier of the left resource. The indication "left" specifies that <paramref name="hasManyRelationship" /> is declared on
+    /// <typeparamref name="TResource" />.
+    /// </param>
+    /// <param name="hasManyRelationship">
+    /// The to-many relationship being added to.
+    /// </param>
+    /// <param name="rightResourceIds">
+    /// The set of resource identifiers to add to the to-many relationship, coming from the request.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    Task OnAddToRelationshipAsync(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Executes before removing resources from the right side of a to-many relationship, as part of a DELETE relationship request.
-        /// <para>
-        /// Implementing this method enables to perform validations and make changes to <paramref name="rightResourceIds" />, before the relationship is updated.
-        /// </para>
-        /// </summary>
-        /// <param name="leftResource">
-        /// The original resource as retrieved from the underlying data store. The indication "left" specifies that <paramref name="hasManyRelationship" /> is
-        /// declared on <typeparamref name="TResource" />. Be aware that for performance reasons, not the full relationship is populated, but only the subset of
-        /// resources to be removed.
-        /// </param>
-        /// <param name="hasManyRelationship">
-        /// The to-many relationship being removed from.
-        /// </param>
-        /// <param name="rightResourceIds">
-        /// The set of resource identifiers to remove from the to-many relationship, coming from the request.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        Task OnRemoveFromRelationshipAsync(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken);
+    /// <summary>
+    /// Executes before removing resources from the right side of a to-many relationship, as part of a DELETE relationship request.
+    /// <para>
+    /// Implementing this method enables to perform validations and make changes to <paramref name="rightResourceIds" />, before the relationship is updated.
+    /// </para>
+    /// </summary>
+    /// <param name="leftResource">
+    /// The original resource as retrieved from the underlying data store. The indication "left" specifies that <paramref name="hasManyRelationship" /> is
+    /// declared on <typeparamref name="TResource" />. Be aware that for performance reasons, not the full relationship is populated, but only the subset of
+    /// resources to be removed.
+    /// </param>
+    /// <param name="hasManyRelationship">
+    /// The to-many relationship being removed from.
+    /// </param>
+    /// <param name="rightResourceIds">
+    /// The set of resource identifiers to remove from the to-many relationship, coming from the request.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    Task OnRemoveFromRelationshipAsync(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Executes before writing the changed resource to the underlying data store, as part of a write request.
-        /// <para>
-        /// Implementing this method enables to perform validations and make changes to <paramref name="resource" />, after the fields from the request have been
-        /// copied into it.
-        /// </para>
-        /// <para>
-        /// An example usage is to set the last-modification timestamp, overwriting the value from the incoming request.
-        /// </para>
-        /// <para>
-        /// Another use case is to add a notification message to an outbox table, which gets committed along with the resource write in a single transaction (see
-        /// https://microservices.io/patterns/data/transactional-outbox.html).
-        /// </para>
-        /// </summary>
-        /// <param name="resource">
-        /// The original resource retrieved from the underlying data store (or a freshly instantiated resource in case of a POST resource request), updated with
-        /// the changes from the incoming request. Exception: In case <paramref name="writeOperation" /> is <see cref="WriteOperationKind.DeleteResource" />,
-        /// <see cref="WriteOperationKind.AddToRelationship" /> or <see cref="WriteOperationKind.RemoveFromRelationship" />, this is an empty object with only
-        /// the <see cref="Identifiable{T}.Id" /> property set, because for those endpoints no resource is retrieved upfront.
-        /// </param>
-        /// <param name="writeOperation">
-        /// Identifies the logical write operation for which this method was called. Possible values: <see cref="WriteOperationKind.CreateResource" />,
-        /// <see cref="WriteOperationKind.UpdateResource" />, <see cref="WriteOperationKind.DeleteResource" />, <see cref="WriteOperationKind.SetRelationship" />
-        /// , <see cref="WriteOperationKind.AddToRelationship" /> and <see cref="WriteOperationKind.RemoveFromRelationship" />.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        Task OnWritingAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken);
+    /// <summary>
+    /// Executes before writing the changed resource to the underlying data store, as part of a write request.
+    /// <para>
+    /// Implementing this method enables to perform validations and make changes to <paramref name="resource" />, after the fields from the request have been
+    /// copied into it.
+    /// </para>
+    /// <para>
+    /// An example usage is to set the last-modification timestamp, overwriting the value from the incoming request.
+    /// </para>
+    /// <para>
+    /// Another use case is to add a notification message to an outbox table, which gets committed along with the resource write in a single transaction (see
+    /// https://microservices.io/patterns/data/transactional-outbox.html).
+    /// </para>
+    /// </summary>
+    /// <param name="resource">
+    /// The original resource retrieved from the underlying data store (or a freshly instantiated resource in case of a POST resource request), updated with
+    /// the changes from the incoming request. Exception: In case <paramref name="writeOperation" /> is <see cref="WriteOperationKind.DeleteResource" />,
+    /// <see cref="WriteOperationKind.AddToRelationship" /> or <see cref="WriteOperationKind.RemoveFromRelationship" />, this is an empty object with only
+    /// the <see cref="Identifiable{T}.Id" /> property set, because for those endpoints no resource is retrieved upfront.
+    /// </param>
+    /// <param name="writeOperation">
+    /// Identifies the logical write operation for which this method was called. Possible values: <see cref="WriteOperationKind.CreateResource" />,
+    /// <see cref="WriteOperationKind.UpdateResource" />, <see cref="WriteOperationKind.DeleteResource" />, <see cref="WriteOperationKind.SetRelationship" />
+    /// , <see cref="WriteOperationKind.AddToRelationship" /> and <see cref="WriteOperationKind.RemoveFromRelationship" />.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    Task OnWritingAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Executes after successfully writing the changed resource to the underlying data store, as part of a write request.
-        /// <para>
-        /// Implementing this method enables to run additional logic, for example enqueue a notification message on a service bus.
-        /// </para>
-        /// </summary>
-        /// <param name="resource">
-        /// The resource as written to the underlying data store.
-        /// </param>
-        /// <param name="writeOperation">
-        /// Identifies the logical write operation for which this method was called. Possible values: <see cref="WriteOperationKind.CreateResource" />,
-        /// <see cref="WriteOperationKind.UpdateResource" />, <see cref="WriteOperationKind.DeleteResource" />, <see cref="WriteOperationKind.SetRelationship" />
-        /// , <see cref="WriteOperationKind.AddToRelationship" /> and <see cref="WriteOperationKind.RemoveFromRelationship" />.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        Task OnWriteSucceededAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken);
+    /// <summary>
+    /// Executes after successfully writing the changed resource to the underlying data store, as part of a write request.
+    /// <para>
+    /// Implementing this method enables to run additional logic, for example enqueue a notification message on a service bus.
+    /// </para>
+    /// </summary>
+    /// <param name="resource">
+    /// The resource as written to the underlying data store.
+    /// </param>
+    /// <param name="writeOperation">
+    /// Identifies the logical write operation for which this method was called. Possible values: <see cref="WriteOperationKind.CreateResource" />,
+    /// <see cref="WriteOperationKind.UpdateResource" />, <see cref="WriteOperationKind.DeleteResource" />, <see cref="WriteOperationKind.SetRelationship" />
+    /// , <see cref="WriteOperationKind.AddToRelationship" /> and <see cref="WriteOperationKind.RemoveFromRelationship" />.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    Task OnWriteSucceededAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken);
 
-        /// <summary>
-        /// Executes after a resource has been deserialized from an incoming request body.
-        /// </summary>
-        /// <para>
-        /// Implementing this method enables to change the incoming resource before it enters an ASP.NET Controller Action method.
-        /// </para>
-        /// <para>
-        /// Changing attributes on <paramref name="resource" /> from this method may break detection of side effects on resource POST/PATCH requests, because
-        /// side effect detection considers any changes done from this method to be part of the incoming request body. So setting additional attributes from this
-        /// method (that were not sent by the client) are not considered side effects, resulting in incorrectly reporting that there were no side effects.
-        /// </para>
-        /// <param name="resource">
-        /// The deserialized resource.
-        /// </param>
-        void OnDeserialize(TResource resource);
+    /// <summary>
+    /// Executes after a resource has been deserialized from an incoming request body.
+    /// </summary>
+    /// <para>
+    /// Implementing this method enables to change the incoming resource before it enters an ASP.NET Controller Action method.
+    /// </para>
+    /// <para>
+    /// Changing attributes on <paramref name="resource" /> from this method may break detection of side effects on resource POST/PATCH requests, because
+    /// side effect detection considers any changes done from this method to be part of the incoming request body. So setting additional attributes from this
+    /// method (that were not sent by the client) are not considered side effects, resulting in incorrectly reporting that there were no side effects.
+    /// </para>
+    /// <param name="resource">
+    /// The deserialized resource.
+    /// </param>
+    void OnDeserialize(TResource resource);
 
-        /// <summary>
-        /// Executes before a (primary or included) resource is serialized into an outgoing response body.
-        /// </summary>
-        /// <para>
-        /// Implementing this method enables to change the returned resource, for example scrub sensitive data or transform returned attribute values.
-        /// </para>
-        /// <para>
-        /// Changing attributes on <paramref name="resource" /> from this method may break detection of side effects on resource POST/PATCH requests. What this
-        /// means is that if side effects were detected before, this is not re-evaluated after running this method, so it may incorrectly report side effects if
-        /// they were undone by this method.
-        /// </para>
-        /// <param name="resource">
-        /// The serialized resource.
-        /// </param>
-        void OnSerialize(TResource resource);
-    }
+    /// <summary>
+    /// Executes before a (primary or included) resource is serialized into an outgoing response body.
+    /// </summary>
+    /// <para>
+    /// Implementing this method enables to change the returned resource, for example scrub sensitive data or transform returned attribute values.
+    /// </para>
+    /// <para>
+    /// Changing attributes on <paramref name="resource" /> from this method may break detection of side effects on resource POST/PATCH requests. What this
+    /// means is that if side effects were detected before, this is not re-evaluated after running this method, so it may incorrectly report side effects if
+    /// they were undone by this method.
+    /// </para>
+    /// <param name="resource">
+    /// The serialized resource.
+    /// </param>
+    void OnSerialize(TResource resource);
 }
diff --git a/src/JsonApiDotNetCore/Resources/IResourceDefinitionAccessor.cs b/src/JsonApiDotNetCore/Resources/IResourceDefinitionAccessor.cs
index ed4dad1270..a6d229609a 100644
--- a/src/JsonApiDotNetCore/Resources/IResourceDefinitionAccessor.cs
+++ b/src/JsonApiDotNetCore/Resources/IResourceDefinitionAccessor.cs
@@ -1,111 +1,105 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Resources
+namespace JsonApiDotNetCore.Resources;
+
+/// <summary>
+/// Retrieves an <see cref="IResourceDefinition{TResource,TId}" /> instance from the D/I container and invokes a callback on it.
+/// </summary>
+public interface IResourceDefinitionAccessor
 {
     /// <summary>
-    /// Retrieves an <see cref="IResourceDefinition{TResource,TId}" /> instance from the D/I container and invokes a callback on it.
-    /// </summary>
-    public interface IResourceDefinitionAccessor
-    {
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnApplyIncludes" /> for the specified resource type.
-        /// </summary>
-        IImmutableSet<IncludeElementExpression> OnApplyIncludes(ResourceType resourceType, IImmutableSet<IncludeElementExpression> existingIncludes);
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnApplyFilter" /> for the specified resource type.
-        /// </summary>
-        FilterExpression? OnApplyFilter(ResourceType resourceType, FilterExpression? existingFilter);
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnApplySort" /> for the specified resource type.
-        /// </summary>
-        SortExpression? OnApplySort(ResourceType resourceType, SortExpression? existingSort);
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnApplyPagination" /> for the specified resource type.
-        /// </summary>
-        PaginationExpression? OnApplyPagination(ResourceType resourceType, PaginationExpression? existingPagination);
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnApplySparseFieldSet" /> for the specified resource type.
-        /// </summary>
-        SparseFieldSetExpression? OnApplySparseFieldSet(ResourceType resourceType, SparseFieldSetExpression? existingSparseFieldSet);
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnRegisterQueryableHandlersForQueryStringParameters" /> for the specified resource type, then
-        /// returns the <see cref="IQueryable{T}" /> expression for the specified parameter name.
-        /// </summary>
-        object? GetQueryableHandlerForQueryStringParameter(Type resourceClrType, string parameterName);
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.GetMeta" /> for the specified resource.
-        /// </summary>
-        IDictionary<string, object?>? GetMeta(ResourceType resourceType, IIdentifiable resourceInstance);
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnPrepareWriteAsync" /> for the specified resource.
-        /// </summary>
-        Task OnPrepareWriteAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable;
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnSetToOneRelationshipAsync" /> for the specified resource.
-        /// </summary>
-        public Task<IIdentifiable?> OnSetToOneRelationshipAsync<TResource>(TResource leftResource, HasOneAttribute hasOneRelationship,
-            IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable;
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnSetToManyRelationshipAsync" /> for the specified resource.
-        /// </summary>
-        public Task OnSetToManyRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable;
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnAddToRelationshipAsync" /> for the specified resource.
-        /// </summary>
-        public Task OnAddToRelationshipAsync<TResource, TId>(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable<TId>;
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnRemoveFromRelationshipAsync" /> for the specified resource.
-        /// </summary>
-        public Task OnRemoveFromRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable;
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnWritingAsync" /> for the specified resource.
-        /// </summary>
-        Task OnWritingAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable;
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnWriteSucceededAsync" /> for the specified resource.
-        /// </summary>
-        Task OnWriteSucceededAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable;
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnDeserialize" /> for the specified resource.
-        /// </summary>
-        void OnDeserialize(IIdentifiable resource);
-
-        /// <summary>
-        /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnSerialize" /> for the specified resource.
-        /// </summary>
-        void OnSerialize(IIdentifiable resource);
-    }
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnApplyIncludes" /> for the specified resource type.
+    /// </summary>
+    IImmutableSet<IncludeElementExpression> OnApplyIncludes(ResourceType resourceType, IImmutableSet<IncludeElementExpression> existingIncludes);
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnApplyFilter" /> for the specified resource type.
+    /// </summary>
+    FilterExpression? OnApplyFilter(ResourceType resourceType, FilterExpression? existingFilter);
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnApplySort" /> for the specified resource type.
+    /// </summary>
+    SortExpression? OnApplySort(ResourceType resourceType, SortExpression? existingSort);
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnApplyPagination" /> for the specified resource type.
+    /// </summary>
+    PaginationExpression? OnApplyPagination(ResourceType resourceType, PaginationExpression? existingPagination);
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnApplySparseFieldSet" /> for the specified resource type.
+    /// </summary>
+    SparseFieldSetExpression? OnApplySparseFieldSet(ResourceType resourceType, SparseFieldSetExpression? existingSparseFieldSet);
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnRegisterQueryableHandlersForQueryStringParameters" /> for the specified resource type, then
+    /// returns the <see cref="IQueryable{T}" /> expression for the specified parameter name.
+    /// </summary>
+    object? GetQueryableHandlerForQueryStringParameter(Type resourceClrType, string parameterName);
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.GetMeta" /> for the specified resource.
+    /// </summary>
+    IDictionary<string, object?>? GetMeta(ResourceType resourceType, IIdentifiable resourceInstance);
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnPrepareWriteAsync" /> for the specified resource.
+    /// </summary>
+    Task OnPrepareWriteAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable;
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnSetToOneRelationshipAsync" /> for the specified resource.
+    /// </summary>
+    public Task<IIdentifiable?> OnSetToOneRelationshipAsync<TResource>(TResource leftResource, HasOneAttribute hasOneRelationship,
+        IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable;
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnSetToManyRelationshipAsync" /> for the specified resource.
+    /// </summary>
+    public Task OnSetToManyRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable;
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnAddToRelationshipAsync" /> for the specified resource.
+    /// </summary>
+    public Task OnAddToRelationshipAsync<TResource, TId>(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable<TId>;
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnRemoveFromRelationshipAsync" /> for the specified resource.
+    /// </summary>
+    public Task OnRemoveFromRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable;
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnWritingAsync" /> for the specified resource.
+    /// </summary>
+    Task OnWritingAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable;
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnWriteSucceededAsync" /> for the specified resource.
+    /// </summary>
+    Task OnWriteSucceededAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable;
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnDeserialize" /> for the specified resource.
+    /// </summary>
+    void OnDeserialize(IIdentifiable resource);
+
+    /// <summary>
+    /// Invokes <see cref="IResourceDefinition{TResource,TId}.OnSerialize" /> for the specified resource.
+    /// </summary>
+    void OnSerialize(IIdentifiable resource);
 }
diff --git a/src/JsonApiDotNetCore/Resources/IResourceFactory.cs b/src/JsonApiDotNetCore/Resources/IResourceFactory.cs
index 1e37304528..2906049e84 100644
--- a/src/JsonApiDotNetCore/Resources/IResourceFactory.cs
+++ b/src/JsonApiDotNetCore/Resources/IResourceFactory.cs
@@ -1,27 +1,25 @@
-using System;
 using System.Linq.Expressions;
 
-namespace JsonApiDotNetCore.Resources
+namespace JsonApiDotNetCore.Resources;
+
+/// <summary>
+/// Creates object instances for resource classes, which may have injectable dependencies.
+/// </summary>
+public interface IResourceFactory
 {
     /// <summary>
-    /// Creates object instances for resource classes, which may have injectable dependencies.
+    /// Creates a new resource object instance.
     /// </summary>
-    public interface IResourceFactory
-    {
-        /// <summary>
-        /// Creates a new resource object instance.
-        /// </summary>
-        public IIdentifiable CreateInstance(Type resourceClrType);
+    public IIdentifiable CreateInstance(Type resourceClrType);
 
-        /// <summary>
-        /// Creates a new resource object instance.
-        /// </summary>
-        public TResource CreateInstance<TResource>()
-            where TResource : IIdentifiable;
+    /// <summary>
+    /// Creates a new resource object instance.
+    /// </summary>
+    public TResource CreateInstance<TResource>()
+        where TResource : IIdentifiable;
 
-        /// <summary>
-        /// Returns an expression tree that represents creating a new resource object instance.
-        /// </summary>
-        public NewExpression CreateNewExpression(Type resourceClrType);
-    }
+    /// <summary>
+    /// Returns an expression tree that represents creating a new resource object instance.
+    /// </summary>
+    public NewExpression CreateNewExpression(Type resourceClrType);
 }
diff --git a/src/JsonApiDotNetCore/Resources/ITargetedFields.cs b/src/JsonApiDotNetCore/Resources/ITargetedFields.cs
index 1498f96744..32226e214d 100644
--- a/src/JsonApiDotNetCore/Resources/ITargetedFields.cs
+++ b/src/JsonApiDotNetCore/Resources/ITargetedFields.cs
@@ -1,26 +1,24 @@
-using System.Collections.Generic;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Resources
+namespace JsonApiDotNetCore.Resources;
+
+/// <summary>
+/// Container to register which resource fields (attributes and relationships) are targeted by a request.
+/// </summary>
+public interface ITargetedFields
 {
     /// <summary>
-    /// Container to register which resource fields (attributes and relationships) are targeted by a request.
+    /// The set of attributes that are targeted by a request.
     /// </summary>
-    public interface ITargetedFields
-    {
-        /// <summary>
-        /// The set of attributes that are targeted by a request.
-        /// </summary>
-        IReadOnlySet<AttrAttribute> Attributes { get; }
+    IReadOnlySet<AttrAttribute> Attributes { get; }
 
-        /// <summary>
-        /// The set of relationships that are targeted by a request.
-        /// </summary>
-        IReadOnlySet<RelationshipAttribute> Relationships { get; }
+    /// <summary>
+    /// The set of relationships that are targeted by a request.
+    /// </summary>
+    IReadOnlySet<RelationshipAttribute> Relationships { get; }
 
-        /// <summary>
-        /// Performs a shallow copy.
-        /// </summary>
-        void CopyFrom(ITargetedFields other);
-    }
+    /// <summary>
+    /// Performs a shallow copy.
+    /// </summary>
+    void CopyFrom(ITargetedFields other);
 }
diff --git a/src/JsonApiDotNetCore/Resources/Identifiable.cs b/src/JsonApiDotNetCore/Resources/Identifiable.cs
deleted file mode 100644
index 6a379bfcad..0000000000
--- a/src/JsonApiDotNetCore/Resources/Identifiable.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations.Schema;
-using JsonApiDotNetCore.Resources.Internal;
-
-namespace JsonApiDotNetCore.Resources
-{
-    /// <summary>
-    /// A convenient basic implementation of <see cref="IIdentifiable{TId}" /> that provides conversion between typed <see cref="Id" /> and
-    /// <see cref="StringId" />.
-    /// </summary>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    public abstract class Identifiable<TId> : IIdentifiable<TId>
-    {
-        /// <inheritdoc />
-        public virtual TId Id { get; set; } = default!;
-
-        /// <inheritdoc />
-        [NotMapped]
-        public string? StringId
-        {
-            get => GetStringId(Id);
-            set => Id = GetTypedId(value);
-        }
-
-        /// <inheritdoc />
-        [NotMapped]
-        public string? LocalId { get; set; }
-
-        /// <summary>
-        /// Converts an outgoing typed resource identifier to string format for use in a JSON:API response.
-        /// </summary>
-        protected virtual string? GetStringId(TId value)
-        {
-            return EqualityComparer<TId>.Default.Equals(value, default) ? null : value!.ToString();
-        }
-
-        /// <summary>
-        /// Converts an incoming 'id' element from a JSON:API request to the typed resource identifier.
-        /// </summary>
-        protected virtual TId GetTypedId(string? value)
-        {
-            return value == null ? default! : (TId)RuntimeTypeConverter.ConvertType(value, typeof(TId))!;
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/IdentifiableComparer.cs b/src/JsonApiDotNetCore/Resources/IdentifiableComparer.cs
index 67c0cc833c..a59dc8f15f 100644
--- a/src/JsonApiDotNetCore/Resources/IdentifiableComparer.cs
+++ b/src/JsonApiDotNetCore/Resources/IdentifiableComparer.cs
@@ -1,46 +1,43 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Resources
+namespace JsonApiDotNetCore.Resources;
+
+/// <summary>
+/// Compares `IIdentifiable` instances with each other based on their type and <see cref="IIdentifiable.StringId" />, falling back to
+/// <see cref="IIdentifiable.LocalId" /> when both StringIds are null.
+/// </summary>
+[PublicAPI]
+public sealed class IdentifiableComparer : IEqualityComparer<IIdentifiable>
 {
-    /// <summary>
-    /// Compares `IIdentifiable` instances with each other based on their type and <see cref="IIdentifiable.StringId" />, falling back to
-    /// <see cref="IIdentifiable.LocalId" /> when both StringIds are null.
-    /// </summary>
-    [PublicAPI]
-    public sealed class IdentifiableComparer : IEqualityComparer<IIdentifiable>
+    public static readonly IdentifiableComparer Instance = new();
+
+    private IdentifiableComparer()
     {
-        public static readonly IdentifiableComparer Instance = new();
+    }
 
-        private IdentifiableComparer()
+    public bool Equals(IIdentifiable? left, IIdentifiable? right)
+    {
+        if (ReferenceEquals(left, right))
         {
+            return true;
         }
 
-        public bool Equals(IIdentifiable? left, IIdentifiable? right)
+        if (left is null || right is null || left.GetType() != right.GetType())
         {
-            if (ReferenceEquals(left, right))
-            {
-                return true;
-            }
-
-            if (left is null || right is null || left.GetType() != right.GetType())
-            {
-                return false;
-            }
-
-            if (left.StringId == null && right.StringId == null)
-            {
-                return left.LocalId == right.LocalId;
-            }
-
-            return left.StringId == right.StringId;
+            return false;
         }
 
-        public int GetHashCode(IIdentifiable obj)
+        if (left.StringId == null && right.StringId == null)
         {
-            // LocalId is intentionally omitted here, it is okay for hashes to collide.
-            return HashCode.Combine(obj.GetType(), obj.StringId);
+            return left.LocalId == right.LocalId;
         }
+
+        return left.StringId == right.StringId;
+    }
+
+    public int GetHashCode(IIdentifiable obj)
+    {
+        // LocalId is intentionally omitted here, it is okay for hashes to collide.
+        return HashCode.Combine(obj.GetType(), obj.StringId);
     }
 }
diff --git a/src/JsonApiDotNetCore/Resources/IdentifiableExtensions.cs b/src/JsonApiDotNetCore/Resources/IdentifiableExtensions.cs
index 2adf4c2e2c..7e8064826a 100644
--- a/src/JsonApiDotNetCore/Resources/IdentifiableExtensions.cs
+++ b/src/JsonApiDotNetCore/Resources/IdentifiableExtensions.cs
@@ -1,39 +1,37 @@
-using System;
 using System.Reflection;
 using JsonApiDotNetCore.Resources.Internal;
 
-namespace JsonApiDotNetCore.Resources
+namespace JsonApiDotNetCore.Resources;
+
+internal static class IdentifiableExtensions
 {
-    internal static class IdentifiableExtensions
+    private const string IdPropertyName = nameof(Identifiable<object>.Id);
+
+    public static object GetTypedId(this IIdentifiable identifiable)
     {
-        private const string IdPropertyName = nameof(Identifiable<object>.Id);
+        ArgumentGuard.NotNull(identifiable, nameof(identifiable));
+
+        PropertyInfo? property = identifiable.GetType().GetProperty(IdPropertyName);
 
-        public static object GetTypedId(this IIdentifiable identifiable)
+        if (property == null)
         {
-            ArgumentGuard.NotNull(identifiable, nameof(identifiable));
+            throw new InvalidOperationException($"Resource of type '{identifiable.GetType()}' does not contain a property named '{IdPropertyName}'.");
+        }
 
-            PropertyInfo? property = identifiable.GetType().GetProperty(IdPropertyName);
+        object? propertyValue = property.GetValue(identifiable);
 
-            if (property == null)
-            {
-                throw new InvalidOperationException($"Resource of type '{identifiable.GetType()}' does not contain a property named '{IdPropertyName}'.");
-            }
-
-            object? propertyValue = property.GetValue(identifiable);
+        // PERF: We want to throw when 'Id' is unassigned without doing an expensive reflection call, unless this is likely the case.
+        if (identifiable.StringId == null)
+        {
+            object? defaultValue = RuntimeTypeConverter.GetDefaultValue(property.PropertyType);
 
-            // PERF: We want to throw when 'Id' is unassigned without doing an expensive reflection call, unless this is likely the case.
-            if (identifiable.StringId == null)
+            if (Equals(propertyValue, defaultValue))
             {
-                object? defaultValue = RuntimeTypeConverter.GetDefaultValue(property.PropertyType);
-
-                if (Equals(propertyValue, defaultValue))
-                {
-                    throw new InvalidOperationException($"Property '{identifiable.GetType().Name}.{IdPropertyName}' should " +
-                        $"have been assigned at this point, but it contains its default {property.PropertyType.Name} value '{propertyValue}'.");
-                }
+                throw new InvalidOperationException($"Property '{identifiable.GetType().Name}.{IdPropertyName}' should " +
+                    $"have been assigned at this point, but it contains its default {property.PropertyType.Name} value '{propertyValue}'.");
             }
-
-            return propertyValue!;
         }
+
+        return propertyValue!;
     }
 }
diff --git a/src/JsonApiDotNetCore/Resources/Internal/RuntimeTypeConverter.cs b/src/JsonApiDotNetCore/Resources/Internal/RuntimeTypeConverter.cs
deleted file mode 100644
index 16c72ed604..0000000000
--- a/src/JsonApiDotNetCore/Resources/Internal/RuntimeTypeConverter.cs
+++ /dev/null
@@ -1,93 +0,0 @@
-using System;
-using JetBrains.Annotations;
-
-#pragma warning disable AV1008 // Class should not be static
-
-namespace JsonApiDotNetCore.Resources.Internal
-{
-    [PublicAPI]
-    public static class RuntimeTypeConverter
-    {
-        public static object? ConvertType(object? value, Type type)
-        {
-            ArgumentGuard.NotNull(type, nameof(type));
-
-            if (value == null)
-            {
-                if (!CanContainNull(type))
-                {
-                    string targetTypeName = type.GetFriendlyTypeName();
-                    throw new FormatException($"Failed to convert 'null' to type '{targetTypeName}'.");
-                }
-
-                return null;
-            }
-
-            Type runtimeType = value.GetType();
-
-            if (type == runtimeType || type.IsAssignableFrom(runtimeType))
-            {
-                return value;
-            }
-
-            string? stringValue = value.ToString();
-
-            if (string.IsNullOrEmpty(stringValue))
-            {
-                return GetDefaultValue(type);
-            }
-
-            bool isNullableTypeRequested = type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>);
-            Type nonNullableType = Nullable.GetUnderlyingType(type) ?? type;
-
-            try
-            {
-                if (nonNullableType == typeof(Guid))
-                {
-                    Guid convertedValue = Guid.Parse(stringValue);
-                    return isNullableTypeRequested ? (Guid?)convertedValue : convertedValue;
-                }
-
-                if (nonNullableType == typeof(DateTimeOffset))
-                {
-                    DateTimeOffset convertedValue = DateTimeOffset.Parse(stringValue);
-                    return isNullableTypeRequested ? (DateTimeOffset?)convertedValue : convertedValue;
-                }
-
-                if (nonNullableType == typeof(TimeSpan))
-                {
-                    TimeSpan convertedValue = TimeSpan.Parse(stringValue);
-                    return isNullableTypeRequested ? (TimeSpan?)convertedValue : convertedValue;
-                }
-
-                if (nonNullableType.IsEnum)
-                {
-                    object convertedValue = Enum.Parse(nonNullableType, stringValue);
-
-                    // https://bradwilson.typepad.com/blog/2008/07/creating-nullab.html
-                    return convertedValue;
-                }
-
-                // https://bradwilson.typepad.com/blog/2008/07/creating-nullab.html
-                return Convert.ChangeType(stringValue, nonNullableType);
-            }
-            catch (Exception exception) when (exception is FormatException or OverflowException or InvalidCastException or ArgumentException)
-            {
-                string runtimeTypeName = runtimeType.GetFriendlyTypeName();
-                string targetTypeName = type.GetFriendlyTypeName();
-
-                throw new FormatException($"Failed to convert '{value}' of type '{runtimeTypeName}' to type '{targetTypeName}'.", exception);
-            }
-        }
-
-        public static bool CanContainNull(Type type)
-        {
-            return !type.IsValueType || Nullable.GetUnderlyingType(type) != null;
-        }
-
-        public static object? GetDefaultValue(Type type)
-        {
-            return type.IsValueType ? Activator.CreateInstance(type) : null;
-        }
-    }
-}
diff --git a/src/JsonApiDotNetCore/Resources/JsonApiResourceDefinition.cs b/src/JsonApiDotNetCore/Resources/JsonApiResourceDefinition.cs
index da1d76b395..99f575a293 100644
--- a/src/JsonApiDotNetCore/Resources/JsonApiResourceDefinition.cs
+++ b/src/JsonApiDotNetCore/Resources/JsonApiResourceDefinition.cs
@@ -1,173 +1,167 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.ComponentModel;
-using System.Linq;
 using System.Linq.Expressions;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Resources
-{
-    /// <inheritdoc />
-    [PublicAPI]
-    public class JsonApiResourceDefinition<TResource, TId> : IResourceDefinition<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        protected IResourceGraph ResourceGraph { get; }
+namespace JsonApiDotNetCore.Resources;
 
-        /// <summary>
-        /// Provides metadata for the resource type <typeparamref name="TResource" />.
-        /// </summary>
-        protected ResourceType ResourceType { get; }
+/// <inheritdoc />
+[PublicAPI]
+public class JsonApiResourceDefinition<TResource, TId> : IResourceDefinition<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
+{
+    protected IResourceGraph ResourceGraph { get; }
 
-        public JsonApiResourceDefinition(IResourceGraph resourceGraph)
-        {
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+    /// <summary>
+    /// Provides metadata for the resource type <typeparamref name="TResource" />.
+    /// </summary>
+    protected ResourceType ResourceType { get; }
 
-            ResourceGraph = resourceGraph;
-            ResourceType = resourceGraph.GetResourceType<TResource>();
-        }
+    public JsonApiResourceDefinition(IResourceGraph resourceGraph)
+    {
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
 
-        /// <inheritdoc />
-        public virtual IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes)
-        {
-            return existingIncludes;
-        }
+        ResourceGraph = resourceGraph;
+        ResourceType = resourceGraph.GetResourceType<TResource>();
+    }
 
-        /// <inheritdoc />
-        public virtual FilterExpression? OnApplyFilter(FilterExpression? existingFilter)
-        {
-            return existingFilter;
-        }
+    /// <inheritdoc />
+    public virtual IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes)
+    {
+        return existingIncludes;
+    }
 
-        /// <inheritdoc />
-        public virtual SortExpression? OnApplySort(SortExpression? existingSort)
-        {
-            return existingSort;
-        }
+    /// <inheritdoc />
+    public virtual FilterExpression? OnApplyFilter(FilterExpression? existingFilter)
+    {
+        return existingFilter;
+    }
 
-        /// <summary>
-        /// Creates a <see cref="SortExpression" /> from a lambda expression.
-        /// </summary>
-        /// <example>
-        /// <code><![CDATA[
-        /// var sort = CreateSortExpressionFromLambda(new PropertySortOrder
-        /// {
-        ///     (model => model.CreatedAt, ListSortDirection.Ascending),
-        ///     (model => model.Password, ListSortDirection.Descending)
-        /// });
-        /// ]]></code>
-        /// </example>
-        protected SortExpression CreateSortExpressionFromLambda(PropertySortOrder keySelectors)
-        {
-            ArgumentGuard.NotNullNorEmpty(keySelectors, nameof(keySelectors));
+    /// <inheritdoc />
+    public virtual SortExpression? OnApplySort(SortExpression? existingSort)
+    {
+        return existingSort;
+    }
 
-            ImmutableArray<SortElementExpression>.Builder elementsBuilder = ImmutableArray.CreateBuilder<SortElementExpression>(keySelectors.Count);
+    /// <summary>
+    /// Creates a <see cref="SortExpression" /> from a lambda expression.
+    /// </summary>
+    /// <example>
+    /// <code><![CDATA[
+    /// var sort = CreateSortExpressionFromLambda(new PropertySortOrder
+    /// {
+    ///     (model => model.CreatedAt, ListSortDirection.Ascending),
+    ///     (model => model.Password, ListSortDirection.Descending)
+    /// });
+    /// ]]></code>
+    /// </example>
+    protected SortExpression CreateSortExpressionFromLambda(PropertySortOrder keySelectors)
+    {
+        ArgumentGuard.NotNullNorEmpty(keySelectors, nameof(keySelectors));
 
-            foreach ((Expression<Func<TResource, dynamic?>> keySelector, ListSortDirection sortDirection) in keySelectors)
-            {
-                bool isAscending = sortDirection == ListSortDirection.Ascending;
-                AttrAttribute attribute = ResourceGraph.GetAttributes(keySelector).Single();
+        ImmutableArray<SortElementExpression>.Builder elementsBuilder = ImmutableArray.CreateBuilder<SortElementExpression>(keySelectors.Count);
 
-                var sortElement = new SortElementExpression(new ResourceFieldChainExpression(attribute), isAscending);
-                elementsBuilder.Add(sortElement);
-            }
+        foreach ((Expression<Func<TResource, dynamic?>> keySelector, ListSortDirection sortDirection) in keySelectors)
+        {
+            bool isAscending = sortDirection == ListSortDirection.Ascending;
+            AttrAttribute attribute = ResourceGraph.GetAttributes(keySelector).Single();
 
-            return new SortExpression(elementsBuilder.ToImmutable());
+            var sortElement = new SortElementExpression(new ResourceFieldChainExpression(attribute), isAscending);
+            elementsBuilder.Add(sortElement);
         }
 
-        /// <inheritdoc />
-        public virtual PaginationExpression? OnApplyPagination(PaginationExpression? existingPagination)
-        {
-            return existingPagination;
-        }
+        return new SortExpression(elementsBuilder.ToImmutable());
+    }
 
-        /// <inheritdoc />
-        public virtual SparseFieldSetExpression? OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet)
-        {
-            return existingSparseFieldSet;
-        }
+    /// <inheritdoc />
+    public virtual PaginationExpression? OnApplyPagination(PaginationExpression? existingPagination)
+    {
+        return existingPagination;
+    }
 
-        /// <inheritdoc />
-        public virtual QueryStringParameterHandlers<TResource>? OnRegisterQueryableHandlersForQueryStringParameters()
-        {
-            return null;
-        }
+    /// <inheritdoc />
+    public virtual SparseFieldSetExpression? OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet)
+    {
+        return existingSparseFieldSet;
+    }
 
-        /// <inheritdoc />
-        public virtual IDictionary<string, object?>? GetMeta(TResource resource)
-        {
-            return null;
-        }
+    /// <inheritdoc />
+    public virtual QueryStringParameterHandlers<TResource>? OnRegisterQueryableHandlersForQueryStringParameters()
+    {
+        return null;
+    }
 
-        /// <inheritdoc />
-        public virtual Task OnPrepareWriteAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            return Task.CompletedTask;
-        }
+    /// <inheritdoc />
+    public virtual IDictionary<string, object?>? GetMeta(TResource resource)
+    {
+        return null;
+    }
 
-        /// <inheritdoc />
-        public virtual Task<IIdentifiable?> OnSetToOneRelationshipAsync(TResource leftResource, HasOneAttribute hasOneRelationship,
-            IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(rightResourceId);
-        }
+    /// <inheritdoc />
+    public virtual Task OnPrepareWriteAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        return Task.CompletedTask;
+    }
 
-        /// <inheritdoc />
-        public virtual Task OnSetToManyRelationshipAsync(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            return Task.CompletedTask;
-        }
+    /// <inheritdoc />
+    public virtual Task<IIdentifiable?> OnSetToOneRelationshipAsync(TResource leftResource, HasOneAttribute hasOneRelationship, IIdentifiable? rightResourceId,
+        WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        return Task.FromResult(rightResourceId);
+    }
 
-        /// <inheritdoc />
-        public virtual Task OnAddToRelationshipAsync(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-        {
-            return Task.CompletedTask;
-        }
+    /// <inheritdoc />
+    public virtual Task OnSetToManyRelationshipAsync(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        return Task.CompletedTask;
+    }
 
-        /// <inheritdoc />
-        public virtual Task OnRemoveFromRelationshipAsync(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-        {
-            return Task.CompletedTask;
-        }
+    /// <inheritdoc />
+    public virtual Task OnAddToRelationshipAsync(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        return Task.CompletedTask;
+    }
 
-        /// <inheritdoc />
-        public virtual Task OnWritingAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            return Task.CompletedTask;
-        }
+    /// <inheritdoc />
+    public virtual Task OnRemoveFromRelationshipAsync(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        return Task.CompletedTask;
+    }
 
-        /// <inheritdoc />
-        public virtual Task OnWriteSucceededAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            return Task.CompletedTask;
-        }
+    /// <inheritdoc />
+    public virtual Task OnWritingAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        return Task.CompletedTask;
+    }
 
-        /// <inheritdoc />
-        public virtual void OnDeserialize(TResource resource)
-        {
-        }
+    /// <inheritdoc />
+    public virtual Task OnWriteSucceededAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        return Task.CompletedTask;
+    }
 
-        /// <inheritdoc />
-        public virtual void OnSerialize(TResource resource)
-        {
-        }
+    /// <inheritdoc />
+    public virtual void OnDeserialize(TResource resource)
+    {
+    }
 
-        /// <summary>
-        /// This is an alias type intended to simplify the implementation's method signature. See <see cref="CreateSortExpressionFromLambda" /> for usage
-        /// details.
-        /// </summary>
-        public sealed class PropertySortOrder : List<(Expression<Func<TResource, dynamic?>> KeySelector, ListSortDirection SortDirection)>
-        {
-        }
+    /// <inheritdoc />
+    public virtual void OnSerialize(TResource resource)
+    {
+    }
+
+    /// <summary>
+    /// This is an alias type intended to simplify the implementation's method signature. See <see cref="CreateSortExpressionFromLambda" /> for usage
+    /// details.
+    /// </summary>
+    public sealed class PropertySortOrder : List<(Expression<Func<TResource, dynamic?>> KeySelector, ListSortDirection SortDirection)>
+    {
     }
 }
diff --git a/src/JsonApiDotNetCore/Resources/OperationContainer.cs b/src/JsonApiDotNetCore/Resources/OperationContainer.cs
index 4336fef3f3..91f2553fd2 100644
--- a/src/JsonApiDotNetCore/Resources/OperationContainer.cs
+++ b/src/JsonApiDotNetCore/Resources/OperationContainer.cs
@@ -1,63 +1,61 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Resources
-{
-    /// <summary>
-    /// Represents a write operation on a JSON:API resource.
-    /// </summary>
-    [PublicAPI]
-    public sealed class OperationContainer
-    {
-        private static readonly CollectionConverter CollectionConverter = new();
+namespace JsonApiDotNetCore.Resources;
 
-        public IIdentifiable Resource { get; }
-        public ITargetedFields TargetedFields { get; }
-        public IJsonApiRequest Request { get; }
+/// <summary>
+/// Represents a write operation on a JSON:API resource.
+/// </summary>
+[PublicAPI]
+public sealed class OperationContainer
+{
+    private static readonly CollectionConverter CollectionConverter = new();
 
-        public OperationContainer(IIdentifiable resource, ITargetedFields targetedFields, IJsonApiRequest request)
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
-            ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
-            ArgumentGuard.NotNull(request, nameof(request));
+    public IIdentifiable Resource { get; }
+    public ITargetedFields TargetedFields { get; }
+    public IJsonApiRequest Request { get; }
 
-            Resource = resource;
-            TargetedFields = targetedFields;
-            Request = request;
-        }
+    public OperationContainer(IIdentifiable resource, ITargetedFields targetedFields, IJsonApiRequest request)
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
+        ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
+        ArgumentGuard.NotNull(request, nameof(request));
 
-        public void SetTransactionId(string transactionId)
-        {
-            ((JsonApiRequest)Request).TransactionId = transactionId;
-        }
+        Resource = resource;
+        TargetedFields = targetedFields;
+        Request = request;
+    }
 
-        public OperationContainer WithResource(IIdentifiable resource)
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
+    public void SetTransactionId(string transactionId)
+    {
+        ((JsonApiRequest)Request).TransactionId = transactionId;
+    }
 
-            return new OperationContainer(resource, TargetedFields, Request);
-        }
+    public OperationContainer WithResource(IIdentifiable resource)
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-        public ISet<IIdentifiable> GetSecondaryResources()
-        {
-            var secondaryResources = new HashSet<IIdentifiable>(IdentifiableComparer.Instance);
+        return new OperationContainer(resource, TargetedFields, Request);
+    }
 
-            foreach (RelationshipAttribute relationship in TargetedFields.Relationships)
-            {
-                AddSecondaryResources(relationship, secondaryResources);
-            }
+    public ISet<IIdentifiable> GetSecondaryResources()
+    {
+        var secondaryResources = new HashSet<IIdentifiable>(IdentifiableComparer.Instance);
 
-            return secondaryResources;
+        foreach (RelationshipAttribute relationship in TargetedFields.Relationships)
+        {
+            AddSecondaryResources(relationship, secondaryResources);
         }
 
-        private void AddSecondaryResources(RelationshipAttribute relationship, HashSet<IIdentifiable> secondaryResources)
-        {
-            object? rightValue = relationship.GetValue(Resource);
-            ICollection<IIdentifiable> rightResources = CollectionConverter.ExtractResources(rightValue);
+        return secondaryResources;
+    }
 
-            secondaryResources.AddRange(rightResources);
-        }
+    private void AddSecondaryResources(RelationshipAttribute relationship, HashSet<IIdentifiable> secondaryResources)
+    {
+        object? rightValue = relationship.GetValue(Resource);
+        ICollection<IIdentifiable> rightResources = CollectionConverter.ExtractResources(rightValue);
+
+        secondaryResources.AddRange(rightResources);
     }
 }
diff --git a/src/JsonApiDotNetCore/Resources/QueryStringParameterHandlers.cs b/src/JsonApiDotNetCore/Resources/QueryStringParameterHandlers.cs
index 1f5d412252..52c9f7d71a 100644
--- a/src/JsonApiDotNetCore/Resources/QueryStringParameterHandlers.cs
+++ b/src/JsonApiDotNetCore/Resources/QueryStringParameterHandlers.cs
@@ -1,15 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCore.Resources
+namespace JsonApiDotNetCore.Resources;
+
+/// <summary>
+/// This is an alias type intended to simplify the implementation's method signature. See
+/// <see cref="IResourceDefinition{TResource, TId}.OnRegisterQueryableHandlersForQueryStringParameters" /> for usage details.
+/// </summary>
+public sealed class QueryStringParameterHandlers<TResource> : Dictionary<string, Func<IQueryable<TResource>, StringValues, IQueryable<TResource>>>
 {
-    /// <summary>
-    /// This is an alias type intended to simplify the implementation's method signature. See
-    /// <see cref="IResourceDefinition{TResource, TId}.OnRegisterQueryableHandlersForQueryStringParameters" /> for usage details.
-    /// </summary>
-    public sealed class QueryStringParameterHandlers<TResource> : Dictionary<string, Func<IQueryable<TResource>, StringValues, IQueryable<TResource>>>
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Resources/ResourceChangeTracker.cs b/src/JsonApiDotNetCore/Resources/ResourceChangeTracker.cs
index 92d797e14e..7ccd381456 100644
--- a/src/JsonApiDotNetCore/Resources/ResourceChangeTracker.cs
+++ b/src/JsonApiDotNetCore/Resources/ResourceChangeTracker.cs
@@ -1,100 +1,98 @@
-using System.Collections.Generic;
 using System.Text.Json;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Resources
-{
-    /// <inheritdoc />
-    [PublicAPI]
-    public sealed class ResourceChangeTracker<TResource> : IResourceChangeTracker<TResource>
-        where TResource : class, IIdentifiable
-    {
-        private readonly ResourceType _resourceType;
-        private readonly ITargetedFields _targetedFields;
+namespace JsonApiDotNetCore.Resources;
 
-        private IDictionary<string, string>? _initiallyStoredAttributeValues;
-        private IDictionary<string, string>? _requestAttributeValues;
-        private IDictionary<string, string>? _finallyStoredAttributeValues;
+/// <inheritdoc />
+[PublicAPI]
+public sealed class ResourceChangeTracker<TResource> : IResourceChangeTracker<TResource>
+    where TResource : class, IIdentifiable
+{
+    private readonly ResourceType _resourceType;
+    private readonly ITargetedFields _targetedFields;
 
-        public ResourceChangeTracker(IResourceGraph resourceGraph, ITargetedFields targetedFields)
-        {
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-            ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
+    private IDictionary<string, string>? _initiallyStoredAttributeValues;
+    private IDictionary<string, string>? _requestAttributeValues;
+    private IDictionary<string, string>? _finallyStoredAttributeValues;
 
-            _resourceType = resourceGraph.GetResourceType<TResource>();
-            _targetedFields = targetedFields;
-        }
+    public ResourceChangeTracker(IResourceGraph resourceGraph, ITargetedFields targetedFields)
+    {
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
 
-        /// <inheritdoc />
-        public void SetInitiallyStoredAttributeValues(TResource resource)
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
+        _resourceType = resourceGraph.GetResourceType<TResource>();
+        _targetedFields = targetedFields;
+    }
 
-            _initiallyStoredAttributeValues = CreateAttributeDictionary(resource, _resourceType.Attributes);
-        }
+    /// <inheritdoc />
+    public void SetInitiallyStoredAttributeValues(TResource resource)
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-        /// <inheritdoc />
-        public void SetRequestAttributeValues(TResource resource)
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
+        _initiallyStoredAttributeValues = CreateAttributeDictionary(resource, _resourceType.Attributes);
+    }
 
-            _requestAttributeValues = CreateAttributeDictionary(resource, _targetedFields.Attributes);
-        }
+    /// <inheritdoc />
+    public void SetRequestAttributeValues(TResource resource)
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-        /// <inheritdoc />
-        public void SetFinallyStoredAttributeValues(TResource resource)
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
+        _requestAttributeValues = CreateAttributeDictionary(resource, _targetedFields.Attributes);
+    }
 
-            _finallyStoredAttributeValues = CreateAttributeDictionary(resource, _resourceType.Attributes);
-        }
+    /// <inheritdoc />
+    public void SetFinallyStoredAttributeValues(TResource resource)
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-        private IDictionary<string, string> CreateAttributeDictionary(TResource resource, IEnumerable<AttrAttribute> attributes)
-        {
-            var result = new Dictionary<string, string>();
+        _finallyStoredAttributeValues = CreateAttributeDictionary(resource, _resourceType.Attributes);
+    }
 
-            foreach (AttrAttribute attribute in attributes)
-            {
-                object? value = attribute.GetValue(resource);
-                string json = JsonSerializer.Serialize(value);
-                result.Add(attribute.PublicName, json);
-            }
+    private IDictionary<string, string> CreateAttributeDictionary(TResource resource, IEnumerable<AttrAttribute> attributes)
+    {
+        var result = new Dictionary<string, string>();
 
-            return result;
+        foreach (AttrAttribute attribute in attributes)
+        {
+            object? value = attribute.GetValue(resource);
+            string json = JsonSerializer.Serialize(value);
+            result.Add(attribute.PublicName, json);
         }
 
-        /// <inheritdoc />
-        public bool HasImplicitChanges()
+        return result;
+    }
+
+    /// <inheritdoc />
+    public bool HasImplicitChanges()
+    {
+        if (_initiallyStoredAttributeValues != null && _requestAttributeValues != null && _finallyStoredAttributeValues != null)
         {
-            if (_initiallyStoredAttributeValues != null && _requestAttributeValues != null && _finallyStoredAttributeValues != null)
+            foreach (string key in _initiallyStoredAttributeValues.Keys)
             {
-                foreach (string key in _initiallyStoredAttributeValues.Keys)
+                if (_requestAttributeValues.TryGetValue(key, out string? requestValue))
                 {
-                    if (_requestAttributeValues.TryGetValue(key, out string? requestValue))
-                    {
-                        string actualValue = _finallyStoredAttributeValues[key];
+                    string actualValue = _finallyStoredAttributeValues[key];
 
-                        if (requestValue != actualValue)
-                        {
-                            return true;
-                        }
-                    }
-                    else
+                    if (requestValue != actualValue)
                     {
-                        string initiallyStoredValue = _initiallyStoredAttributeValues[key];
-                        string finallyStoredValue = _finallyStoredAttributeValues[key];
+                        return true;
+                    }
+                }
+                else
+                {
+                    string initiallyStoredValue = _initiallyStoredAttributeValues[key];
+                    string finallyStoredValue = _finallyStoredAttributeValues[key];
 
-                        if (initiallyStoredValue != finallyStoredValue)
-                        {
-                            return true;
-                        }
+                    if (initiallyStoredValue != finallyStoredValue)
+                    {
+                        return true;
                     }
                 }
             }
-
-            return false;
         }
+
+        return false;
     }
 }
diff --git a/src/JsonApiDotNetCore/Resources/ResourceDefinitionAccessor.cs b/src/JsonApiDotNetCore/Resources/ResourceDefinitionAccessor.cs
index 1622a32bd2..a16b04cfea 100644
--- a/src/JsonApiDotNetCore/Resources/ResourceDefinitionAccessor.cs
+++ b/src/JsonApiDotNetCore/Resources/ResourceDefinitionAccessor.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -10,206 +6,205 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace JsonApiDotNetCore.Resources
+namespace JsonApiDotNetCore.Resources;
+
+/// <inheritdoc />
+[PublicAPI]
+public class ResourceDefinitionAccessor : IResourceDefinitionAccessor
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public class ResourceDefinitionAccessor : IResourceDefinitionAccessor
-    {
-        private readonly IResourceGraph _resourceGraph;
-        private readonly IServiceProvider _serviceProvider;
+    private readonly IResourceGraph _resourceGraph;
+    private readonly IServiceProvider _serviceProvider;
 
-        public ResourceDefinitionAccessor(IResourceGraph resourceGraph, IServiceProvider serviceProvider)
-        {
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-            ArgumentGuard.NotNull(serviceProvider, nameof(serviceProvider));
+    public ResourceDefinitionAccessor(IResourceGraph resourceGraph, IServiceProvider serviceProvider)
+    {
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        ArgumentGuard.NotNull(serviceProvider, nameof(serviceProvider));
 
-            _resourceGraph = resourceGraph;
-            _serviceProvider = serviceProvider;
-        }
+        _resourceGraph = resourceGraph;
+        _serviceProvider = serviceProvider;
+    }
 
-        /// <inheritdoc />
-        public IImmutableSet<IncludeElementExpression> OnApplyIncludes(ResourceType resourceType, IImmutableSet<IncludeElementExpression> existingIncludes)
-        {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+    /// <inheritdoc />
+    public IImmutableSet<IncludeElementExpression> OnApplyIncludes(ResourceType resourceType, IImmutableSet<IncludeElementExpression> existingIncludes)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
-            return resourceDefinition.OnApplyIncludes(existingIncludes);
-        }
+        dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
+        return resourceDefinition.OnApplyIncludes(existingIncludes);
+    }
 
-        /// <inheritdoc />
-        public FilterExpression? OnApplyFilter(ResourceType resourceType, FilterExpression? existingFilter)
-        {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+    /// <inheritdoc />
+    public FilterExpression? OnApplyFilter(ResourceType resourceType, FilterExpression? existingFilter)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
-            return resourceDefinition.OnApplyFilter(existingFilter);
-        }
+        dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
+        return resourceDefinition.OnApplyFilter(existingFilter);
+    }
 
-        /// <inheritdoc />
-        public SortExpression? OnApplySort(ResourceType resourceType, SortExpression? existingSort)
-        {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+    /// <inheritdoc />
+    public SortExpression? OnApplySort(ResourceType resourceType, SortExpression? existingSort)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
-            return resourceDefinition.OnApplySort(existingSort);
-        }
+        dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
+        return resourceDefinition.OnApplySort(existingSort);
+    }
 
-        /// <inheritdoc />
-        public PaginationExpression? OnApplyPagination(ResourceType resourceType, PaginationExpression? existingPagination)
-        {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+    /// <inheritdoc />
+    public PaginationExpression? OnApplyPagination(ResourceType resourceType, PaginationExpression? existingPagination)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
-            return resourceDefinition.OnApplyPagination(existingPagination);
-        }
+        dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
+        return resourceDefinition.OnApplyPagination(existingPagination);
+    }
 
-        /// <inheritdoc />
-        public SparseFieldSetExpression? OnApplySparseFieldSet(ResourceType resourceType, SparseFieldSetExpression? existingSparseFieldSet)
-        {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+    /// <inheritdoc />
+    public SparseFieldSetExpression? OnApplySparseFieldSet(ResourceType resourceType, SparseFieldSetExpression? existingSparseFieldSet)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
-            return resourceDefinition.OnApplySparseFieldSet(existingSparseFieldSet);
-        }
+        dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
+        return resourceDefinition.OnApplySparseFieldSet(existingSparseFieldSet);
+    }
 
-        /// <inheritdoc />
-        public object? GetQueryableHandlerForQueryStringParameter(Type resourceClrType, string parameterName)
-        {
-            ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
-            ArgumentGuard.NotNullNorEmpty(parameterName, nameof(parameterName));
+    /// <inheritdoc />
+    public object? GetQueryableHandlerForQueryStringParameter(Type resourceClrType, string parameterName)
+    {
+        ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
+        ArgumentGuard.NotNullNorEmpty(parameterName, nameof(parameterName));
 
-            dynamic resourceDefinition = ResolveResourceDefinition(resourceClrType);
-            dynamic handlers = resourceDefinition.OnRegisterQueryableHandlersForQueryStringParameters();
+        dynamic resourceDefinition = ResolveResourceDefinition(resourceClrType);
+        dynamic handlers = resourceDefinition.OnRegisterQueryableHandlersForQueryStringParameters();
 
-            if (handlers != null)
+        if (handlers != null)
+        {
+            if (handlers.ContainsKey(parameterName))
             {
-                if (handlers.ContainsKey(parameterName))
-                {
-                    return handlers[parameterName];
-                }
+                return handlers[parameterName];
             }
-
-            return null;
         }
 
-        /// <inheritdoc />
-        public IDictionary<string, object?>? GetMeta(ResourceType resourceType, IIdentifiable resourceInstance)
-        {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+        return null;
+    }
 
-            dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
-            return resourceDefinition.GetMeta((dynamic)resourceInstance);
-        }
+    /// <inheritdoc />
+    public IDictionary<string, object?>? GetMeta(ResourceType resourceType, IIdentifiable resourceInstance)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-        /// <inheritdoc />
-        public async Task OnPrepareWriteAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
+        dynamic resourceDefinition = ResolveResourceDefinition(resourceType);
+        return resourceDefinition.GetMeta((dynamic)resourceInstance);
+    }
 
-            dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
-            await resourceDefinition.OnPrepareWriteAsync(resource, writeOperation, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task OnPrepareWriteAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-        /// <inheritdoc />
-        public async Task<IIdentifiable?> OnSetToOneRelationshipAsync<TResource>(TResource leftResource, HasOneAttribute hasOneRelationship,
-            IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable
-        {
-            ArgumentGuard.NotNull(leftResource, nameof(leftResource));
-            ArgumentGuard.NotNull(hasOneRelationship, nameof(hasOneRelationship));
+        dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
+        await resourceDefinition.OnPrepareWriteAsync(resource, writeOperation, cancellationToken);
+    }
 
-            dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
-            return await resourceDefinition.OnSetToOneRelationshipAsync(leftResource, hasOneRelationship, rightResourceId, writeOperation, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task<IIdentifiable?> OnSetToOneRelationshipAsync<TResource>(TResource leftResource, HasOneAttribute hasOneRelationship,
+        IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable
+    {
+        ArgumentGuard.NotNull(leftResource, nameof(leftResource));
+        ArgumentGuard.NotNull(hasOneRelationship, nameof(hasOneRelationship));
 
-        /// <inheritdoc />
-        public async Task OnSetToManyRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship,
-            ISet<IIdentifiable> rightResourceIds, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable
-        {
-            ArgumentGuard.NotNull(leftResource, nameof(leftResource));
-            ArgumentGuard.NotNull(hasManyRelationship, nameof(hasManyRelationship));
-            ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
+        dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
+        return await resourceDefinition.OnSetToOneRelationshipAsync(leftResource, hasOneRelationship, rightResourceId, writeOperation, cancellationToken);
+    }
 
-            dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
-            await resourceDefinition.OnSetToManyRelationshipAsync(leftResource, hasManyRelationship, rightResourceIds, writeOperation, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task OnSetToManyRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship,
+        ISet<IIdentifiable> rightResourceIds, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable
+    {
+        ArgumentGuard.NotNull(leftResource, nameof(leftResource));
+        ArgumentGuard.NotNull(hasManyRelationship, nameof(hasManyRelationship));
+        ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
 
-        /// <inheritdoc />
-        public async Task OnAddToRelationshipAsync<TResource, TId>(TId leftResourceId, HasManyAttribute hasManyRelationship,
-            ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable<TId>
-        {
-            ArgumentGuard.NotNull(hasManyRelationship, nameof(hasManyRelationship));
-            ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
+        dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
+        await resourceDefinition.OnSetToManyRelationshipAsync(leftResource, hasManyRelationship, rightResourceIds, writeOperation, cancellationToken);
+    }
 
-            dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
-            await resourceDefinition.OnAddToRelationshipAsync(leftResourceId, hasManyRelationship, rightResourceIds, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task OnAddToRelationshipAsync<TResource, TId>(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable<TId>
+    {
+        ArgumentGuard.NotNull(hasManyRelationship, nameof(hasManyRelationship));
+        ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
 
-        /// <inheritdoc />
-        public async Task OnRemoveFromRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship,
-            ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable
-        {
-            ArgumentGuard.NotNull(leftResource, nameof(leftResource));
-            ArgumentGuard.NotNull(hasManyRelationship, nameof(hasManyRelationship));
-            ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
+        dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
+        await resourceDefinition.OnAddToRelationshipAsync(leftResourceId, hasManyRelationship, rightResourceIds, cancellationToken);
+    }
 
-            dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
-            await resourceDefinition.OnRemoveFromRelationshipAsync(leftResource, hasManyRelationship, rightResourceIds, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task OnRemoveFromRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship,
+        ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable
+    {
+        ArgumentGuard.NotNull(leftResource, nameof(leftResource));
+        ArgumentGuard.NotNull(hasManyRelationship, nameof(hasManyRelationship));
+        ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
 
-        /// <inheritdoc />
-        public async Task OnWritingAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
+        dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
+        await resourceDefinition.OnRemoveFromRelationshipAsync(leftResource, hasManyRelationship, rightResourceIds, cancellationToken);
+    }
 
-            dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
-            await resourceDefinition.OnWritingAsync(resource, writeOperation, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task OnWritingAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-        /// <inheritdoc />
-        public async Task OnWriteSucceededAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            where TResource : class, IIdentifiable
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
+        dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
+        await resourceDefinition.OnWritingAsync(resource, writeOperation, cancellationToken);
+    }
 
-            dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
-            await resourceDefinition.OnWriteSucceededAsync(resource, writeOperation, cancellationToken);
-        }
+    /// <inheritdoc />
+    public async Task OnWriteSucceededAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        where TResource : class, IIdentifiable
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-        /// <inheritdoc />
-        public void OnDeserialize(IIdentifiable resource)
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
+        dynamic resourceDefinition = ResolveResourceDefinition(typeof(TResource));
+        await resourceDefinition.OnWriteSucceededAsync(resource, writeOperation, cancellationToken);
+    }
 
-            dynamic resourceDefinition = ResolveResourceDefinition(resource.GetType());
-            resourceDefinition.OnDeserialize((dynamic)resource);
-        }
+    /// <inheritdoc />
+    public void OnDeserialize(IIdentifiable resource)
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-        /// <inheritdoc />
-        public void OnSerialize(IIdentifiable resource)
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
+        dynamic resourceDefinition = ResolveResourceDefinition(resource.GetType());
+        resourceDefinition.OnDeserialize((dynamic)resource);
+    }
 
-            dynamic resourceDefinition = ResolveResourceDefinition(resource.GetType());
-            resourceDefinition.OnSerialize((dynamic)resource);
-        }
+    /// <inheritdoc />
+    public void OnSerialize(IIdentifiable resource)
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-        protected object ResolveResourceDefinition(Type resourceClrType)
-        {
-            ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
-            return ResolveResourceDefinition(resourceType);
-        }
+        dynamic resourceDefinition = ResolveResourceDefinition(resource.GetType());
+        resourceDefinition.OnSerialize((dynamic)resource);
+    }
 
-        protected virtual object ResolveResourceDefinition(ResourceType resourceType)
-        {
-            Type resourceDefinitionType = typeof(IResourceDefinition<,>).MakeGenericType(resourceType.ClrType, resourceType.IdentityClrType);
-            return _serviceProvider.GetRequiredService(resourceDefinitionType);
-        }
+    protected object ResolveResourceDefinition(Type resourceClrType)
+    {
+        ResourceType resourceType = _resourceGraph.GetResourceType(resourceClrType);
+        return ResolveResourceDefinition(resourceType);
+    }
+
+    protected virtual object ResolveResourceDefinition(ResourceType resourceType)
+    {
+        Type resourceDefinitionType = typeof(IResourceDefinition<,>).MakeGenericType(resourceType.ClrType, resourceType.IdentityClrType);
+        return _serviceProvider.GetRequiredService(resourceDefinitionType);
     }
 }
diff --git a/src/JsonApiDotNetCore/Resources/ResourceFactory.cs b/src/JsonApiDotNetCore/Resources/ResourceFactory.cs
index f5e305a29f..fa3e571c7c 100644
--- a/src/JsonApiDotNetCore/Resources/ResourceFactory.cs
+++ b/src/JsonApiDotNetCore/Resources/ResourceFactory.cs
@@ -1,142 +1,124 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
+using JsonApiDotNetCore.Queries.Internal;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace JsonApiDotNetCore.Resources
+namespace JsonApiDotNetCore.Resources;
+
+/// <inheritdoc />
+internal sealed class ResourceFactory : IResourceFactory
 {
+    private readonly IServiceProvider _serviceProvider;
+
+    public ResourceFactory(IServiceProvider serviceProvider)
+    {
+        ArgumentGuard.NotNull(serviceProvider, nameof(serviceProvider));
+
+        _serviceProvider = serviceProvider;
+    }
+
     /// <inheritdoc />
-    internal sealed class ResourceFactory : IResourceFactory
+    public IIdentifiable CreateInstance(Type resourceClrType)
     {
-        private readonly IServiceProvider _serviceProvider;
+        ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
 
-        public ResourceFactory(IServiceProvider serviceProvider)
-        {
-            ArgumentGuard.NotNull(serviceProvider, nameof(serviceProvider));
+        return InnerCreateInstance(resourceClrType, _serviceProvider);
+    }
 
-            _serviceProvider = serviceProvider;
-        }
+    /// <inheritdoc />
+    public TResource CreateInstance<TResource>()
+        where TResource : IIdentifiable
+    {
+        return (TResource)InnerCreateInstance(typeof(TResource), _serviceProvider);
+    }
 
-        /// <inheritdoc />
-        public IIdentifiable CreateInstance(Type resourceClrType)
-        {
-            ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
+    private static IIdentifiable InnerCreateInstance(Type type, IServiceProvider serviceProvider)
+    {
+        bool hasSingleConstructorWithoutParameters = HasSingleConstructorWithoutParameters(type);
 
-            return InnerCreateInstance(resourceClrType, _serviceProvider);
+        try
+        {
+            return hasSingleConstructorWithoutParameters
+                ? (IIdentifiable)Activator.CreateInstance(type)!
+                : (IIdentifiable)ActivatorUtilities.CreateInstance(serviceProvider, type);
         }
-
-        /// <inheritdoc />
-        public TResource CreateInstance<TResource>()
-            where TResource : IIdentifiable
+#pragma warning disable AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
+        catch (Exception exception)
+#pragma warning restore AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
         {
-            return (TResource)InnerCreateInstance(typeof(TResource), _serviceProvider);
+            throw new InvalidOperationException(
+                hasSingleConstructorWithoutParameters
+                    ? $"Failed to create an instance of '{type.FullName}' using its default constructor."
+                    : $"Failed to create an instance of '{type.FullName}' using injected constructor parameters.", exception);
         }
+    }
+
+    /// <inheritdoc />
+    public NewExpression CreateNewExpression(Type resourceClrType)
+    {
+        ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
 
-        private static IIdentifiable InnerCreateInstance(Type type, IServiceProvider serviceProvider)
+        if (HasSingleConstructorWithoutParameters(resourceClrType))
         {
-            bool hasSingleConstructorWithoutParameters = HasSingleConstructorWithoutParameters(type);
+            return Expression.New(resourceClrType);
+        }
+
+        var constructorArguments = new List<Expression>();
+
+        ConstructorInfo longestConstructor = GetLongestConstructor(resourceClrType);
 
+        foreach (ParameterInfo constructorParameter in longestConstructor.GetParameters())
+        {
             try
             {
-                return hasSingleConstructorWithoutParameters
-                    ? (IIdentifiable)Activator.CreateInstance(type)!
-                    : (IIdentifiable)ActivatorUtilities.CreateInstance(serviceProvider, type);
+                object constructorArgument = ActivatorUtilities.GetServiceOrCreateInstance(_serviceProvider, constructorParameter.ParameterType);
+
+                Expression argumentExpression = constructorArgument.CreateTupleAccessExpressionForConstant(constructorArgument.GetType());
+                constructorArguments.Add(argumentExpression);
             }
 #pragma warning disable AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
             catch (Exception exception)
 #pragma warning restore AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
             {
                 throw new InvalidOperationException(
-                    hasSingleConstructorWithoutParameters
-                        ? $"Failed to create an instance of '{type.FullName}' using its default constructor."
-                        : $"Failed to create an instance of '{type.FullName}' using injected constructor parameters.", exception);
+                    $"Failed to create an instance of '{resourceClrType.FullName}': Parameter '{constructorParameter.Name}' could not be resolved.", exception);
             }
         }
 
-        /// <inheritdoc />
-        public NewExpression CreateNewExpression(Type resourceClrType)
-        {
-            ArgumentGuard.NotNull(resourceClrType, nameof(resourceClrType));
-
-            if (HasSingleConstructorWithoutParameters(resourceClrType))
-            {
-                return Expression.New(resourceClrType);
-            }
-
-            var constructorArguments = new List<Expression>();
-
-            ConstructorInfo longestConstructor = GetLongestConstructor(resourceClrType);
-
-            foreach (ParameterInfo constructorParameter in longestConstructor.GetParameters())
-            {
-                try
-                {
-                    object constructorArgument = ActivatorUtilities.GetServiceOrCreateInstance(_serviceProvider, constructorParameter.ParameterType);
+        return Expression.New(longestConstructor, constructorArguments);
+    }
 
-                    Expression argumentExpression = CreateTupleAccessExpressionForConstant(constructorArgument, constructorArgument.GetType());
+    private static bool HasSingleConstructorWithoutParameters(Type type)
+    {
+        ConstructorInfo[] constructors = type.GetConstructors().Where(constructor => !constructor.IsStatic).ToArray();
 
-                    constructorArguments.Add(argumentExpression);
-                }
-#pragma warning disable AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
-                catch (Exception exception)
-#pragma warning restore AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
-                {
-                    throw new InvalidOperationException(
-                        $"Failed to create an instance of '{resourceClrType.FullName}': Parameter '{constructorParameter.Name}' could not be resolved.",
-                        exception);
-                }
-            }
+        return constructors.Length == 1 && constructors[0].GetParameters().Length == 0;
+    }
 
-            return Expression.New(longestConstructor, constructorArguments);
-        }
+    private static ConstructorInfo GetLongestConstructor(Type type)
+    {
+        ConstructorInfo[] constructors = type.GetConstructors().Where(constructor => !constructor.IsStatic).ToArray();
 
-        private static Expression CreateTupleAccessExpressionForConstant(object value, Type type)
+        if (constructors.Length == 0)
         {
-            MethodInfo tupleCreateMethod = typeof(Tuple).GetMethods()
-                .Single(method => method.Name == "Create" && method.IsGenericMethod && method.GetGenericArguments().Length == 1);
-
-            MethodInfo constructedTupleCreateMethod = tupleCreateMethod.MakeGenericMethod(type);
-
-            ConstantExpression constantExpression = Expression.Constant(value, type);
-
-            MethodCallExpression tupleCreateCall = Expression.Call(constructedTupleCreateMethod, constantExpression);
-            return Expression.Property(tupleCreateCall, "Item1");
+            throw new InvalidOperationException($"No public constructor was found for '{type.FullName}'.");
         }
 
-        private static bool HasSingleConstructorWithoutParameters(Type type)
-        {
-            ConstructorInfo[] constructors = type.GetConstructors().Where(constructor => !constructor.IsStatic).ToArray();
-
-            return constructors.Length == 1 && constructors[0].GetParameters().Length == 0;
-        }
+        ConstructorInfo bestMatch = constructors[0];
+        int maxParameterLength = constructors[0].GetParameters().Length;
 
-        private static ConstructorInfo GetLongestConstructor(Type type)
+        for (int index = 1; index < constructors.Length; index++)
         {
-            ConstructorInfo[] constructors = type.GetConstructors().Where(constructor => !constructor.IsStatic).ToArray();
+            ConstructorInfo constructor = constructors[index];
+            int length = constructor.GetParameters().Length;
 
-            if (constructors.Length == 0)
+            if (length > maxParameterLength)
             {
-                throw new InvalidOperationException($"No public constructor was found for '{type.FullName}'.");
+                bestMatch = constructor;
+                maxParameterLength = length;
             }
-
-            ConstructorInfo bestMatch = constructors[0];
-            int maxParameterLength = constructors[0].GetParameters().Length;
-
-            for (int index = 1; index < constructors.Length; index++)
-            {
-                ConstructorInfo constructor = constructors[index];
-                int length = constructor.GetParameters().Length;
-
-                if (length > maxParameterLength)
-                {
-                    bestMatch = constructor;
-                    maxParameterLength = length;
-                }
-            }
-
-            return bestMatch;
         }
+
+        return bestMatch;
     }
 }
diff --git a/src/JsonApiDotNetCore/Resources/TargetedFields.cs b/src/JsonApiDotNetCore/Resources/TargetedFields.cs
index 4e2d571e5c..fe4701c61e 100644
--- a/src/JsonApiDotNetCore/Resources/TargetedFields.cs
+++ b/src/JsonApiDotNetCore/Resources/TargetedFields.cs
@@ -1,32 +1,30 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Resources
+namespace JsonApiDotNetCore.Resources;
+
+/// <inheritdoc />
+[PublicAPI]
+public sealed class TargetedFields : ITargetedFields
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public sealed class TargetedFields : ITargetedFields
-    {
-        IReadOnlySet<AttrAttribute> ITargetedFields.Attributes => Attributes;
-        IReadOnlySet<RelationshipAttribute> ITargetedFields.Relationships => Relationships;
+    IReadOnlySet<AttrAttribute> ITargetedFields.Attributes => Attributes;
+    IReadOnlySet<RelationshipAttribute> ITargetedFields.Relationships => Relationships;
 
-        public HashSet<AttrAttribute> Attributes { get; } = new();
-        public HashSet<RelationshipAttribute> Relationships { get; } = new();
+    public HashSet<AttrAttribute> Attributes { get; } = new();
+    public HashSet<RelationshipAttribute> Relationships { get; } = new();
 
-        /// <inheritdoc />
-        public void CopyFrom(ITargetedFields other)
-        {
-            Clear();
+    /// <inheritdoc />
+    public void CopyFrom(ITargetedFields other)
+    {
+        Clear();
 
-            Attributes.AddRange(other.Attributes);
-            Relationships.AddRange(other.Relationships);
-        }
+        Attributes.AddRange(other.Attributes);
+        Relationships.AddRange(other.Relationships);
+    }
 
-        public void Clear()
-        {
-            Attributes.Clear();
-            Relationships.Clear();
-        }
+    public void Clear()
+    {
+        Attributes.Clear();
+        Relationships.Clear();
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/JsonConverters/JsonObjectConverter.cs b/src/JsonApiDotNetCore/Serialization/JsonConverters/JsonObjectConverter.cs
index f77f21cdab..32e4351e12 100644
--- a/src/JsonApiDotNetCore/Serialization/JsonConverters/JsonObjectConverter.cs
+++ b/src/JsonApiDotNetCore/Serialization/JsonConverters/JsonObjectConverter.cs
@@ -1,35 +1,34 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace JsonApiDotNetCore.Serialization.JsonConverters
+namespace JsonApiDotNetCore.Serialization.JsonConverters;
+
+public abstract class JsonObjectConverter<TObject> : JsonConverter<TObject>
 {
-    public abstract class JsonObjectConverter<TObject> : JsonConverter<TObject>
+    protected static TValue? ReadSubTree<TValue>(ref Utf8JsonReader reader, JsonSerializerOptions options)
     {
-        protected static TValue? ReadSubTree<TValue>(ref Utf8JsonReader reader, JsonSerializerOptions options)
+        if (typeof(TValue) != typeof(object) && options.GetConverter(typeof(TValue)) is JsonConverter<TValue> converter)
         {
-            if (typeof(TValue) != typeof(object) && options.GetConverter(typeof(TValue)) is JsonConverter<TValue> converter)
-            {
-                return converter.Read(ref reader, typeof(TValue), options);
-            }
-
-            return JsonSerializer.Deserialize<TValue>(ref reader, options);
+            return converter.Read(ref reader, typeof(TValue), options);
         }
 
-        protected static void WriteSubTree<TValue>(Utf8JsonWriter writer, TValue value, JsonSerializerOptions options)
+        return JsonSerializer.Deserialize<TValue>(ref reader, options);
+    }
+
+    protected static void WriteSubTree<TValue>(Utf8JsonWriter writer, TValue value, JsonSerializerOptions options)
+    {
+        if (typeof(TValue) != typeof(object) && options.GetConverter(typeof(TValue)) is JsonConverter<TValue> converter)
         {
-            if (typeof(TValue) != typeof(object) && options.GetConverter(typeof(TValue)) is JsonConverter<TValue> converter)
-            {
-                converter.Write(writer, value, options);
-            }
-            else
-            {
-                JsonSerializer.Serialize(writer, value, options);
-            }
+            converter.Write(writer, value, options);
         }
-
-        protected static JsonException GetEndOfStreamError()
+        else
         {
-            return new JsonException("Unexpected end of JSON stream.");
+            JsonSerializer.Serialize(writer, value, options);
         }
     }
+
+    protected static JsonException GetEndOfStreamError()
+    {
+        return new JsonException("Unexpected end of JSON stream.");
+    }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/JsonConverters/ResourceObjectConverter.cs b/src/JsonApiDotNetCore/Serialization/JsonConverters/ResourceObjectConverter.cs
index 9fb5e4c607..005e423add 100644
--- a/src/JsonApiDotNetCore/Serialization/JsonConverters/ResourceObjectConverter.cs
+++ b/src/JsonApiDotNetCore/Serialization/JsonConverters/ResourceObjectConverter.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using System.Text.Json;
 using JetBrains.Annotations;
@@ -9,262 +7,261 @@
 using JsonApiDotNetCore.Serialization.Objects;
 using JsonApiDotNetCore.Serialization.Request;
 
-namespace JsonApiDotNetCore.Serialization.JsonConverters
+namespace JsonApiDotNetCore.Serialization.JsonConverters;
+
+/// <summary>
+/// Converts <see cref="ResourceObject" /> to/from JSON.
+/// </summary>
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class ResourceObjectConverter : JsonObjectConverter<ResourceObject>
 {
+    private static readonly JsonEncodedText TypeText = JsonEncodedText.Encode("type");
+    private static readonly JsonEncodedText IdText = JsonEncodedText.Encode("id");
+    private static readonly JsonEncodedText LidText = JsonEncodedText.Encode("lid");
+    private static readonly JsonEncodedText MetaText = JsonEncodedText.Encode("meta");
+    private static readonly JsonEncodedText AttributesText = JsonEncodedText.Encode("attributes");
+    private static readonly JsonEncodedText RelationshipsText = JsonEncodedText.Encode("relationships");
+    private static readonly JsonEncodedText LinksText = JsonEncodedText.Encode("links");
+
+    private readonly IResourceGraph _resourceGraph;
+
+    public ResourceObjectConverter(IResourceGraph resourceGraph)
+    {
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+
+        _resourceGraph = resourceGraph;
+    }
+
     /// <summary>
-    /// Converts <see cref="ResourceObject" /> to/from JSON.
+    /// Resolves the resource type and attributes against the resource graph. Because attribute values in <see cref="ResourceObject" /> are typed as
+    /// <see cref="object" />, we must lookup and supply the target type to the serializer.
     /// </summary>
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class ResourceObjectConverter : JsonObjectConverter<ResourceObject>
+    public override ResourceObject Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        private static readonly JsonEncodedText TypeText = JsonEncodedText.Encode("type");
-        private static readonly JsonEncodedText IdText = JsonEncodedText.Encode("id");
-        private static readonly JsonEncodedText LidText = JsonEncodedText.Encode("lid");
-        private static readonly JsonEncodedText MetaText = JsonEncodedText.Encode("meta");
-        private static readonly JsonEncodedText AttributesText = JsonEncodedText.Encode("attributes");
-        private static readonly JsonEncodedText RelationshipsText = JsonEncodedText.Encode("relationships");
-        private static readonly JsonEncodedText LinksText = JsonEncodedText.Encode("links");
+        // Inside a JsonConverter there is no way to know where in the JSON object tree we are. And the serializer is unable to provide
+        // the correct position either. So we avoid an exception on missing/invalid 'type' element and postpone producing an error response
+        // to the post-processing phase.
 
-        private readonly IResourceGraph _resourceGraph;
-
-        public ResourceObjectConverter(IResourceGraph resourceGraph)
+        var resourceObject = new ResourceObject
         {
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+            // The 'attributes' element may occur before 'type', but we need to know the resource type before we can deserialize attributes
+            // into their corresponding CLR types.
+            Type = PeekType(ref reader)
+        };
 
-            _resourceGraph = resourceGraph;
-        }
+        ResourceType? resourceType = resourceObject.Type != null ? _resourceGraph.FindResourceType(resourceObject.Type) : null;
 
-        /// <summary>
-        /// Resolves the resource type and attributes against the resource graph. Because attribute values in <see cref="ResourceObject" /> are typed as
-        /// <see cref="object" />, we must lookup and supply the target type to the serializer.
-        /// </summary>
-        public override ResourceObject Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        while (reader.Read())
         {
-            // Inside a JsonConverter there is no way to know where in the JSON object tree we are. And the serializer is unable to provide
-            // the correct position either. So we avoid an exception on missing/invalid 'type' element and postpone producing an error response
-            // to the post-processing phase.
-
-            var resourceObject = new ResourceObject
-            {
-                // The 'attributes' element may occur before 'type', but we need to know the resource type before we can deserialize attributes
-                // into their corresponding CLR types.
-                Type = PeekType(ref reader)
-            };
-
-            ResourceType? resourceType = resourceObject.Type != null ? _resourceGraph.FindResourceType(resourceObject.Type) : null;
-
-            while (reader.Read())
+            switch (reader.TokenType)
             {
-                switch (reader.TokenType)
+                case JsonTokenType.EndObject:
                 {
-                    case JsonTokenType.EndObject:
-                    {
-                        return resourceObject;
-                    }
-                    case JsonTokenType.PropertyName:
-                    {
-                        string? propertyName = reader.GetString();
-                        reader.Read();
+                    return resourceObject;
+                }
+                case JsonTokenType.PropertyName:
+                {
+                    string? propertyName = reader.GetString();
+                    reader.Read();
 
-                        switch (propertyName)
+                    switch (propertyName)
+                    {
+                        case "id":
                         {
-                            case "id":
-                            {
-                                if (reader.TokenType != JsonTokenType.String)
-                                {
-                                    // Newtonsoft.Json used to auto-convert number to strings, while System.Text.Json does not. This is so likely
-                                    // to hit users during upgrade that we special-case for this and produce a helpful error message.
-                                    var jsonElement = ReadSubTree<JsonElement>(ref reader, options);
-                                    throw new JsonException($"Failed to convert ID '{jsonElement}' of type '{jsonElement.ValueKind}' to type 'String'.");
-                                }
-
-                                resourceObject.Id = reader.GetString();
-                                break;
-                            }
-                            case "lid":
-                            {
-                                resourceObject.Lid = reader.GetString();
-                                break;
-                            }
-                            case "attributes":
-                            {
-                                if (resourceType != null)
-                                {
-                                    resourceObject.Attributes = ReadAttributes(ref reader, options, resourceType);
-                                }
-                                else
-                                {
-                                    reader.Skip();
-                                }
-
-                                break;
-                            }
-                            case "relationships":
-                            {
-                                resourceObject.Relationships = ReadSubTree<IDictionary<string, RelationshipObject?>>(ref reader, options);
-                                break;
-                            }
-                            case "links":
+                            if (reader.TokenType != JsonTokenType.String)
                             {
-                                resourceObject.Links = ReadSubTree<ResourceLinks>(ref reader, options);
-                                break;
+                                // Newtonsoft.Json used to auto-convert number to strings, while System.Text.Json does not. This is so likely
+                                // to hit users during upgrade that we special-case for this and produce a helpful error message.
+                                var jsonElement = ReadSubTree<JsonElement>(ref reader, options);
+                                throw new JsonException($"Failed to convert ID '{jsonElement}' of type '{jsonElement.ValueKind}' to type 'String'.");
                             }
-                            case "meta":
+
+                            resourceObject.Id = reader.GetString();
+                            break;
+                        }
+                        case "lid":
+                        {
+                            resourceObject.Lid = reader.GetString();
+                            break;
+                        }
+                        case "attributes":
+                        {
+                            if (resourceType != null)
                             {
-                                resourceObject.Meta = ReadSubTree<IDictionary<string, object?>>(ref reader, options);
-                                break;
+                                resourceObject.Attributes = ReadAttributes(ref reader, options, resourceType);
                             }
-                            default:
+                            else
                             {
                                 reader.Skip();
-                                break;
                             }
-                        }
-
-                        break;
-                    }
-                }
-            }
 
-            throw GetEndOfStreamError();
-        }
-
-        private static string? PeekType(ref Utf8JsonReader reader)
-        {
-            // https://docs.microsoft.com/en-us/dotnet/standard/serialization/system-text-json-converters-how-to?pivots=dotnet-5-0#an-alternative-way-to-do-polymorphic-deserialization
-            Utf8JsonReader readerClone = reader;
-
-            while (readerClone.Read())
-            {
-                if (readerClone.TokenType == JsonTokenType.PropertyName)
-                {
-                    string? propertyName = readerClone.GetString();
-                    readerClone.Read();
-
-                    switch (propertyName)
-                    {
-                        case "type":
+                            break;
+                        }
+                        case "relationships":
+                        {
+                            resourceObject.Relationships = ReadSubTree<IDictionary<string, RelationshipObject?>>(ref reader, options);
+                            break;
+                        }
+                        case "links":
+                        {
+                            resourceObject.Links = ReadSubTree<ResourceLinks>(ref reader, options);
+                            break;
+                        }
+                        case "meta":
                         {
-                            return readerClone.GetString();
+                            resourceObject.Meta = ReadSubTree<IDictionary<string, object?>>(ref reader, options);
+                            break;
                         }
                         default:
                         {
-                            readerClone.Skip();
+                            reader.Skip();
                             break;
                         }
                     }
+
+                    break;
                 }
             }
-
-            return null;
         }
 
-        private static IDictionary<string, object?> ReadAttributes(ref Utf8JsonReader reader, JsonSerializerOptions options, ResourceType resourceType)
-        {
-            var attributes = new Dictionary<string, object?>();
+        throw GetEndOfStreamError();
+    }
 
-            while (reader.Read())
+    private static string? PeekType(ref Utf8JsonReader reader)
+    {
+        // https://docs.microsoft.com/en-us/dotnet/standard/serialization/system-text-json-converters-how-to?pivots=dotnet-5-0#an-alternative-way-to-do-polymorphic-deserialization
+        Utf8JsonReader readerClone = reader;
+
+        while (readerClone.Read())
+        {
+            if (readerClone.TokenType == JsonTokenType.PropertyName)
             {
-                switch (reader.TokenType)
+                string? propertyName = readerClone.GetString();
+                readerClone.Read();
+
+                switch (propertyName)
                 {
-                    case JsonTokenType.EndObject:
+                    case "type":
                     {
-                        return attributes;
+                        return readerClone.GetString();
                     }
-                    case JsonTokenType.PropertyName:
+                    default:
                     {
-                        string attributeName = reader.GetString() ?? string.Empty;
-                        reader.Read();
+                        readerClone.Skip();
+                        break;
+                    }
+                }
+            }
+        }
 
-                        AttrAttribute? attribute = resourceType.FindAttributeByPublicName(attributeName);
-                        PropertyInfo? property = attribute?.Property;
+        return null;
+    }
 
-                        if (property != null)
-                        {
-                            object? attributeValue;
+    private static IDictionary<string, object?> ReadAttributes(ref Utf8JsonReader reader, JsonSerializerOptions options, ResourceType resourceType)
+    {
+        var attributes = new Dictionary<string, object?>();
 
-                            if (property.Name == nameof(Identifiable<object>.Id))
-                            {
-                                attributeValue = JsonInvalidAttributeInfo.Id;
-                            }
-                            else
-                            {
-                                try
-                                {
-                                    attributeValue = JsonSerializer.Deserialize(ref reader, property.PropertyType, options);
-                                }
-                                catch (JsonException)
-                                {
-                                    // Inside a JsonConverter there is no way to know where in the JSON object tree we are. And the serializer
-                                    // is unable to provide the correct position either. So we avoid an exception and postpone producing an error
-                                    // response to the post-processing phase, by setting a sentinel value.
-                                    var jsonElement = ReadSubTree<JsonElement>(ref reader, options);
-
-                                    attributeValue = new JsonInvalidAttributeInfo(attributeName, property.PropertyType, jsonElement.ToString(),
-                                        jsonElement.ValueKind);
-                                }
-                            }
+        while (reader.Read())
+        {
+            switch (reader.TokenType)
+            {
+                case JsonTokenType.EndObject:
+                {
+                    return attributes;
+                }
+                case JsonTokenType.PropertyName:
+                {
+                    string attributeName = reader.GetString() ?? string.Empty;
+                    reader.Read();
 
-                            attributes.Add(attributeName, attributeValue);
+                    AttrAttribute? attribute = resourceType.FindAttributeByPublicName(attributeName);
+                    PropertyInfo? property = attribute?.Property;
+
+                    if (property != null)
+                    {
+                        object? attributeValue;
+
+                        if (property.Name == nameof(Identifiable<object>.Id))
+                        {
+                            attributeValue = JsonInvalidAttributeInfo.Id;
                         }
                         else
                         {
-                            attributes.Add(attributeName, null);
-                            reader.Skip();
+                            try
+                            {
+                                attributeValue = JsonSerializer.Deserialize(ref reader, property.PropertyType, options);
+                            }
+                            catch (JsonException)
+                            {
+                                // Inside a JsonConverter there is no way to know where in the JSON object tree we are. And the serializer
+                                // is unable to provide the correct position either. So we avoid an exception and postpone producing an error
+                                // response to the post-processing phase, by setting a sentinel value.
+                                var jsonElement = ReadSubTree<JsonElement>(ref reader, options);
+
+                                attributeValue = new JsonInvalidAttributeInfo(attributeName, property.PropertyType, jsonElement.ToString(),
+                                    jsonElement.ValueKind);
+                            }
                         }
 
-                        break;
+                        attributes.Add(attributeName, attributeValue);
                     }
+                    else
+                    {
+                        attributes.Add(attributeName, null);
+                        reader.Skip();
+                    }
+
+                    break;
                 }
             }
-
-            throw GetEndOfStreamError();
         }
 
-        /// <summary>
-        /// Ensures that attribute values are not wrapped in <see cref="JsonElement" />s.
-        /// </summary>
-        public override void Write(Utf8JsonWriter writer, ResourceObject value, JsonSerializerOptions options)
-        {
-            writer.WriteStartObject();
+        throw GetEndOfStreamError();
+    }
 
-            writer.WriteString(TypeText, value.Type);
+    /// <summary>
+    /// Ensures that attribute values are not wrapped in <see cref="JsonElement" />s.
+    /// </summary>
+    public override void Write(Utf8JsonWriter writer, ResourceObject value, JsonSerializerOptions options)
+    {
+        writer.WriteStartObject();
 
-            if (value.Id != null)
-            {
-                writer.WriteString(IdText, value.Id);
-            }
+        writer.WriteString(TypeText, value.Type);
 
-            if (value.Lid != null)
-            {
-                writer.WriteString(LidText, value.Lid);
-            }
+        if (value.Id != null)
+        {
+            writer.WriteString(IdText, value.Id);
+        }
 
-            if (!value.Attributes.IsNullOrEmpty())
-            {
-                writer.WritePropertyName(AttributesText);
-                WriteSubTree(writer, value.Attributes, options);
-            }
+        if (value.Lid != null)
+        {
+            writer.WriteString(LidText, value.Lid);
+        }
 
-            if (!value.Relationships.IsNullOrEmpty())
-            {
-                writer.WritePropertyName(RelationshipsText);
-                WriteSubTree(writer, value.Relationships, options);
-            }
+        if (!value.Attributes.IsNullOrEmpty())
+        {
+            writer.WritePropertyName(AttributesText);
+            WriteSubTree(writer, value.Attributes, options);
+        }
 
-            if (value.Links != null && value.Links.HasValue())
-            {
-                writer.WritePropertyName(LinksText);
-                WriteSubTree(writer, value.Links, options);
-            }
+        if (!value.Relationships.IsNullOrEmpty())
+        {
+            writer.WritePropertyName(RelationshipsText);
+            WriteSubTree(writer, value.Relationships, options);
+        }
 
-            if (!value.Meta.IsNullOrEmpty())
-            {
-                writer.WritePropertyName(MetaText);
-                WriteSubTree(writer, value.Meta, options);
-            }
+        if (value.Links != null && value.Links.HasValue())
+        {
+            writer.WritePropertyName(LinksText);
+            WriteSubTree(writer, value.Links, options);
+        }
 
-            writer.WriteEndObject();
+        if (!value.Meta.IsNullOrEmpty())
+        {
+            writer.WritePropertyName(MetaText);
+            WriteSubTree(writer, value.Meta, options);
         }
+
+        writer.WriteEndObject();
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/JsonConverters/SingleOrManyDataConverterFactory.cs b/src/JsonApiDotNetCore/Serialization/JsonConverters/SingleOrManyDataConverterFactory.cs
index 2ad8ad6e06..25e497c2c1 100644
--- a/src/JsonApiDotNetCore/Serialization/JsonConverters/SingleOrManyDataConverterFactory.cs
+++ b/src/JsonApiDotNetCore/Serialization/JsonConverters/SingleOrManyDataConverterFactory.cs
@@ -1,83 +1,79 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.JsonConverters
+namespace JsonApiDotNetCore.Serialization.JsonConverters;
+
+/// <summary>
+/// Converts <see cref="SingleOrManyData{T}" /> to/from JSON.
+/// </summary>
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class SingleOrManyDataConverterFactory : JsonConverterFactory
 {
-    /// <summary>
-    /// Converts <see cref="SingleOrManyData{T}" /> to/from JSON.
-    /// </summary>
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class SingleOrManyDataConverterFactory : JsonConverterFactory
+    public override bool CanConvert(Type typeToConvert)
     {
-        public override bool CanConvert(Type typeToConvert)
-        {
-            return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SingleOrManyData<>);
-        }
+        return typeToConvert.IsGenericType && typeToConvert.GetGenericTypeDefinition() == typeof(SingleOrManyData<>);
+    }
 
-        public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
-        {
-            Type objectType = typeToConvert.GetGenericArguments()[0];
-            Type converterType = typeof(SingleOrManyDataConverter<>).MakeGenericType(objectType);
+    public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+    {
+        Type objectType = typeToConvert.GetGenericArguments()[0];
+        Type converterType = typeof(SingleOrManyDataConverter<>).MakeGenericType(objectType);
 
-            return (JsonConverter)Activator.CreateInstance(converterType, BindingFlags.Instance | BindingFlags.Public, null, null, null)!;
-        }
+        return (JsonConverter)Activator.CreateInstance(converterType, BindingFlags.Instance | BindingFlags.Public, null, null, null)!;
+    }
 
-        private sealed class SingleOrManyDataConverter<T> : JsonObjectConverter<SingleOrManyData<T>>
-            where T : class, IResourceIdentity, new()
+    private sealed class SingleOrManyDataConverter<T> : JsonObjectConverter<SingleOrManyData<T>>
+        where T : class, IResourceIdentity, new()
+    {
+        public override SingleOrManyData<T> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions serializerOptions)
         {
-            public override SingleOrManyData<T> Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions serializerOptions)
-            {
-                var objects = new List<T?>();
-                bool isManyData = false;
-                bool hasCompletedToMany = false;
+            var objects = new List<T?>();
+            bool isManyData = false;
+            bool hasCompletedToMany = false;
 
-                do
+            do
+            {
+                switch (reader.TokenType)
                 {
-                    switch (reader.TokenType)
+                    case JsonTokenType.EndArray:
                     {
-                        case JsonTokenType.EndArray:
+                        hasCompletedToMany = true;
+                        break;
+                    }
+                    case JsonTokenType.Null:
+                    {
+                        if (isManyData)
                         {
-                            hasCompletedToMany = true;
-                            break;
+                            objects.Add(new T());
                         }
-                        case JsonTokenType.Null:
-                        {
-                            if (isManyData)
-                            {
-                                objects.Add(new T());
-                            }
 
-                            break;
-                        }
-                        case JsonTokenType.StartObject:
-                        {
-                            var resourceObject = ReadSubTree<T>(ref reader, serializerOptions);
-                            objects.Add(resourceObject);
-                            break;
-                        }
-                        case JsonTokenType.StartArray:
-                        {
-                            isManyData = true;
-                            break;
-                        }
+                        break;
+                    }
+                    case JsonTokenType.StartObject:
+                    {
+                        var resourceObject = ReadSubTree<T>(ref reader, serializerOptions);
+                        objects.Add(resourceObject);
+                        break;
+                    }
+                    case JsonTokenType.StartArray:
+                    {
+                        isManyData = true;
+                        break;
                     }
                 }
-                while (isManyData && !hasCompletedToMany && reader.Read());
-
-                object? data = isManyData ? objects : objects.FirstOrDefault();
-                return new SingleOrManyData<T>(data);
             }
+            while (isManyData && !hasCompletedToMany && reader.Read());
 
-            public override void Write(Utf8JsonWriter writer, SingleOrManyData<T> value, JsonSerializerOptions options)
-            {
-                WriteSubTree(writer, value.Value, options);
-            }
+            object? data = isManyData ? objects : objects.FirstOrDefault();
+            return new SingleOrManyData<T>(data);
+        }
+
+        public override void Write(Utf8JsonWriter writer, SingleOrManyData<T> value, JsonSerializerOptions options)
+        {
+            WriteSubTree(writer, value.Value, options);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/JsonConverters/WriteOnlyDocumentConverter.cs b/src/JsonApiDotNetCore/Serialization/JsonConverters/WriteOnlyDocumentConverter.cs
index 65d8f36d12..623857f5ff 100644
--- a/src/JsonApiDotNetCore/Serialization/JsonConverters/WriteOnlyDocumentConverter.cs
+++ b/src/JsonApiDotNetCore/Serialization/JsonConverters/WriteOnlyDocumentConverter.cs
@@ -1,86 +1,84 @@
-using System;
 using System.Text.Json;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.JsonConverters
+namespace JsonApiDotNetCore.Serialization.JsonConverters;
+
+/// <summary>
+/// Converts <see cref="Document" /> to JSON.
+/// </summary>
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class WriteOnlyDocumentConverter : JsonObjectConverter<Document>
 {
+    private static readonly JsonEncodedText JsonApiText = JsonEncodedText.Encode("jsonapi");
+    private static readonly JsonEncodedText LinksText = JsonEncodedText.Encode("links");
+    private static readonly JsonEncodedText DataText = JsonEncodedText.Encode("data");
+    private static readonly JsonEncodedText AtomicOperationsText = JsonEncodedText.Encode("atomic:operations");
+    private static readonly JsonEncodedText AtomicResultsText = JsonEncodedText.Encode("atomic:results");
+    private static readonly JsonEncodedText ErrorsText = JsonEncodedText.Encode("errors");
+    private static readonly JsonEncodedText IncludedText = JsonEncodedText.Encode("included");
+    private static readonly JsonEncodedText MetaText = JsonEncodedText.Encode("meta");
+
+    public override Document Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        throw new NotSupportedException("This converter cannot be used for reading JSON.");
+    }
+
     /// <summary>
-    /// Converts <see cref="Document" /> to JSON.
+    /// Conditionally writes <code>"data": null</code> or omits it, depending on <see cref="SingleOrManyData{TObject}.IsAssigned" />.
     /// </summary>
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class WriteOnlyDocumentConverter : JsonObjectConverter<Document>
+    public override void Write(Utf8JsonWriter writer, Document value, JsonSerializerOptions options)
     {
-        private static readonly JsonEncodedText JsonApiText = JsonEncodedText.Encode("jsonapi");
-        private static readonly JsonEncodedText LinksText = JsonEncodedText.Encode("links");
-        private static readonly JsonEncodedText DataText = JsonEncodedText.Encode("data");
-        private static readonly JsonEncodedText AtomicOperationsText = JsonEncodedText.Encode("atomic:operations");
-        private static readonly JsonEncodedText AtomicResultsText = JsonEncodedText.Encode("atomic:results");
-        private static readonly JsonEncodedText ErrorsText = JsonEncodedText.Encode("errors");
-        private static readonly JsonEncodedText IncludedText = JsonEncodedText.Encode("included");
-        private static readonly JsonEncodedText MetaText = JsonEncodedText.Encode("meta");
+        writer.WriteStartObject();
 
-        public override Document Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        if (value.JsonApi != null)
         {
-            throw new NotSupportedException("This converter cannot be used for reading JSON.");
+            writer.WritePropertyName(JsonApiText);
+            WriteSubTree(writer, value.JsonApi, options);
         }
 
-        /// <summary>
-        /// Conditionally writes <code>"data": null</code> or omits it, depending on <see cref="SingleOrManyData{TObject}.IsAssigned" />.
-        /// </summary>
-        public override void Write(Utf8JsonWriter writer, Document value, JsonSerializerOptions options)
+        if (value.Links != null && value.Links.HasValue())
         {
-            writer.WriteStartObject();
-
-            if (value.JsonApi != null)
-            {
-                writer.WritePropertyName(JsonApiText);
-                WriteSubTree(writer, value.JsonApi, options);
-            }
-
-            if (value.Links != null && value.Links.HasValue())
-            {
-                writer.WritePropertyName(LinksText);
-                WriteSubTree(writer, value.Links, options);
-            }
-
-            if (value.Data.IsAssigned)
-            {
-                writer.WritePropertyName(DataText);
-                WriteSubTree(writer, value.Data, options);
-            }
+            writer.WritePropertyName(LinksText);
+            WriteSubTree(writer, value.Links, options);
+        }
 
-            if (!value.Operations.IsNullOrEmpty())
-            {
-                writer.WritePropertyName(AtomicOperationsText);
-                WriteSubTree(writer, value.Operations, options);
-            }
+        if (value.Data.IsAssigned)
+        {
+            writer.WritePropertyName(DataText);
+            WriteSubTree(writer, value.Data, options);
+        }
 
-            if (!value.Results.IsNullOrEmpty())
-            {
-                writer.WritePropertyName(AtomicResultsText);
-                WriteSubTree(writer, value.Results, options);
-            }
+        if (!value.Operations.IsNullOrEmpty())
+        {
+            writer.WritePropertyName(AtomicOperationsText);
+            WriteSubTree(writer, value.Operations, options);
+        }
 
-            if (!value.Errors.IsNullOrEmpty())
-            {
-                writer.WritePropertyName(ErrorsText);
-                WriteSubTree(writer, value.Errors, options);
-            }
+        if (!value.Results.IsNullOrEmpty())
+        {
+            writer.WritePropertyName(AtomicResultsText);
+            WriteSubTree(writer, value.Results, options);
+        }
 
-            if (value.Included != null)
-            {
-                writer.WritePropertyName(IncludedText);
-                WriteSubTree(writer, value.Included, options);
-            }
+        if (!value.Errors.IsNullOrEmpty())
+        {
+            writer.WritePropertyName(ErrorsText);
+            WriteSubTree(writer, value.Errors, options);
+        }
 
-            if (!value.Meta.IsNullOrEmpty())
-            {
-                writer.WritePropertyName(MetaText);
-                WriteSubTree(writer, value.Meta, options);
-            }
+        if (value.Included != null)
+        {
+            writer.WritePropertyName(IncludedText);
+            WriteSubTree(writer, value.Included, options);
+        }
 
-            writer.WriteEndObject();
+        if (!value.Meta.IsNullOrEmpty())
+        {
+            writer.WritePropertyName(MetaText);
+            WriteSubTree(writer, value.Meta, options);
         }
+
+        writer.WriteEndObject();
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/JsonConverters/WriteOnlyRelationshipObjectConverter.cs b/src/JsonApiDotNetCore/Serialization/JsonConverters/WriteOnlyRelationshipObjectConverter.cs
index d80fcee5bd..047e0737c5 100644
--- a/src/JsonApiDotNetCore/Serialization/JsonConverters/WriteOnlyRelationshipObjectConverter.cs
+++ b/src/JsonApiDotNetCore/Serialization/JsonConverters/WriteOnlyRelationshipObjectConverter.cs
@@ -1,51 +1,49 @@
-using System;
 using System.Text.Json;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.JsonConverters
+namespace JsonApiDotNetCore.Serialization.JsonConverters;
+
+/// <summary>
+/// Converts <see cref="RelationshipObject" /> to JSON.
+/// </summary>
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class WriteOnlyRelationshipObjectConverter : JsonObjectConverter<RelationshipObject>
 {
+    private static readonly JsonEncodedText DataText = JsonEncodedText.Encode("data");
+    private static readonly JsonEncodedText LinksText = JsonEncodedText.Encode("links");
+    private static readonly JsonEncodedText MetaText = JsonEncodedText.Encode("meta");
+
+    public override RelationshipObject Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        throw new NotSupportedException("This converter cannot be used for reading JSON.");
+    }
+
     /// <summary>
-    /// Converts <see cref="RelationshipObject" /> to JSON.
+    /// Conditionally writes <code>"data": null</code> or omits it, depending on <see cref="SingleOrManyData{TObject}.IsAssigned" />.
     /// </summary>
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class WriteOnlyRelationshipObjectConverter : JsonObjectConverter<RelationshipObject>
+    public override void Write(Utf8JsonWriter writer, RelationshipObject value, JsonSerializerOptions options)
     {
-        private static readonly JsonEncodedText DataText = JsonEncodedText.Encode("data");
-        private static readonly JsonEncodedText LinksText = JsonEncodedText.Encode("links");
-        private static readonly JsonEncodedText MetaText = JsonEncodedText.Encode("meta");
+        writer.WriteStartObject();
 
-        public override RelationshipObject Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        if (value.Links != null && value.Links.HasValue())
         {
-            throw new NotSupportedException("This converter cannot be used for reading JSON.");
+            writer.WritePropertyName(LinksText);
+            WriteSubTree(writer, value.Links, options);
         }
 
-        /// <summary>
-        /// Conditionally writes <code>"data": null</code> or omits it, depending on <see cref="SingleOrManyData{TObject}.IsAssigned" />.
-        /// </summary>
-        public override void Write(Utf8JsonWriter writer, RelationshipObject value, JsonSerializerOptions options)
+        if (value.Data.IsAssigned)
         {
-            writer.WriteStartObject();
-
-            if (value.Links != null && value.Links.HasValue())
-            {
-                writer.WritePropertyName(LinksText);
-                WriteSubTree(writer, value.Links, options);
-            }
-
-            if (value.Data.IsAssigned)
-            {
-                writer.WritePropertyName(DataText);
-                WriteSubTree(writer, value.Data, options);
-            }
-
-            if (!value.Meta.IsNullOrEmpty())
-            {
-                writer.WritePropertyName(MetaText);
-                WriteSubTree(writer, value.Meta, options);
-            }
-
-            writer.WriteEndObject();
+            writer.WritePropertyName(DataText);
+            WriteSubTree(writer, value.Data, options);
         }
+
+        if (!value.Meta.IsNullOrEmpty())
+        {
+            writer.WritePropertyName(MetaText);
+            WriteSubTree(writer, value.Meta, options);
+        }
+
+        writer.WriteEndObject();
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/AtomicOperationCode.cs b/src/JsonApiDotNetCore/Serialization/Objects/AtomicOperationCode.cs
index c016299024..7fa05cac3d 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/AtomicOperationCode.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/AtomicOperationCode.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See "op" in https://jsonapi.org/ext/atomic/#operation-objects.
+/// </summary>
+[JsonConverter(typeof(JsonStringEnumConverter))]
+public enum AtomicOperationCode
 {
-    /// <summary>
-    /// See "op" in https://jsonapi.org/ext/atomic/#operation-objects.
-    /// </summary>
-    [JsonConverter(typeof(JsonStringEnumConverter))]
-    public enum AtomicOperationCode
-    {
-        Add,
-        Update,
-        Remove
-    }
+    Add,
+    Update,
+    Remove
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/AtomicOperationObject.cs b/src/JsonApiDotNetCore/Serialization/Objects/AtomicOperationObject.cs
index b4cddf1aa7..b9233e0ed8 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/AtomicOperationObject.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/AtomicOperationObject.cs
@@ -1,33 +1,31 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See https://jsonapi.org/ext/atomic/#operation-objects.
+/// </summary>
+[PublicAPI]
+public sealed class AtomicOperationObject
 {
-    /// <summary>
-    /// See https://jsonapi.org/ext/atomic/#operation-objects.
-    /// </summary>
-    [PublicAPI]
-    public sealed class AtomicOperationObject
-    {
-        [JsonPropertyName("data")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-        public SingleOrManyData<ResourceObject> Data { get; set; }
+    [JsonPropertyName("data")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public SingleOrManyData<ResourceObject> Data { get; set; }
 
-        [JsonPropertyName("op")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-        public AtomicOperationCode Code { get; set; }
+    [JsonPropertyName("op")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public AtomicOperationCode Code { get; set; }
 
-        [JsonPropertyName("ref")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public AtomicReference? Ref { get; set; }
+    [JsonPropertyName("ref")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public AtomicReference? Ref { get; set; }
 
-        [JsonPropertyName("href")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Href { get; set; }
+    [JsonPropertyName("href")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Href { get; set; }
 
-        [JsonPropertyName("meta")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IDictionary<string, object?>? Meta { get; set; }
-    }
+    [JsonPropertyName("meta")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IDictionary<string, object?>? Meta { get; set; }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/AtomicReference.cs b/src/JsonApiDotNetCore/Serialization/Objects/AtomicReference.cs
index 7c4f93caa9..01693d1db6 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/AtomicReference.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/AtomicReference.cs
@@ -1,28 +1,27 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See "ref" in https://jsonapi.org/ext/atomic/#operation-objects.
+/// </summary>
+[PublicAPI]
+public sealed class AtomicReference : IResourceIdentity
 {
-    /// <summary>
-    /// See "ref" in https://jsonapi.org/ext/atomic/#operation-objects.
-    /// </summary>
-    [PublicAPI]
-    public sealed class AtomicReference : IResourceIdentity
-    {
-        [JsonPropertyName("type")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-        public string? Type { get; set; }
+    [JsonPropertyName("type")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public string? Type { get; set; }
 
-        [JsonPropertyName("id")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Id { get; set; }
+    [JsonPropertyName("id")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Id { get; set; }
 
-        [JsonPropertyName("lid")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Lid { get; set; }
+    [JsonPropertyName("lid")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Lid { get; set; }
 
-        [JsonPropertyName("relationship")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Relationship { get; set; }
-    }
+    [JsonPropertyName("relationship")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Relationship { get; set; }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/AtomicResultObject.cs b/src/JsonApiDotNetCore/Serialization/Objects/AtomicResultObject.cs
index 0d55c65a3c..90a4ee9345 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/AtomicResultObject.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/AtomicResultObject.cs
@@ -1,21 +1,19 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See https://jsonapi.org/ext/atomic/#result-objects.
+/// </summary>
+[PublicAPI]
+public sealed class AtomicResultObject
 {
-    /// <summary>
-    /// See https://jsonapi.org/ext/atomic/#result-objects.
-    /// </summary>
-    [PublicAPI]
-    public sealed class AtomicResultObject
-    {
-        [JsonPropertyName("data")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-        public SingleOrManyData<ResourceObject> Data { get; set; }
+    [JsonPropertyName("data")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public SingleOrManyData<ResourceObject> Data { get; set; }
 
-        [JsonPropertyName("meta")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IDictionary<string, object?>? Meta { get; set; }
-    }
+    [JsonPropertyName("meta")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IDictionary<string, object?>? Meta { get; set; }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/Document.cs b/src/JsonApiDotNetCore/Serialization/Objects/Document.cs
index 9242398d34..2f40aeb27b 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/Document.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/Document.cs
@@ -1,43 +1,41 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See https://jsonapi.org/format/1.1/#document-top-level and https://jsonapi.org/ext/atomic/#document-structure.
+/// </summary>
+public sealed class Document
 {
-    /// <summary>
-    /// See https://jsonapi.org/format/1.1/#document-top-level and https://jsonapi.org/ext/atomic/#document-structure.
-    /// </summary>
-    public sealed class Document
-    {
-        [JsonPropertyName("jsonapi")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public JsonApiObject? JsonApi { get; set; }
-
-        [JsonPropertyName("links")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public TopLevelLinks? Links { get; set; }
-
-        [JsonPropertyName("data")]
-        // JsonIgnoreCondition is determined at runtime by WriteOnlyDocumentConverter.
-        public SingleOrManyData<ResourceObject> Data { get; set; }
-
-        [JsonPropertyName("atomic:operations")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IList<AtomicOperationObject?>? Operations { get; set; }
-
-        [JsonPropertyName("atomic:results")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IList<AtomicResultObject>? Results { get; set; }
-
-        [JsonPropertyName("errors")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IList<ErrorObject>? Errors { get; set; }
-
-        [JsonPropertyName("included")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IList<ResourceObject>? Included { get; set; }
-
-        [JsonPropertyName("meta")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IDictionary<string, object?>? Meta { get; set; }
-    }
+    [JsonPropertyName("jsonapi")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public JsonApiObject? JsonApi { get; set; }
+
+    [JsonPropertyName("links")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public TopLevelLinks? Links { get; set; }
+
+    [JsonPropertyName("data")]
+    // JsonIgnoreCondition is determined at runtime by WriteOnlyDocumentConverter.
+    public SingleOrManyData<ResourceObject> Data { get; set; }
+
+    [JsonPropertyName("atomic:operations")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IList<AtomicOperationObject?>? Operations { get; set; }
+
+    [JsonPropertyName("atomic:results")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IList<AtomicResultObject>? Results { get; set; }
+
+    [JsonPropertyName("errors")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IList<ErrorObject>? Errors { get; set; }
+
+    [JsonPropertyName("included")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IList<ResourceObject>? Included { get; set; }
+
+    [JsonPropertyName("meta")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IDictionary<string, object?>? Meta { get; set; }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/ErrorLinks.cs b/src/JsonApiDotNetCore/Serialization/Objects/ErrorLinks.cs
index e45dc22a2f..4b8d4de528 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/ErrorLinks.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/ErrorLinks.cs
@@ -1,20 +1,19 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See "links" in https://jsonapi.org/format/1.1/#error-objects.
+/// </summary>
+[PublicAPI]
+public sealed class ErrorLinks
 {
-    /// <summary>
-    /// See "links" in https://jsonapi.org/format/1.1/#error-objects.
-    /// </summary>
-    [PublicAPI]
-    public sealed class ErrorLinks
-    {
-        [JsonPropertyName("about")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? About { get; set; }
+    [JsonPropertyName("about")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? About { get; set; }
 
-        [JsonPropertyName("type")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Type { get; set; }
-    }
+    [JsonPropertyName("type")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Type { get; set; }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/ErrorObject.cs b/src/JsonApiDotNetCore/Serialization/Objects/ErrorObject.cs
index 9fb0eb6f85..87ad1ebefe 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/ErrorObject.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/ErrorObject.cs
@@ -1,78 +1,74 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See https://jsonapi.org/format/1.1/#error-objects.
+/// </summary>
+[PublicAPI]
+public sealed class ErrorObject
 {
-    /// <summary>
-    /// See https://jsonapi.org/format/1.1/#error-objects.
-    /// </summary>
-    [PublicAPI]
-    public sealed class ErrorObject
-    {
-        [JsonPropertyName("id")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Id { get; set; } = Guid.NewGuid().ToString();
+    [JsonPropertyName("id")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Id { get; set; } = Guid.NewGuid().ToString();
 
-        [JsonPropertyName("links")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public ErrorLinks? Links { get; set; }
+    [JsonPropertyName("links")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public ErrorLinks? Links { get; set; }
 
-        [JsonIgnore]
-        public HttpStatusCode StatusCode { get; set; }
+    [JsonIgnore]
+    public HttpStatusCode StatusCode { get; set; }
 
-        [JsonPropertyName("status")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-        public string Status
-        {
-            get => StatusCode.ToString("d");
-            set => StatusCode = (HttpStatusCode)int.Parse(value);
-        }
+    [JsonPropertyName("status")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public string Status
+    {
+        get => StatusCode.ToString("d");
+        set => StatusCode = (HttpStatusCode)int.Parse(value);
+    }
 
-        [JsonPropertyName("code")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Code { get; set; }
+    [JsonPropertyName("code")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Code { get; set; }
 
-        [JsonPropertyName("title")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Title { get; set; }
+    [JsonPropertyName("title")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Title { get; set; }
 
-        [JsonPropertyName("detail")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Detail { get; set; }
+    [JsonPropertyName("detail")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Detail { get; set; }
 
-        [JsonPropertyName("source")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public ErrorSource? Source { get; set; }
+    [JsonPropertyName("source")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public ErrorSource? Source { get; set; }
 
-        [JsonPropertyName("meta")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IDictionary<string, object?>? Meta { get; set; }
+    [JsonPropertyName("meta")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IDictionary<string, object?>? Meta { get; set; }
 
-        public ErrorObject(HttpStatusCode statusCode)
-        {
-            StatusCode = statusCode;
-        }
+    public ErrorObject(HttpStatusCode statusCode)
+    {
+        StatusCode = statusCode;
+    }
 
-        public static HttpStatusCode GetResponseStatusCode(IReadOnlyList<ErrorObject> errorObjects)
+    public static HttpStatusCode GetResponseStatusCode(IReadOnlyList<ErrorObject> errorObjects)
+    {
+        if (errorObjects.IsNullOrEmpty())
         {
-            if (errorObjects.IsNullOrEmpty())
-            {
-                return HttpStatusCode.InternalServerError;
-            }
-
-            int[] statusCodes = errorObjects.Select(error => (int)error.StatusCode).Distinct().ToArray();
+            return HttpStatusCode.InternalServerError;
+        }
 
-            if (statusCodes.Length == 1)
-            {
-                return (HttpStatusCode)statusCodes[0];
-            }
+        int[] statusCodes = errorObjects.Select(error => (int)error.StatusCode).Distinct().ToArray();
 
-            int statusCode = int.Parse($"{statusCodes.Max().ToString()[0]}00");
-            return (HttpStatusCode)statusCode;
+        if (statusCodes.Length == 1)
+        {
+            return (HttpStatusCode)statusCodes[0];
         }
+
+        int statusCode = int.Parse($"{statusCodes.Max().ToString()[0]}00");
+        return (HttpStatusCode)statusCode;
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/ErrorSource.cs b/src/JsonApiDotNetCore/Serialization/Objects/ErrorSource.cs
index ec363c2f8d..156f734aa2 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/ErrorSource.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/ErrorSource.cs
@@ -1,24 +1,23 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See "source" in https://jsonapi.org/format/1.1/#error-objects.
+/// </summary>
+[PublicAPI]
+public sealed class ErrorSource
 {
-    /// <summary>
-    /// See "source" in https://jsonapi.org/format/1.1/#error-objects.
-    /// </summary>
-    [PublicAPI]
-    public sealed class ErrorSource
-    {
-        [JsonPropertyName("pointer")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Pointer { get; set; }
+    [JsonPropertyName("pointer")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Pointer { get; set; }
 
-        [JsonPropertyName("parameter")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Parameter { get; set; }
+    [JsonPropertyName("parameter")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Parameter { get; set; }
 
-        [JsonPropertyName("header")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Header { get; set; }
-    }
+    [JsonPropertyName("header")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Header { get; set; }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/IResourceIdentity.cs b/src/JsonApiDotNetCore/Serialization/Objects/IResourceIdentity.cs
index 9b683c6922..c4b57f535f 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/IResourceIdentity.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/IResourceIdentity.cs
@@ -1,9 +1,8 @@
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+public interface IResourceIdentity
 {
-    public interface IResourceIdentity
-    {
-        public string? Type { get; }
-        public string? Id { get; }
-        public string? Lid { get; }
-    }
+    public string? Type { get; }
+    public string? Id { get; }
+    public string? Lid { get; }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/JsonApiObject.cs b/src/JsonApiDotNetCore/Serialization/Objects/JsonApiObject.cs
index d0a385e404..4a48f90099 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/JsonApiObject.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/JsonApiObject.cs
@@ -1,29 +1,27 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See https://jsonapi.org/format/1.1/#document-jsonapi-object.
+/// </summary>
+[PublicAPI]
+public sealed class JsonApiObject
 {
-    /// <summary>
-    /// See https://jsonapi.org/format/1.1/#document-jsonapi-object.
-    /// </summary>
-    [PublicAPI]
-    public sealed class JsonApiObject
-    {
-        [JsonPropertyName("version")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Version { get; set; }
+    [JsonPropertyName("version")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Version { get; set; }
 
-        [JsonPropertyName("ext")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IList<string>? Ext { get; set; }
+    [JsonPropertyName("ext")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IList<string>? Ext { get; set; }
 
-        [JsonPropertyName("profile")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IList<string>? Profile { get; set; }
+    [JsonPropertyName("profile")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IList<string>? Profile { get; set; }
 
-        [JsonPropertyName("meta")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IDictionary<string, object?>? Meta { get; set; }
-    }
+    [JsonPropertyName("meta")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IDictionary<string, object?>? Meta { get; set; }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/RelationshipLinks.cs b/src/JsonApiDotNetCore/Serialization/Objects/RelationshipLinks.cs
index 944b811605..f3f6c2bf02 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/RelationshipLinks.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/RelationshipLinks.cs
@@ -1,25 +1,24 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See "links" in https://jsonapi.org/format/1.1/#document-resource-object-relationships.
+/// </summary>
+[PublicAPI]
+public sealed class RelationshipLinks
 {
-    /// <summary>
-    /// See "links" in https://jsonapi.org/format/1.1/#document-resource-object-relationships.
-    /// </summary>
-    [PublicAPI]
-    public sealed class RelationshipLinks
-    {
-        [JsonPropertyName("self")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Self { get; set; }
+    [JsonPropertyName("self")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Self { get; set; }
 
-        [JsonPropertyName("related")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Related { get; set; }
+    [JsonPropertyName("related")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Related { get; set; }
 
-        internal bool HasValue()
-        {
-            return !string.IsNullOrEmpty(Self) || !string.IsNullOrEmpty(Related);
-        }
+    internal bool HasValue()
+    {
+        return !string.IsNullOrEmpty(Self) || !string.IsNullOrEmpty(Related);
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/RelationshipObject.cs b/src/JsonApiDotNetCore/Serialization/Objects/RelationshipObject.cs
index 96f5414eea..9411ecf83a 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/RelationshipObject.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/RelationshipObject.cs
@@ -1,25 +1,23 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See https://jsonapi.org/format/1.1/#document-resource-object-relationships.
+/// </summary>
+[PublicAPI]
+public sealed class RelationshipObject
 {
-    /// <summary>
-    /// See https://jsonapi.org/format/1.1/#document-resource-object-relationships.
-    /// </summary>
-    [PublicAPI]
-    public sealed class RelationshipObject
-    {
-        [JsonPropertyName("links")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public RelationshipLinks? Links { get; set; }
+    [JsonPropertyName("links")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public RelationshipLinks? Links { get; set; }
 
-        [JsonPropertyName("data")]
-        // JsonIgnoreCondition is determined at runtime by WriteOnlyRelationshipObjectConverter.
-        public SingleOrManyData<ResourceIdentifierObject> Data { get; set; }
+    [JsonPropertyName("data")]
+    // JsonIgnoreCondition is determined at runtime by WriteOnlyRelationshipObjectConverter.
+    public SingleOrManyData<ResourceIdentifierObject> Data { get; set; }
 
-        [JsonPropertyName("meta")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IDictionary<string, object?>? Meta { get; set; }
-    }
+    [JsonPropertyName("meta")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IDictionary<string, object?>? Meta { get; set; }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/ResourceIdentifierObject.cs b/src/JsonApiDotNetCore/Serialization/Objects/ResourceIdentifierObject.cs
index 9b9de3afb8..a1b8271cf7 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/ResourceIdentifierObject.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/ResourceIdentifierObject.cs
@@ -1,29 +1,27 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See https://jsonapi.org/format/1.1/#document-resource-identifier-objects.
+/// </summary>
+[PublicAPI]
+public sealed class ResourceIdentifierObject : IResourceIdentity
 {
-    /// <summary>
-    /// See https://jsonapi.org/format/1.1/#document-resource-identifier-objects.
-    /// </summary>
-    [PublicAPI]
-    public sealed class ResourceIdentifierObject : IResourceIdentity
-    {
-        [JsonPropertyName("type")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-        public string? Type { get; set; }
+    [JsonPropertyName("type")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public string? Type { get; set; }
 
-        [JsonPropertyName("id")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Id { get; set; }
+    [JsonPropertyName("id")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Id { get; set; }
 
-        [JsonPropertyName("lid")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Lid { get; set; }
+    [JsonPropertyName("lid")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Lid { get; set; }
 
-        [JsonPropertyName("meta")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IDictionary<string, object?>? Meta { get; set; }
-    }
+    [JsonPropertyName("meta")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IDictionary<string, object?>? Meta { get; set; }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/ResourceLinks.cs b/src/JsonApiDotNetCore/Serialization/Objects/ResourceLinks.cs
index ddee80c85d..22c396082d 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/ResourceLinks.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/ResourceLinks.cs
@@ -1,21 +1,20 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See https://jsonapi.org/format/1.1/#document-resource-object-links.
+/// </summary>
+[PublicAPI]
+public sealed class ResourceLinks
 {
-    /// <summary>
-    /// See https://jsonapi.org/format/1.1/#document-resource-object-links.
-    /// </summary>
-    [PublicAPI]
-    public sealed class ResourceLinks
-    {
-        [JsonPropertyName("self")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Self { get; set; }
+    [JsonPropertyName("self")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Self { get; set; }
 
-        internal bool HasValue()
-        {
-            return !string.IsNullOrEmpty(Self);
-        }
+    internal bool HasValue()
+    {
+        return !string.IsNullOrEmpty(Self);
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/ResourceObject.cs b/src/JsonApiDotNetCore/Serialization/Objects/ResourceObject.cs
index 85f340075d..43b3b9616a 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/ResourceObject.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/ResourceObject.cs
@@ -1,41 +1,39 @@
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See https://jsonapi.org/format/1.1/#document-resource-objects.
+/// </summary>
+[PublicAPI]
+public sealed class ResourceObject : IResourceIdentity
 {
-    /// <summary>
-    /// See https://jsonapi.org/format/1.1/#document-resource-objects.
-    /// </summary>
-    [PublicAPI]
-    public sealed class ResourceObject : IResourceIdentity
-    {
-        [JsonPropertyName("type")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
-        public string? Type { get; set; }
-
-        [JsonPropertyName("id")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Id { get; set; }
-
-        [JsonPropertyName("lid")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Lid { get; set; }
-
-        [JsonPropertyName("attributes")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IDictionary<string, object?>? Attributes { get; set; }
-
-        [JsonPropertyName("relationships")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IDictionary<string, RelationshipObject?>? Relationships { get; set; }
-
-        [JsonPropertyName("links")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public ResourceLinks? Links { get; set; }
-
-        [JsonPropertyName("meta")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public IDictionary<string, object?>? Meta { get; set; }
-    }
+    [JsonPropertyName("type")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.Never)]
+    public string? Type { get; set; }
+
+    [JsonPropertyName("id")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Id { get; set; }
+
+    [JsonPropertyName("lid")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Lid { get; set; }
+
+    [JsonPropertyName("attributes")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IDictionary<string, object?>? Attributes { get; set; }
+
+    [JsonPropertyName("relationships")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IDictionary<string, RelationshipObject?>? Relationships { get; set; }
+
+    [JsonPropertyName("links")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public ResourceLinks? Links { get; set; }
+
+    [JsonPropertyName("meta")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public IDictionary<string, object?>? Meta { get; set; }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/SingleOrManyData.cs b/src/JsonApiDotNetCore/Serialization/Objects/SingleOrManyData.cs
index 548dde07e9..1d2f99e126 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/SingleOrManyData.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/SingleOrManyData.cs
@@ -1,49 +1,44 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.JsonConverters;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// Represents the value of the "data" element, which is either null, a single object or an array of objects. Add
+/// <see cref="SingleOrManyDataConverterFactory" /> to <see cref="JsonSerializerOptions.Converters" /> to properly roundtrip.
+/// </summary>
+[PublicAPI]
+public readonly struct SingleOrManyData<T>
+    // The "new()" constraint exists for parity with SingleOrManyDataConverterFactory, which creates empty instances
+    // to ensure ManyValue never contains null items.
+    where T : class, IResourceIdentity, new()
 {
-    /// <summary>
-    /// Represents the value of the "data" element, which is either null, a single object or an array of objects. Add
-    /// <see cref="SingleOrManyDataConverterFactory" /> to <see cref="JsonSerializerOptions.Converters" /> to properly roundtrip.
-    /// </summary>
-    [PublicAPI]
-    public readonly struct SingleOrManyData<T>
-        // The "new()" constraint exists for parity with SingleOrManyDataConverterFactory, which creates empty instances
-        // to ensure ManyValue never contains null items.
-        where T : class, IResourceIdentity, new()
-    {
-        // ReSharper disable once MergeConditionalExpression
-        // Justification: ReSharper reporting this is a bug, which is fixed in v2021.2.1. This condition cannot be merged.
-        public object? Value => ManyValue != null ? ManyValue : SingleValue;
+    public object? Value => ManyValue != null ? ManyValue : SingleValue;
 
-        [JsonIgnore]
-        public bool IsAssigned { get; }
+    [JsonIgnore]
+    public bool IsAssigned { get; }
 
-        [JsonIgnore]
-        public T? SingleValue { get; }
+    [JsonIgnore]
+    public T? SingleValue { get; }
 
-        [JsonIgnore]
-        public IList<T>? ManyValue { get; }
+    [JsonIgnore]
+    public IList<T>? ManyValue { get; }
 
-        public SingleOrManyData(object? value)
-        {
-            IsAssigned = true;
+    public SingleOrManyData(object? value)
+    {
+        IsAssigned = true;
 
-            if (value is IEnumerable<T> manyData)
-            {
-                ManyValue = manyData.ToList();
-                SingleValue = null;
-            }
-            else
-            {
-                ManyValue = null;
-                SingleValue = (T?)value;
-            }
+        if (value is IEnumerable<T> manyData)
+        {
+            ManyValue = manyData.ToList();
+            SingleValue = null;
+        }
+        else
+        {
+            ManyValue = null;
+            SingleValue = (T?)value;
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Objects/TopLevelLinks.cs b/src/JsonApiDotNetCore/Serialization/Objects/TopLevelLinks.cs
index abb8a365e9..14578253c2 100644
--- a/src/JsonApiDotNetCore/Serialization/Objects/TopLevelLinks.cs
+++ b/src/JsonApiDotNetCore/Serialization/Objects/TopLevelLinks.cs
@@ -1,46 +1,45 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Objects
+namespace JsonApiDotNetCore.Serialization.Objects;
+
+/// <summary>
+/// See "links" in https://jsonapi.org/format/1.1/#document-top-level.
+/// </summary>
+[PublicAPI]
+public sealed class TopLevelLinks
 {
-    /// <summary>
-    /// See "links" in https://jsonapi.org/format/1.1/#document-top-level.
-    /// </summary>
-    [PublicAPI]
-    public sealed class TopLevelLinks
+    [JsonPropertyName("self")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Self { get; set; }
+
+    [JsonPropertyName("related")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Related { get; set; }
+
+    [JsonPropertyName("describedby")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? DescribedBy { get; set; }
+
+    [JsonPropertyName("first")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? First { get; set; }
+
+    [JsonPropertyName("last")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Last { get; set; }
+
+    [JsonPropertyName("prev")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Prev { get; set; }
+
+    [JsonPropertyName("next")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public string? Next { get; set; }
+
+    internal bool HasValue()
     {
-        [JsonPropertyName("self")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Self { get; set; }
-
-        [JsonPropertyName("related")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Related { get; set; }
-
-        [JsonPropertyName("describedby")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? DescribedBy { get; set; }
-
-        [JsonPropertyName("first")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? First { get; set; }
-
-        [JsonPropertyName("last")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Last { get; set; }
-
-        [JsonPropertyName("prev")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Prev { get; set; }
-
-        [JsonPropertyName("next")]
-        [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
-        public string? Next { get; set; }
-
-        internal bool HasValue()
-        {
-            return !string.IsNullOrEmpty(Self) || !string.IsNullOrEmpty(Related) || !string.IsNullOrEmpty(DescribedBy) || !string.IsNullOrEmpty(First) ||
-                !string.IsNullOrEmpty(Last) || !string.IsNullOrEmpty(Prev) || !string.IsNullOrEmpty(Next);
-        }
+        return !string.IsNullOrEmpty(Self) || !string.IsNullOrEmpty(Related) || !string.IsNullOrEmpty(DescribedBy) || !string.IsNullOrEmpty(First) ||
+            !string.IsNullOrEmpty(Last) || !string.IsNullOrEmpty(Prev) || !string.IsNullOrEmpty(Next);
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicOperationObjectAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicOperationObjectAdapter.cs
index ea157e917d..061bd0f920 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicOperationObjectAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicOperationObjectAdapter.cs
@@ -1,164 +1,159 @@
-using System;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
-{
-    /// <inheritdoc />
-    public sealed class AtomicOperationObjectAdapter : IAtomicOperationObjectAdapter
-    {
-        private readonly IResourceDataInOperationsRequestAdapter _resourceDataInOperationsRequestAdapter;
-        private readonly IAtomicReferenceAdapter _atomicReferenceAdapter;
-        private readonly IRelationshipDataAdapter _relationshipDataAdapter;
-        private readonly IJsonApiOptions _options;
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
 
-        public AtomicOperationObjectAdapter(IJsonApiOptions options, IAtomicReferenceAdapter atomicReferenceAdapter,
-            IResourceDataInOperationsRequestAdapter resourceDataInOperationsRequestAdapter, IRelationshipDataAdapter relationshipDataAdapter)
-        {
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(atomicReferenceAdapter, nameof(atomicReferenceAdapter));
-            ArgumentGuard.NotNull(resourceDataInOperationsRequestAdapter, nameof(resourceDataInOperationsRequestAdapter));
-            ArgumentGuard.NotNull(relationshipDataAdapter, nameof(relationshipDataAdapter));
-
-            _options = options;
-            _atomicReferenceAdapter = atomicReferenceAdapter;
-            _resourceDataInOperationsRequestAdapter = resourceDataInOperationsRequestAdapter;
-            _relationshipDataAdapter = relationshipDataAdapter;
-        }
+/// <inheritdoc />
+public sealed class AtomicOperationObjectAdapter : IAtomicOperationObjectAdapter
+{
+    private readonly IResourceDataInOperationsRequestAdapter _resourceDataInOperationsRequestAdapter;
+    private readonly IAtomicReferenceAdapter _atomicReferenceAdapter;
+    private readonly IRelationshipDataAdapter _relationshipDataAdapter;
+    private readonly IJsonApiOptions _options;
 
-        /// <inheritdoc />
-        public OperationContainer Convert(AtomicOperationObject atomicOperationObject, RequestAdapterState state)
-        {
-            AssertNoHref(atomicOperationObject, state);
+    public AtomicOperationObjectAdapter(IJsonApiOptions options, IAtomicReferenceAdapter atomicReferenceAdapter,
+        IResourceDataInOperationsRequestAdapter resourceDataInOperationsRequestAdapter, IRelationshipDataAdapter relationshipDataAdapter)
+    {
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(atomicReferenceAdapter, nameof(atomicReferenceAdapter));
+        ArgumentGuard.NotNull(resourceDataInOperationsRequestAdapter, nameof(resourceDataInOperationsRequestAdapter));
+        ArgumentGuard.NotNull(relationshipDataAdapter, nameof(relationshipDataAdapter));
+
+        _options = options;
+        _atomicReferenceAdapter = atomicReferenceAdapter;
+        _resourceDataInOperationsRequestAdapter = resourceDataInOperationsRequestAdapter;
+        _relationshipDataAdapter = relationshipDataAdapter;
+    }
 
-            WriteOperationKind writeOperation = ConvertOperationCode(atomicOperationObject, state);
+    /// <inheritdoc />
+    public OperationContainer Convert(AtomicOperationObject atomicOperationObject, RequestAdapterState state)
+    {
+        AssertNoHref(atomicOperationObject, state);
 
-            state.WritableTargetedFields = new TargetedFields();
+        WriteOperationKind writeOperation = ConvertOperationCode(atomicOperationObject, state);
 
-            state.WritableRequest = new JsonApiRequest
-            {
-                Kind = EndpointKind.AtomicOperations,
-                WriteOperation = writeOperation
-            };
+        state.WritableTargetedFields = new TargetedFields();
 
-            (ResourceIdentityRequirements requirements, IIdentifiable? primaryResource) = ConvertRef(atomicOperationObject, state);
+        state.WritableRequest = new JsonApiRequest
+        {
+            Kind = EndpointKind.AtomicOperations,
+            WriteOperation = writeOperation
+        };
 
-            if (writeOperation is WriteOperationKind.CreateResource or WriteOperationKind.UpdateResource)
-            {
-                primaryResource = _resourceDataInOperationsRequestAdapter.Convert(atomicOperationObject.Data, requirements, state);
-            }
+        (ResourceIdentityRequirements requirements, IIdentifiable? primaryResource) = ConvertRef(atomicOperationObject, state);
 
-            return new OperationContainer(primaryResource!, state.WritableTargetedFields, state.Request);
+        if (writeOperation is WriteOperationKind.CreateResource or WriteOperationKind.UpdateResource)
+        {
+            primaryResource = _resourceDataInOperationsRequestAdapter.Convert(atomicOperationObject.Data, requirements, state);
         }
 
-        private static void AssertNoHref(AtomicOperationObject atomicOperationObject, RequestAdapterState state)
+        return new OperationContainer(primaryResource!, state.WritableTargetedFields, state.Request);
+    }
+
+    private static void AssertNoHref(AtomicOperationObject atomicOperationObject, RequestAdapterState state)
+    {
+        if (atomicOperationObject.Href != null)
         {
-            if (atomicOperationObject.Href != null)
-            {
-                using IDisposable _ = state.Position.PushElement("href");
-                throw new ModelConversionException(state.Position, "The 'href' element is not supported.", null);
-            }
+            using IDisposable _ = state.Position.PushElement("href");
+            throw new ModelConversionException(state.Position, "The 'href' element is not supported.", null);
         }
+    }
 
-        private WriteOperationKind ConvertOperationCode(AtomicOperationObject atomicOperationObject, RequestAdapterState state)
+    private WriteOperationKind ConvertOperationCode(AtomicOperationObject atomicOperationObject, RequestAdapterState state)
+    {
+        switch (atomicOperationObject.Code)
         {
-            switch (atomicOperationObject.Code)
+            case AtomicOperationCode.Add:
             {
-                case AtomicOperationCode.Add:
+                if (atomicOperationObject.Ref is { Relationship: null })
                 {
-                    // ReSharper disable once MergeIntoPattern
-                    // Justification: Merging this into a pattern crashes the command-line versions of CleanupCode/InspectCode.
-                    // Tracked at: https://youtrack.jetbrains.com/issue/RSRP-486717
-                    if (atomicOperationObject.Ref != null && atomicOperationObject.Ref.Relationship == null)
-                    {
-                        using IDisposable _ = state.Position.PushElement("ref");
-                        throw new ModelConversionException(state.Position, "The 'relationship' element is required.", null);
-                    }
-
-                    return atomicOperationObject.Ref == null ? WriteOperationKind.CreateResource : WriteOperationKind.AddToRelationship;
+                    using IDisposable _ = state.Position.PushElement("ref");
+                    throw new ModelConversionException(state.Position, "The 'relationship' element is required.", null);
                 }
-                case AtomicOperationCode.Update:
+
+                return atomicOperationObject.Ref == null ? WriteOperationKind.CreateResource : WriteOperationKind.AddToRelationship;
+            }
+            case AtomicOperationCode.Update:
+            {
+                return atomicOperationObject.Ref?.Relationship != null ? WriteOperationKind.SetRelationship : WriteOperationKind.UpdateResource;
+            }
+            case AtomicOperationCode.Remove:
+            {
+                if (atomicOperationObject.Ref == null)
                 {
-                    return atomicOperationObject.Ref?.Relationship != null ? WriteOperationKind.SetRelationship : WriteOperationKind.UpdateResource;
+                    throw new ModelConversionException(state.Position, "The 'ref' element is required.", null);
                 }
-                case AtomicOperationCode.Remove:
-                {
-                    if (atomicOperationObject.Ref == null)
-                    {
-                        throw new ModelConversionException(state.Position, "The 'ref' element is required.", null);
-                    }
 
-                    return atomicOperationObject.Ref.Relationship != null ? WriteOperationKind.RemoveFromRelationship : WriteOperationKind.DeleteResource;
-                }
+                return atomicOperationObject.Ref.Relationship != null ? WriteOperationKind.RemoveFromRelationship : WriteOperationKind.DeleteResource;
             }
-
-            throw new NotSupportedException($"Unknown operation code '{atomicOperationObject.Code}'.");
         }
 
-        private (ResourceIdentityRequirements requirements, IIdentifiable? primaryResource) ConvertRef(AtomicOperationObject atomicOperationObject,
-            RequestAdapterState state)
-        {
-            ResourceIdentityRequirements requirements = CreateRefRequirements(state);
-            IIdentifiable? primaryResource = null;
+        throw new NotSupportedException($"Unknown operation code '{atomicOperationObject.Code}'.");
+    }
 
-            AtomicReferenceResult? refResult = atomicOperationObject.Ref != null
-                ? _atomicReferenceAdapter.Convert(atomicOperationObject.Ref, requirements, state)
-                : null;
+    private (ResourceIdentityRequirements requirements, IIdentifiable? primaryResource) ConvertRef(AtomicOperationObject atomicOperationObject,
+        RequestAdapterState state)
+    {
+        ResourceIdentityRequirements requirements = CreateRefRequirements(state);
+        IIdentifiable? primaryResource = null;
 
-            if (refResult != null)
-            {
-                state.WritableRequest!.PrimaryId = refResult.Resource.StringId;
-                state.WritableRequest.PrimaryResourceType = refResult.ResourceType;
-                state.WritableRequest.Relationship = refResult.Relationship;
-                state.WritableRequest.IsCollection = refResult.Relationship is HasManyAttribute;
+        AtomicReferenceResult? refResult = atomicOperationObject.Ref != null
+            ? _atomicReferenceAdapter.Convert(atomicOperationObject.Ref, requirements, state)
+            : null;
 
-                ConvertRefRelationship(atomicOperationObject.Data, refResult, state);
+        if (refResult != null)
+        {
+            state.WritableRequest!.PrimaryId = refResult.Resource.StringId;
+            state.WritableRequest.PrimaryResourceType = refResult.ResourceType;
+            state.WritableRequest.Relationship = refResult.Relationship;
+            state.WritableRequest.IsCollection = refResult.Relationship is HasManyAttribute;
 
-                requirements = CreateDataRequirements(refResult, requirements);
-                primaryResource = refResult.Resource;
-            }
+            ConvertRefRelationship(atomicOperationObject.Data, refResult, state);
 
-            return (requirements, primaryResource);
+            requirements = CreateDataRequirements(refResult, requirements);
+            primaryResource = refResult.Resource;
         }
 
-        private ResourceIdentityRequirements CreateRefRequirements(RequestAdapterState state)
-        {
-            JsonElementConstraint? idConstraint = state.Request.WriteOperation == WriteOperationKind.CreateResource
-                ? _options.AllowClientGeneratedIds ? null : JsonElementConstraint.Forbidden
-                : JsonElementConstraint.Required;
+        return (requirements, primaryResource);
+    }
 
-            return new ResourceIdentityRequirements
-            {
-                IdConstraint = idConstraint
-            };
-        }
+    private ResourceIdentityRequirements CreateRefRequirements(RequestAdapterState state)
+    {
+        JsonElementConstraint? idConstraint = state.Request.WriteOperation == WriteOperationKind.CreateResource
+            ? _options.AllowClientGeneratedIds ? null : JsonElementConstraint.Forbidden
+            : JsonElementConstraint.Required;
 
-        private static ResourceIdentityRequirements CreateDataRequirements(AtomicReferenceResult refResult, ResourceIdentityRequirements refRequirements)
+        return new ResourceIdentityRequirements
         {
-            return new ResourceIdentityRequirements
-            {
-                ResourceType = refResult.ResourceType,
-                IdConstraint = refRequirements.IdConstraint,
-                IdValue = refResult.Resource.StringId,
-                LidValue = refResult.Resource.LocalId,
-                RelationshipName = refResult.Relationship?.PublicName
-            };
-        }
+            IdConstraint = idConstraint
+        };
+    }
 
-        private void ConvertRefRelationship(SingleOrManyData<ResourceObject> relationshipData, AtomicReferenceResult refResult, RequestAdapterState state)
+    private static ResourceIdentityRequirements CreateDataRequirements(AtomicReferenceResult refResult, ResourceIdentityRequirements refRequirements)
+    {
+        return new ResourceIdentityRequirements
         {
-            if (refResult.Relationship != null)
-            {
-                state.WritableRequest!.SecondaryResourceType = refResult.Relationship.RightType;
+            ResourceType = refResult.ResourceType,
+            IdConstraint = refRequirements.IdConstraint,
+            IdValue = refResult.Resource.StringId,
+            LidValue = refResult.Resource.LocalId,
+            RelationshipName = refResult.Relationship?.PublicName
+        };
+    }
+
+    private void ConvertRefRelationship(SingleOrManyData<ResourceObject> relationshipData, AtomicReferenceResult refResult, RequestAdapterState state)
+    {
+        if (refResult.Relationship != null)
+        {
+            state.WritableRequest!.SecondaryResourceType = refResult.Relationship.RightType;
 
-                state.WritableTargetedFields!.Relationships.Add(refResult.Relationship);
+            state.WritableTargetedFields!.Relationships.Add(refResult.Relationship);
 
-                object? rightValue = _relationshipDataAdapter.Convert(relationshipData, refResult.Relationship, true, state);
-                refResult.Relationship.SetValue(refResult.Resource, rightValue);
-            }
+            object? rightValue = _relationshipDataAdapter.Convert(relationshipData, refResult.Relationship, true, state);
+            refResult.Relationship.SetValue(refResult.Resource, rightValue);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicReferenceAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicReferenceAdapter.cs
index b17c94edb6..e1aec5641b 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicReferenceAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicReferenceAdapter.cs
@@ -1,47 +1,45 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <inheritdoc cref="IAtomicReferenceAdapter" />
+[PublicAPI]
+public sealed class AtomicReferenceAdapter : ResourceIdentityAdapter, IAtomicReferenceAdapter
 {
-    /// <inheritdoc cref="IAtomicReferenceAdapter" />
-    [PublicAPI]
-    public sealed class AtomicReferenceAdapter : ResourceIdentityAdapter, IAtomicReferenceAdapter
+    public AtomicReferenceAdapter(IResourceGraph resourceGraph, IResourceFactory resourceFactory)
+        : base(resourceGraph, resourceFactory)
+    {
+    }
+
+    /// <inheritdoc />
+    public AtomicReferenceResult Convert(AtomicReference atomicReference, ResourceIdentityRequirements requirements, RequestAdapterState state)
+    {
+        ArgumentGuard.NotNull(atomicReference, nameof(atomicReference));
+        ArgumentGuard.NotNull(requirements, nameof(requirements));
+        ArgumentGuard.NotNull(state, nameof(state));
+
+        using IDisposable _ = state.Position.PushElement("ref");
+        (IIdentifiable resource, ResourceType resourceType) = ConvertResourceIdentity(atomicReference, requirements, state);
+
+        RelationshipAttribute? relationship = atomicReference.Relationship != null
+            ? ConvertRelationship(atomicReference.Relationship, resourceType, state)
+            : null;
+
+        return new AtomicReferenceResult(resource, resourceType, relationship);
+    }
+
+    private RelationshipAttribute ConvertRelationship(string relationshipName, ResourceType resourceType, RequestAdapterState state)
     {
-        public AtomicReferenceAdapter(IResourceGraph resourceGraph, IResourceFactory resourceFactory)
-            : base(resourceGraph, resourceFactory)
-        {
-        }
-
-        /// <inheritdoc />
-        public AtomicReferenceResult Convert(AtomicReference atomicReference, ResourceIdentityRequirements requirements, RequestAdapterState state)
-        {
-            ArgumentGuard.NotNull(atomicReference, nameof(atomicReference));
-            ArgumentGuard.NotNull(requirements, nameof(requirements));
-            ArgumentGuard.NotNull(state, nameof(state));
-
-            using IDisposable _ = state.Position.PushElement("ref");
-            (IIdentifiable resource, ResourceType resourceType) = ConvertResourceIdentity(atomicReference, requirements, state);
-
-            RelationshipAttribute? relationship = atomicReference.Relationship != null
-                ? ConvertRelationship(atomicReference.Relationship, resourceType, state)
-                : null;
-
-            return new AtomicReferenceResult(resource, resourceType, relationship);
-        }
-
-        private RelationshipAttribute ConvertRelationship(string relationshipName, ResourceType resourceType, RequestAdapterState state)
-        {
-            using IDisposable _ = state.Position.PushElement("relationship");
-            RelationshipAttribute? relationship = resourceType.FindRelationshipByPublicName(relationshipName);
-
-            AssertIsKnownRelationship(relationship, relationshipName, resourceType, state);
-            AssertToManyInAddOrRemoveRelationship(relationship, state);
-
-            return relationship;
-        }
+        using IDisposable _ = state.Position.PushElement("relationship");
+        RelationshipAttribute? relationship = resourceType.FindRelationshipByPublicName(relationshipName);
+
+        AssertIsKnownRelationship(relationship, relationshipName, resourceType, state);
+        AssertToManyInAddOrRemoveRelationship(relationship, state);
+
+        return relationship;
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicReferenceResult.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicReferenceResult.cs
index 724a5da96c..9e6d982e21 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicReferenceResult.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/AtomicReferenceResult.cs
@@ -3,26 +3,25 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// The result of validating and converting "ref" in an entry of an atomic:operations request.
+/// </summary>
+[PublicAPI]
+public sealed class AtomicReferenceResult
 {
-    /// <summary>
-    /// The result of validating and converting "ref" in an entry of an atomic:operations request.
-    /// </summary>
-    [PublicAPI]
-    public sealed class AtomicReferenceResult
-    {
-        public IIdentifiable Resource { get; }
-        public ResourceType ResourceType { get; }
-        public RelationshipAttribute? Relationship { get; }
+    public IIdentifiable Resource { get; }
+    public ResourceType ResourceType { get; }
+    public RelationshipAttribute? Relationship { get; }
 
-        public AtomicReferenceResult(IIdentifiable resource, ResourceType resourceType, RelationshipAttribute? relationship)
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+    public AtomicReferenceResult(IIdentifiable resource, ResourceType resourceType, RelationshipAttribute? relationship)
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
 
-            Resource = resource;
-            ResourceType = resourceType;
-            Relationship = relationship;
-        }
+        Resource = resource;
+        ResourceType = resourceType;
+        Relationship = relationship;
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/BaseAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/BaseAdapter.cs
index 72c4d12b1e..64e2f6d53b 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/BaseAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/BaseAdapter.cs
@@ -2,64 +2,63 @@
 using JsonApiDotNetCore.Serialization.Objects;
 using SysNotNull = System.Diagnostics.CodeAnalysis.NotNullAttribute;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Contains shared assertions for derived types.
+/// </summary>
+public abstract class BaseAdapter
 {
-    /// <summary>
-    /// Contains shared assertions for derived types.
-    /// </summary>
-    public abstract class BaseAdapter
+    [AssertionMethod]
+    protected static void AssertHasData<T>(SingleOrManyData<T> data, RequestAdapterState state)
+        where T : class, IResourceIdentity, new()
     {
-        [AssertionMethod]
-        protected static void AssertHasData<T>(SingleOrManyData<T> data, RequestAdapterState state)
-            where T : class, IResourceIdentity, new()
+        if (!data.IsAssigned)
         {
-            if (!data.IsAssigned)
-            {
-                throw new ModelConversionException(state.Position, "The 'data' element is required.", null);
-            }
+            throw new ModelConversionException(state.Position, "The 'data' element is required.", null);
         }
+    }
 
-        [AssertionMethod]
-        protected static void AssertDataHasSingleValue<T>(SingleOrManyData<T> data, bool allowNull, RequestAdapterState state)
-            where T : class, IResourceIdentity, new()
+    [AssertionMethod]
+    protected static void AssertDataHasSingleValue<T>(SingleOrManyData<T> data, bool allowNull, RequestAdapterState state)
+        where T : class, IResourceIdentity, new()
+    {
+        if (data.SingleValue == null)
         {
-            if (data.SingleValue == null)
+            if (!allowNull)
             {
-                if (!allowNull)
+                if (data.ManyValue == null)
                 {
-                    if (data.ManyValue == null)
-                    {
-                        AssertObjectIsNotNull(data.SingleValue, state);
-                    }
-
-                    throw new ModelConversionException(state.Position, "Expected an object, instead of an array.", null);
+                    AssertObjectIsNotNull(data.SingleValue, state);
                 }
 
-                if (data.ManyValue != null)
-                {
-                    throw new ModelConversionException(state.Position, "Expected an object or 'null', instead of an array.", null);
-                }
+                throw new ModelConversionException(state.Position, "Expected an object, instead of an array.", null);
             }
-        }
 
-        [AssertionMethod]
-        protected static void AssertDataHasManyValue<T>(SingleOrManyData<T> data, RequestAdapterState state)
-            where T : class, IResourceIdentity, new()
-        {
-            if (data.ManyValue == null)
+            if (data.ManyValue != null)
             {
-                throw new ModelConversionException(state.Position,
-                    data.SingleValue == null ? "Expected an array, instead of 'null'." : "Expected an array, instead of an object.", null);
+                throw new ModelConversionException(state.Position, "Expected an object or 'null', instead of an array.", null);
             }
         }
+    }
 
-        protected static void AssertObjectIsNotNull<T>([SysNotNull] T? value, RequestAdapterState state)
-            where T : class
+    [AssertionMethod]
+    protected static void AssertDataHasManyValue<T>(SingleOrManyData<T> data, RequestAdapterState state)
+        where T : class, IResourceIdentity, new()
+    {
+        if (data.ManyValue == null)
         {
-            if (value is null)
-            {
-                throw new ModelConversionException(state.Position, "Expected an object, instead of 'null'.", null);
-            }
+            throw new ModelConversionException(state.Position,
+                data.SingleValue == null ? "Expected an array, instead of 'null'." : "Expected an array, instead of an object.", null);
+        }
+    }
+
+    protected static void AssertObjectIsNotNull<T>([SysNotNull] T? value, RequestAdapterState state)
+        where T : class
+    {
+        if (value is null)
+        {
+            throw new ModelConversionException(state.Position, "Expected an object, instead of 'null'.", null);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/DocumentAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/DocumentAdapter.cs
index 46bcc1ca25..369f9076d2 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/DocumentAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/DocumentAdapter.cs
@@ -2,41 +2,40 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <inheritdoc />
+public sealed class DocumentAdapter : IDocumentAdapter
 {
-    /// <inheritdoc />
-    public sealed class DocumentAdapter : IDocumentAdapter
-    {
-        private readonly IJsonApiRequest _request;
-        private readonly ITargetedFields _targetedFields;
-        private readonly IDocumentInResourceOrRelationshipRequestAdapter _documentInResourceOrRelationshipRequestAdapter;
-        private readonly IDocumentInOperationsRequestAdapter _documentInOperationsRequestAdapter;
+    private readonly IJsonApiRequest _request;
+    private readonly ITargetedFields _targetedFields;
+    private readonly IDocumentInResourceOrRelationshipRequestAdapter _documentInResourceOrRelationshipRequestAdapter;
+    private readonly IDocumentInOperationsRequestAdapter _documentInOperationsRequestAdapter;
 
-        public DocumentAdapter(IJsonApiRequest request, ITargetedFields targetedFields,
-            IDocumentInResourceOrRelationshipRequestAdapter documentInResourceOrRelationshipRequestAdapter,
-            IDocumentInOperationsRequestAdapter documentInOperationsRequestAdapter)
-        {
-            ArgumentGuard.NotNull(request, nameof(request));
-            ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
-            ArgumentGuard.NotNull(documentInResourceOrRelationshipRequestAdapter, nameof(documentInResourceOrRelationshipRequestAdapter));
-            ArgumentGuard.NotNull(documentInOperationsRequestAdapter, nameof(documentInOperationsRequestAdapter));
+    public DocumentAdapter(IJsonApiRequest request, ITargetedFields targetedFields,
+        IDocumentInResourceOrRelationshipRequestAdapter documentInResourceOrRelationshipRequestAdapter,
+        IDocumentInOperationsRequestAdapter documentInOperationsRequestAdapter)
+    {
+        ArgumentGuard.NotNull(request, nameof(request));
+        ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
+        ArgumentGuard.NotNull(documentInResourceOrRelationshipRequestAdapter, nameof(documentInResourceOrRelationshipRequestAdapter));
+        ArgumentGuard.NotNull(documentInOperationsRequestAdapter, nameof(documentInOperationsRequestAdapter));
 
-            _request = request;
-            _targetedFields = targetedFields;
-            _documentInResourceOrRelationshipRequestAdapter = documentInResourceOrRelationshipRequestAdapter;
-            _documentInOperationsRequestAdapter = documentInOperationsRequestAdapter;
-        }
+        _request = request;
+        _targetedFields = targetedFields;
+        _documentInResourceOrRelationshipRequestAdapter = documentInResourceOrRelationshipRequestAdapter;
+        _documentInOperationsRequestAdapter = documentInOperationsRequestAdapter;
+    }
 
-        /// <inheritdoc />
-        public object? Convert(Document document)
-        {
-            ArgumentGuard.NotNull(document, nameof(document));
+    /// <inheritdoc />
+    public object? Convert(Document document)
+    {
+        ArgumentGuard.NotNull(document, nameof(document));
 
-            using var adapterState = new RequestAdapterState(_request, _targetedFields);
+        using var adapterState = new RequestAdapterState(_request, _targetedFields);
 
-            return adapterState.Request.Kind == EndpointKind.AtomicOperations
-                ? _documentInOperationsRequestAdapter.Convert(document, adapterState)
-                : _documentInResourceOrRelationshipRequestAdapter.Convert(document, adapterState);
-        }
+        return adapterState.Request.Kind == EndpointKind.AtomicOperations
+            ? _documentInOperationsRequestAdapter.Convert(document, adapterState)
+            : _documentInResourceOrRelationshipRequestAdapter.Convert(document, adapterState);
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/DocumentInOperationsRequestAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/DocumentInOperationsRequestAdapter.cs
index a5088cf1af..6d26125666 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/DocumentInOperationsRequestAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/DocumentInOperationsRequestAdapter.cs
@@ -1,74 +1,71 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <inheritdoc cref="IDocumentInOperationsRequestAdapter" />
+public sealed class DocumentInOperationsRequestAdapter : BaseAdapter, IDocumentInOperationsRequestAdapter
 {
-    /// <inheritdoc cref="IDocumentInOperationsRequestAdapter" />
-    public sealed class DocumentInOperationsRequestAdapter : BaseAdapter, IDocumentInOperationsRequestAdapter
-    {
-        private readonly IJsonApiOptions _options;
-        private readonly IAtomicOperationObjectAdapter _atomicOperationObjectAdapter;
+    private readonly IJsonApiOptions _options;
+    private readonly IAtomicOperationObjectAdapter _atomicOperationObjectAdapter;
 
-        public DocumentInOperationsRequestAdapter(IJsonApiOptions options, IAtomicOperationObjectAdapter atomicOperationObjectAdapter)
-        {
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(atomicOperationObjectAdapter, nameof(atomicOperationObjectAdapter));
+    public DocumentInOperationsRequestAdapter(IJsonApiOptions options, IAtomicOperationObjectAdapter atomicOperationObjectAdapter)
+    {
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(atomicOperationObjectAdapter, nameof(atomicOperationObjectAdapter));
 
-            _options = options;
-            _atomicOperationObjectAdapter = atomicOperationObjectAdapter;
-        }
+        _options = options;
+        _atomicOperationObjectAdapter = atomicOperationObjectAdapter;
+    }
 
-        /// <inheritdoc />
-        public IList<OperationContainer> Convert(Document document, RequestAdapterState state)
-        {
-            ArgumentGuard.NotNull(state, nameof(state));
-            AssertHasOperations(document.Operations, state);
+    /// <inheritdoc />
+    public IList<OperationContainer> Convert(Document document, RequestAdapterState state)
+    {
+        ArgumentGuard.NotNull(state, nameof(state));
+        AssertHasOperations(document.Operations, state);
 
-            using IDisposable _ = state.Position.PushElement("atomic:operations");
-            AssertMaxOperationsNotExceeded(document.Operations, state);
+        using IDisposable _ = state.Position.PushElement("atomic:operations");
+        AssertMaxOperationsNotExceeded(document.Operations, state);
 
-            return ConvertOperations(document.Operations, state);
-        }
+        return ConvertOperations(document.Operations, state);
+    }
 
-        private static void AssertHasOperations([NotNull] IEnumerable<AtomicOperationObject?>? atomicOperationObjects, RequestAdapterState state)
+    private static void AssertHasOperations([NotNull] IEnumerable<AtomicOperationObject?>? atomicOperationObjects, RequestAdapterState state)
+    {
+        if (atomicOperationObjects.IsNullOrEmpty())
         {
-            if (atomicOperationObjects.IsNullOrEmpty())
-            {
-                throw new ModelConversionException(state.Position, "No operations found.", null);
-            }
+            throw new ModelConversionException(state.Position, "No operations found.", null);
         }
+    }
 
-        private void AssertMaxOperationsNotExceeded(ICollection<AtomicOperationObject?> atomicOperationObjects, RequestAdapterState state)
+    private void AssertMaxOperationsNotExceeded(ICollection<AtomicOperationObject?> atomicOperationObjects, RequestAdapterState state)
+    {
+        if (atomicOperationObjects.Count > _options.MaximumOperationsPerRequest)
         {
-            if (atomicOperationObjects.Count > _options.MaximumOperationsPerRequest)
-            {
-                throw new ModelConversionException(state.Position, "Too many operations in request.",
-                    $"The number of operations in this request ({atomicOperationObjects.Count}) is higher " +
-                    $"than the maximum of {_options.MaximumOperationsPerRequest}.");
-            }
+            throw new ModelConversionException(state.Position, "Too many operations in request.",
+                $"The number of operations in this request ({atomicOperationObjects.Count}) is higher " +
+                $"than the maximum of {_options.MaximumOperationsPerRequest}.");
         }
+    }
 
-        private IList<OperationContainer> ConvertOperations(IEnumerable<AtomicOperationObject?> atomicOperationObjects, RequestAdapterState state)
-        {
-            var operations = new List<OperationContainer>();
-            int operationIndex = 0;
-
-            foreach (AtomicOperationObject? atomicOperationObject in atomicOperationObjects)
-            {
-                using IDisposable _ = state.Position.PushArrayIndex(operationIndex);
-                AssertObjectIsNotNull(atomicOperationObject, state);
+    private IList<OperationContainer> ConvertOperations(IEnumerable<AtomicOperationObject?> atomicOperationObjects, RequestAdapterState state)
+    {
+        var operations = new List<OperationContainer>();
+        int operationIndex = 0;
 
-                OperationContainer operation = _atomicOperationObjectAdapter.Convert(atomicOperationObject, state);
-                operations.Add(operation);
+        foreach (AtomicOperationObject? atomicOperationObject in atomicOperationObjects)
+        {
+            using IDisposable _ = state.Position.PushArrayIndex(operationIndex);
+            AssertObjectIsNotNull(atomicOperationObject, state);
 
-                operationIndex++;
-            }
+            OperationContainer operation = _atomicOperationObjectAdapter.Convert(atomicOperationObject, state);
+            operations.Add(operation);
 
-            return operations;
+            operationIndex++;
         }
+
+        return operations;
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/DocumentInResourceOrRelationshipRequestAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/DocumentInResourceOrRelationshipRequestAdapter.cs
index 1a127b49ed..aaf5b813c8 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/DocumentInResourceOrRelationshipRequestAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/DocumentInResourceOrRelationshipRequestAdapter.cs
@@ -1,77 +1,75 @@
-using System.Collections.Generic;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <inheritdoc />
+public sealed class DocumentInResourceOrRelationshipRequestAdapter : IDocumentInResourceOrRelationshipRequestAdapter
 {
-    /// <inheritdoc />
-    public sealed class DocumentInResourceOrRelationshipRequestAdapter : IDocumentInResourceOrRelationshipRequestAdapter
+    private readonly IJsonApiOptions _options;
+    private readonly IResourceDataAdapter _resourceDataAdapter;
+    private readonly IRelationshipDataAdapter _relationshipDataAdapter;
+
+    public DocumentInResourceOrRelationshipRequestAdapter(IJsonApiOptions options, IResourceDataAdapter resourceDataAdapter,
+        IRelationshipDataAdapter relationshipDataAdapter)
     {
-        private readonly IJsonApiOptions _options;
-        private readonly IResourceDataAdapter _resourceDataAdapter;
-        private readonly IRelationshipDataAdapter _relationshipDataAdapter;
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(resourceDataAdapter, nameof(resourceDataAdapter));
+        ArgumentGuard.NotNull(relationshipDataAdapter, nameof(relationshipDataAdapter));
 
-        public DocumentInResourceOrRelationshipRequestAdapter(IJsonApiOptions options, IResourceDataAdapter resourceDataAdapter,
-            IRelationshipDataAdapter relationshipDataAdapter)
-        {
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(resourceDataAdapter, nameof(resourceDataAdapter));
-            ArgumentGuard.NotNull(relationshipDataAdapter, nameof(relationshipDataAdapter));
+        _options = options;
+        _resourceDataAdapter = resourceDataAdapter;
+        _relationshipDataAdapter = relationshipDataAdapter;
+    }
 
-            _options = options;
-            _resourceDataAdapter = resourceDataAdapter;
-            _relationshipDataAdapter = relationshipDataAdapter;
-        }
+    /// <inheritdoc />
+    public object? Convert(Document document, RequestAdapterState state)
+    {
+        state.WritableTargetedFields = new TargetedFields();
 
-        /// <inheritdoc />
-        public object? Convert(Document document, RequestAdapterState state)
+        switch (state.Request.WriteOperation)
         {
-            state.WritableTargetedFields = new TargetedFields();
-
-            switch (state.Request.WriteOperation)
+            case WriteOperationKind.CreateResource:
+            case WriteOperationKind.UpdateResource:
+            {
+                ResourceIdentityRequirements requirements = CreateIdentityRequirements(state);
+                return _resourceDataAdapter.Convert(document.Data, requirements, state);
+            }
+            case WriteOperationKind.SetRelationship:
+            case WriteOperationKind.AddToRelationship:
+            case WriteOperationKind.RemoveFromRelationship:
             {
-                case WriteOperationKind.CreateResource:
-                case WriteOperationKind.UpdateResource:
+                if (state.Request.Relationship == null)
                 {
-                    ResourceIdentityRequirements requirements = CreateIdentityRequirements(state);
-                    return _resourceDataAdapter.Convert(document.Data, requirements, state);
+                    // Let the controller throw for unknown relationship, because it knows the relationship name that was used.
+                    return new HashSet<IIdentifiable>(IdentifiableComparer.Instance);
                 }
-                case WriteOperationKind.SetRelationship:
-                case WriteOperationKind.AddToRelationship:
-                case WriteOperationKind.RemoveFromRelationship:
-                {
-                    if (state.Request.Relationship == null)
-                    {
-                        // Let the controller throw for unknown relationship, because it knows the relationship name that was used.
-                        return new HashSet<IIdentifiable>(IdentifiableComparer.Instance);
-                    }
 
-                    ResourceIdentityAdapter.AssertToManyInAddOrRemoveRelationship(state.Request.Relationship, state);
+                ResourceIdentityAdapter.AssertToManyInAddOrRemoveRelationship(state.Request.Relationship, state);
 
-                    state.WritableTargetedFields.Relationships.Add(state.Request.Relationship);
-                    return _relationshipDataAdapter.Convert(document.Data, state.Request.Relationship, false, state);
-                }
+                state.WritableTargetedFields.Relationships.Add(state.Request.Relationship);
+                return _relationshipDataAdapter.Convert(document.Data, state.Request.Relationship, false, state);
             }
-
-            return null;
         }
 
-        private ResourceIdentityRequirements CreateIdentityRequirements(RequestAdapterState state)
-        {
-            JsonElementConstraint? idConstraint = state.Request.WriteOperation == WriteOperationKind.CreateResource
-                ? _options.AllowClientGeneratedIds ? null : JsonElementConstraint.Forbidden
-                : JsonElementConstraint.Required;
+        return null;
+    }
 
-            var requirements = new ResourceIdentityRequirements
-            {
-                ResourceType = state.Request.PrimaryResourceType,
-                IdConstraint = idConstraint,
-                IdValue = state.Request.PrimaryId
-            };
+    private ResourceIdentityRequirements CreateIdentityRequirements(RequestAdapterState state)
+    {
+        JsonElementConstraint? idConstraint = state.Request.WriteOperation == WriteOperationKind.CreateResource
+            ? _options.AllowClientGeneratedIds ? null : JsonElementConstraint.Forbidden
+            : JsonElementConstraint.Required;
 
-            return requirements;
-        }
+        var requirements = new ResourceIdentityRequirements
+        {
+            ResourceType = state.Request.PrimaryResourceType,
+            IdConstraint = idConstraint,
+            IdValue = state.Request.PrimaryId
+        };
+
+        return requirements;
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IAtomicOperationObjectAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IAtomicOperationObjectAdapter.cs
index 5fb2c1d680..b734a96dad 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IAtomicOperationObjectAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IAtomicOperationObjectAdapter.cs
@@ -1,16 +1,15 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Validates and converts a single operation inside an atomic:operations request.
+/// </summary>
+public interface IAtomicOperationObjectAdapter
 {
     /// <summary>
-    /// Validates and converts a single operation inside an atomic:operations request.
+    /// Validates and converts the specified <paramref name="atomicOperationObject" />.
     /// </summary>
-    public interface IAtomicOperationObjectAdapter
-    {
-        /// <summary>
-        /// Validates and converts the specified <paramref name="atomicOperationObject" />.
-        /// </summary>
-        OperationContainer Convert(AtomicOperationObject atomicOperationObject, RequestAdapterState state);
-    }
+    OperationContainer Convert(AtomicOperationObject atomicOperationObject, RequestAdapterState state);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IAtomicReferenceAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IAtomicReferenceAdapter.cs
index bd4a12b2de..047ec78181 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IAtomicReferenceAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IAtomicReferenceAdapter.cs
@@ -1,16 +1,15 @@
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Validates and converts a 'ref' element in an entry of an atomic:operations request. It appears in most kinds of operations and typically indicates
+/// what would otherwise have been in the endpoint URL, if it were a resource request.
+/// </summary>
+public interface IAtomicReferenceAdapter
 {
     /// <summary>
-    /// Validates and converts a 'ref' element in an entry of an atomic:operations request. It appears in most kinds of operations and typically indicates
-    /// what would otherwise have been in the endpoint URL, if it were a resource request.
+    /// Validates and converts the specified <paramref name="atomicReference" />.
     /// </summary>
-    public interface IAtomicReferenceAdapter
-    {
-        /// <summary>
-        /// Validates and converts the specified <paramref name="atomicReference" />.
-        /// </summary>
-        AtomicReferenceResult Convert(AtomicReference atomicReference, ResourceIdentityRequirements requirements, RequestAdapterState state);
-    }
+    AtomicReferenceResult Convert(AtomicReference atomicReference, ResourceIdentityRequirements requirements, RequestAdapterState state);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentAdapter.cs
index 78e3ed2f1a..794278fc73 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentAdapter.cs
@@ -1,38 +1,37 @@
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// The entry point for validating and converting the deserialized <see cref="Document" /> from the request body into a model. The produced models are
+/// used in ASP.NET Model Binding.
+/// </summary>
+public interface IDocumentAdapter
 {
     /// <summary>
-    /// The entry point for validating and converting the deserialized <see cref="Document" /> from the request body into a model. The produced models are
-    /// used in ASP.NET Model Binding.
+    /// Validates and converts the specified <paramref name="document" />. Possible return values:
+    /// <list type="bullet">
+    /// <item>
+    /// <description>
+    /// <code><![CDATA[IList<OperationContainer>]]></code> (operations)
+    /// </description>
+    /// </item>
+    /// <item>
+    /// <description>
+    /// <code><![CDATA[ISet<IIdentifiable>]]></code> (to-many relationship, unknown relationship)
+    /// </description>
+    /// </item>
+    /// <item>
+    /// <description>
+    /// <code><![CDATA[IIdentifiable]]></code> (resource, to-one relationship)
+    /// </description>
+    /// </item>
+    /// <item>
+    /// <description>
+    /// <code><![CDATA[null]]></code> (to-one relationship)
+    /// </description>
+    /// </item>
+    /// </list>
     /// </summary>
-    public interface IDocumentAdapter
-    {
-        /// <summary>
-        /// Validates and converts the specified <paramref name="document" />. Possible return values:
-        /// <list type="bullet">
-        /// <item>
-        /// <description>
-        /// <code><![CDATA[IList<OperationContainer>]]></code> (operations)
-        /// </description>
-        /// </item>
-        /// <item>
-        /// <description>
-        /// <code><![CDATA[ISet<IIdentifiable>]]></code> (to-many relationship, unknown relationship)
-        /// </description>
-        /// </item>
-        /// <item>
-        /// <description>
-        /// <code><![CDATA[IIdentifiable]]></code> (resource, to-one relationship)
-        /// </description>
-        /// </item>
-        /// <item>
-        /// <description>
-        /// <code><![CDATA[null]]></code> (to-one relationship)
-        /// </description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        object? Convert(Document document);
-    }
+    object? Convert(Document document);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentInOperationsRequestAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentInOperationsRequestAdapter.cs
index de39fa6c91..228abbf3ce 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentInOperationsRequestAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentInOperationsRequestAdapter.cs
@@ -1,17 +1,15 @@
-using System.Collections.Generic;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Validates and converts a <see cref="Document" /> belonging to an atomic:operations request.
+/// </summary>
+public interface IDocumentInOperationsRequestAdapter
 {
     /// <summary>
-    /// Validates and converts a <see cref="Document" /> belonging to an atomic:operations request.
+    /// Validates and converts the specified <paramref name="document" />.
     /// </summary>
-    public interface IDocumentInOperationsRequestAdapter
-    {
-        /// <summary>
-        /// Validates and converts the specified <paramref name="document" />.
-        /// </summary>
-        IList<OperationContainer> Convert(Document document, RequestAdapterState state);
-    }
+    IList<OperationContainer> Convert(Document document, RequestAdapterState state);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentInResourceOrRelationshipRequestAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentInResourceOrRelationshipRequestAdapter.cs
index a1b8fc0585..5da648ce4e 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentInResourceOrRelationshipRequestAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IDocumentInResourceOrRelationshipRequestAdapter.cs
@@ -1,15 +1,14 @@
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Validates and converts a <see cref="Document" /> belonging to a resource or relationship request.
+/// </summary>
+public interface IDocumentInResourceOrRelationshipRequestAdapter
 {
     /// <summary>
-    /// Validates and converts a <see cref="Document" /> belonging to a resource or relationship request.
+    /// Validates and converts the specified <paramref name="document" />.
     /// </summary>
-    public interface IDocumentInResourceOrRelationshipRequestAdapter
-    {
-        /// <summary>
-        /// Validates and converts the specified <paramref name="document" />.
-        /// </summary>
-        object? Convert(Document document, RequestAdapterState state);
-    }
+    object? Convert(Document document, RequestAdapterState state);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IRelationshipDataAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IRelationshipDataAdapter.cs
index 222642dc76..4a1b6d11a9 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IRelationshipDataAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IRelationshipDataAdapter.cs
@@ -1,24 +1,22 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Validates and converts the data from a relationship. It appears in a relationship request, in the relationships of a POST/PATCH resource request, in
+/// an entry of an atomic:operations request that targets a relationship and in the relationships of an operations entry that creates or updates a
+/// resource.
+/// </summary>
+public interface IRelationshipDataAdapter
 {
     /// <summary>
-    /// Validates and converts the data from a relationship. It appears in a relationship request, in the relationships of a POST/PATCH resource request, in
-    /// an entry of an atomic:operations request that targets a relationship and in the relationships of an operations entry that creates or updates a
-    /// resource.
+    /// Validates and converts the specified <paramref name="data" />.
     /// </summary>
-    public interface IRelationshipDataAdapter
-    {
-        /// <summary>
-        /// Validates and converts the specified <paramref name="data" />.
-        /// </summary>
-        object? Convert(SingleOrManyData<ResourceObject> data, RelationshipAttribute relationship, bool useToManyElementType, RequestAdapterState state);
+    object? Convert(SingleOrManyData<ResourceObject> data, RelationshipAttribute relationship, bool useToManyElementType, RequestAdapterState state);
 
-        /// <summary>
-        /// Validates and converts the specified <paramref name="data" />.
-        /// </summary>
-        object? Convert(SingleOrManyData<ResourceIdentifierObject> data, RelationshipAttribute relationship, bool useToManyElementType,
-            RequestAdapterState state);
-    }
+    /// <summary>
+    /// Validates and converts the specified <paramref name="data" />.
+    /// </summary>
+    object? Convert(SingleOrManyData<ResourceIdentifierObject> data, RelationshipAttribute relationship, bool useToManyElementType, RequestAdapterState state);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceDataAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceDataAdapter.cs
index e7dd737cfb..850e81d77c 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceDataAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceDataAdapter.cs
@@ -1,16 +1,15 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Validates and converts the data from a resource in a POST/PATCH resource request.
+/// </summary>
+public interface IResourceDataAdapter
 {
     /// <summary>
-    /// Validates and converts the data from a resource in a POST/PATCH resource request.
+    /// Validates and converts the specified <paramref name="data" />.
     /// </summary>
-    public interface IResourceDataAdapter
-    {
-        /// <summary>
-        /// Validates and converts the specified <paramref name="data" />.
-        /// </summary>
-        IIdentifiable Convert(SingleOrManyData<ResourceObject> data, ResourceIdentityRequirements requirements, RequestAdapterState state);
-    }
+    IIdentifiable Convert(SingleOrManyData<ResourceObject> data, ResourceIdentityRequirements requirements, RequestAdapterState state);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceDataInOperationsRequestAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceDataInOperationsRequestAdapter.cs
index f47e25dfa0..b2dd3da844 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceDataInOperationsRequestAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceDataInOperationsRequestAdapter.cs
@@ -2,17 +2,16 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Validates and converts the data from an entry in an atomic:operations request that creates or updates a resource.
+/// </summary>
+[PublicAPI]
+public interface IResourceDataInOperationsRequestAdapter
 {
     /// <summary>
-    /// Validates and converts the data from an entry in an atomic:operations request that creates or updates a resource.
+    /// Validates and converts the specified <paramref name="data" />.
     /// </summary>
-    [PublicAPI]
-    public interface IResourceDataInOperationsRequestAdapter
-    {
-        /// <summary>
-        /// Validates and converts the specified <paramref name="data" />.
-        /// </summary>
-        IIdentifiable Convert(SingleOrManyData<ResourceObject> data, ResourceIdentityRequirements requirements, RequestAdapterState state);
-    }
+    IIdentifiable Convert(SingleOrManyData<ResourceObject> data, ResourceIdentityRequirements requirements, RequestAdapterState state);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceIdentifierObjectAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceIdentifierObjectAdapter.cs
index 3105143908..d1b233d4f0 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceIdentifierObjectAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceIdentifierObjectAdapter.cs
@@ -1,16 +1,15 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Validates and converts a <see cref="ResourceIdentifierObject" />. It appears in the data object(s) of a relationship.
+/// </summary>
+public interface IResourceIdentifierObjectAdapter
 {
     /// <summary>
-    /// Validates and converts a <see cref="ResourceIdentifierObject" />. It appears in the data object(s) of a relationship.
+    /// Validates and converts the specified <paramref name="resourceIdentifierObject" />.
     /// </summary>
-    public interface IResourceIdentifierObjectAdapter
-    {
-        /// <summary>
-        /// Validates and converts the specified <paramref name="resourceIdentifierObject" />.
-        /// </summary>
-        IIdentifiable Convert(ResourceIdentifierObject resourceIdentifierObject, ResourceIdentityRequirements requirements, RequestAdapterState state);
-    }
+    IIdentifiable Convert(ResourceIdentifierObject resourceIdentifierObject, ResourceIdentityRequirements requirements, RequestAdapterState state);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceObjectAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceObjectAdapter.cs
index 8245444e08..a8bec30bf6 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceObjectAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/IResourceObjectAdapter.cs
@@ -2,18 +2,17 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Validates and converts a <see cref="ResourceObject" />. It appears in a POST/PATCH resource request and an entry in an atomic:operations request that
+/// creates or updates a resource.
+/// </summary>
+public interface IResourceObjectAdapter
 {
     /// <summary>
-    /// Validates and converts a <see cref="ResourceObject" />. It appears in a POST/PATCH resource request and an entry in an atomic:operations request that
-    /// creates or updates a resource.
+    /// Validates and converts the specified <paramref name="resourceObject" />.
     /// </summary>
-    public interface IResourceObjectAdapter
-    {
-        /// <summary>
-        /// Validates and converts the specified <paramref name="resourceObject" />.
-        /// </summary>
-        (IIdentifiable resource, ResourceType resourceType) Convert(ResourceObject resourceObject, ResourceIdentityRequirements requirements,
-            RequestAdapterState state);
-    }
+    (IIdentifiable resource, ResourceType resourceType) Convert(ResourceObject resourceObject, ResourceIdentityRequirements requirements,
+        RequestAdapterState state);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/JsonElementConstraint.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/JsonElementConstraint.cs
index ebdd76945a..eaee05538c 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/JsonElementConstraint.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/JsonElementConstraint.cs
@@ -1,21 +1,20 @@
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Lists constraints for the presence or absence of a JSON element.
+/// </summary>
+[PublicAPI]
+public enum JsonElementConstraint
 {
     /// <summary>
-    /// Lists constraints for the presence or absence of a JSON element.
+    /// A value for the element is not allowed.
     /// </summary>
-    [PublicAPI]
-    public enum JsonElementConstraint
-    {
-        /// <summary>
-        /// A value for the element is not allowed.
-        /// </summary>
-        Forbidden,
+    Forbidden,
 
-        /// <summary>
-        /// A value for the element is required.
-        /// </summary>
-        Required
-    }
+    /// <summary>
+    /// A value for the element is required.
+    /// </summary>
+    Required
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/RelationshipDataAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/RelationshipDataAdapter.cs
index 6cc42bacdd..89cf3caa18 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/RelationshipDataAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/RelationshipDataAdapter.cs
@@ -1,121 +1,117 @@
-using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <inheritdoc cref="IRelationshipDataAdapter" />
+public sealed class RelationshipDataAdapter : BaseAdapter, IRelationshipDataAdapter
 {
-    /// <inheritdoc cref="IRelationshipDataAdapter" />
-    public sealed class RelationshipDataAdapter : BaseAdapter, IRelationshipDataAdapter
-    {
-        private static readonly CollectionConverter CollectionConverter = new();
+    private static readonly CollectionConverter CollectionConverter = new();
 
-        private readonly IResourceIdentifierObjectAdapter _resourceIdentifierObjectAdapter;
+    private readonly IResourceIdentifierObjectAdapter _resourceIdentifierObjectAdapter;
 
-        public RelationshipDataAdapter(IResourceIdentifierObjectAdapter resourceIdentifierObjectAdapter)
-        {
-            ArgumentGuard.NotNull(resourceIdentifierObjectAdapter, nameof(resourceIdentifierObjectAdapter));
+    public RelationshipDataAdapter(IResourceIdentifierObjectAdapter resourceIdentifierObjectAdapter)
+    {
+        ArgumentGuard.NotNull(resourceIdentifierObjectAdapter, nameof(resourceIdentifierObjectAdapter));
 
-            _resourceIdentifierObjectAdapter = resourceIdentifierObjectAdapter;
-        }
+        _resourceIdentifierObjectAdapter = resourceIdentifierObjectAdapter;
+    }
 
-        /// <inheritdoc />
-        public object? Convert(SingleOrManyData<ResourceObject> data, RelationshipAttribute relationship, bool useToManyElementType, RequestAdapterState state)
-        {
-            SingleOrManyData<ResourceIdentifierObject> identifierData = ToIdentifierData(data);
-            return Convert(identifierData, relationship, useToManyElementType, state);
-        }
+    /// <inheritdoc />
+    public object? Convert(SingleOrManyData<ResourceObject> data, RelationshipAttribute relationship, bool useToManyElementType, RequestAdapterState state)
+    {
+        SingleOrManyData<ResourceIdentifierObject> identifierData = ToIdentifierData(data);
+        return Convert(identifierData, relationship, useToManyElementType, state);
+    }
 
-        private static SingleOrManyData<ResourceIdentifierObject> ToIdentifierData(SingleOrManyData<ResourceObject> data)
+    private static SingleOrManyData<ResourceIdentifierObject> ToIdentifierData(SingleOrManyData<ResourceObject> data)
+    {
+        if (!data.IsAssigned)
         {
-            if (!data.IsAssigned)
-            {
-                return default;
-            }
+            return default;
+        }
 
-            object? newValue = null;
+        object? newValue = null;
 
-            if (data.ManyValue != null)
-            {
-                newValue = data.ManyValue.Select(resourceObject => new ResourceIdentifierObject
-                {
-                    Type = resourceObject.Type,
-                    Id = resourceObject.Id,
-                    Lid = resourceObject.Lid
-                });
-            }
-            else if (data.SingleValue != null)
+        if (data.ManyValue != null)
+        {
+            newValue = data.ManyValue.Select(resourceObject => new ResourceIdentifierObject
             {
-                newValue = new ResourceIdentifierObject
-                {
-                    Type = data.SingleValue.Type,
-                    Id = data.SingleValue.Id,
-                    Lid = data.SingleValue.Lid
-                };
-            }
-
-            return new SingleOrManyData<ResourceIdentifierObject>(newValue);
+                Type = resourceObject.Type,
+                Id = resourceObject.Id,
+                Lid = resourceObject.Lid
+            });
         }
-
-        /// <inheritdoc />
-        public object? Convert(SingleOrManyData<ResourceIdentifierObject> data, RelationshipAttribute relationship, bool useToManyElementType,
-            RequestAdapterState state)
+        else if (data.SingleValue != null)
         {
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
-            ArgumentGuard.NotNull(state, nameof(state));
-            AssertHasData(data, state);
-
-            using IDisposable _ = state.Position.PushElement("data");
-
-            var requirements = new ResourceIdentityRequirements
+            newValue = new ResourceIdentifierObject
             {
-                ResourceType = relationship.RightType,
-                IdConstraint = JsonElementConstraint.Required,
-                RelationshipName = relationship.PublicName
+                Type = data.SingleValue.Type,
+                Id = data.SingleValue.Id,
+                Lid = data.SingleValue.Lid
             };
-
-            return relationship is HasOneAttribute
-                ? ConvertToOneRelationshipData(data, requirements, state)
-                : ConvertToManyRelationshipData(data, relationship, requirements, useToManyElementType, state);
         }
 
-        private IIdentifiable? ConvertToOneRelationshipData(SingleOrManyData<ResourceIdentifierObject> data, ResourceIdentityRequirements requirements,
-            RequestAdapterState state)
-        {
-            AssertDataHasSingleValue(data, true, state);
+        return new SingleOrManyData<ResourceIdentifierObject>(newValue);
+    }
 
-            return data.SingleValue != null ? _resourceIdentifierObjectAdapter.Convert(data.SingleValue, requirements, state) : null;
-        }
+    /// <inheritdoc />
+    public object? Convert(SingleOrManyData<ResourceIdentifierObject> data, RelationshipAttribute relationship, bool useToManyElementType,
+        RequestAdapterState state)
+    {
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
+        ArgumentGuard.NotNull(state, nameof(state));
+        AssertHasData(data, state);
 
-        private IEnumerable ConvertToManyRelationshipData(SingleOrManyData<ResourceIdentifierObject> data, RelationshipAttribute relationship,
-            ResourceIdentityRequirements requirements, bool useToManyElementType, RequestAdapterState state)
+        using IDisposable _ = state.Position.PushElement("data");
+
+        var requirements = new ResourceIdentityRequirements
         {
-            AssertDataHasManyValue(data, state);
+            ResourceType = relationship.RightType,
+            IdConstraint = JsonElementConstraint.Required,
+            RelationshipName = relationship.PublicName
+        };
+
+        return relationship is HasOneAttribute
+            ? ConvertToOneRelationshipData(data, requirements, state)
+            : ConvertToManyRelationshipData(data, relationship, requirements, useToManyElementType, state);
+    }
 
-            int arrayIndex = 0;
-            var rightResources = new List<IIdentifiable>();
+    private IIdentifiable? ConvertToOneRelationshipData(SingleOrManyData<ResourceIdentifierObject> data, ResourceIdentityRequirements requirements,
+        RequestAdapterState state)
+    {
+        AssertDataHasSingleValue(data, true, state);
 
-            foreach (ResourceIdentifierObject resourceIdentifierObject in data.ManyValue!)
-            {
-                using IDisposable _ = state.Position.PushArrayIndex(arrayIndex);
+        return data.SingleValue != null ? _resourceIdentifierObjectAdapter.Convert(data.SingleValue, requirements, state) : null;
+    }
 
-                IIdentifiable rightResource = _resourceIdentifierObjectAdapter.Convert(resourceIdentifierObject, requirements, state);
-                rightResources.Add(rightResource);
+    private IEnumerable ConvertToManyRelationshipData(SingleOrManyData<ResourceIdentifierObject> data, RelationshipAttribute relationship,
+        ResourceIdentityRequirements requirements, bool useToManyElementType, RequestAdapterState state)
+    {
+        AssertDataHasManyValue(data, state);
 
-                arrayIndex++;
-            }
+        int arrayIndex = 0;
+        var rightResources = new List<IIdentifiable>();
 
-            if (useToManyElementType)
-            {
-                return CollectionConverter.CopyToTypedCollection(rightResources, relationship.Property.PropertyType);
-            }
+        foreach (ResourceIdentifierObject resourceIdentifierObject in data.ManyValue!)
+        {
+            using IDisposable _ = state.Position.PushArrayIndex(arrayIndex);
+
+            IIdentifiable rightResource = _resourceIdentifierObjectAdapter.Convert(resourceIdentifierObject, requirements, state);
+            rightResources.Add(rightResource);
 
-            var resourceSet = new HashSet<IIdentifiable>(IdentifiableComparer.Instance);
-            resourceSet.AddRange(rightResources);
-            return resourceSet;
+            arrayIndex++;
         }
+
+        if (useToManyElementType)
+        {
+            return CollectionConverter.CopyToTypedCollection(rightResources, relationship.Property.PropertyType);
+        }
+
+        var resourceSet = new HashSet<IIdentifiable>(IdentifiableComparer.Instance);
+        resourceSet.AddRange(rightResources);
+        return resourceSet;
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/RequestAdapterPosition.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/RequestAdapterPosition.cs
index 252c0fe2a6..3ae7caa6af 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/RequestAdapterPosition.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/RequestAdapterPosition.cs
@@ -1,76 +1,72 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Tracks the location within an object tree when validating and converting a request body.
+/// </summary>
+[PublicAPI]
+public sealed class RequestAdapterPosition
 {
-    /// <summary>
-    /// Tracks the location within an object tree when validating and converting a request body.
-    /// </summary>
-    [PublicAPI]
-    public sealed class RequestAdapterPosition
+    private readonly Stack<string> _stack = new();
+    private readonly IDisposable _disposable;
+
+    public RequestAdapterPosition()
     {
-        private readonly Stack<string> _stack = new();
-        private readonly IDisposable _disposable;
+        _disposable = new PopStackOnDispose(this);
+    }
 
-        public RequestAdapterPosition()
-        {
-            _disposable = new PopStackOnDispose(this);
-        }
+    public IDisposable PushElement(string name)
+    {
+        ArgumentGuard.NotNullNorEmpty(name, nameof(name));
 
-        public IDisposable PushElement(string name)
-        {
-            ArgumentGuard.NotNullNorEmpty(name, nameof(name));
+        _stack.Push($"/{name}");
+        return _disposable;
+    }
 
-            _stack.Push($"/{name}");
-            return _disposable;
-        }
+    public IDisposable PushArrayIndex(int index)
+    {
+        _stack.Push($"[{index}]");
+        return _disposable;
+    }
 
-        public IDisposable PushArrayIndex(int index)
+    public string? ToSourcePointer()
+    {
+        if (!_stack.Any())
         {
-            _stack.Push($"[{index}]");
-            return _disposable;
+            return null;
         }
 
-        public string? ToSourcePointer()
+        var builder = new StringBuilder();
+        var clone = new Stack<string>(_stack);
+
+        while (clone.Any())
         {
-            if (!_stack.Any())
-            {
-                return null;
-            }
+            string element = clone.Pop();
+            builder.Append(element);
+        }
 
-            var builder = new StringBuilder();
-            var clone = new Stack<string>(_stack);
+        return builder.ToString();
+    }
 
-            while (clone.Any())
-            {
-                string element = clone.Pop();
-                builder.Append(element);
-            }
+    public override string ToString()
+    {
+        return ToSourcePointer() ?? string.Empty;
+    }
 
-            return builder.ToString();
-        }
+    private sealed class PopStackOnDispose : IDisposable
+    {
+        private readonly RequestAdapterPosition _owner;
 
-        public override string ToString()
+        public PopStackOnDispose(RequestAdapterPosition owner)
         {
-            return ToSourcePointer() ?? string.Empty;
+            _owner = owner;
         }
 
-        private sealed class PopStackOnDispose : IDisposable
+        public void Dispose()
         {
-            private readonly RequestAdapterPosition _owner;
-
-            public PopStackOnDispose(RequestAdapterPosition owner)
-            {
-                _owner = owner;
-            }
-
-            public void Dispose()
-            {
-                _owner._stack.Pop();
-            }
+            _owner._stack.Pop();
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/RequestAdapterState.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/RequestAdapterState.cs
index b333b61140..88cf686f51 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/RequestAdapterState.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/RequestAdapterState.cs
@@ -1,68 +1,66 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.AtomicOperations;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Tracks state while adapting objects from <see cref="JsonApiDotNetCore.Serialization.Objects" /> into the shape that controller actions accept.
+/// </summary>
+[PublicAPI]
+public sealed class RequestAdapterState : IDisposable
 {
-    /// <summary>
-    /// Tracks state while adapting objects from <see cref="JsonApiDotNetCore.Serialization.Objects" /> into the shape that controller actions accept.
-    /// </summary>
-    [PublicAPI]
-    public sealed class RequestAdapterState : IDisposable
-    {
-        private readonly IDisposable? _backupRequestState;
+    private readonly IDisposable? _backupRequestState;
 
-        public IJsonApiRequest InjectableRequest { get; }
-        public ITargetedFields InjectableTargetedFields { get; }
+    public IJsonApiRequest InjectableRequest { get; }
+    public ITargetedFields InjectableTargetedFields { get; }
 
-        public JsonApiRequest? WritableRequest { get; set; }
-        public TargetedFields? WritableTargetedFields { get; set; }
+    public JsonApiRequest? WritableRequest { get; set; }
+    public TargetedFields? WritableTargetedFields { get; set; }
 
-        public RequestAdapterPosition Position { get; } = new();
-        public IJsonApiRequest Request => WritableRequest ?? InjectableRequest;
+    public RequestAdapterPosition Position { get; } = new();
+    public IJsonApiRequest Request => WritableRequest ?? InjectableRequest;
 
-        public RequestAdapterState(IJsonApiRequest request, ITargetedFields targetedFields)
-        {
-            ArgumentGuard.NotNull(request, nameof(request));
-            ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
+    public RequestAdapterState(IJsonApiRequest request, ITargetedFields targetedFields)
+    {
+        ArgumentGuard.NotNull(request, nameof(request));
+        ArgumentGuard.NotNull(targetedFields, nameof(targetedFields));
 
-            InjectableRequest = request;
-            InjectableTargetedFields = targetedFields;
+        InjectableRequest = request;
+        InjectableTargetedFields = targetedFields;
 
-            if (request.Kind == EndpointKind.AtomicOperations)
-            {
-                _backupRequestState = new RevertRequestStateOnDispose(request, targetedFields);
-            }
+        if (request.Kind == EndpointKind.AtomicOperations)
+        {
+            _backupRequestState = new RevertRequestStateOnDispose(request, targetedFields);
         }
+    }
 
-        public void RefreshInjectables()
+    public void RefreshInjectables()
+    {
+        if (WritableRequest != null)
         {
-            if (WritableRequest != null)
-            {
-                InjectableRequest.CopyFrom(WritableRequest);
-            }
-
-            if (WritableTargetedFields != null)
-            {
-                InjectableTargetedFields.CopyFrom(WritableTargetedFields);
-            }
+            InjectableRequest.CopyFrom(WritableRequest);
         }
 
-        public void Dispose()
+        if (WritableTargetedFields != null)
         {
-            // For resource requests, we'd like the injected state to become the final state.
-            // But for operations, it makes more sense to reset than to reflect the last operation.
+            InjectableTargetedFields.CopyFrom(WritableTargetedFields);
+        }
+    }
+
+    public void Dispose()
+    {
+        // For resource requests, we'd like the injected state to become the final state.
+        // But for operations, it makes more sense to reset than to reflect the last operation.
 
-            if (_backupRequestState != null)
-            {
-                _backupRequestState.Dispose();
-            }
-            else
-            {
-                RefreshInjectables();
-            }
+        if (_backupRequestState != null)
+        {
+            _backupRequestState.Dispose();
+        }
+        else
+        {
+            RefreshInjectables();
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceDataAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceDataAdapter.cs
index 6e1d72fc17..dc84fbad3d 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceDataAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceDataAdapter.cs
@@ -1,49 +1,47 @@
-using System;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <inheritdoc cref="IResourceDataAdapter" />
+public class ResourceDataAdapter : BaseAdapter, IResourceDataAdapter
 {
-    /// <inheritdoc cref="IResourceDataAdapter" />
-    public class ResourceDataAdapter : BaseAdapter, IResourceDataAdapter
-    {
-        private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
-        private readonly IResourceObjectAdapter _resourceObjectAdapter;
+    private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
+    private readonly IResourceObjectAdapter _resourceObjectAdapter;
 
-        public ResourceDataAdapter(IResourceDefinitionAccessor resourceDefinitionAccessor, IResourceObjectAdapter resourceObjectAdapter)
-        {
-            ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
-            ArgumentGuard.NotNull(resourceObjectAdapter, nameof(resourceObjectAdapter));
+    public ResourceDataAdapter(IResourceDefinitionAccessor resourceDefinitionAccessor, IResourceObjectAdapter resourceObjectAdapter)
+    {
+        ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
+        ArgumentGuard.NotNull(resourceObjectAdapter, nameof(resourceObjectAdapter));
 
-            _resourceDefinitionAccessor = resourceDefinitionAccessor;
-            _resourceObjectAdapter = resourceObjectAdapter;
-        }
+        _resourceDefinitionAccessor = resourceDefinitionAccessor;
+        _resourceObjectAdapter = resourceObjectAdapter;
+    }
 
-        /// <inheritdoc />
-        public IIdentifiable Convert(SingleOrManyData<ResourceObject> data, ResourceIdentityRequirements requirements, RequestAdapterState state)
-        {
-            ArgumentGuard.NotNull(requirements, nameof(requirements));
-            ArgumentGuard.NotNull(state, nameof(state));
+    /// <inheritdoc />
+    public IIdentifiable Convert(SingleOrManyData<ResourceObject> data, ResourceIdentityRequirements requirements, RequestAdapterState state)
+    {
+        ArgumentGuard.NotNull(requirements, nameof(requirements));
+        ArgumentGuard.NotNull(state, nameof(state));
 
-            AssertHasData(data, state);
+        AssertHasData(data, state);
 
-            using IDisposable _ = state.Position.PushElement("data");
-            AssertDataHasSingleValue(data, false, state);
+        using IDisposable _ = state.Position.PushElement("data");
+        AssertDataHasSingleValue(data, false, state);
 
-            (IIdentifiable resource, ResourceType _) = ConvertResourceObject(data, requirements, state);
+        (IIdentifiable resource, ResourceType _) = ConvertResourceObject(data, requirements, state);
 
-            // Ensure that IResourceDefinition extensibility point sees the current operation, in case it injects IJsonApiRequest.
-            state.RefreshInjectables();
+        // Ensure that IResourceDefinition extensibility point sees the current operation, in case it injects IJsonApiRequest.
+        state.RefreshInjectables();
 
-            _resourceDefinitionAccessor.OnDeserialize(resource);
-            return resource;
-        }
+        _resourceDefinitionAccessor.OnDeserialize(resource);
+        return resource;
+    }
 
-        protected virtual (IIdentifiable resource, ResourceType resourceType) ConvertResourceObject(SingleOrManyData<ResourceObject> data,
-            ResourceIdentityRequirements requirements, RequestAdapterState state)
-        {
-            return _resourceObjectAdapter.Convert(data.SingleValue!, requirements, state);
-        }
+    protected virtual (IIdentifiable resource, ResourceType resourceType) ConvertResourceObject(SingleOrManyData<ResourceObject> data,
+        ResourceIdentityRequirements requirements, RequestAdapterState state)
+    {
+        return _resourceObjectAdapter.Convert(data.SingleValue!, requirements, state);
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceDataInOperationsRequestAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceDataInOperationsRequestAdapter.cs
index 5ebdb6f3cd..afccb303b5 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceDataInOperationsRequestAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceDataInOperationsRequestAdapter.cs
@@ -2,27 +2,26 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <inheritdoc cref="IResourceDataInOperationsRequestAdapter" />
+public sealed class ResourceDataInOperationsRequestAdapter : ResourceDataAdapter, IResourceDataInOperationsRequestAdapter
 {
-    /// <inheritdoc cref="IResourceDataInOperationsRequestAdapter" />
-    public sealed class ResourceDataInOperationsRequestAdapter : ResourceDataAdapter, IResourceDataInOperationsRequestAdapter
+    public ResourceDataInOperationsRequestAdapter(IResourceDefinitionAccessor resourceDefinitionAccessor, IResourceObjectAdapter resourceObjectAdapter)
+        : base(resourceDefinitionAccessor, resourceObjectAdapter)
     {
-        public ResourceDataInOperationsRequestAdapter(IResourceDefinitionAccessor resourceDefinitionAccessor, IResourceObjectAdapter resourceObjectAdapter)
-            : base(resourceDefinitionAccessor, resourceObjectAdapter)
-        {
-        }
+    }
 
-        protected override (IIdentifiable resource, ResourceType resourceType) ConvertResourceObject(SingleOrManyData<ResourceObject> data,
-            ResourceIdentityRequirements requirements, RequestAdapterState state)
-        {
-            // This override ensures that we enrich IJsonApiRequest before calling into IResourceDefinition, so it is ready for consumption there.
+    protected override (IIdentifiable resource, ResourceType resourceType) ConvertResourceObject(SingleOrManyData<ResourceObject> data,
+        ResourceIdentityRequirements requirements, RequestAdapterState state)
+    {
+        // This override ensures that we enrich IJsonApiRequest before calling into IResourceDefinition, so it is ready for consumption there.
 
-            (IIdentifiable resource, ResourceType resourceType) = base.ConvertResourceObject(data, requirements, state);
+        (IIdentifiable resource, ResourceType resourceType) = base.ConvertResourceObject(data, requirements, state);
 
-            state.WritableRequest!.PrimaryResourceType = resourceType;
-            state.WritableRequest.PrimaryId = resource.StringId;
+        state.WritableRequest!.PrimaryResourceType = resourceType;
+        state.WritableRequest.PrimaryId = resource.StringId;
 
-            return (resource, resourceType);
-        }
+        return (resource, resourceType);
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentifierObjectAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentifierObjectAdapter.cs
index fc5cbfc3e4..d0e1b54856 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentifierObjectAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentifierObjectAdapter.cs
@@ -2,25 +2,24 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <inheritdoc cref="IResourceIdentifierObjectAdapter" />
+public sealed class ResourceIdentifierObjectAdapter : ResourceIdentityAdapter, IResourceIdentifierObjectAdapter
 {
-    /// <inheritdoc cref="IResourceIdentifierObjectAdapter" />
-    public sealed class ResourceIdentifierObjectAdapter : ResourceIdentityAdapter, IResourceIdentifierObjectAdapter
+    public ResourceIdentifierObjectAdapter(IResourceGraph resourceGraph, IResourceFactory resourceFactory)
+        : base(resourceGraph, resourceFactory)
     {
-        public ResourceIdentifierObjectAdapter(IResourceGraph resourceGraph, IResourceFactory resourceFactory)
-            : base(resourceGraph, resourceFactory)
-        {
-        }
+    }
 
-        /// <inheritdoc />
-        public IIdentifiable Convert(ResourceIdentifierObject resourceIdentifierObject, ResourceIdentityRequirements requirements, RequestAdapterState state)
-        {
-            ArgumentGuard.NotNull(resourceIdentifierObject, nameof(resourceIdentifierObject));
-            ArgumentGuard.NotNull(requirements, nameof(requirements));
-            ArgumentGuard.NotNull(state, nameof(state));
+    /// <inheritdoc />
+    public IIdentifiable Convert(ResourceIdentifierObject resourceIdentifierObject, ResourceIdentityRequirements requirements, RequestAdapterState state)
+    {
+        ArgumentGuard.NotNull(resourceIdentifierObject, nameof(resourceIdentifierObject));
+        ArgumentGuard.NotNull(requirements, nameof(requirements));
+        ArgumentGuard.NotNull(state, nameof(state));
 
-            (IIdentifiable resource, _) = ConvertResourceIdentity(resourceIdentifierObject, requirements, state);
-            return resource;
-        }
+        (IIdentifiable resource, _) = ConvertResourceIdentity(resourceIdentifierObject, requirements, state);
+        return resource;
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentityAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentityAdapter.cs
index 80d927c1b0..f453b8dd21 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentityAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentityAdapter.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Net;
 using JsonApiDotNetCore.Configuration;
@@ -7,217 +6,215 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Base class for validating and converting objects that represent an identity.
+/// </summary>
+public abstract class ResourceIdentityAdapter : BaseAdapter
 {
-    /// <summary>
-    /// Base class for validating and converting objects that represent an identity.
-    /// </summary>
-    public abstract class ResourceIdentityAdapter : BaseAdapter
-    {
-        private readonly IResourceGraph _resourceGraph;
-        private readonly IResourceFactory _resourceFactory;
+    private readonly IResourceGraph _resourceGraph;
+    private readonly IResourceFactory _resourceFactory;
 
-        protected ResourceIdentityAdapter(IResourceGraph resourceGraph, IResourceFactory resourceFactory)
-        {
-            ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
-            ArgumentGuard.NotNull(resourceFactory, nameof(resourceFactory));
+    protected ResourceIdentityAdapter(IResourceGraph resourceGraph, IResourceFactory resourceFactory)
+    {
+        ArgumentGuard.NotNull(resourceGraph, nameof(resourceGraph));
+        ArgumentGuard.NotNull(resourceFactory, nameof(resourceFactory));
 
-            _resourceGraph = resourceGraph;
-            _resourceFactory = resourceFactory;
-        }
+        _resourceGraph = resourceGraph;
+        _resourceFactory = resourceFactory;
+    }
 
-        protected (IIdentifiable resource, ResourceType resourceType) ConvertResourceIdentity(IResourceIdentity identity,
-            ResourceIdentityRequirements requirements, RequestAdapterState state)
-        {
-            ArgumentGuard.NotNull(identity, nameof(identity));
-            ArgumentGuard.NotNull(requirements, nameof(requirements));
-            ArgumentGuard.NotNull(state, nameof(state));
+    protected (IIdentifiable resource, ResourceType resourceType) ConvertResourceIdentity(IResourceIdentity identity, ResourceIdentityRequirements requirements,
+        RequestAdapterState state)
+    {
+        ArgumentGuard.NotNull(identity, nameof(identity));
+        ArgumentGuard.NotNull(requirements, nameof(requirements));
+        ArgumentGuard.NotNull(state, nameof(state));
 
-            ResourceType resourceType = ResolveType(identity, requirements, state);
-            IIdentifiable resource = CreateResource(identity, requirements, resourceType.ClrType, state);
+        ResourceType resourceType = ResolveType(identity, requirements, state);
+        IIdentifiable resource = CreateResource(identity, requirements, resourceType.ClrType, state);
 
-            return (resource, resourceType);
-        }
+        return (resource, resourceType);
+    }
 
-        private ResourceType ResolveType(IResourceIdentity identity, ResourceIdentityRequirements requirements, RequestAdapterState state)
-        {
-            AssertHasType(identity.Type, state);
+    private ResourceType ResolveType(IResourceIdentity identity, ResourceIdentityRequirements requirements, RequestAdapterState state)
+    {
+        AssertHasType(identity.Type, state);
 
-            using IDisposable _ = state.Position.PushElement("type");
-            ResourceType? resourceType = _resourceGraph.FindResourceType(identity.Type);
+        using IDisposable _ = state.Position.PushElement("type");
+        ResourceType? resourceType = _resourceGraph.FindResourceType(identity.Type);
 
-            AssertIsKnownResourceType(resourceType, identity.Type, state);
-            AssertIsCompatibleResourceType(resourceType, requirements.ResourceType, requirements.RelationshipName, state);
+        AssertIsKnownResourceType(resourceType, identity.Type, state);
+        AssertIsCompatibleResourceType(resourceType, requirements.ResourceType, requirements.RelationshipName, state);
 
-            return resourceType;
-        }
+        return resourceType;
+    }
 
-        private static void AssertHasType([NotNull] string? identityType, RequestAdapterState state)
+    private static void AssertHasType([NotNull] string? identityType, RequestAdapterState state)
+    {
+        if (identityType == null)
         {
-            if (identityType == null)
-            {
-                throw new ModelConversionException(state.Position, "The 'type' element is required.", null);
-            }
+            throw new ModelConversionException(state.Position, "The 'type' element is required.", null);
         }
+    }
 
-        private static void AssertIsKnownResourceType([NotNull] ResourceType? resourceType, string typeName, RequestAdapterState state)
+    private static void AssertIsKnownResourceType([NotNull] ResourceType? resourceType, string typeName, RequestAdapterState state)
+    {
+        if (resourceType == null)
         {
-            if (resourceType == null)
-            {
-                throw new ModelConversionException(state.Position, "Unknown resource type found.", $"Resource type '{typeName}' does not exist.");
-            }
+            throw new ModelConversionException(state.Position, "Unknown resource type found.", $"Resource type '{typeName}' does not exist.");
         }
+    }
 
-        private static void AssertIsCompatibleResourceType(ResourceType actual, ResourceType? expected, string? relationshipName, RequestAdapterState state)
+    private static void AssertIsCompatibleResourceType(ResourceType actual, ResourceType? expected, string? relationshipName, RequestAdapterState state)
+    {
+        if (expected != null && !expected.ClrType.IsAssignableFrom(actual.ClrType))
         {
-            if (expected != null && !expected.ClrType.IsAssignableFrom(actual.ClrType))
-            {
-                string message = relationshipName != null
-                    ? $"Type '{actual.PublicName}' is incompatible with type '{expected.PublicName}' of relationship '{relationshipName}'."
-                    : $"Type '{actual.PublicName}' is incompatible with type '{expected.PublicName}'.";
+            string message = relationshipName != null
+                ? $"Type '{actual.PublicName}' is incompatible with type '{expected.PublicName}' of relationship '{relationshipName}'."
+                : $"Type '{actual.PublicName}' is incompatible with type '{expected.PublicName}'.";
 
-                throw new ModelConversionException(state.Position, "Incompatible resource type found.", message, HttpStatusCode.Conflict);
-            }
+            throw new ModelConversionException(state.Position, "Incompatible resource type found.", message, HttpStatusCode.Conflict);
         }
+    }
 
-        private IIdentifiable CreateResource(IResourceIdentity identity, ResourceIdentityRequirements requirements, Type resourceClrType,
-            RequestAdapterState state)
+    private IIdentifiable CreateResource(IResourceIdentity identity, ResourceIdentityRequirements requirements, Type resourceClrType, RequestAdapterState state)
+    {
+        if (state.Request.Kind != EndpointKind.AtomicOperations)
         {
-            if (state.Request.Kind != EndpointKind.AtomicOperations)
-            {
-                AssertHasNoLid(identity, state);
-            }
+            AssertHasNoLid(identity, state);
+        }
 
-            AssertNoIdWithLid(identity, state);
+        AssertNoIdWithLid(identity, state);
 
-            if (requirements.IdConstraint == JsonElementConstraint.Required)
-            {
-                AssertHasIdOrLid(identity, requirements, state);
-            }
-            else if (requirements.IdConstraint == JsonElementConstraint.Forbidden)
-            {
-                AssertHasNoId(identity, state);
-            }
+        if (requirements.IdConstraint == JsonElementConstraint.Required)
+        {
+            AssertHasIdOrLid(identity, requirements, state);
+        }
+        else if (requirements.IdConstraint == JsonElementConstraint.Forbidden)
+        {
+            AssertHasNoId(identity, state);
+        }
 
-            AssertSameIdValue(identity, requirements.IdValue, state);
-            AssertSameLidValue(identity, requirements.LidValue, state);
+        AssertSameIdValue(identity, requirements.IdValue, state);
+        AssertSameLidValue(identity, requirements.LidValue, state);
 
-            IIdentifiable resource = _resourceFactory.CreateInstance(resourceClrType);
-            AssignStringId(identity, resource, state);
-            resource.LocalId = identity.Lid;
-            return resource;
-        }
+        IIdentifiable resource = _resourceFactory.CreateInstance(resourceClrType);
+        AssignStringId(identity, resource, state);
+        resource.LocalId = identity.Lid;
+        return resource;
+    }
 
-        private static void AssertHasNoLid(IResourceIdentity identity, RequestAdapterState state)
+    private static void AssertHasNoLid(IResourceIdentity identity, RequestAdapterState state)
+    {
+        if (identity.Lid != null)
         {
-            if (identity.Lid != null)
-            {
-                using IDisposable _ = state.Position.PushElement("lid");
-                throw new ModelConversionException(state.Position, "The 'lid' element is not supported at this endpoint.", null);
-            }
+            using IDisposable _ = state.Position.PushElement("lid");
+            throw new ModelConversionException(state.Position, "The 'lid' element is not supported at this endpoint.", null);
         }
+    }
 
-        private static void AssertNoIdWithLid(IResourceIdentity identity, RequestAdapterState state)
+    private static void AssertNoIdWithLid(IResourceIdentity identity, RequestAdapterState state)
+    {
+        if (identity.Id != null && identity.Lid != null)
         {
-            if (identity.Id != null && identity.Lid != null)
-            {
-                throw new ModelConversionException(state.Position, "The 'id' and 'lid' element are mutually exclusive.", null);
-            }
+            throw new ModelConversionException(state.Position, "The 'id' and 'lid' element are mutually exclusive.", null);
         }
+    }
 
-        private static void AssertHasIdOrLid(IResourceIdentity identity, ResourceIdentityRequirements requirements, RequestAdapterState state)
-        {
-            string? message = null;
+    private static void AssertHasIdOrLid(IResourceIdentity identity, ResourceIdentityRequirements requirements, RequestAdapterState state)
+    {
+        string? message = null;
 
-            if (requirements.IdValue != null && identity.Id == null)
-            {
-                message = "The 'id' element is required.";
-            }
-            else if (requirements.LidValue != null && identity.Lid == null)
-            {
-                message = "The 'lid' element is required.";
-            }
-            else if (identity.Id == null && identity.Lid == null)
-            {
-                message = state.Request.Kind == EndpointKind.AtomicOperations ? "The 'id' or 'lid' element is required." : "The 'id' element is required.";
-            }
+        if (requirements.IdValue != null && identity.Id == null)
+        {
+            message = "The 'id' element is required.";
+        }
+        else if (requirements.LidValue != null && identity.Lid == null)
+        {
+            message = "The 'lid' element is required.";
+        }
+        else if (identity.Id == null && identity.Lid == null)
+        {
+            message = state.Request.Kind == EndpointKind.AtomicOperations ? "The 'id' or 'lid' element is required." : "The 'id' element is required.";
+        }
 
-            if (message != null)
-            {
-                throw new ModelConversionException(state.Position, message, null);
-            }
+        if (message != null)
+        {
+            throw new ModelConversionException(state.Position, message, null);
         }
+    }
 
-        private static void AssertHasNoId(IResourceIdentity identity, RequestAdapterState state)
+    private static void AssertHasNoId(IResourceIdentity identity, RequestAdapterState state)
+    {
+        if (identity.Id != null)
         {
-            if (identity.Id != null)
-            {
-                using IDisposable _ = state.Position.PushElement("id");
-                throw new ModelConversionException(state.Position, "The use of client-generated IDs is disabled.", null, HttpStatusCode.Forbidden);
-            }
+            using IDisposable _ = state.Position.PushElement("id");
+            throw new ModelConversionException(state.Position, "The use of client-generated IDs is disabled.", null, HttpStatusCode.Forbidden);
         }
+    }
 
-        private static void AssertSameIdValue(IResourceIdentity identity, string? expected, RequestAdapterState state)
+    private static void AssertSameIdValue(IResourceIdentity identity, string? expected, RequestAdapterState state)
+    {
+        if (expected != null && identity.Id != expected)
         {
-            if (expected != null && identity.Id != expected)
-            {
-                using IDisposable _ = state.Position.PushElement("id");
+            using IDisposable _ = state.Position.PushElement("id");
 
-                throw new ModelConversionException(state.Position, "Conflicting 'id' values found.", $"Expected '{expected}' instead of '{identity.Id}'.",
-                    HttpStatusCode.Conflict);
-            }
+            throw new ModelConversionException(state.Position, "Conflicting 'id' values found.", $"Expected '{expected}' instead of '{identity.Id}'.",
+                HttpStatusCode.Conflict);
         }
+    }
 
-        private static void AssertSameLidValue(IResourceIdentity identity, string? expected, RequestAdapterState state)
+    private static void AssertSameLidValue(IResourceIdentity identity, string? expected, RequestAdapterState state)
+    {
+        if (expected != null && identity.Lid != expected)
         {
-            if (expected != null && identity.Lid != expected)
-            {
-                using IDisposable _ = state.Position.PushElement("lid");
+            using IDisposable _ = state.Position.PushElement("lid");
 
-                throw new ModelConversionException(state.Position, "Conflicting 'lid' values found.", $"Expected '{expected}' instead of '{identity.Lid}'.",
-                    HttpStatusCode.Conflict);
-            }
+            throw new ModelConversionException(state.Position, "Conflicting 'lid' values found.", $"Expected '{expected}' instead of '{identity.Lid}'.",
+                HttpStatusCode.Conflict);
         }
+    }
 
-        private void AssignStringId(IResourceIdentity identity, IIdentifiable resource, RequestAdapterState state)
+    private void AssignStringId(IResourceIdentity identity, IIdentifiable resource, RequestAdapterState state)
+    {
+        if (identity.Id != null)
         {
-            if (identity.Id != null)
+            try
             {
-                try
-                {
-                    resource.StringId = identity.Id;
-                }
-                catch (FormatException exception)
-                {
-                    using IDisposable _ = state.Position.PushElement("id");
-                    throw new ModelConversionException(state.Position, "Incompatible 'id' value found.", exception.Message);
-                }
+                resource.StringId = identity.Id;
             }
-        }
-
-        protected static void AssertIsKnownRelationship([NotNull] RelationshipAttribute? relationship, string relationshipName, ResourceType resourceType,
-            RequestAdapterState state)
-        {
-            if (relationship == null)
+            catch (FormatException exception)
             {
-                throw new ModelConversionException(state.Position, "Unknown relationship found.",
-                    $"Relationship '{relationshipName}' does not exist on resource type '{resourceType.PublicName}'.");
+                using IDisposable _ = state.Position.PushElement("id");
+                throw new ModelConversionException(state.Position, "Incompatible 'id' value found.", exception.Message);
             }
         }
+    }
 
-        protected internal static void AssertToManyInAddOrRemoveRelationship(RelationshipAttribute relationship, RequestAdapterState state)
+    protected static void AssertIsKnownRelationship([NotNull] RelationshipAttribute? relationship, string relationshipName, ResourceType resourceType,
+        RequestAdapterState state)
+    {
+        if (relationship == null)
         {
-            bool requireToManyRelationship = state.Request.WriteOperation is WriteOperationKind.AddToRelationship or WriteOperationKind.RemoveFromRelationship;
+            throw new ModelConversionException(state.Position, "Unknown relationship found.",
+                $"Relationship '{relationshipName}' does not exist on resource type '{resourceType.PublicName}'.");
+        }
+    }
 
-            if (requireToManyRelationship && relationship is not HasManyAttribute)
-            {
-                string message = state.Request.Kind == EndpointKind.AtomicOperations
-                    ? "Only to-many relationships can be targeted through this operation."
-                    : "Only to-many relationships can be targeted through this endpoint.";
+    protected internal static void AssertToManyInAddOrRemoveRelationship(RelationshipAttribute relationship, RequestAdapterState state)
+    {
+        bool requireToManyRelationship = state.Request.WriteOperation is WriteOperationKind.AddToRelationship or WriteOperationKind.RemoveFromRelationship;
 
-                throw new ModelConversionException(state.Position, message, $"Relationship '{relationship.PublicName}' is not a to-many relationship.",
-                    HttpStatusCode.Forbidden);
-            }
+        if (requireToManyRelationship && relationship is not HasManyAttribute)
+        {
+            string message = state.Request.Kind == EndpointKind.AtomicOperations
+                ? "Only to-many relationships can be targeted through this operation."
+                : "Only to-many relationships can be targeted through this endpoint.";
+
+            throw new ModelConversionException(state.Position, message, $"Relationship '{relationship.PublicName}' is not a to-many relationship.",
+                HttpStatusCode.Forbidden);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentityRequirements.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentityRequirements.cs
index 0483723abd..11db5e8ee3 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentityRequirements.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceIdentityRequirements.cs
@@ -2,37 +2,36 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <summary>
+/// Defines requirements to validate an <see cref="IResourceIdentity" /> instance against.
+/// </summary>
+[PublicAPI]
+public sealed class ResourceIdentityRequirements
 {
     /// <summary>
-    /// Defines requirements to validate an <see cref="IResourceIdentity" /> instance against.
+    /// When not null, indicates that the "type" element must be compatible with the specified resource type.
     /// </summary>
-    [PublicAPI]
-    public sealed class ResourceIdentityRequirements
-    {
-        /// <summary>
-        /// When not null, indicates that the "type" element must be compatible with the specified resource type.
-        /// </summary>
-        public ResourceType? ResourceType { get; init; }
+    public ResourceType? ResourceType { get; init; }
 
-        /// <summary>
-        /// When not null, indicates the presence or absence of the "id" element.
-        /// </summary>
-        public JsonElementConstraint? IdConstraint { get; init; }
+    /// <summary>
+    /// When not null, indicates the presence or absence of the "id" element.
+    /// </summary>
+    public JsonElementConstraint? IdConstraint { get; init; }
 
-        /// <summary>
-        /// When not null, indicates what the value of the "id" element must be.
-        /// </summary>
-        public string? IdValue { get; init; }
+    /// <summary>
+    /// When not null, indicates what the value of the "id" element must be.
+    /// </summary>
+    public string? IdValue { get; init; }
 
-        /// <summary>
-        /// When not null, indicates what the value of the "lid" element must be.
-        /// </summary>
-        public string? LidValue { get; init; }
+    /// <summary>
+    /// When not null, indicates what the value of the "lid" element must be.
+    /// </summary>
+    public string? LidValue { get; init; }
 
-        /// <summary>
-        /// When not null, indicates the name of the relationship to use in error messages.
-        /// </summary>
-        public string? RelationshipName { get; init; }
-    }
+    /// <summary>
+    /// When not null, indicates the name of the relationship to use in error messages.
+    /// </summary>
+    public string? RelationshipName { get; init; }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceObjectAdapter.cs b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceObjectAdapter.cs
index 5e1ebb5311..2199782a3a 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceObjectAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/Adapters/ResourceObjectAdapter.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -7,155 +5,153 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Request.Adapters
+namespace JsonApiDotNetCore.Serialization.Request.Adapters;
+
+/// <inheritdoc cref="IResourceObjectAdapter" />
+public sealed class ResourceObjectAdapter : ResourceIdentityAdapter, IResourceObjectAdapter
 {
-    /// <inheritdoc cref="IResourceObjectAdapter" />
-    public sealed class ResourceObjectAdapter : ResourceIdentityAdapter, IResourceObjectAdapter
+    private readonly IJsonApiOptions _options;
+    private readonly IRelationshipDataAdapter _relationshipDataAdapter;
+
+    public ResourceObjectAdapter(IResourceGraph resourceGraph, IResourceFactory resourceFactory, IJsonApiOptions options,
+        IRelationshipDataAdapter relationshipDataAdapter)
+        : base(resourceGraph, resourceFactory)
     {
-        private readonly IJsonApiOptions _options;
-        private readonly IRelationshipDataAdapter _relationshipDataAdapter;
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(relationshipDataAdapter, nameof(relationshipDataAdapter));
 
-        public ResourceObjectAdapter(IResourceGraph resourceGraph, IResourceFactory resourceFactory, IJsonApiOptions options,
-            IRelationshipDataAdapter relationshipDataAdapter)
-            : base(resourceGraph, resourceFactory)
-        {
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(relationshipDataAdapter, nameof(relationshipDataAdapter));
+        _options = options;
+        _relationshipDataAdapter = relationshipDataAdapter;
+    }
 
-            _options = options;
-            _relationshipDataAdapter = relationshipDataAdapter;
-        }
+    /// <inheritdoc />
+    public (IIdentifiable resource, ResourceType resourceType) Convert(ResourceObject resourceObject, ResourceIdentityRequirements requirements,
+        RequestAdapterState state)
+    {
+        ArgumentGuard.NotNull(resourceObject, nameof(resourceObject));
+        ArgumentGuard.NotNull(requirements, nameof(requirements));
+        ArgumentGuard.NotNull(state, nameof(state));
 
-        /// <inheritdoc />
-        public (IIdentifiable resource, ResourceType resourceType) Convert(ResourceObject resourceObject, ResourceIdentityRequirements requirements,
-            RequestAdapterState state)
-        {
-            ArgumentGuard.NotNull(resourceObject, nameof(resourceObject));
-            ArgumentGuard.NotNull(requirements, nameof(requirements));
-            ArgumentGuard.NotNull(state, nameof(state));
+        (IIdentifiable resource, ResourceType resourceType) = ConvertResourceIdentity(resourceObject, requirements, state);
 
-            (IIdentifiable resource, ResourceType resourceType) = ConvertResourceIdentity(resourceObject, requirements, state);
+        ConvertAttributes(resourceObject.Attributes, resource, resourceType, state);
+        ConvertRelationships(resourceObject.Relationships, resource, resourceType, state);
 
-            ConvertAttributes(resourceObject.Attributes, resource, resourceType, state);
-            ConvertRelationships(resourceObject.Relationships, resource, resourceType, state);
+        return (resource, resourceType);
+    }
 
-            return (resource, resourceType);
-        }
+    private void ConvertAttributes(IDictionary<string, object?>? resourceObjectAttributes, IIdentifiable resource, ResourceType resourceType,
+        RequestAdapterState state)
+    {
+        using IDisposable _ = state.Position.PushElement("attributes");
 
-        private void ConvertAttributes(IDictionary<string, object?>? resourceObjectAttributes, IIdentifiable resource, ResourceType resourceType,
-            RequestAdapterState state)
+        foreach ((string attributeName, object? attributeValue) in resourceObjectAttributes.EmptyIfNull())
         {
-            using IDisposable _ = state.Position.PushElement("attributes");
-
-            foreach ((string attributeName, object? attributeValue) in resourceObjectAttributes.EmptyIfNull())
-            {
-                ConvertAttribute(resource, attributeName, attributeValue, resourceType, state);
-            }
+            ConvertAttribute(resource, attributeName, attributeValue, resourceType, state);
         }
+    }
 
-        private void ConvertAttribute(IIdentifiable resource, string attributeName, object? attributeValue, ResourceType resourceType,
-            RequestAdapterState state)
-        {
-            using IDisposable _ = state.Position.PushElement(attributeName);
-            AttrAttribute? attr = resourceType.FindAttributeByPublicName(attributeName);
+    private void ConvertAttribute(IIdentifiable resource, string attributeName, object? attributeValue, ResourceType resourceType, RequestAdapterState state)
+    {
+        using IDisposable _ = state.Position.PushElement(attributeName);
+        AttrAttribute? attr = resourceType.FindAttributeByPublicName(attributeName);
 
-            if (attr == null && _options.AllowUnknownFieldsInRequestBody)
-            {
-                return;
-            }
+        if (attr == null && _options.AllowUnknownFieldsInRequestBody)
+        {
+            return;
+        }
 
-            AssertIsKnownAttribute(attr, attributeName, resourceType, state);
-            AssertNoInvalidAttribute(attributeValue, state);
-            AssertNoBlockedCreate(attr, resourceType, state);
-            AssertNoBlockedChange(attr, resourceType, state);
-            AssertNotReadOnly(attr, resourceType, state);
+        AssertIsKnownAttribute(attr, attributeName, resourceType, state);
+        AssertNoInvalidAttribute(attributeValue, state);
+        AssertNoBlockedCreate(attr, resourceType, state);
+        AssertNoBlockedChange(attr, resourceType, state);
+        AssertNotReadOnly(attr, resourceType, state);
 
-            attr.SetValue(resource, attributeValue);
-            state.WritableTargetedFields!.Attributes.Add(attr);
-        }
+        attr.SetValue(resource, attributeValue);
+        state.WritableTargetedFields!.Attributes.Add(attr);
+    }
 
-        private static void AssertIsKnownAttribute([NotNull] AttrAttribute? attr, string attributeName, ResourceType resourceType, RequestAdapterState state)
+    private static void AssertIsKnownAttribute([NotNull] AttrAttribute? attr, string attributeName, ResourceType resourceType, RequestAdapterState state)
+    {
+        if (attr == null)
         {
-            if (attr == null)
-            {
-                throw new ModelConversionException(state.Position, "Unknown attribute found.",
-                    $"Attribute '{attributeName}' does not exist on resource type '{resourceType.PublicName}'.");
-            }
+            throw new ModelConversionException(state.Position, "Unknown attribute found.",
+                $"Attribute '{attributeName}' does not exist on resource type '{resourceType.PublicName}'.");
         }
+    }
 
-        private static void AssertNoInvalidAttribute(object? attributeValue, RequestAdapterState state)
+    private static void AssertNoInvalidAttribute(object? attributeValue, RequestAdapterState state)
+    {
+        if (attributeValue is JsonInvalidAttributeInfo info)
         {
-            if (attributeValue is JsonInvalidAttributeInfo info)
+            if (info == JsonInvalidAttributeInfo.Id)
             {
-                if (info == JsonInvalidAttributeInfo.Id)
-                {
-                    throw new ModelConversionException(state.Position, "Resource ID is read-only.", null);
-                }
+                throw new ModelConversionException(state.Position, "Resource ID is read-only.", null);
+            }
 
-                string typeName = info.AttributeType.GetFriendlyTypeName();
+            string typeName = info.AttributeType.GetFriendlyTypeName();
 
-                throw new ModelConversionException(state.Position, "Incompatible attribute value found.",
-                    $"Failed to convert attribute '{info.AttributeName}' with value '{info.JsonValue}' of type '{info.JsonType}' to type '{typeName}'.");
-            }
+            throw new ModelConversionException(state.Position, "Incompatible attribute value found.",
+                $"Failed to convert attribute '{info.AttributeName}' with value '{info.JsonValue}' of type '{info.JsonType}' to type '{typeName}'.");
         }
+    }
 
-        private static void AssertNoBlockedCreate(AttrAttribute attr, ResourceType resourceType, RequestAdapterState state)
+    private static void AssertNoBlockedCreate(AttrAttribute attr, ResourceType resourceType, RequestAdapterState state)
+    {
+        if (state.Request.WriteOperation == WriteOperationKind.CreateResource && !attr.Capabilities.HasFlag(AttrCapabilities.AllowCreate))
         {
-            if (state.Request.WriteOperation == WriteOperationKind.CreateResource && !attr.Capabilities.HasFlag(AttrCapabilities.AllowCreate))
-            {
-                throw new ModelConversionException(state.Position, "Attribute value cannot be assigned when creating resource.",
-                    $"The attribute '{attr.PublicName}' on resource type '{resourceType.PublicName}' cannot be assigned to.");
-            }
+            throw new ModelConversionException(state.Position, "Attribute value cannot be assigned when creating resource.",
+                $"The attribute '{attr.PublicName}' on resource type '{resourceType.PublicName}' cannot be assigned to.");
         }
+    }
 
-        private static void AssertNoBlockedChange(AttrAttribute attr, ResourceType resourceType, RequestAdapterState state)
+    private static void AssertNoBlockedChange(AttrAttribute attr, ResourceType resourceType, RequestAdapterState state)
+    {
+        if (state.Request.WriteOperation == WriteOperationKind.UpdateResource && !attr.Capabilities.HasFlag(AttrCapabilities.AllowChange))
         {
-            if (state.Request.WriteOperation == WriteOperationKind.UpdateResource && !attr.Capabilities.HasFlag(AttrCapabilities.AllowChange))
-            {
-                throw new ModelConversionException(state.Position, "Attribute value cannot be assigned when updating resource.",
-                    $"The attribute '{attr.PublicName}' on resource type '{resourceType.PublicName}' cannot be assigned to.");
-            }
+            throw new ModelConversionException(state.Position, "Attribute value cannot be assigned when updating resource.",
+                $"The attribute '{attr.PublicName}' on resource type '{resourceType.PublicName}' cannot be assigned to.");
         }
+    }
 
-        private static void AssertNotReadOnly(AttrAttribute attr, ResourceType resourceType, RequestAdapterState state)
+    private static void AssertNotReadOnly(AttrAttribute attr, ResourceType resourceType, RequestAdapterState state)
+    {
+        if (attr.Property.SetMethod == null)
         {
-            if (attr.Property.SetMethod == null)
-            {
-                throw new ModelConversionException(state.Position, "Attribute is read-only.",
-                    $"Attribute '{attr.PublicName}' on resource type '{resourceType.PublicName}' is read-only.");
-            }
+            throw new ModelConversionException(state.Position, "Attribute is read-only.",
+                $"Attribute '{attr.PublicName}' on resource type '{resourceType.PublicName}' is read-only.");
         }
+    }
 
-        private void ConvertRelationships(IDictionary<string, RelationshipObject?>? resourceObjectRelationships, IIdentifiable resource,
-            ResourceType resourceType, RequestAdapterState state)
-        {
-            using IDisposable _ = state.Position.PushElement("relationships");
+    private void ConvertRelationships(IDictionary<string, RelationshipObject?>? resourceObjectRelationships, IIdentifiable resource, ResourceType resourceType,
+        RequestAdapterState state)
+    {
+        using IDisposable _ = state.Position.PushElement("relationships");
 
-            foreach ((string relationshipName, RelationshipObject? relationshipObject) in resourceObjectRelationships.EmptyIfNull())
-            {
-                ConvertRelationship(relationshipName, relationshipObject, resource, resourceType, state);
-            }
+        foreach ((string relationshipName, RelationshipObject? relationshipObject) in resourceObjectRelationships.EmptyIfNull())
+        {
+            ConvertRelationship(relationshipName, relationshipObject, resource, resourceType, state);
         }
+    }
 
-        private void ConvertRelationship(string relationshipName, RelationshipObject? relationshipObject, IIdentifiable resource, ResourceType resourceType,
-            RequestAdapterState state)
-        {
-            using IDisposable _ = state.Position.PushElement(relationshipName);
-            AssertObjectIsNotNull(relationshipObject, state);
+    private void ConvertRelationship(string relationshipName, RelationshipObject? relationshipObject, IIdentifiable resource, ResourceType resourceType,
+        RequestAdapterState state)
+    {
+        using IDisposable _ = state.Position.PushElement(relationshipName);
+        AssertObjectIsNotNull(relationshipObject, state);
 
-            RelationshipAttribute? relationship = resourceType.FindRelationshipByPublicName(relationshipName);
+        RelationshipAttribute? relationship = resourceType.FindRelationshipByPublicName(relationshipName);
 
-            if (relationship == null && _options.AllowUnknownFieldsInRequestBody)
-            {
-                return;
-            }
+        if (relationship == null && _options.AllowUnknownFieldsInRequestBody)
+        {
+            return;
+        }
 
-            AssertIsKnownRelationship(relationship, relationshipName, resourceType, state);
+        AssertIsKnownRelationship(relationship, relationshipName, resourceType, state);
 
-            object? rightValue = _relationshipDataAdapter.Convert(relationshipObject.Data, relationship, true, state);
+        object? rightValue = _relationshipDataAdapter.Convert(relationshipObject.Data, relationship, true, state);
 
-            relationship.SetValue(resource, rightValue);
-            state.WritableTargetedFields!.Relationships.Add(relationship);
-        }
+        relationship.SetValue(resource, rightValue);
+        state.WritableTargetedFields!.Relationships.Add(relationship);
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/IJsonApiReader.cs b/src/JsonApiDotNetCore/Serialization/Request/IJsonApiReader.cs
index 7d4a915f62..be91910c75 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/IJsonApiReader.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/IJsonApiReader.cs
@@ -1,19 +1,17 @@
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Http;
 
-namespace JsonApiDotNetCore.Serialization.Request
+namespace JsonApiDotNetCore.Serialization.Request;
+
+/// <summary>
+/// Deserializes the incoming JSON:API request body and converts it to models, which are passed to controller actions by ASP.NET on `FromBody`
+/// parameters.
+/// </summary>
+[PublicAPI]
+public interface IJsonApiReader
 {
     /// <summary>
-    /// Deserializes the incoming JSON:API request body and converts it to models, which are passed to controller actions by ASP.NET on `FromBody`
-    /// parameters.
+    /// Reads an object from the request body.
     /// </summary>
-    [PublicAPI]
-    public interface IJsonApiReader
-    {
-        /// <summary>
-        /// Reads an object from the request body.
-        /// </summary>
-        Task<object?> ReadAsync(HttpRequest httpRequest);
-    }
+    Task<object?> ReadAsync(HttpRequest httpRequest);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/JsonApiReader.cs b/src/JsonApiDotNetCore/Serialization/Request/JsonApiReader.cs
index 312c11b0b4..0942683487 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/JsonApiReader.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/JsonApiReader.cs
@@ -1,8 +1,6 @@
-using System;
 using System.Net;
 using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Diagnostics;
@@ -16,107 +14,106 @@
 using Microsoft.Extensions.Logging;
 using SysNotNull = System.Diagnostics.CodeAnalysis.NotNullAttribute;
 
-namespace JsonApiDotNetCore.Serialization.Request
+namespace JsonApiDotNetCore.Serialization.Request;
+
+/// <inheritdoc />
+public sealed class JsonApiReader : IJsonApiReader
 {
+    private readonly IJsonApiOptions _options;
+    private readonly IDocumentAdapter _documentAdapter;
+    private readonly TraceLogWriter<JsonApiReader> _traceWriter;
+
+    public JsonApiReader(IJsonApiOptions options, IDocumentAdapter documentAdapter, ILoggerFactory loggerFactory)
+    {
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(documentAdapter, nameof(documentAdapter));
+        ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
+
+        _options = options;
+        _documentAdapter = documentAdapter;
+        _traceWriter = new TraceLogWriter<JsonApiReader>(loggerFactory);
+    }
+
     /// <inheritdoc />
-    public sealed class JsonApiReader : IJsonApiReader
+    public async Task<object?> ReadAsync(HttpRequest httpRequest)
     {
-        private readonly IJsonApiOptions _options;
-        private readonly IDocumentAdapter _documentAdapter;
-        private readonly TraceLogWriter<JsonApiReader> _traceWriter;
+        ArgumentGuard.NotNull(httpRequest, nameof(httpRequest));
 
-        public JsonApiReader(IJsonApiOptions options, IDocumentAdapter documentAdapter, ILoggerFactory loggerFactory)
-        {
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(documentAdapter, nameof(documentAdapter));
-            ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
+        string requestBody = await ReceiveRequestBodyAsync(httpRequest);
 
-            _options = options;
-            _documentAdapter = documentAdapter;
-            _traceWriter = new TraceLogWriter<JsonApiReader>(loggerFactory);
-        }
+        _traceWriter.LogMessage(() => $"Received {httpRequest.Method} request at '{httpRequest.GetEncodedUrl()}' with body: <<{requestBody}>>");
 
-        /// <inheritdoc />
-        public async Task<object?> ReadAsync(HttpRequest httpRequest)
-        {
-            ArgumentGuard.NotNull(httpRequest, nameof(httpRequest));
+        return GetModel(requestBody);
+    }
 
-            string requestBody = await ReceiveRequestBodyAsync(httpRequest);
+    private static async Task<string> ReceiveRequestBodyAsync(HttpRequest httpRequest)
+    {
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Receive request body");
 
-            _traceWriter.LogMessage(() => $"Received {httpRequest.Method} request at '{httpRequest.GetEncodedUrl()}' with body: <<{requestBody}>>");
+        using var reader = new HttpRequestStreamReader(httpRequest.Body, Encoding.UTF8);
+        return await reader.ReadToEndAsync();
+    }
 
-            return GetModel(requestBody);
-        }
+    private object? GetModel(string requestBody)
+    {
+        AssertHasRequestBody(requestBody);
 
-        private static async Task<string> ReceiveRequestBodyAsync(HttpRequest httpRequest)
-        {
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Receive request body");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Read request body");
+
+        Document document = DeserializeDocument(requestBody);
+        return ConvertDocumentToModel(document, requestBody);
+    }
 
-            using var reader = new HttpRequestStreamReader(httpRequest.Body, Encoding.UTF8);
-            return await reader.ReadToEndAsync();
+    [AssertionMethod]
+    private static void AssertHasRequestBody(string requestBody)
+    {
+        if (string.IsNullOrEmpty(requestBody))
+        {
+            throw new InvalidRequestBodyException(null, "Missing request body.", null, null, HttpStatusCode.BadRequest);
         }
+    }
 
-        private object? GetModel(string requestBody)
+    private Document DeserializeDocument(string requestBody)
+    {
+        try
         {
-            AssertHasRequestBody(requestBody);
+            using IDisposable _ =
+                CodeTimingSessionManager.Current.Measure("JsonSerializer.Deserialize", MeasurementSettings.ExcludeJsonSerializationInPercentages);
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Read request body");
+            var document = JsonSerializer.Deserialize<Document>(requestBody, _options.SerializerReadOptions);
 
-            Document document = DeserializeDocument(requestBody);
-            return ConvertDocumentToModel(document, requestBody);
-        }
+            AssertHasDocument(document, requestBody);
 
-        [AssertionMethod]
-        private static void AssertHasRequestBody(string requestBody)
+            return document;
+        }
+        catch (JsonException exception)
         {
-            if (string.IsNullOrEmpty(requestBody))
-            {
-                throw new InvalidRequestBodyException(null, "Missing request body.", null, null, HttpStatusCode.BadRequest);
-            }
+            // JsonException.Path looks great for setting error.source.pointer, but unfortunately it is wrong in most cases.
+            // This is due to the use of custom converters, which are unable to interact with internal position tracking.
+            // https://github.com/dotnet/runtime/issues/50205#issuecomment-808401245
+            throw new InvalidRequestBodyException(_options.IncludeRequestBodyInErrors ? requestBody : null, null, exception.Message, null, null, exception);
         }
+    }
 
-        private Document DeserializeDocument(string requestBody)
+    private void AssertHasDocument([SysNotNull] Document? document, string requestBody)
+    {
+        if (document == null)
         {
-            try
-            {
-                using IDisposable _ =
-                    CodeTimingSessionManager.Current.Measure("JsonSerializer.Deserialize", MeasurementSettings.ExcludeJsonSerializationInPercentages);
-
-                var document = JsonSerializer.Deserialize<Document>(requestBody, _options.SerializerReadOptions);
-
-                AssertHasDocument(document, requestBody);
-
-                return document;
-            }
-            catch (JsonException exception)
-            {
-                // JsonException.Path looks great for setting error.source.pointer, but unfortunately it is wrong in most cases.
-                // This is due to the use of custom converters, which are unable to interact with internal position tracking.
-                // https://github.com/dotnet/runtime/issues/50205#issuecomment-808401245
-                throw new InvalidRequestBodyException(_options.IncludeRequestBodyInErrors ? requestBody : null, null, exception.Message, null, null, exception);
-            }
+            throw new InvalidRequestBodyException(_options.IncludeRequestBodyInErrors ? requestBody : null, "Expected an object, instead of 'null'.", null,
+                null);
         }
+    }
 
-        private void AssertHasDocument([SysNotNull] Document? document, string requestBody)
+    private object? ConvertDocumentToModel(Document document, string requestBody)
+    {
+        try
         {
-            if (document == null)
-            {
-                throw new InvalidRequestBodyException(_options.IncludeRequestBodyInErrors ? requestBody : null, "Expected an object, instead of 'null'.", null,
-                    null);
-            }
+            return _documentAdapter.Convert(document);
         }
-
-        private object? ConvertDocumentToModel(Document document, string requestBody)
+        catch (ModelConversionException exception)
         {
-            try
-            {
-                return _documentAdapter.Convert(document);
-            }
-            catch (ModelConversionException exception)
-            {
-                throw new InvalidRequestBodyException(_options.IncludeRequestBodyInErrors ? requestBody : null, exception.GenericMessage,
-                    exception.SpecificMessage, exception.SourcePointer, exception.StatusCode, exception);
-            }
+            throw new InvalidRequestBodyException(_options.IncludeRequestBodyInErrors ? requestBody : null, exception.GenericMessage, exception.SpecificMessage,
+                exception.SourcePointer, exception.StatusCode, exception);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/JsonInvalidAttributeInfo.cs b/src/JsonApiDotNetCore/Serialization/Request/JsonInvalidAttributeInfo.cs
index 7080da1c9d..02ef36aa53 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/JsonInvalidAttributeInfo.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/JsonInvalidAttributeInfo.cs
@@ -1,29 +1,27 @@
-using System;
 using System.Text.Json;
 
-namespace JsonApiDotNetCore.Serialization.Request
+namespace JsonApiDotNetCore.Serialization.Request;
+
+/// <summary>
+/// A sentinel value that is temporarily stored in the attributes dictionary to postpone producing an error.
+/// </summary>
+internal sealed class JsonInvalidAttributeInfo
 {
-    /// <summary>
-    /// A sentinel value that is temporarily stored in the attributes dictionary to postpone producing an error.
-    /// </summary>
-    internal sealed class JsonInvalidAttributeInfo
-    {
-        public static readonly JsonInvalidAttributeInfo Id = new("id", typeof(string), "-", JsonValueKind.Undefined);
+    public static readonly JsonInvalidAttributeInfo Id = new("id", typeof(string), "-", JsonValueKind.Undefined);
 
-        public string AttributeName { get; }
-        public Type AttributeType { get; }
-        public string? JsonValue { get; }
-        public JsonValueKind JsonType { get; }
+    public string AttributeName { get; }
+    public Type AttributeType { get; }
+    public string? JsonValue { get; }
+    public JsonValueKind JsonType { get; }
 
-        public JsonInvalidAttributeInfo(string attributeName, Type attributeType, string? jsonValue, JsonValueKind jsonType)
-        {
-            ArgumentGuard.NotNullNorEmpty(attributeName, nameof(attributeName));
-            ArgumentGuard.NotNull(attributeType, nameof(attributeType));
+    public JsonInvalidAttributeInfo(string attributeName, Type attributeType, string? jsonValue, JsonValueKind jsonType)
+    {
+        ArgumentGuard.NotNullNorEmpty(attributeName, nameof(attributeName));
+        ArgumentGuard.NotNull(attributeType, nameof(attributeType));
 
-            AttributeName = attributeName;
-            AttributeType = attributeType;
-            JsonValue = jsonValue;
-            JsonType = jsonType;
-        }
+        AttributeName = attributeName;
+        AttributeType = attributeType;
+        JsonValue = jsonValue;
+        JsonType = jsonType;
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Request/ModelConversionException.cs b/src/JsonApiDotNetCore/Serialization/Request/ModelConversionException.cs
index 70be3f7366..b43af538e5 100644
--- a/src/JsonApiDotNetCore/Serialization/Request/ModelConversionException.cs
+++ b/src/JsonApiDotNetCore/Serialization/Request/ModelConversionException.cs
@@ -1,30 +1,28 @@
-using System;
 using System.Net;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Serialization.Request.Adapters;
 
-namespace JsonApiDotNetCore.Serialization.Request
+namespace JsonApiDotNetCore.Serialization.Request;
+
+/// <summary>
+/// The error that is thrown when unable to convert a deserialized request body to an ASP.NET model.
+/// </summary>
+[PublicAPI]
+public sealed class ModelConversionException : Exception
 {
-    /// <summary>
-    /// The error that is thrown when unable to convert a deserialized request body to an ASP.NET model.
-    /// </summary>
-    [PublicAPI]
-    public sealed class ModelConversionException : Exception
-    {
-        public string? GenericMessage { get; }
-        public string? SpecificMessage { get; }
-        public HttpStatusCode? StatusCode { get; }
-        public string? SourcePointer { get; }
+    public string? GenericMessage { get; }
+    public string? SpecificMessage { get; }
+    public HttpStatusCode? StatusCode { get; }
+    public string? SourcePointer { get; }
 
-        public ModelConversionException(RequestAdapterPosition position, string? genericMessage, string? specificMessage, HttpStatusCode? statusCode = null)
-            : base(genericMessage)
-        {
-            ArgumentGuard.NotNull(position, nameof(position));
+    public ModelConversionException(RequestAdapterPosition position, string? genericMessage, string? specificMessage, HttpStatusCode? statusCode = null)
+        : base(genericMessage)
+    {
+        ArgumentGuard.NotNull(position, nameof(position));
 
-            GenericMessage = genericMessage;
-            SpecificMessage = specificMessage;
-            StatusCode = statusCode;
-            SourcePointer = position.ToSourcePointer();
-        }
+        GenericMessage = genericMessage;
+        SpecificMessage = specificMessage;
+        StatusCode = statusCode;
+        SourcePointer = position.ToSourcePointer();
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/ETagGenerator.cs b/src/JsonApiDotNetCore/Serialization/Response/ETagGenerator.cs
index f2a78adb65..1352317575 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/ETagGenerator.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/ETagGenerator.cs
@@ -1,26 +1,25 @@
 using Microsoft.Net.Http.Headers;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <inheritdoc />
+internal sealed class ETagGenerator : IETagGenerator
 {
-    /// <inheritdoc />
-    internal sealed class ETagGenerator : IETagGenerator
-    {
-        private readonly IFingerprintGenerator _fingerprintGenerator;
+    private readonly IFingerprintGenerator _fingerprintGenerator;
 
-        public ETagGenerator(IFingerprintGenerator fingerprintGenerator)
-        {
-            ArgumentGuard.NotNull(fingerprintGenerator, nameof(fingerprintGenerator));
+    public ETagGenerator(IFingerprintGenerator fingerprintGenerator)
+    {
+        ArgumentGuard.NotNull(fingerprintGenerator, nameof(fingerprintGenerator));
 
-            _fingerprintGenerator = fingerprintGenerator;
-        }
+        _fingerprintGenerator = fingerprintGenerator;
+    }
 
-        /// <inheritdoc />
-        public EntityTagHeaderValue Generate(string requestUrl, string responseBody)
-        {
-            string fingerprint = _fingerprintGenerator.Generate(ArrayFactory.Create(requestUrl, responseBody));
-            string eTagValue = $"\"{fingerprint}\"";
+    /// <inheritdoc />
+    public EntityTagHeaderValue Generate(string requestUrl, string responseBody)
+    {
+        string fingerprint = _fingerprintGenerator.Generate(ArrayFactory.Create(requestUrl, responseBody));
+        string eTagValue = $"\"{fingerprint}\"";
 
-            return EntityTagHeaderValue.Parse(eTagValue);
-        }
+        return EntityTagHeaderValue.Parse(eTagValue);
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/EmptyResponseMeta.cs b/src/JsonApiDotNetCore/Serialization/Response/EmptyResponseMeta.cs
index a787901494..77b2058796 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/EmptyResponseMeta.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/EmptyResponseMeta.cs
@@ -1,14 +1,11 @@
-using System.Collections.Generic;
+namespace JsonApiDotNetCore.Serialization.Response;
 
-namespace JsonApiDotNetCore.Serialization.Response
+/// <inheritdoc />
+public sealed class EmptyResponseMeta : IResponseMeta
 {
     /// <inheritdoc />
-    public sealed class EmptyResponseMeta : IResponseMeta
+    public IReadOnlyDictionary<string, object?>? GetMeta()
     {
-        /// <inheritdoc />
-        public IReadOnlyDictionary<string, object?>? GetMeta()
-        {
-            return null;
-        }
+        return null;
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/FingerprintGenerator.cs b/src/JsonApiDotNetCore/Serialization/Response/FingerprintGenerator.cs
index 9835bf5de3..0eaee430c3 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/FingerprintGenerator.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/FingerprintGenerator.cs
@@ -1,54 +1,51 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <inheritdoc />
+internal sealed class FingerprintGenerator : IFingerprintGenerator
 {
+    private static readonly byte[] Separator = Encoding.UTF8.GetBytes("|");
+    private static readonly uint[] LookupTable = Enumerable.Range(0, 256).Select(ToLookupEntry).ToArray();
+
+    private static uint ToLookupEntry(int index)
+    {
+        string hex = index.ToString("X2");
+        return hex[0] + ((uint)hex[1] << 16);
+    }
+
     /// <inheritdoc />
-    internal sealed class FingerprintGenerator : IFingerprintGenerator
+    public string Generate(IEnumerable<string> elements)
     {
-        private static readonly byte[] Separator = Encoding.UTF8.GetBytes("|");
-        private static readonly uint[] LookupTable = Enumerable.Range(0, 256).Select(ToLookupEntry).ToArray();
+        ArgumentGuard.NotNull(elements, nameof(elements));
 
-        private static uint ToLookupEntry(int index)
-        {
-            string hex = index.ToString("X2");
-            return hex[0] + ((uint)hex[1] << 16);
-        }
+        using var hasher = IncrementalHash.CreateHash(HashAlgorithmName.MD5);
 
-        /// <inheritdoc />
-        public string Generate(IEnumerable<string> elements)
+        foreach (string element in elements)
         {
-            ArgumentGuard.NotNull(elements, nameof(elements));
-
-            using var hasher = IncrementalHash.CreateHash(HashAlgorithmName.MD5);
-
-            foreach (string element in elements)
-            {
-                byte[] buffer = Encoding.UTF8.GetBytes(element);
-                hasher.AppendData(buffer);
-                hasher.AppendData(Separator);
-            }
-
-            byte[] hash = hasher.GetHashAndReset();
-            return ByteArrayToHex(hash);
+            byte[] buffer = Encoding.UTF8.GetBytes(element);
+            hasher.AppendData(buffer);
+            hasher.AppendData(Separator);
         }
 
-        private static string ByteArrayToHex(byte[] bytes)
-        {
-            // https://stackoverflow.com/questions/311165/how-do-you-convert-a-byte-array-to-a-hexadecimal-string-and-vice-versa
+        byte[] hash = hasher.GetHashAndReset();
+        return ByteArrayToHex(hash);
+    }
 
-            char[] buffer = new char[bytes.Length * 2];
+    private static string ByteArrayToHex(byte[] bytes)
+    {
+        // https://stackoverflow.com/questions/311165/how-do-you-convert-a-byte-array-to-a-hexadecimal-string-and-vice-versa
 
-            for (int index = 0; index < bytes.Length; index++)
-            {
-                uint value = LookupTable[bytes[index]];
-                buffer[2 * index] = (char)value;
-                buffer[2 * index + 1] = (char)(value >> 16);
-            }
+        char[] buffer = new char[bytes.Length * 2];
 
-            return new string(buffer);
+        for (int index = 0; index < bytes.Length; index++)
+        {
+            uint value = LookupTable[bytes[index]];
+            buffer[2 * index] = (char)value;
+            buffer[2 * index + 1] = (char)(value >> 16);
         }
+
+        return new string(buffer);
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/IETagGenerator.cs b/src/JsonApiDotNetCore/Serialization/Response/IETagGenerator.cs
index 5fc5070129..1adcbb8515 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/IETagGenerator.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/IETagGenerator.cs
@@ -1,24 +1,23 @@
 using Microsoft.Net.Http.Headers;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <summary>
+/// Provides generation of an ETag HTTP response header.
+/// </summary>
+public interface IETagGenerator
 {
     /// <summary>
-    /// Provides generation of an ETag HTTP response header.
+    /// Generates an ETag HTTP response header value for the response to an incoming request.
     /// </summary>
-    public interface IETagGenerator
-    {
-        /// <summary>
-        /// Generates an ETag HTTP response header value for the response to an incoming request.
-        /// </summary>
-        /// <param name="requestUrl">
-        /// The incoming request URL, including query string.
-        /// </param>
-        /// <param name="responseBody">
-        /// The produced response body.
-        /// </param>
-        /// <returns>
-        /// The ETag, or <c>null</c> to disable saving bandwidth.
-        /// </returns>
-        public EntityTagHeaderValue Generate(string requestUrl, string responseBody);
-    }
+    /// <param name="requestUrl">
+    /// The incoming request URL, including query string.
+    /// </param>
+    /// <param name="responseBody">
+    /// The produced response body.
+    /// </param>
+    /// <returns>
+    /// The ETag, or <c>null</c> to disable saving bandwidth.
+    /// </returns>
+    public EntityTagHeaderValue Generate(string requestUrl, string responseBody);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/IFingerprintGenerator.cs b/src/JsonApiDotNetCore/Serialization/Response/IFingerprintGenerator.cs
index 7b18e7db19..d1189c4076 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/IFingerprintGenerator.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/IFingerprintGenerator.cs
@@ -1,17 +1,15 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <summary>
+/// Provides a method to generate a fingerprint for a collection of string values.
+/// </summary>
+[PublicAPI]
+public interface IFingerprintGenerator
 {
     /// <summary>
-    /// Provides a method to generate a fingerprint for a collection of string values.
+    /// Generates a fingerprint for the specified elements.
     /// </summary>
-    [PublicAPI]
-    public interface IFingerprintGenerator
-    {
-        /// <summary>
-        /// Generates a fingerprint for the specified elements.
-        /// </summary>
-        public string Generate(IEnumerable<string> elements);
-    }
+    public string Generate(IEnumerable<string> elements);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/IJsonApiWriter.cs b/src/JsonApiDotNetCore/Serialization/Response/IJsonApiWriter.cs
index 8c904cf032..62087d2adb 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/IJsonApiWriter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/IJsonApiWriter.cs
@@ -1,18 +1,16 @@
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Microsoft.AspNetCore.Http;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <summary>
+/// Serializes ASP.NET models into the outgoing JSON:API response body.
+/// </summary>
+[PublicAPI]
+public interface IJsonApiWriter
 {
     /// <summary>
-    /// Serializes ASP.NET models into the outgoing JSON:API response body.
+    /// Writes an object to the response body.
     /// </summary>
-    [PublicAPI]
-    public interface IJsonApiWriter
-    {
-        /// <summary>
-        /// Writes an object to the response body.
-        /// </summary>
-        Task WriteAsync(object? model, HttpContext httpContext);
-    }
+    Task WriteAsync(object? model, HttpContext httpContext);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/ILinkBuilder.cs b/src/JsonApiDotNetCore/Serialization/Response/ILinkBuilder.cs
index 891556c7af..e8c9870b85 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/ILinkBuilder.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/ILinkBuilder.cs
@@ -3,26 +3,25 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <summary>
+/// Builds resource object links and relationship object links.
+/// </summary>
+public interface ILinkBuilder
 {
     /// <summary>
-    /// Builds resource object links and relationship object links.
+    /// Builds the links object that is included in the top-level of the document.
     /// </summary>
-    public interface ILinkBuilder
-    {
-        /// <summary>
-        /// Builds the links object that is included in the top-level of the document.
-        /// </summary>
-        TopLevelLinks? GetTopLevelLinks();
+    TopLevelLinks? GetTopLevelLinks();
 
-        /// <summary>
-        /// Builds the links object for a returned resource (primary or included).
-        /// </summary>
-        ResourceLinks? GetResourceLinks(ResourceType resourceType, IIdentifiable resource);
+    /// <summary>
+    /// Builds the links object for a returned resource (primary or included).
+    /// </summary>
+    ResourceLinks? GetResourceLinks(ResourceType resourceType, IIdentifiable resource);
 
-        /// <summary>
-        /// Builds the links object for a relationship inside a returned resource.
-        /// </summary>
-        RelationshipLinks? GetRelationshipLinks(RelationshipAttribute relationship, IIdentifiable leftResource);
-    }
+    /// <summary>
+    /// Builds the links object for a relationship inside a returned resource.
+    /// </summary>
+    RelationshipLinks? GetRelationshipLinks(RelationshipAttribute relationship, IIdentifiable leftResource);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/IMetaBuilder.cs b/src/JsonApiDotNetCore/Serialization/Response/IMetaBuilder.cs
index 285f0df550..e804179505 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/IMetaBuilder.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/IMetaBuilder.cs
@@ -1,23 +1,21 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <summary>
+/// Builds the top-level meta object.
+/// </summary>
+[PublicAPI]
+public interface IMetaBuilder
 {
     /// <summary>
-    /// Builds the top-level meta object.
+    /// Merges the specified dictionary with existing key/value pairs. In the event of a key collision, the value from the specified dictionary will
+    /// overwrite the existing one.
     /// </summary>
-    [PublicAPI]
-    public interface IMetaBuilder
-    {
-        /// <summary>
-        /// Merges the specified dictionary with existing key/value pairs. In the event of a key collision, the value from the specified dictionary will
-        /// overwrite the existing one.
-        /// </summary>
-        void Add(IReadOnlyDictionary<string, object?> values);
+    void Add(IReadOnlyDictionary<string, object?> values);
 
-        /// <summary>
-        /// Builds the top-level meta data object.
-        /// </summary>
-        IDictionary<string, object?>? Build();
-    }
+    /// <summary>
+    /// Builds the top-level meta data object.
+    /// </summary>
+    IDictionary<string, object?>? Build();
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/IResponseMeta.cs b/src/JsonApiDotNetCore/Serialization/Response/IResponseMeta.cs
index 83596f9146..f3035cfa4c 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/IResponseMeta.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/IResponseMeta.cs
@@ -1,18 +1,16 @@
-using System.Collections.Generic;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <summary>
+/// Provides a method to obtain global JSON:API meta, which is added at top-level to a response <see cref="Document" />. Use
+/// <see cref="IResourceDefinition{TResource,TId}.GetMeta" /> to specify nested metadata per individual resource.
+/// </summary>
+public interface IResponseMeta
 {
     /// <summary>
-    /// Provides a method to obtain global JSON:API meta, which is added at top-level to a response <see cref="Document" />. Use
-    /// <see cref="IResourceDefinition{TResource,TId}.GetMeta" /> to specify nested metadata per individual resource.
+    /// Gets the global top-level JSON:API meta information to add to the response.
     /// </summary>
-    public interface IResponseMeta
-    {
-        /// <summary>
-        /// Gets the global top-level JSON:API meta information to add to the response.
-        /// </summary>
-        IReadOnlyDictionary<string, object?>? GetMeta();
-    }
+    IReadOnlyDictionary<string, object?>? GetMeta();
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/IResponseModelAdapter.cs b/src/JsonApiDotNetCore/Serialization/Response/IResponseModelAdapter.cs
index 153e993b0d..f458edf33a 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/IResponseModelAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/IResponseModelAdapter.cs
@@ -1,47 +1,46 @@
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <summary>
+/// Converts the produced model from an ASP.NET controller action into a <see cref="Document" />, ready to be serialized as the response body.
+/// </summary>
+public interface IResponseModelAdapter
 {
     /// <summary>
-    /// Converts the produced model from an ASP.NET controller action into a <see cref="Document" />, ready to be serialized as the response body.
+    /// Validates and converts the specified <paramref name="model" />. Supported model types:
+    /// <list type="bullet">
+    /// <item>
+    /// <description>
+    /// <code><![CDATA[IEnumerable<IIdentifiable>]]></code>
+    /// </description>
+    /// </item>
+    /// <item>
+    /// <description>
+    /// <code><![CDATA[IIdentifiable]]></code>
+    /// </description>
+    /// </item>
+    /// <item>
+    /// <description>
+    /// <code><![CDATA[null]]></code>
+    /// </description>
+    /// </item>
+    /// <item>
+    /// <description>
+    /// <code><![CDATA[IEnumerable<OperationContainer?>]]></code>
+    /// </description>
+    /// </item>
+    /// <item>
+    /// <description>
+    /// <code><![CDATA[IEnumerable<ErrorObject>]]></code>
+    /// </description>
+    /// </item>
+    /// <item>
+    /// <description>
+    /// <code><![CDATA[ErrorObject]]></code>
+    /// </description>
+    /// </item>
+    /// </list>
     /// </summary>
-    public interface IResponseModelAdapter
-    {
-        /// <summary>
-        /// Validates and converts the specified <paramref name="model" />. Supported model types:
-        /// <list type="bullet">
-        /// <item>
-        /// <description>
-        /// <code><![CDATA[IEnumerable<IIdentifiable>]]></code>
-        /// </description>
-        /// </item>
-        /// <item>
-        /// <description>
-        /// <code><![CDATA[IIdentifiable]]></code>
-        /// </description>
-        /// </item>
-        /// <item>
-        /// <description>
-        /// <code><![CDATA[null]]></code>
-        /// </description>
-        /// </item>
-        /// <item>
-        /// <description>
-        /// <code><![CDATA[IEnumerable<OperationContainer?>]]></code>
-        /// </description>
-        /// </item>
-        /// <item>
-        /// <description>
-        /// <code><![CDATA[IEnumerable<ErrorObject>]]></code>
-        /// </description>
-        /// </item>
-        /// <item>
-        /// <description>
-        /// <code><![CDATA[ErrorObject]]></code>
-        /// </description>
-        /// </item>
-        /// </list>
-        /// </summary>
-        Document Convert(object? model);
-    }
+    Document Convert(object? model);
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/JsonApiWriter.cs b/src/JsonApiDotNetCore/Serialization/Response/JsonApiWriter.cs
index 793a720c3a..20f4ad242b 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/JsonApiWriter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/JsonApiWriter.cs
@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
 using System.Net;
-using System.Net.Http;
 using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Diagnostics;
 using JsonApiDotNetCore.Errors;
@@ -18,169 +13,166 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Net.Http.Headers;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <inheritdoc />
+public sealed class JsonApiWriter : IJsonApiWriter
 {
+    private readonly IJsonApiRequest _request;
+    private readonly IJsonApiOptions _options;
+    private readonly IResponseModelAdapter _responseModelAdapter;
+    private readonly IExceptionHandler _exceptionHandler;
+    private readonly IETagGenerator _eTagGenerator;
+    private readonly TraceLogWriter<JsonApiWriter> _traceWriter;
+
+    public JsonApiWriter(IJsonApiRequest request, IJsonApiOptions options, IResponseModelAdapter responseModelAdapter, IExceptionHandler exceptionHandler,
+        IETagGenerator eTagGenerator, ILoggerFactory loggerFactory)
+    {
+        ArgumentGuard.NotNull(request, nameof(request));
+        ArgumentGuard.NotNull(responseModelAdapter, nameof(responseModelAdapter));
+        ArgumentGuard.NotNull(exceptionHandler, nameof(exceptionHandler));
+        ArgumentGuard.NotNull(eTagGenerator, nameof(eTagGenerator));
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
+
+        _request = request;
+        _options = options;
+        _responseModelAdapter = responseModelAdapter;
+        _exceptionHandler = exceptionHandler;
+        _eTagGenerator = eTagGenerator;
+        _traceWriter = new TraceLogWriter<JsonApiWriter>(loggerFactory);
+    }
+
     /// <inheritdoc />
-    public sealed class JsonApiWriter : IJsonApiWriter
+    public async Task WriteAsync(object? model, HttpContext httpContext)
     {
-        private readonly IJsonApiRequest _request;
-        private readonly IJsonApiOptions _options;
-        private readonly IResponseModelAdapter _responseModelAdapter;
-        private readonly IExceptionHandler _exceptionHandler;
-        private readonly IETagGenerator _eTagGenerator;
-        private readonly TraceLogWriter<JsonApiWriter> _traceWriter;
-
-        public JsonApiWriter(IJsonApiRequest request, IJsonApiOptions options, IResponseModelAdapter responseModelAdapter, IExceptionHandler exceptionHandler,
-            IETagGenerator eTagGenerator, ILoggerFactory loggerFactory)
-        {
-            ArgumentGuard.NotNull(request, nameof(request));
-            ArgumentGuard.NotNull(responseModelAdapter, nameof(responseModelAdapter));
-            ArgumentGuard.NotNull(exceptionHandler, nameof(exceptionHandler));
-            ArgumentGuard.NotNull(eTagGenerator, nameof(eTagGenerator));
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
-
-            _request = request;
-            _options = options;
-            _responseModelAdapter = responseModelAdapter;
-            _exceptionHandler = exceptionHandler;
-            _eTagGenerator = eTagGenerator;
-            _traceWriter = new TraceLogWriter<JsonApiWriter>(loggerFactory);
-        }
+        ArgumentGuard.NotNull(httpContext, nameof(httpContext));
 
-        /// <inheritdoc />
-        public async Task WriteAsync(object? model, HttpContext httpContext)
+        if (model == null && !CanWriteBody((HttpStatusCode)httpContext.Response.StatusCode))
         {
-            ArgumentGuard.NotNull(httpContext, nameof(httpContext));
+            // Prevent exception from Kestrel server, caused by writing data:null json response.
+            return;
+        }
 
-            if (model == null && !CanWriteBody((HttpStatusCode)httpContext.Response.StatusCode))
-            {
-                // Prevent exception from Kestrel server, caused by writing data:null json response.
-                return;
-            }
+        string? responseBody = GetResponseBody(model, httpContext);
 
-            string? responseBody = GetResponseBody(model, httpContext);
+        if (httpContext.Request.Method == HttpMethod.Head.Method)
+        {
+            httpContext.Response.GetTypedHeaders().ContentLength = responseBody == null ? 0 : Encoding.UTF8.GetByteCount(responseBody);
+            return;
+        }
 
-            if (httpContext.Request.Method == HttpMethod.Head.Method)
-            {
-                httpContext.Response.GetTypedHeaders().ContentLength = responseBody == null ? 0 : Encoding.UTF8.GetByteCount(responseBody);
-                return;
-            }
+        _traceWriter.LogMessage(() =>
+            $"Sending {httpContext.Response.StatusCode} response for {httpContext.Request.Method} request at '{httpContext.Request.GetEncodedUrl()}' with body: <<{responseBody}>>");
 
-            _traceWriter.LogMessage(() =>
-                $"Sending {httpContext.Response.StatusCode} response for {httpContext.Request.Method} request at '{httpContext.Request.GetEncodedUrl()}' with body: <<{responseBody}>>");
+        await SendResponseBodyAsync(httpContext.Response, responseBody);
+    }
 
-            await SendResponseBodyAsync(httpContext.Response, responseBody);
-        }
+    private static bool CanWriteBody(HttpStatusCode statusCode)
+    {
+        return statusCode is not HttpStatusCode.NoContent and not HttpStatusCode.ResetContent and not HttpStatusCode.NotModified;
+    }
 
-        private static bool CanWriteBody(HttpStatusCode statusCode)
-        {
-            return statusCode is not HttpStatusCode.NoContent and not HttpStatusCode.ResetContent and not HttpStatusCode.NotModified;
-        }
+    private string? GetResponseBody(object? model, HttpContext httpContext)
+    {
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Write response body");
 
-        private string? GetResponseBody(object? model, HttpContext httpContext)
+        try
         {
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Write response body");
-
-            try
+            if (model is ProblemDetails problemDetails)
             {
-                if (model is ProblemDetails problemDetails)
-                {
-                    throw new UnsuccessfulActionResultException(problemDetails);
-                }
-
-                if (model == null && !IsSuccessStatusCode((HttpStatusCode)httpContext.Response.StatusCode))
-                {
-                    throw new UnsuccessfulActionResultException((HttpStatusCode)httpContext.Response.StatusCode);
-                }
+                throw new UnsuccessfulActionResultException(problemDetails);
+            }
 
-                string responseBody = RenderModel(model);
+            if (model == null && !IsSuccessStatusCode((HttpStatusCode)httpContext.Response.StatusCode))
+            {
+                throw new UnsuccessfulActionResultException((HttpStatusCode)httpContext.Response.StatusCode);
+            }
 
-                if (SetETagResponseHeader(httpContext.Request, httpContext.Response, responseBody))
-                {
-                    httpContext.Response.StatusCode = (int)HttpStatusCode.NotModified;
-                    return null;
-                }
+            string responseBody = RenderModel(model);
 
-                return responseBody;
-            }
-#pragma warning disable AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
-            catch (Exception exception)
-#pragma warning restore AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
+            if (SetETagResponseHeader(httpContext.Request, httpContext.Response, responseBody))
             {
-                IReadOnlyList<ErrorObject> errors = _exceptionHandler.HandleException(exception);
-                httpContext.Response.StatusCode = (int)ErrorObject.GetResponseStatusCode(errors);
-
-                return RenderModel(errors);
+                httpContext.Response.StatusCode = (int)HttpStatusCode.NotModified;
+                return null;
             }
-        }
 
-        private static bool IsSuccessStatusCode(HttpStatusCode statusCode)
-        {
-            return new HttpResponseMessage(statusCode).IsSuccessStatusCode;
+            return responseBody;
         }
-
-        private string RenderModel(object? model)
+#pragma warning disable AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
+        catch (Exception exception)
+#pragma warning restore AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
         {
-            Document document = _responseModelAdapter.Convert(model);
-            return SerializeDocument(document);
+            IReadOnlyList<ErrorObject> errors = _exceptionHandler.HandleException(exception);
+            httpContext.Response.StatusCode = (int)ErrorObject.GetResponseStatusCode(errors);
+
+            return RenderModel(errors);
         }
+    }
 
-        private string SerializeDocument(Document document)
-        {
-            using IDisposable _ =
-                CodeTimingSessionManager.Current.Measure("JsonSerializer.Serialize", MeasurementSettings.ExcludeJsonSerializationInPercentages);
+    private static bool IsSuccessStatusCode(HttpStatusCode statusCode)
+    {
+        return new HttpResponseMessage(statusCode).IsSuccessStatusCode;
+    }
 
-            return JsonSerializer.Serialize(document, _options.SerializerWriteOptions);
-        }
+    private string RenderModel(object? model)
+    {
+        Document document = _responseModelAdapter.Convert(model);
+        return SerializeDocument(document);
+    }
 
-        private bool SetETagResponseHeader(HttpRequest request, HttpResponse response, string responseContent)
-        {
-            bool isReadOnly = request.Method == HttpMethod.Get.Method || request.Method == HttpMethod.Head.Method;
+    private string SerializeDocument(Document document)
+    {
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("JsonSerializer.Serialize", MeasurementSettings.ExcludeJsonSerializationInPercentages);
 
-            if (isReadOnly && response.StatusCode == (int)HttpStatusCode.OK)
-            {
-                string url = request.GetEncodedUrl();
-                EntityTagHeaderValue responseETag = _eTagGenerator.Generate(url, responseContent);
+        return JsonSerializer.Serialize(document, _options.SerializerWriteOptions);
+    }
+
+    private bool SetETagResponseHeader(HttpRequest request, HttpResponse response, string responseContent)
+    {
+        bool isReadOnly = request.Method == HttpMethod.Get.Method || request.Method == HttpMethod.Head.Method;
 
-                response.Headers.Add(HeaderNames.ETag, responseETag.ToString());
+        if (isReadOnly && response.StatusCode == (int)HttpStatusCode.OK)
+        {
+            string url = request.GetEncodedUrl();
+            EntityTagHeaderValue responseETag = _eTagGenerator.Generate(url, responseContent);
 
-                return RequestContainsMatchingETag(request.Headers, responseETag);
-            }
+            response.Headers.Add(HeaderNames.ETag, responseETag.ToString());
 
-            return false;
+            return RequestContainsMatchingETag(request.Headers, responseETag);
         }
 
-        private static bool RequestContainsMatchingETag(IHeaderDictionary requestHeaders, EntityTagHeaderValue responseETag)
+        return false;
+    }
+
+    private static bool RequestContainsMatchingETag(IHeaderDictionary requestHeaders, EntityTagHeaderValue responseETag)
+    {
+        if (requestHeaders.Keys.Contains(HeaderNames.IfNoneMatch) &&
+            EntityTagHeaderValue.TryParseList(requestHeaders[HeaderNames.IfNoneMatch], out IList<EntityTagHeaderValue>? requestETags))
         {
-            if (requestHeaders.Keys.Contains(HeaderNames.IfNoneMatch) &&
-                EntityTagHeaderValue.TryParseList(requestHeaders[HeaderNames.IfNoneMatch], out IList<EntityTagHeaderValue>? requestETags))
+            foreach (EntityTagHeaderValue requestETag in requestETags)
             {
-                foreach (EntityTagHeaderValue requestETag in requestETags)
+                if (responseETag.Equals(requestETag))
                 {
-                    if (responseETag.Equals(requestETag))
-                    {
-                        return true;
-                    }
+                    return true;
                 }
             }
-
-            return false;
         }
 
-        private async Task SendResponseBodyAsync(HttpResponse httpResponse, string? responseBody)
+        return false;
+    }
+
+    private async Task SendResponseBodyAsync(HttpResponse httpResponse, string? responseBody)
+    {
+        if (!string.IsNullOrEmpty(responseBody))
         {
-            if (!string.IsNullOrEmpty(responseBody))
-            {
-                httpResponse.ContentType =
-                    _request.Kind == EndpointKind.AtomicOperations ? HeaderConstants.AtomicOperationsMediaType : HeaderConstants.MediaType;
+            httpResponse.ContentType = _request.Kind == EndpointKind.AtomicOperations ? HeaderConstants.AtomicOperationsMediaType : HeaderConstants.MediaType;
 
-                using IDisposable _ = CodeTimingSessionManager.Current.Measure("Send response body");
+            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Send response body");
 
-                await using TextWriter writer = new HttpResponseStreamWriter(httpResponse.Body, Encoding.UTF8);
-                await writer.WriteAsync(responseBody);
-                await writer.FlushAsync();
-            }
+            await using TextWriter writer = new HttpResponseStreamWriter(httpResponse.Body, Encoding.UTF8);
+            await writer.WriteAsync(responseBody);
+            await writer.FlushAsync();
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs b/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs
index 1b95266000..38e63ea9cb 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/LinkBuilder.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
@@ -16,330 +13,327 @@
 using Microsoft.AspNetCore.Http.Extensions;
 using Microsoft.AspNetCore.Routing;
 
-namespace JsonApiDotNetCore.Serialization.Response
-{
-    [PublicAPI]
-    public class LinkBuilder : ILinkBuilder
-    {
-        private const string PageSizeParameterName = "page[size]";
-        private const string PageNumberParameterName = "page[number]";
+namespace JsonApiDotNetCore.Serialization.Response;
 
-        private static readonly string GetPrimaryControllerActionName = NoAsyncSuffix(nameof(BaseJsonApiController<Identifiable<int>, int>.GetAsync));
+[PublicAPI]
+public class LinkBuilder : ILinkBuilder
+{
+    private const string PageSizeParameterName = "page[size]";
+    private const string PageNumberParameterName = "page[number]";
 
-        private static readonly string GetSecondaryControllerActionName =
-            NoAsyncSuffix(nameof(BaseJsonApiController<Identifiable<int>, int>.GetSecondaryAsync));
+    private static readonly string GetPrimaryControllerActionName = NoAsyncSuffix(nameof(BaseJsonApiController<Identifiable<int>, int>.GetAsync));
+    private static readonly string GetSecondaryControllerActionName = NoAsyncSuffix(nameof(BaseJsonApiController<Identifiable<int>, int>.GetSecondaryAsync));
 
-        private static readonly string GetRelationshipControllerActionName =
-            NoAsyncSuffix(nameof(BaseJsonApiController<Identifiable<int>, int>.GetRelationshipAsync));
+    private static readonly string GetRelationshipControllerActionName =
+        NoAsyncSuffix(nameof(BaseJsonApiController<Identifiable<int>, int>.GetRelationshipAsync));
 
-        private readonly IJsonApiOptions _options;
-        private readonly IJsonApiRequest _request;
-        private readonly IPaginationContext _paginationContext;
-        private readonly IHttpContextAccessor _httpContextAccessor;
-        private readonly LinkGenerator _linkGenerator;
-        private readonly IControllerResourceMapping _controllerResourceMapping;
+    private readonly IJsonApiOptions _options;
+    private readonly IJsonApiRequest _request;
+    private readonly IPaginationContext _paginationContext;
+    private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly LinkGenerator _linkGenerator;
+    private readonly IControllerResourceMapping _controllerResourceMapping;
 
-        private HttpContext HttpContext
+    private HttpContext HttpContext
+    {
+        get
         {
-            get
+            if (_httpContextAccessor.HttpContext == null)
             {
-                if (_httpContextAccessor.HttpContext == null)
-                {
-                    throw new InvalidOperationException("An active HTTP request is required.");
-                }
-
-                return _httpContextAccessor.HttpContext;
+                throw new InvalidOperationException("An active HTTP request is required.");
             }
-        }
 
-        public LinkBuilder(IJsonApiOptions options, IJsonApiRequest request, IPaginationContext paginationContext, IHttpContextAccessor httpContextAccessor,
-            LinkGenerator linkGenerator, IControllerResourceMapping controllerResourceMapping)
-        {
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(request, nameof(request));
-            ArgumentGuard.NotNull(paginationContext, nameof(paginationContext));
-            ArgumentGuard.NotNull(linkGenerator, nameof(linkGenerator));
-            ArgumentGuard.NotNull(controllerResourceMapping, nameof(controllerResourceMapping));
-
-            _options = options;
-            _request = request;
-            _paginationContext = paginationContext;
-            _httpContextAccessor = httpContextAccessor;
-            _linkGenerator = linkGenerator;
-            _controllerResourceMapping = controllerResourceMapping;
+            return _httpContextAccessor.HttpContext;
         }
+    }
 
-        private static string NoAsyncSuffix(string actionName)
-        {
-            return actionName.EndsWith("Async", StringComparison.Ordinal) ? actionName[..^"Async".Length] : actionName;
-        }
-
-        /// <inheritdoc />
-        public TopLevelLinks? GetTopLevelLinks()
-        {
-            var links = new TopLevelLinks();
-            ResourceType? resourceType = _request.SecondaryResourceType ?? _request.PrimaryResourceType;
-
-            if (ShouldIncludeTopLevelLink(LinkTypes.Self, resourceType))
-            {
-                links.Self = GetLinkForTopLevelSelf();
-            }
+    public LinkBuilder(IJsonApiOptions options, IJsonApiRequest request, IPaginationContext paginationContext, IHttpContextAccessor httpContextAccessor,
+        LinkGenerator linkGenerator, IControllerResourceMapping controllerResourceMapping)
+    {
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(request, nameof(request));
+        ArgumentGuard.NotNull(paginationContext, nameof(paginationContext));
+        ArgumentGuard.NotNull(linkGenerator, nameof(linkGenerator));
+        ArgumentGuard.NotNull(controllerResourceMapping, nameof(controllerResourceMapping));
+
+        _options = options;
+        _request = request;
+        _paginationContext = paginationContext;
+        _httpContextAccessor = httpContextAccessor;
+        _linkGenerator = linkGenerator;
+        _controllerResourceMapping = controllerResourceMapping;
+    }
 
-            if (_request.Kind == EndpointKind.Relationship && _request.Relationship != null && ShouldIncludeTopLevelLink(LinkTypes.Related, resourceType))
-            {
-                links.Related = GetLinkForRelationshipRelated(_request.PrimaryId!, _request.Relationship);
-            }
+    private static string NoAsyncSuffix(string actionName)
+    {
+        return actionName.EndsWith("Async", StringComparison.Ordinal) ? actionName[..^"Async".Length] : actionName;
+    }
 
-            if (_request.IsCollection && _paginationContext.PageSize != null && ShouldIncludeTopLevelLink(LinkTypes.Paging, resourceType))
-            {
-                SetPaginationInTopLevelLinks(resourceType!, links);
-            }
+    /// <inheritdoc />
+    public TopLevelLinks? GetTopLevelLinks()
+    {
+        var links = new TopLevelLinks();
+        ResourceType? resourceType = _request.SecondaryResourceType ?? _request.PrimaryResourceType;
 
-            return links.HasValue() ? links : null;
+        if (ShouldIncludeTopLevelLink(LinkTypes.Self, resourceType))
+        {
+            links.Self = GetLinkForTopLevelSelf();
         }
 
-        /// <summary>
-        /// Checks if the top-level <paramref name="linkType" /> should be added by first checking configuration on the <see cref="ResourceType" />, and if not
-        /// configured, by checking with the global configuration in <see cref="IJsonApiOptions" />.
-        /// </summary>
-        private bool ShouldIncludeTopLevelLink(LinkTypes linkType, ResourceType? resourceType)
+        if (_request.Kind == EndpointKind.Relationship && _request.Relationship != null && ShouldIncludeTopLevelLink(LinkTypes.Related, resourceType))
         {
-            if (resourceType != null && resourceType.TopLevelLinks != LinkTypes.NotConfigured)
-            {
-                return resourceType.TopLevelLinks.HasFlag(linkType);
-            }
-
-            return _options.TopLevelLinks.HasFlag(linkType);
+            links.Related = GetLinkForRelationshipRelated(_request.PrimaryId!, _request.Relationship);
         }
 
-        private string GetLinkForTopLevelSelf()
+        if (_request.IsCollection && _paginationContext.PageSize != null && ShouldIncludeTopLevelLink(LinkTypes.Paging, resourceType))
         {
-            // Note: in tests, this does not properly escape special characters due to WebApplicationFactory short-circuiting.
-            return _options.UseRelativeLinks ? HttpContext.Request.GetEncodedPathAndQuery() : HttpContext.Request.GetEncodedUrl();
+            SetPaginationInTopLevelLinks(resourceType!, links);
         }
 
-        private void SetPaginationInTopLevelLinks(ResourceType resourceType, TopLevelLinks links)
+        return links.HasValue() ? links : null;
+    }
+
+    /// <summary>
+    /// Checks if the top-level <paramref name="linkType" /> should be added by first checking configuration on the <see cref="ResourceType" />, and if not
+    /// configured, by checking with the global configuration in <see cref="IJsonApiOptions" />.
+    /// </summary>
+    private bool ShouldIncludeTopLevelLink(LinkTypes linkType, ResourceType? resourceType)
+    {
+        if (resourceType != null && resourceType.TopLevelLinks != LinkTypes.NotConfigured)
         {
-            string? pageSizeValue = CalculatePageSizeValue(_paginationContext.PageSize, resourceType);
+            return resourceType.TopLevelLinks.HasFlag(linkType);
+        }
 
-            links.First = GetLinkForPagination(1, pageSizeValue);
+        return _options.TopLevelLinks.HasFlag(linkType);
+    }
 
-            if (_paginationContext.TotalPageCount > 0)
-            {
-                links.Last = GetLinkForPagination(_paginationContext.TotalPageCount.Value, pageSizeValue);
-            }
+    private string GetLinkForTopLevelSelf()
+    {
+        // Note: in tests, this does not properly escape special characters due to WebApplicationFactory short-circuiting.
+        return _options.UseRelativeLinks ? HttpContext.Request.GetEncodedPathAndQuery() : HttpContext.Request.GetEncodedUrl();
+    }
 
-            if (_paginationContext.PageNumber.OneBasedValue > 1)
-            {
-                links.Prev = GetLinkForPagination(_paginationContext.PageNumber.OneBasedValue - 1, pageSizeValue);
-            }
+    private void SetPaginationInTopLevelLinks(ResourceType resourceType, TopLevelLinks links)
+    {
+        string? pageSizeValue = CalculatePageSizeValue(_paginationContext.PageSize, resourceType);
 
-            bool hasNextPage = _paginationContext.PageNumber.OneBasedValue < _paginationContext.TotalPageCount;
-            bool possiblyHasNextPage = _paginationContext.TotalPageCount == null && _paginationContext.IsPageFull;
+        links.First = GetLinkForPagination(1, pageSizeValue);
 
-            if (hasNextPage || possiblyHasNextPage)
-            {
-                links.Next = GetLinkForPagination(_paginationContext.PageNumber.OneBasedValue + 1, pageSizeValue);
-            }
+        if (_paginationContext.TotalPageCount > 0)
+        {
+            links.Last = GetLinkForPagination(_paginationContext.TotalPageCount.Value, pageSizeValue);
         }
 
-        private string? CalculatePageSizeValue(PageSize? topPageSize, ResourceType resourceType)
+        if (_paginationContext.PageNumber.OneBasedValue > 1)
         {
-            string pageSizeParameterValue = HttpContext.Request.Query[PageSizeParameterName];
-
-            PageSize? newTopPageSize = Equals(topPageSize, _options.DefaultPageSize) ? null : topPageSize;
-            return ChangeTopPageSize(pageSizeParameterValue, newTopPageSize, resourceType);
+            links.Prev = GetLinkForPagination(_paginationContext.PageNumber.OneBasedValue - 1, pageSizeValue);
         }
 
-        private string? ChangeTopPageSize(string pageSizeParameterValue, PageSize? topPageSize, ResourceType resourceType)
+        bool hasNextPage = _paginationContext.PageNumber.OneBasedValue < _paginationContext.TotalPageCount;
+        bool possiblyHasNextPage = _paginationContext.TotalPageCount == null && _paginationContext.IsPageFull;
+
+        if (hasNextPage || possiblyHasNextPage)
         {
-            IImmutableList<PaginationElementQueryStringValueExpression> elements = ParsePageSizeExpression(pageSizeParameterValue, resourceType);
-            int elementInTopScopeIndex = elements.FindIndex(expression => expression.Scope == null);
+            links.Next = GetLinkForPagination(_paginationContext.PageNumber.OneBasedValue + 1, pageSizeValue);
+        }
+    }
 
-            if (topPageSize != null)
-            {
-                var topPageSizeElement = new PaginationElementQueryStringValueExpression(null, topPageSize.Value);
+    private string? CalculatePageSizeValue(PageSize? topPageSize, ResourceType resourceType)
+    {
+        string pageSizeParameterValue = HttpContext.Request.Query[PageSizeParameterName];
 
-                elements = elementInTopScopeIndex != -1 ? elements.SetItem(elementInTopScopeIndex, topPageSizeElement) : elements.Insert(0, topPageSizeElement);
-            }
-            else
-            {
-                if (elementInTopScopeIndex != -1)
-                {
-                    elements = elements.RemoveAt(elementInTopScopeIndex);
-                }
-            }
+        PageSize? newTopPageSize = Equals(topPageSize, _options.DefaultPageSize) ? null : topPageSize;
+        return ChangeTopPageSize(pageSizeParameterValue, newTopPageSize, resourceType);
+    }
+
+    private string? ChangeTopPageSize(string pageSizeParameterValue, PageSize? topPageSize, ResourceType resourceType)
+    {
+        IImmutableList<PaginationElementQueryStringValueExpression> elements = ParsePageSizeExpression(pageSizeParameterValue, resourceType);
+        int elementInTopScopeIndex = elements.FindIndex(expression => expression.Scope == null);
 
-            string parameterValue = string.Join(',',
-                elements.Select(expression => expression.Scope == null ? expression.Value.ToString() : $"{expression.Scope}:{expression.Value}"));
+        if (topPageSize != null)
+        {
+            var topPageSizeElement = new PaginationElementQueryStringValueExpression(null, topPageSize.Value);
 
-            return parameterValue == string.Empty ? null : parameterValue;
+            elements = elementInTopScopeIndex != -1 ? elements.SetItem(elementInTopScopeIndex, topPageSizeElement) : elements.Insert(0, topPageSizeElement);
         }
-
-        private IImmutableList<PaginationElementQueryStringValueExpression> ParsePageSizeExpression(string? pageSizeParameterValue, ResourceType resourceType)
+        else
         {
-            if (pageSizeParameterValue == null)
+            if (elementInTopScopeIndex != -1)
             {
-                return ImmutableArray<PaginationElementQueryStringValueExpression>.Empty;
+                elements = elements.RemoveAt(elementInTopScopeIndex);
             }
+        }
 
-            var parser = new PaginationParser();
-            PaginationQueryStringValueExpression paginationExpression = parser.Parse(pageSizeParameterValue, resourceType);
+        string parameterValue = string.Join(',',
+            elements.Select(expression => expression.Scope == null ? expression.Value.ToString() : $"{expression.Scope}:{expression.Value}"));
 
-            return paginationExpression.Elements;
-        }
+        return parameterValue == string.Empty ? null : parameterValue;
+    }
 
-        private string GetLinkForPagination(int pageOffset, string? pageSizeValue)
+    private IImmutableList<PaginationElementQueryStringValueExpression> ParsePageSizeExpression(string? pageSizeParameterValue, ResourceType resourceType)
+    {
+        if (pageSizeParameterValue == null)
         {
-            string queryStringValue = GetQueryStringInPaginationLink(pageOffset, pageSizeValue);
+            return ImmutableArray<PaginationElementQueryStringValueExpression>.Empty;
+        }
 
-            var builder = new UriBuilder(HttpContext.Request.GetEncodedUrl())
-            {
-                Query = queryStringValue
-            };
+        var parser = new PaginationParser();
+        PaginationQueryStringValueExpression paginationExpression = parser.Parse(pageSizeParameterValue, resourceType);
 
-            UriComponents components = _options.UseRelativeLinks ? UriComponents.PathAndQuery : UriComponents.AbsoluteUri;
-            return builder.Uri.GetComponents(components, UriFormat.SafeUnescaped);
-        }
+        return paginationExpression.Elements;
+    }
+
+    private string GetLinkForPagination(int pageOffset, string? pageSizeValue)
+    {
+        string queryStringValue = GetQueryStringInPaginationLink(pageOffset, pageSizeValue);
 
-        private string GetQueryStringInPaginationLink(int pageOffset, string? pageSizeValue)
+        var builder = new UriBuilder(HttpContext.Request.GetEncodedUrl())
         {
-            IDictionary<string, string?> parameters = HttpContext.Request.Query.ToDictionary(pair => pair.Key, pair => (string?)pair.Value.ToString());
+            Query = queryStringValue
+        };
 
-            if (pageSizeValue == null)
-            {
-                parameters.Remove(PageSizeParameterName);
-            }
-            else
-            {
-                parameters[PageSizeParameterName] = pageSizeValue;
-            }
+        UriComponents components = _options.UseRelativeLinks ? UriComponents.PathAndQuery : UriComponents.AbsoluteUri;
+        return builder.Uri.GetComponents(components, UriFormat.SafeUnescaped);
+    }
 
-            if (pageOffset == 1)
-            {
-                parameters.Remove(PageNumberParameterName);
-            }
-            else
-            {
-                parameters[PageNumberParameterName] = pageOffset.ToString();
-            }
+    private string GetQueryStringInPaginationLink(int pageOffset, string? pageSizeValue)
+    {
+        IDictionary<string, string?> parameters = HttpContext.Request.Query.ToDictionary(pair => pair.Key, pair => (string?)pair.Value.ToString());
 
-            return QueryString.Create(parameters).Value ?? string.Empty;
+        if (pageSizeValue == null)
+        {
+            parameters.Remove(PageSizeParameterName);
+        }
+        else
+        {
+            parameters[PageSizeParameterName] = pageSizeValue;
         }
 
-        /// <inheritdoc />
-        public ResourceLinks? GetResourceLinks(ResourceType resourceType, IIdentifiable resource)
+        if (pageOffset == 1)
+        {
+            parameters.Remove(PageNumberParameterName);
+        }
+        else
         {
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
-            ArgumentGuard.NotNull(resource, nameof(resource));
+            parameters[PageNumberParameterName] = pageOffset.ToString();
+        }
 
-            var links = new ResourceLinks();
+        return QueryString.Create(parameters).Value ?? string.Empty;
+    }
 
-            if (ShouldIncludeResourceLink(LinkTypes.Self, resourceType))
-            {
-                links.Self = GetLinkForResourceSelf(resourceType, resource);
-            }
+    /// <inheritdoc />
+    public ResourceLinks? GetResourceLinks(ResourceType resourceType, IIdentifiable resource)
+    {
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-            return links.HasValue() ? links : null;
-        }
+        var links = new ResourceLinks();
 
-        /// <summary>
-        /// Checks if the resource object level <paramref name="linkType" /> should be added by first checking configuration on the <see cref="ResourceType" />,
-        /// and if not configured, by checking with the global configuration in <see cref="IJsonApiOptions" />.
-        /// </summary>
-        private bool ShouldIncludeResourceLink(LinkTypes linkType, ResourceType resourceType)
+        if (ShouldIncludeResourceLink(LinkTypes.Self, resourceType))
         {
-            if (resourceType.ResourceLinks != LinkTypes.NotConfigured)
-            {
-                return resourceType.ResourceLinks.HasFlag(linkType);
-            }
-
-            return _options.ResourceLinks.HasFlag(linkType);
+            links.Self = GetLinkForResourceSelf(resourceType, resource);
         }
 
-        private string? GetLinkForResourceSelf(ResourceType resourceType, IIdentifiable resource)
-        {
-            string? controllerName = _controllerResourceMapping.GetControllerNameForResourceType(resourceType);
-            IDictionary<string, object?> routeValues = GetRouteValues(resource.StringId!, null);
+        return links.HasValue() ? links : null;
+    }
 
-            return RenderLinkForAction(controllerName, GetPrimaryControllerActionName, routeValues);
+    /// <summary>
+    /// Checks if the resource object level <paramref name="linkType" /> should be added by first checking configuration on the <see cref="ResourceType" />,
+    /// and if not configured, by checking with the global configuration in <see cref="IJsonApiOptions" />.
+    /// </summary>
+    private bool ShouldIncludeResourceLink(LinkTypes linkType, ResourceType resourceType)
+    {
+        if (resourceType.ResourceLinks != LinkTypes.NotConfigured)
+        {
+            return resourceType.ResourceLinks.HasFlag(linkType);
         }
 
-        /// <inheritdoc />
-        public RelationshipLinks? GetRelationshipLinks(RelationshipAttribute relationship, IIdentifiable leftResource)
-        {
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
-            ArgumentGuard.NotNull(leftResource, nameof(leftResource));
+        return _options.ResourceLinks.HasFlag(linkType);
+    }
 
-            var links = new RelationshipLinks();
+    private string? GetLinkForResourceSelf(ResourceType resourceType, IIdentifiable resource)
+    {
+        string? controllerName = _controllerResourceMapping.GetControllerNameForResourceType(resourceType);
+        IDictionary<string, object?> routeValues = GetRouteValues(resource.StringId!, null);
 
-            if (ShouldIncludeRelationshipLink(LinkTypes.Self, relationship))
-            {
-                links.Self = GetLinkForRelationshipSelf(leftResource.StringId!, relationship);
-            }
+        return RenderLinkForAction(controllerName, GetPrimaryControllerActionName, routeValues);
+    }
 
-            if (ShouldIncludeRelationshipLink(LinkTypes.Related, relationship))
-            {
-                links.Related = GetLinkForRelationshipRelated(leftResource.StringId!, relationship);
-            }
+    /// <inheritdoc />
+    public RelationshipLinks? GetRelationshipLinks(RelationshipAttribute relationship, IIdentifiable leftResource)
+    {
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
+        ArgumentGuard.NotNull(leftResource, nameof(leftResource));
 
-            return links.HasValue() ? links : null;
-        }
+        var links = new RelationshipLinks();
 
-        private string? GetLinkForRelationshipSelf(string leftId, RelationshipAttribute relationship)
+        if (ShouldIncludeRelationshipLink(LinkTypes.Self, relationship))
         {
-            string? controllerName = _controllerResourceMapping.GetControllerNameForResourceType(relationship.LeftType);
-            IDictionary<string, object?> routeValues = GetRouteValues(leftId, relationship.PublicName);
-
-            return RenderLinkForAction(controllerName, GetRelationshipControllerActionName, routeValues);
+            links.Self = GetLinkForRelationshipSelf(leftResource.StringId!, relationship);
         }
 
-        private string? GetLinkForRelationshipRelated(string leftId, RelationshipAttribute relationship)
+        if (ShouldIncludeRelationshipLink(LinkTypes.Related, relationship))
         {
-            string? controllerName = _controllerResourceMapping.GetControllerNameForResourceType(relationship.LeftType);
-            IDictionary<string, object?> routeValues = GetRouteValues(leftId, relationship.PublicName);
-
-            return RenderLinkForAction(controllerName, GetSecondaryControllerActionName, routeValues);
+            links.Related = GetLinkForRelationshipRelated(leftResource.StringId!, relationship);
         }
 
-        private IDictionary<string, object?> GetRouteValues(string primaryId, string? relationshipName)
-        {
-            // By default, we copy all route parameters from the *current* endpoint, which helps in case all endpoints have the same
-            // set of non-standard parameters. There is no way we can know which non-standard parameters a *different* endpoint needs,
-            // so users must override RenderLinkForAction to supply them, if applicable.
-            RouteValueDictionary routeValues = HttpContext.Request.RouteValues;
+        return links.HasValue() ? links : null;
+    }
 
-            routeValues["id"] = primaryId;
-            routeValues["relationshipName"] = relationshipName;
+    private string? GetLinkForRelationshipSelf(string leftId, RelationshipAttribute relationship)
+    {
+        string? controllerName = _controllerResourceMapping.GetControllerNameForResourceType(relationship.LeftType);
+        IDictionary<string, object?> routeValues = GetRouteValues(leftId, relationship.PublicName);
 
-            return routeValues;
-        }
+        return RenderLinkForAction(controllerName, GetRelationshipControllerActionName, routeValues);
+    }
+
+    private string? GetLinkForRelationshipRelated(string leftId, RelationshipAttribute relationship)
+    {
+        string? controllerName = _controllerResourceMapping.GetControllerNameForResourceType(relationship.LeftType);
+        IDictionary<string, object?> routeValues = GetRouteValues(leftId, relationship.PublicName);
+
+        return RenderLinkForAction(controllerName, GetSecondaryControllerActionName, routeValues);
+    }
 
-        protected virtual string? RenderLinkForAction(string? controllerName, string actionName, IDictionary<string, object?> routeValues)
+    private IDictionary<string, object?> GetRouteValues(string primaryId, string? relationshipName)
+    {
+        // By default, we copy all route parameters from the *current* endpoint, which helps in case all endpoints have the same
+        // set of non-standard parameters. There is no way we can know which non-standard parameters a *different* endpoint needs,
+        // so users must override RenderLinkForAction to supply them, if applicable.
+        RouteValueDictionary routeValues = HttpContext.Request.RouteValues;
+
+        routeValues["id"] = primaryId;
+        routeValues["relationshipName"] = relationshipName;
+
+        return routeValues;
+    }
+
+    protected virtual string? RenderLinkForAction(string? controllerName, string actionName, IDictionary<string, object?> routeValues)
+    {
+        return _options.UseRelativeLinks
+            ? _linkGenerator.GetPathByAction(HttpContext, actionName, controllerName, routeValues)
+            : _linkGenerator.GetUriByAction(HttpContext, actionName, controllerName, routeValues);
+    }
+
+    /// <summary>
+    /// Checks if the relationship object level <paramref name="linkType" /> should be added by first checking configuration on the
+    /// <paramref name="relationship" /> attribute, if not configured by checking <see cref="ResourceLinksAttribute.RelationshipLinks" /> on the resource
+    /// type that contains this relationship, and if not configured by checking with the global configuration in <see cref="IJsonApiOptions" />.
+    /// </summary>
+    private bool ShouldIncludeRelationshipLink(LinkTypes linkType, RelationshipAttribute relationship)
+    {
+        if (relationship.Links != LinkTypes.NotConfigured)
         {
-            return _options.UseRelativeLinks
-                ? _linkGenerator.GetPathByAction(HttpContext, actionName, controllerName, routeValues)
-                : _linkGenerator.GetUriByAction(HttpContext, actionName, controllerName, routeValues);
+            return relationship.Links.HasFlag(linkType);
         }
 
-        /// <summary>
-        /// Checks if the relationship object level <paramref name="linkType" /> should be added by first checking configuration on the
-        /// <paramref name="relationship" /> attribute, if not configured by checking <see cref="ResourceLinksAttribute.RelationshipLinks" /> on the resource
-        /// type that contains this relationship, and if not configured by checking with the global configuration in <see cref="IJsonApiOptions" />.
-        /// </summary>
-        private bool ShouldIncludeRelationshipLink(LinkTypes linkType, RelationshipAttribute relationship)
+        if (relationship.LeftType.RelationshipLinks != LinkTypes.NotConfigured)
         {
-            if (relationship.Links != LinkTypes.NotConfigured)
-            {
-                return relationship.Links.HasFlag(linkType);
-            }
-
-            if (relationship.LeftType.RelationshipLinks != LinkTypes.NotConfigured)
-            {
-                return relationship.LeftType.RelationshipLinks.HasFlag(linkType);
-            }
-
-            return _options.RelationshipLinks.HasFlag(linkType);
+            return relationship.LeftType.RelationshipLinks.HasFlag(linkType);
         }
+
+        return _options.RelationshipLinks.HasFlag(linkType);
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/MetaBuilder.cs b/src/JsonApiDotNetCore/Serialization/Response/MetaBuilder.cs
index ef75f6472a..d250501d60 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/MetaBuilder.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/MetaBuilder.cs
@@ -1,62 +1,55 @@
-using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <inheritdoc />
+[PublicAPI]
+public sealed class MetaBuilder : IMetaBuilder
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public sealed class MetaBuilder : IMetaBuilder
-    {
-        private readonly IPaginationContext _paginationContext;
-        private readonly IJsonApiOptions _options;
-        private readonly IResponseMeta _responseMeta;
+    private readonly IPaginationContext _paginationContext;
+    private readonly IJsonApiOptions _options;
+    private readonly IResponseMeta _responseMeta;
 
-        private Dictionary<string, object?> _meta = new();
+    private Dictionary<string, object?> _meta = new();
 
-        public MetaBuilder(IPaginationContext paginationContext, IJsonApiOptions options, IResponseMeta responseMeta)
-        {
-            ArgumentGuard.NotNull(paginationContext, nameof(paginationContext));
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(responseMeta, nameof(responseMeta));
+    public MetaBuilder(IPaginationContext paginationContext, IJsonApiOptions options, IResponseMeta responseMeta)
+    {
+        ArgumentGuard.NotNull(paginationContext, nameof(paginationContext));
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(responseMeta, nameof(responseMeta));
 
-            _paginationContext = paginationContext;
-            _options = options;
-            _responseMeta = responseMeta;
-        }
+        _paginationContext = paginationContext;
+        _options = options;
+        _responseMeta = responseMeta;
+    }
 
-        /// <inheritdoc />
-        public void Add(IReadOnlyDictionary<string, object?> values)
-        {
-            ArgumentGuard.NotNull(values, nameof(values));
+    /// <inheritdoc />
+    public void Add(IReadOnlyDictionary<string, object?> values)
+    {
+        ArgumentGuard.NotNull(values, nameof(values));
 
-            _meta = values.Keys.Union(_meta.Keys).ToDictionary(key => key, key => values.ContainsKey(key) ? values[key] : _meta[key]);
-        }
+        _meta = values.Keys.Union(_meta.Keys).ToDictionary(key => key, key => values.ContainsKey(key) ? values[key] : _meta[key]);
+    }
 
-        /// <inheritdoc />
-        public IDictionary<string, object?>? Build()
+    /// <inheritdoc />
+    public IDictionary<string, object?>? Build()
+    {
+        if (_paginationContext.TotalResourceCount != null)
         {
-            if (_paginationContext.TotalResourceCount != null)
-            {
-                const string keyName = "Total";
-
-                string key = _options.SerializerOptions.DictionaryKeyPolicy == null
-                    ? keyName
-                    : _options.SerializerOptions.DictionaryKeyPolicy.ConvertName(keyName);
-
-                _meta.Add(key, _paginationContext.TotalResourceCount);
-            }
-
-            IReadOnlyDictionary<string, object?>? extraMeta = _responseMeta.GetMeta();
+            const string keyName = "Total";
+            string key = _options.SerializerOptions.DictionaryKeyPolicy == null ? keyName : _options.SerializerOptions.DictionaryKeyPolicy.ConvertName(keyName);
+            _meta.Add(key, _paginationContext.TotalResourceCount);
+        }
 
-            if (extraMeta != null)
-            {
-                Add(extraMeta);
-            }
+        IReadOnlyDictionary<string, object?>? extraMeta = _responseMeta.GetMeta();
 
-            return _meta.Any() ? _meta : null;
+        if (extraMeta != null)
+        {
+            Add(extraMeta);
         }
+
+        return _meta.Any() ? _meta : null;
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/ResourceObjectTreeNode.cs b/src/JsonApiDotNetCore/Serialization/Response/ResourceObjectTreeNode.cs
index f33f566249..df75fcaa66 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/ResourceObjectTreeNode.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/ResourceObjectTreeNode.cs
@@ -1,280 +1,274 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <summary>
+/// Represents a dependency tree of resource objects. It provides the values for 'data' and 'included' in the response body. The tree is built by
+/// recursively walking the resource relationships from the inclusion chains. Note that a subsequent chain may add additional relationships to a resource
+/// object that was produced by an earlier chain. Afterwards, this tree is used to fill relationship objects in the resource objects (depending on sparse
+/// fieldsets) and to emit all entries in relationship declaration order.
+/// </summary>
+internal sealed class ResourceObjectTreeNode : IEquatable<ResourceObjectTreeNode>
 {
-    /// <summary>
-    /// Represents a dependency tree of resource objects. It provides the values for 'data' and 'included' in the response body. The tree is built by
-    /// recursively walking the resource relationships from the inclusion chains. Note that a subsequent chain may add additional relationships to a resource
-    /// object that was produced by an earlier chain. Afterwards, this tree is used to fill relationship objects in the resource objects (depending on sparse
-    /// fieldsets) and to emit all entries in relationship declaration order.
-    /// </summary>
-    internal sealed class ResourceObjectTreeNode : IEquatable<ResourceObjectTreeNode>
-    {
-        // Placeholder root node for the tree, which is never emitted itself.
-        private static readonly ResourceType RootType = new("(root)", typeof(object), typeof(object));
-        private static readonly IIdentifiable RootResource = new EmptyResource();
+    // Placeholder root node for the tree, which is never emitted itself.
+    private static readonly ResourceType RootType = new("(root)", typeof(object), typeof(object));
+    private static readonly IIdentifiable RootResource = new EmptyResource();
 
-        // Direct children from root. These are emitted in 'data'.
-        private List<ResourceObjectTreeNode>? _directChildren;
+    // Direct children from root. These are emitted in 'data'.
+    private List<ResourceObjectTreeNode>? _directChildren;
 
-        // Related resource objects per relationship. These are emitted in 'included'.
-        private Dictionary<RelationshipAttribute, HashSet<ResourceObjectTreeNode>>? _childrenByRelationship;
+    // Related resource objects per relationship. These are emitted in 'included'.
+    private Dictionary<RelationshipAttribute, HashSet<ResourceObjectTreeNode>>? _childrenByRelationship;
 
-        private bool IsTreeRoot => RootType.Equals(ResourceType);
+    private bool IsTreeRoot => RootType.Equals(ResourceType);
 
-        // The resource this node was built for. We only store it for the LinkBuilder.
-        public IIdentifiable Resource { get; }
+    // The resource this node was built for. We only store it for the LinkBuilder.
+    public IIdentifiable Resource { get; }
 
-        // The resource type. We use its relationships to maintain order.
-        public ResourceType ResourceType { get; }
+    // The resource type. We use its relationships to maintain order.
+    public ResourceType ResourceType { get; }
 
-        // The produced resource object from Resource. For each resource, at most one ResourceObject and one tree node must exist.
-        public ResourceObject ResourceObject { get; }
+    // The produced resource object from Resource. For each resource, at most one ResourceObject and one tree node must exist.
+    public ResourceObject ResourceObject { get; }
 
-        public ResourceObjectTreeNode(IIdentifiable resource, ResourceType resourceType, ResourceObject resourceObject)
-        {
-            ArgumentGuard.NotNull(resource, nameof(resource));
-            ArgumentGuard.NotNull(resourceType, nameof(resourceType));
-            ArgumentGuard.NotNull(resourceObject, nameof(resourceObject));
+    public ResourceObjectTreeNode(IIdentifiable resource, ResourceType resourceType, ResourceObject resourceObject)
+    {
+        ArgumentGuard.NotNull(resource, nameof(resource));
+        ArgumentGuard.NotNull(resourceType, nameof(resourceType));
+        ArgumentGuard.NotNull(resourceObject, nameof(resourceObject));
 
-            Resource = resource;
-            ResourceType = resourceType;
-            ResourceObject = resourceObject;
-        }
+        Resource = resource;
+        ResourceType = resourceType;
+        ResourceObject = resourceObject;
+    }
 
-        public static ResourceObjectTreeNode CreateRoot()
-        {
-            return new ResourceObjectTreeNode(RootResource, RootType, new ResourceObject());
-        }
+    public static ResourceObjectTreeNode CreateRoot()
+    {
+        return new ResourceObjectTreeNode(RootResource, RootType, new ResourceObject());
+    }
 
-        public void AttachDirectChild(ResourceObjectTreeNode treeNode)
-        {
-            ArgumentGuard.NotNull(treeNode, nameof(treeNode));
+    public void AttachDirectChild(ResourceObjectTreeNode treeNode)
+    {
+        ArgumentGuard.NotNull(treeNode, nameof(treeNode));
 
-            _directChildren ??= new List<ResourceObjectTreeNode>();
-            _directChildren.Add(treeNode);
-        }
+        _directChildren ??= new List<ResourceObjectTreeNode>();
+        _directChildren.Add(treeNode);
+    }
 
-        public void EnsureHasRelationship(RelationshipAttribute relationship)
-        {
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
+    public void EnsureHasRelationship(RelationshipAttribute relationship)
+    {
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
 
-            _childrenByRelationship ??= new Dictionary<RelationshipAttribute, HashSet<ResourceObjectTreeNode>>();
+        _childrenByRelationship ??= new Dictionary<RelationshipAttribute, HashSet<ResourceObjectTreeNode>>();
 
-            if (!_childrenByRelationship.ContainsKey(relationship))
-            {
-                _childrenByRelationship[relationship] = new HashSet<ResourceObjectTreeNode>();
-            }
+        if (!_childrenByRelationship.ContainsKey(relationship))
+        {
+            _childrenByRelationship[relationship] = new HashSet<ResourceObjectTreeNode>();
         }
+    }
+
+    public void AttachRelationshipChild(RelationshipAttribute relationship, ResourceObjectTreeNode rightNode)
+    {
+        ArgumentGuard.NotNull(relationship, nameof(relationship));
+        ArgumentGuard.NotNull(rightNode, nameof(rightNode));
 
-        public void AttachRelationshipChild(RelationshipAttribute relationship, ResourceObjectTreeNode rightNode)
+        if (_childrenByRelationship == null)
         {
-            ArgumentGuard.NotNull(relationship, nameof(relationship));
-            ArgumentGuard.NotNull(rightNode, nameof(rightNode));
+            throw new InvalidOperationException("Call EnsureHasRelationship() first.");
+        }
 
-            if (_childrenByRelationship == null)
-            {
-                throw new InvalidOperationException("Call EnsureHasRelationship() first.");
-            }
+        HashSet<ResourceObjectTreeNode> rightNodes = _childrenByRelationship[relationship];
+        rightNodes.Add(rightNode);
+    }
 
-            HashSet<ResourceObjectTreeNode> rightNodes = _childrenByRelationship[relationship];
-            rightNodes.Add(rightNode);
-        }
+    /// <summary>
+    /// Recursively walks the tree and returns the set of unique nodes. Uses relationship declaration order.
+    /// </summary>
+    public ISet<ResourceObjectTreeNode> GetUniqueNodes()
+    {
+        AssertIsTreeRoot();
 
-        /// <summary>
-        /// Recursively walks the tree and returns the set of unique nodes. Uses relationship declaration order.
-        /// </summary>
-        public ISet<ResourceObjectTreeNode> GetUniqueNodes()
-        {
-            AssertIsTreeRoot();
+        var visited = new HashSet<ResourceObjectTreeNode>();
 
-            var visited = new HashSet<ResourceObjectTreeNode>();
+        VisitSubtree(this, visited);
 
-            VisitSubtree(this, visited);
+        return visited;
+    }
 
-            return visited;
+    private static void VisitSubtree(ResourceObjectTreeNode treeNode, ISet<ResourceObjectTreeNode> visited)
+    {
+        if (visited.Contains(treeNode))
+        {
+            return;
         }
 
-        private static void VisitSubtree(ResourceObjectTreeNode treeNode, ISet<ResourceObjectTreeNode> visited)
+        if (!treeNode.IsTreeRoot)
         {
-            if (visited.Contains(treeNode))
-            {
-                return;
-            }
-
-            if (!treeNode.IsTreeRoot)
-            {
-                visited.Add(treeNode);
-            }
-
-            VisitDirectChildrenInSubtree(treeNode, visited);
-            VisitRelationshipChildrenInSubtree(treeNode, visited);
+            visited.Add(treeNode);
         }
 
-        private static void VisitDirectChildrenInSubtree(ResourceObjectTreeNode treeNode, ISet<ResourceObjectTreeNode> visited)
+        VisitDirectChildrenInSubtree(treeNode, visited);
+        VisitRelationshipChildrenInSubtree(treeNode, visited);
+    }
+
+    private static void VisitDirectChildrenInSubtree(ResourceObjectTreeNode treeNode, ISet<ResourceObjectTreeNode> visited)
+    {
+        if (treeNode._directChildren != null)
         {
-            if (treeNode._directChildren != null)
+            foreach (ResourceObjectTreeNode child in treeNode._directChildren)
             {
-                foreach (ResourceObjectTreeNode child in treeNode._directChildren)
-                {
-                    VisitSubtree(child, visited);
-                }
+                VisitSubtree(child, visited);
             }
         }
+    }
 
-        private static void VisitRelationshipChildrenInSubtree(ResourceObjectTreeNode treeNode, ISet<ResourceObjectTreeNode> visited)
+    private static void VisitRelationshipChildrenInSubtree(ResourceObjectTreeNode treeNode, ISet<ResourceObjectTreeNode> visited)
+    {
+        if (treeNode._childrenByRelationship != null)
         {
-            if (treeNode._childrenByRelationship != null)
+            foreach (RelationshipAttribute relationship in treeNode.ResourceType.Relationships)
             {
-                foreach (RelationshipAttribute relationship in treeNode.ResourceType.Relationships)
+                if (treeNode._childrenByRelationship.TryGetValue(relationship, out HashSet<ResourceObjectTreeNode>? rightNodes))
                 {
-                    if (treeNode._childrenByRelationship.TryGetValue(relationship, out HashSet<ResourceObjectTreeNode>? rightNodes))
-                    {
-                        VisitRelationshipChildInSubtree(rightNodes, visited);
-                    }
+                    VisitRelationshipChildInSubtree(rightNodes, visited);
                 }
             }
         }
+    }
 
-        private static void VisitRelationshipChildInSubtree(HashSet<ResourceObjectTreeNode> rightNodes, ISet<ResourceObjectTreeNode> visited)
+    private static void VisitRelationshipChildInSubtree(HashSet<ResourceObjectTreeNode> rightNodes, ISet<ResourceObjectTreeNode> visited)
+    {
+        foreach (ResourceObjectTreeNode rightNode in rightNodes)
         {
-            foreach (ResourceObjectTreeNode rightNode in rightNodes)
-            {
-                VisitSubtree(rightNode, visited);
-            }
+            VisitSubtree(rightNode, visited);
         }
+    }
 
-        public ISet<ResourceObjectTreeNode>? GetRightNodesInRelationship(RelationshipAttribute relationship)
-        {
-            return _childrenByRelationship != null && _childrenByRelationship.TryGetValue(relationship, out HashSet<ResourceObjectTreeNode>? rightNodes)
-                ? rightNodes
-                : null;
-        }
+    public ISet<ResourceObjectTreeNode>? GetRightNodesInRelationship(RelationshipAttribute relationship)
+    {
+        return _childrenByRelationship != null && _childrenByRelationship.TryGetValue(relationship, out HashSet<ResourceObjectTreeNode>? rightNodes)
+            ? rightNodes
+            : null;
+    }
 
-        /// <summary>
-        /// Provides the value for 'data' in the response body. Uses relationship declaration order.
-        /// </summary>
-        public IList<ResourceObject> GetResponseData()
-        {
-            AssertIsTreeRoot();
+    /// <summary>
+    /// Provides the value for 'data' in the response body. Uses relationship declaration order.
+    /// </summary>
+    public IList<ResourceObject> GetResponseData()
+    {
+        AssertIsTreeRoot();
 
-            return GetDirectChildren().Select(child => child.ResourceObject).ToArray();
-        }
+        return GetDirectChildren().Select(child => child.ResourceObject).ToArray();
+    }
+
+    /// <summary>
+    /// Provides the value for 'included' in the response body. Uses relationship declaration order.
+    /// </summary>
+    public IList<ResourceObject> GetResponseIncluded()
+    {
+        AssertIsTreeRoot();
+
+        var visited = new HashSet<ResourceObjectTreeNode>();
 
-        /// <summary>
-        /// Provides the value for 'included' in the response body. Uses relationship declaration order.
-        /// </summary>
-        public IList<ResourceObject> GetResponseIncluded()
+        foreach (ResourceObjectTreeNode child in GetDirectChildren())
         {
-            AssertIsTreeRoot();
+            VisitRelationshipChildrenInSubtree(child, visited);
+        }
 
-            var visited = new HashSet<ResourceObjectTreeNode>();
+        return visited.Select(node => node.ResourceObject).ToArray();
+    }
 
-            foreach (ResourceObjectTreeNode child in GetDirectChildren())
-            {
-                VisitRelationshipChildrenInSubtree(child, visited);
-            }
+    private IList<ResourceObjectTreeNode> GetDirectChildren()
+    {
+        return _directChildren == null ? Array.Empty<ResourceObjectTreeNode>() : _directChildren;
+    }
 
-            return visited.Select(node => node.ResourceObject).ToArray();
+    private void AssertIsTreeRoot()
+    {
+        if (!IsTreeRoot)
+        {
+            throw new InvalidOperationException("Internal error: this method should only be called from the root of the tree.");
         }
+    }
 
-        private IList<ResourceObjectTreeNode> GetDirectChildren()
+    public bool Equals(ResourceObjectTreeNode? other)
+    {
+        if (ReferenceEquals(null, other))
         {
-            // ReSharper disable once MergeConditionalExpression
-            // Justification: ReSharper reporting this is a bug, which is fixed in v2021.2.1. This condition cannot be merged.
-            return _directChildren == null ? Array.Empty<ResourceObjectTreeNode>() : _directChildren;
+            return false;
         }
 
-        private void AssertIsTreeRoot()
+        if (ReferenceEquals(this, other))
         {
-            if (!IsTreeRoot)
-            {
-                throw new InvalidOperationException("Internal error: this method should only be called from the root of the tree.");
-            }
+            return true;
         }
 
-        public bool Equals(ResourceObjectTreeNode? other)
-        {
-            if (ReferenceEquals(null, other))
-            {
-                return false;
-            }
+        return ResourceObjectComparer.Instance.Equals(ResourceObject, other.ResourceObject);
+    }
 
-            if (ReferenceEquals(this, other))
-            {
-                return true;
-            }
+    public override bool Equals(object? other)
+    {
+        return Equals(other as ResourceObjectTreeNode);
+    }
 
-            return ResourceObjectComparer.Instance.Equals(ResourceObject, other.ResourceObject);
-        }
+    public override int GetHashCode()
+    {
+        return ResourceObject.GetHashCode();
+    }
+
+    public override string ToString()
+    {
+        var builder = new StringBuilder();
+        builder.Append(IsTreeRoot ? ResourceType.PublicName : $"{ResourceObject.Type}:{ResourceObject.Id}");
 
-        public override bool Equals(object? other)
+        if (_directChildren != null)
         {
-            return Equals(other as ResourceObjectTreeNode);
+            builder.Append($", children: {_directChildren.Count}");
         }
-
-        public override int GetHashCode()
+        else if (_childrenByRelationship != null)
         {
-            return ResourceObject.GetHashCode();
+            builder.Append($", children: {string.Join(',', _childrenByRelationship.Select(pair => $"{pair.Key.PublicName} ({pair.Value.Count})"))}");
         }
 
-        public override string ToString()
-        {
-            var builder = new StringBuilder();
-            builder.Append(IsTreeRoot ? ResourceType.PublicName : $"{ResourceObject.Type}:{ResourceObject.Id}");
+        return builder.ToString();
+    }
 
-            if (_directChildren != null)
-            {
-                builder.Append($", children: {_directChildren.Count}");
-            }
-            else if (_childrenByRelationship != null)
-            {
-                builder.Append($", children: {string.Join(',', _childrenByRelationship.Select(pair => $"{pair.Key.PublicName} ({pair.Value.Count})"))}");
-            }
+    private sealed class EmptyResource : IIdentifiable
+    {
+        public string? StringId { get; set; }
+        public string? LocalId { get; set; }
+    }
 
-            return builder.ToString();
-        }
+    private sealed class ResourceObjectComparer : IEqualityComparer<ResourceObject>
+    {
+        public static readonly ResourceObjectComparer Instance = new();
 
-        private sealed class EmptyResource : IIdentifiable
+        private ResourceObjectComparer()
         {
-            public string? StringId { get; set; }
-            public string? LocalId { get; set; }
         }
 
-        private sealed class ResourceObjectComparer : IEqualityComparer<ResourceObject>
+        public bool Equals(ResourceObject? x, ResourceObject? y)
         {
-            public static readonly ResourceObjectComparer Instance = new();
-
-            private ResourceObjectComparer()
+            if (ReferenceEquals(x, y))
             {
+                return true;
             }
 
-            public bool Equals(ResourceObject? x, ResourceObject? y)
+            if (x is null || y is null || x.GetType() != y.GetType())
             {
-                if (ReferenceEquals(x, y))
-                {
-                    return true;
-                }
-
-                if (x is null || y is null || x.GetType() != y.GetType())
-                {
-                    return false;
-                }
-
-                return x.Type == y.Type && x.Id == y.Id && x.Lid == y.Lid;
+                return false;
             }
 
-            public int GetHashCode(ResourceObject obj)
-            {
-                return HashCode.Combine(obj.Type, obj.Id, obj.Lid);
-            }
+            return x.Type == y.Type && x.Id == y.Id && x.Lid == y.Lid;
+        }
+
+        public int GetHashCode(ResourceObject obj)
+        {
+            return HashCode.Combine(obj.Type, obj.Id, obj.Lid);
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/Serialization/Response/ResponseModelAdapter.cs b/src/JsonApiDotNetCore/Serialization/Response/ResponseModelAdapter.cs
index 1d20316c1e..d881668c9f 100644
--- a/src/JsonApiDotNetCore/Serialization/Response/ResponseModelAdapter.cs
+++ b/src/JsonApiDotNetCore/Serialization/Response/ResponseModelAdapter.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.AtomicOperations;
@@ -15,351 +12,350 @@
 using JsonApiDotNetCore.Resources.Internal;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCore.Serialization.Response
+namespace JsonApiDotNetCore.Serialization.Response;
+
+/// <inheritdoc />
+[PublicAPI]
+public class ResponseModelAdapter : IResponseModelAdapter
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public class ResponseModelAdapter : IResponseModelAdapter
+    private static readonly CollectionConverter CollectionConverter = new();
+
+    private readonly IJsonApiRequest _request;
+    private readonly IJsonApiOptions _options;
+    private readonly ILinkBuilder _linkBuilder;
+    private readonly IMetaBuilder _metaBuilder;
+    private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
+    private readonly IEvaluatedIncludeCache _evaluatedIncludeCache;
+    private readonly IRequestQueryStringAccessor _requestQueryStringAccessor;
+    private readonly ISparseFieldSetCache _sparseFieldSetCache;
+
+    // Ensures that at most one ResourceObject (and one tree node) is produced per resource instance.
+    private readonly Dictionary<IIdentifiable, ResourceObjectTreeNode> _resourceToTreeNodeCache = new(IdentifiableComparer.Instance);
+
+    public ResponseModelAdapter(IJsonApiRequest request, IJsonApiOptions options, ILinkBuilder linkBuilder, IMetaBuilder metaBuilder,
+        IResourceDefinitionAccessor resourceDefinitionAccessor, IEvaluatedIncludeCache evaluatedIncludeCache, ISparseFieldSetCache sparseFieldSetCache,
+        IRequestQueryStringAccessor requestQueryStringAccessor)
     {
-        private static readonly CollectionConverter CollectionConverter = new();
-
-        private readonly IJsonApiRequest _request;
-        private readonly IJsonApiOptions _options;
-        private readonly ILinkBuilder _linkBuilder;
-        private readonly IMetaBuilder _metaBuilder;
-        private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
-        private readonly IEvaluatedIncludeCache _evaluatedIncludeCache;
-        private readonly IRequestQueryStringAccessor _requestQueryStringAccessor;
-        private readonly ISparseFieldSetCache _sparseFieldSetCache;
-
-        // Ensures that at most one ResourceObject (and one tree node) is produced per resource instance.
-        private readonly Dictionary<IIdentifiable, ResourceObjectTreeNode> _resourceToTreeNodeCache = new(IdentifiableComparer.Instance);
-
-        public ResponseModelAdapter(IJsonApiRequest request, IJsonApiOptions options, ILinkBuilder linkBuilder, IMetaBuilder metaBuilder,
-            IResourceDefinitionAccessor resourceDefinitionAccessor, IEvaluatedIncludeCache evaluatedIncludeCache, ISparseFieldSetCache sparseFieldSetCache,
-            IRequestQueryStringAccessor requestQueryStringAccessor)
-        {
-            ArgumentGuard.NotNull(request, nameof(request));
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(linkBuilder, nameof(linkBuilder));
-            ArgumentGuard.NotNull(metaBuilder, nameof(metaBuilder));
-            ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
-            ArgumentGuard.NotNull(evaluatedIncludeCache, nameof(evaluatedIncludeCache));
-            ArgumentGuard.NotNull(sparseFieldSetCache, nameof(sparseFieldSetCache));
-            ArgumentGuard.NotNull(requestQueryStringAccessor, nameof(requestQueryStringAccessor));
-
-            _request = request;
-            _options = options;
-            _linkBuilder = linkBuilder;
-            _metaBuilder = metaBuilder;
-            _resourceDefinitionAccessor = resourceDefinitionAccessor;
-            _evaluatedIncludeCache = evaluatedIncludeCache;
-            _sparseFieldSetCache = sparseFieldSetCache;
-            _requestQueryStringAccessor = requestQueryStringAccessor;
-        }
-
-        /// <inheritdoc />
-        public Document Convert(object? model)
-        {
-            _sparseFieldSetCache.Reset();
-            _resourceToTreeNodeCache.Clear();
-
-            var document = new Document();
+        ArgumentGuard.NotNull(request, nameof(request));
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(linkBuilder, nameof(linkBuilder));
+        ArgumentGuard.NotNull(metaBuilder, nameof(metaBuilder));
+        ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
+        ArgumentGuard.NotNull(evaluatedIncludeCache, nameof(evaluatedIncludeCache));
+        ArgumentGuard.NotNull(sparseFieldSetCache, nameof(sparseFieldSetCache));
+        ArgumentGuard.NotNull(requestQueryStringAccessor, nameof(requestQueryStringAccessor));
+
+        _request = request;
+        _options = options;
+        _linkBuilder = linkBuilder;
+        _metaBuilder = metaBuilder;
+        _resourceDefinitionAccessor = resourceDefinitionAccessor;
+        _evaluatedIncludeCache = evaluatedIncludeCache;
+        _sparseFieldSetCache = sparseFieldSetCache;
+        _requestQueryStringAccessor = requestQueryStringAccessor;
+    }
 
-            IncludeExpression? include = _evaluatedIncludeCache.Get();
-            IImmutableSet<IncludeElementExpression> includeElements = include?.Elements ?? ImmutableHashSet<IncludeElementExpression>.Empty;
+    /// <inheritdoc />
+    public Document Convert(object? model)
+    {
+        _sparseFieldSetCache.Reset();
+        _resourceToTreeNodeCache.Clear();
 
-            var rootNode = ResourceObjectTreeNode.CreateRoot();
+        var document = new Document();
 
-            if (model is IEnumerable<IIdentifiable> resources)
-            {
-                ResourceType resourceType = (_request.SecondaryResourceType ?? _request.PrimaryResourceType)!;
+        IncludeExpression? include = _evaluatedIncludeCache.Get();
+        IImmutableSet<IncludeElementExpression> includeElements = include?.Elements ?? ImmutableHashSet<IncludeElementExpression>.Empty;
 
-                foreach (IIdentifiable resource in resources)
-                {
-                    TraverseResource(resource, resourceType, _request.Kind, includeElements, rootNode, null);
-                }
+        var rootNode = ResourceObjectTreeNode.CreateRoot();
 
-                PopulateRelationshipsInTree(rootNode, _request.Kind);
+        if (model is IEnumerable<IIdentifiable> resources)
+        {
+            ResourceType resourceType = (_request.SecondaryResourceType ?? _request.PrimaryResourceType)!;
 
-                IEnumerable<ResourceObject> resourceObjects = rootNode.GetResponseData();
-                document.Data = new SingleOrManyData<ResourceObject>(resourceObjects);
-            }
-            else if (model is IIdentifiable resource)
+            foreach (IIdentifiable resource in resources)
             {
-                ResourceType resourceType = (_request.SecondaryResourceType ?? _request.PrimaryResourceType)!;
-
                 TraverseResource(resource, resourceType, _request.Kind, includeElements, rootNode, null);
-                PopulateRelationshipsInTree(rootNode, _request.Kind);
-
-                ResourceObject resourceObject = rootNode.GetResponseData().Single();
-                document.Data = new SingleOrManyData<ResourceObject>(resourceObject);
-            }
-            else if (model == null)
-            {
-                document.Data = new SingleOrManyData<ResourceObject>(null);
-            }
-            else if (model is IEnumerable<OperationContainer?> operations)
-            {
-                using var _ = new RevertRequestStateOnDispose(_request, null);
-                document.Results = operations.Select(operation => ConvertOperation(operation, includeElements)).ToList();
-            }
-            else if (model is IEnumerable<ErrorObject> errorObjects)
-            {
-                document.Errors = errorObjects.ToArray();
-            }
-            else if (model is ErrorObject errorObject)
-            {
-                document.Errors = errorObject.AsArray();
-            }
-            else
-            {
-                throw new InvalidOperationException("Data being returned must be resources, operations, errors or null.");
             }
 
-            document.JsonApi = GetApiObject();
-            document.Links = _linkBuilder.GetTopLevelLinks();
-            document.Meta = _metaBuilder.Build();
-            document.Included = GetIncluded(rootNode);
+            PopulateRelationshipsInTree(rootNode, _request.Kind);
 
-            return document;
+            IEnumerable<ResourceObject> resourceObjects = rootNode.GetResponseData();
+            document.Data = new SingleOrManyData<ResourceObject>(resourceObjects);
         }
-
-        protected virtual AtomicResultObject ConvertOperation(OperationContainer? operation, IImmutableSet<IncludeElementExpression> includeElements)
+        else if (model is IIdentifiable resource)
         {
-            ResourceObject? resourceObject = null;
-
-            if (operation != null)
-            {
-                _request.CopyFrom(operation.Request);
+            ResourceType resourceType = (_request.SecondaryResourceType ?? _request.PrimaryResourceType)!;
 
-                ResourceType resourceType = (operation.Request.SecondaryResourceType ?? operation.Request.PrimaryResourceType)!;
-                var rootNode = ResourceObjectTreeNode.CreateRoot();
+            TraverseResource(resource, resourceType, _request.Kind, includeElements, rootNode, null);
+            PopulateRelationshipsInTree(rootNode, _request.Kind);
 
-                TraverseResource(operation.Resource, resourceType, operation.Request.Kind, includeElements, rootNode, null);
-                PopulateRelationshipsInTree(rootNode, operation.Request.Kind);
+            ResourceObject resourceObject = rootNode.GetResponseData().Single();
+            document.Data = new SingleOrManyData<ResourceObject>(resourceObject);
+        }
+        else if (model == null)
+        {
+            document.Data = new SingleOrManyData<ResourceObject>(null);
+        }
+        else if (model is IEnumerable<OperationContainer?> operations)
+        {
+            using var _ = new RevertRequestStateOnDispose(_request, null);
+            document.Results = operations.Select(operation => ConvertOperation(operation, includeElements)).ToList();
+        }
+        else if (model is IEnumerable<ErrorObject> errorObjects)
+        {
+            document.Errors = errorObjects.ToArray();
+        }
+        else if (model is ErrorObject errorObject)
+        {
+            document.Errors = errorObject.AsArray();
+        }
+        else
+        {
+            throw new InvalidOperationException("Data being returned must be resources, operations, errors or null.");
+        }
 
-                resourceObject = rootNode.GetResponseData().Single();
+        document.JsonApi = GetApiObject();
+        document.Links = _linkBuilder.GetTopLevelLinks();
+        document.Meta = _metaBuilder.Build();
+        document.Included = GetIncluded(rootNode);
 
-                _sparseFieldSetCache.Reset();
-                _resourceToTreeNodeCache.Clear();
-            }
+        return document;
+    }
 
-            return new AtomicResultObject
-            {
-                Data = resourceObject == null ? default : new SingleOrManyData<ResourceObject>(resourceObject)
-            };
-        }
+    protected virtual AtomicResultObject ConvertOperation(OperationContainer? operation, IImmutableSet<IncludeElementExpression> includeElements)
+    {
+        ResourceObject? resourceObject = null;
 
-        private void TraverseResource(IIdentifiable resource, ResourceType resourceType, EndpointKind kind,
-            IImmutableSet<IncludeElementExpression> includeElements, ResourceObjectTreeNode parentTreeNode, RelationshipAttribute? parentRelationship)
+        if (operation != null)
         {
-            ResourceObjectTreeNode treeNode = GetOrCreateTreeNode(resource, resourceType, kind);
+            _request.CopyFrom(operation.Request);
 
-            if (parentRelationship != null)
-            {
-                parentTreeNode.AttachRelationshipChild(parentRelationship, treeNode);
-            }
-            else
-            {
-                parentTreeNode.AttachDirectChild(treeNode);
-            }
+            ResourceType resourceType = (operation.Request.SecondaryResourceType ?? operation.Request.PrimaryResourceType)!;
+            var rootNode = ResourceObjectTreeNode.CreateRoot();
 
-            if (kind != EndpointKind.Relationship)
-            {
-                TraverseRelationships(resource, treeNode, includeElements, kind);
-            }
+            TraverseResource(operation.Resource, resourceType, operation.Request.Kind, includeElements, rootNode, null);
+            PopulateRelationshipsInTree(rootNode, operation.Request.Kind);
+
+            resourceObject = rootNode.GetResponseData().Single();
+
+            _sparseFieldSetCache.Reset();
+            _resourceToTreeNodeCache.Clear();
         }
 
-        private ResourceObjectTreeNode GetOrCreateTreeNode(IIdentifiable resource, ResourceType resourceType, EndpointKind kind)
+        return new AtomicResultObject
         {
-            if (!_resourceToTreeNodeCache.TryGetValue(resource, out ResourceObjectTreeNode? treeNode))
-            {
-                ResourceObject resourceObject = ConvertResource(resource, resourceType, kind);
-                treeNode = new ResourceObjectTreeNode(resource, resourceType, resourceObject);
+            Data = resourceObject == null ? default : new SingleOrManyData<ResourceObject>(resourceObject)
+        };
+    }
 
-                _resourceToTreeNodeCache.Add(resource, treeNode);
-            }
+    private void TraverseResource(IIdentifiable resource, ResourceType resourceType, EndpointKind kind, IImmutableSet<IncludeElementExpression> includeElements,
+        ResourceObjectTreeNode parentTreeNode, RelationshipAttribute? parentRelationship)
+    {
+        ResourceObjectTreeNode treeNode = GetOrCreateTreeNode(resource, resourceType, kind);
 
-            return treeNode;
+        if (parentRelationship != null)
+        {
+            parentTreeNode.AttachRelationshipChild(parentRelationship, treeNode);
+        }
+        else
+        {
+            parentTreeNode.AttachDirectChild(treeNode);
         }
 
-        protected virtual ResourceObject ConvertResource(IIdentifiable resource, ResourceType resourceType, EndpointKind kind)
+        if (kind != EndpointKind.Relationship)
         {
-            bool isRelationship = kind == EndpointKind.Relationship;
+            TraverseRelationships(resource, treeNode, includeElements, kind);
+        }
+    }
 
-            if (!isRelationship)
-            {
-                _resourceDefinitionAccessor.OnSerialize(resource);
-            }
+    private ResourceObjectTreeNode GetOrCreateTreeNode(IIdentifiable resource, ResourceType resourceType, EndpointKind kind)
+    {
+        if (!_resourceToTreeNodeCache.TryGetValue(resource, out ResourceObjectTreeNode? treeNode))
+        {
+            ResourceObject resourceObject = ConvertResource(resource, resourceType, kind);
+            treeNode = new ResourceObjectTreeNode(resource, resourceType, resourceObject);
 
-            var resourceObject = new ResourceObject
-            {
-                Type = resourceType.PublicName,
-                Id = resource.StringId
-            };
+            _resourceToTreeNodeCache.Add(resource, treeNode);
+        }
 
-            if (!isRelationship)
-            {
-                IImmutableSet<ResourceFieldAttribute> fieldSet = _sparseFieldSetCache.GetSparseFieldSetForSerializer(resourceType);
+        return treeNode;
+    }
 
-                resourceObject.Attributes = ConvertAttributes(resource, resourceType, fieldSet);
-                resourceObject.Links = _linkBuilder.GetResourceLinks(resourceType, resource);
-                resourceObject.Meta = _resourceDefinitionAccessor.GetMeta(resourceType, resource);
-            }
+    protected virtual ResourceObject ConvertResource(IIdentifiable resource, ResourceType resourceType, EndpointKind kind)
+    {
+        bool isRelationship = kind == EndpointKind.Relationship;
 
-            return resourceObject;
+        if (!isRelationship)
+        {
+            _resourceDefinitionAccessor.OnSerialize(resource);
         }
 
-        protected virtual IDictionary<string, object?>? ConvertAttributes(IIdentifiable resource, ResourceType resourceType,
-            IImmutableSet<ResourceFieldAttribute> fieldSet)
+        var resourceObject = new ResourceObject
         {
-            var attrMap = new Dictionary<string, object?>(resourceType.Attributes.Count);
-
-            foreach (AttrAttribute attr in resourceType.Attributes)
-            {
-                if (!fieldSet.Contains(attr) || attr.Property.Name == nameof(Identifiable<object>.Id))
-                {
-                    continue;
-                }
+            Type = resourceType.PublicName,
+            Id = resource.StringId
+        };
 
-                object? value = attr.GetValue(resource);
-
-                if (_options.SerializerOptions.DefaultIgnoreCondition == JsonIgnoreCondition.WhenWritingNull && value == null)
-                {
-                    continue;
-                }
+        if (!isRelationship)
+        {
+            IImmutableSet<ResourceFieldAttribute> fieldSet = _sparseFieldSetCache.GetSparseFieldSetForSerializer(resourceType);
 
-                if (_options.SerializerOptions.DefaultIgnoreCondition == JsonIgnoreCondition.WhenWritingDefault &&
-                    Equals(value, RuntimeTypeConverter.GetDefaultValue(attr.Property.PropertyType)))
-                {
-                    continue;
-                }
+            resourceObject.Attributes = ConvertAttributes(resource, resourceType, fieldSet);
+            resourceObject.Links = _linkBuilder.GetResourceLinks(resourceType, resource);
+            resourceObject.Meta = _resourceDefinitionAccessor.GetMeta(resourceType, resource);
+        }
 
-                attrMap.Add(attr.PublicName, value);
-            }
+        return resourceObject;
+    }
 
-            return attrMap.Any() ? attrMap : null;
-        }
+    protected virtual IDictionary<string, object?>? ConvertAttributes(IIdentifiable resource, ResourceType resourceType,
+        IImmutableSet<ResourceFieldAttribute> fieldSet)
+    {
+        var attrMap = new Dictionary<string, object?>(resourceType.Attributes.Count);
 
-        private void TraverseRelationships(IIdentifiable leftResource, ResourceObjectTreeNode leftTreeNode,
-            IImmutableSet<IncludeElementExpression> includeElements, EndpointKind kind)
+        foreach (AttrAttribute attr in resourceType.Attributes)
         {
-            foreach (IncludeElementExpression includeElement in includeElements)
+            if (!fieldSet.Contains(attr) || attr.Property.Name == nameof(Identifiable<object>.Id))
             {
-                TraverseRelationship(includeElement.Relationship, leftResource, leftTreeNode, includeElement, kind);
+                continue;
             }
-        }
 
-        private void TraverseRelationship(RelationshipAttribute relationship, IIdentifiable leftResource, ResourceObjectTreeNode leftTreeNode,
-            IncludeElementExpression includeElement, EndpointKind kind)
-        {
-            object? rightValue = relationship.GetValue(leftResource);
-            ICollection<IIdentifiable> rightResources = CollectionConverter.ExtractResources(rightValue);
+            object? value = attr.GetValue(resource);
 
-            leftTreeNode.EnsureHasRelationship(relationship);
+            if (_options.SerializerOptions.DefaultIgnoreCondition == JsonIgnoreCondition.WhenWritingNull && value == null)
+            {
+                continue;
+            }
 
-            foreach (IIdentifiable rightResource in rightResources)
+            if (_options.SerializerOptions.DefaultIgnoreCondition == JsonIgnoreCondition.WhenWritingDefault &&
+                Equals(value, RuntimeTypeConverter.GetDefaultValue(attr.Property.PropertyType)))
             {
-                TraverseResource(rightResource, relationship.RightType, kind, includeElement.Children, leftTreeNode, relationship);
+                continue;
             }
+
+            attrMap.Add(attr.PublicName, value);
         }
 
-        private void PopulateRelationshipsInTree(ResourceObjectTreeNode rootNode, EndpointKind kind)
+        return attrMap.Any() ? attrMap : null;
+    }
+
+    private void TraverseRelationships(IIdentifiable leftResource, ResourceObjectTreeNode leftTreeNode, IImmutableSet<IncludeElementExpression> includeElements,
+        EndpointKind kind)
+    {
+        foreach (IncludeElementExpression includeElement in includeElements)
         {
-            if (kind != EndpointKind.Relationship)
-            {
-                foreach (ResourceObjectTreeNode treeNode in rootNode.GetUniqueNodes())
-                {
-                    PopulateRelationshipsInResourceObject(treeNode);
-                }
-            }
+            TraverseRelationship(includeElement.Relationship, leftResource, leftTreeNode, includeElement, kind);
         }
+    }
+
+    private void TraverseRelationship(RelationshipAttribute relationship, IIdentifiable leftResource, ResourceObjectTreeNode leftTreeNode,
+        IncludeElementExpression includeElement, EndpointKind kind)
+    {
+        object? rightValue = relationship.GetValue(leftResource);
+        ICollection<IIdentifiable> rightResources = CollectionConverter.ExtractResources(rightValue);
+
+        leftTreeNode.EnsureHasRelationship(relationship);
 
-        private void PopulateRelationshipsInResourceObject(ResourceObjectTreeNode treeNode)
+        foreach (IIdentifiable rightResource in rightResources)
         {
-            IImmutableSet<ResourceFieldAttribute> fieldSet = _sparseFieldSetCache.GetSparseFieldSetForSerializer(treeNode.ResourceType);
+            TraverseResource(rightResource, relationship.RightType, kind, includeElement.Children, leftTreeNode, relationship);
+        }
+    }
 
-            foreach (RelationshipAttribute relationship in treeNode.ResourceType.Relationships)
+    private void PopulateRelationshipsInTree(ResourceObjectTreeNode rootNode, EndpointKind kind)
+    {
+        if (kind != EndpointKind.Relationship)
+        {
+            foreach (ResourceObjectTreeNode treeNode in rootNode.GetUniqueNodes())
             {
-                if (fieldSet.Contains(relationship))
-                {
-                    PopulateRelationshipInResourceObject(treeNode, relationship);
-                }
+                PopulateRelationshipsInResourceObject(treeNode);
             }
         }
+    }
 
-        private void PopulateRelationshipInResourceObject(ResourceObjectTreeNode treeNode, RelationshipAttribute relationship)
-        {
-            SingleOrManyData<ResourceIdentifierObject> data = GetRelationshipData(treeNode, relationship);
-            RelationshipLinks? links = _linkBuilder.GetRelationshipLinks(relationship, treeNode.Resource);
+    private void PopulateRelationshipsInResourceObject(ResourceObjectTreeNode treeNode)
+    {
+        IImmutableSet<ResourceFieldAttribute> fieldSet = _sparseFieldSetCache.GetSparseFieldSetForSerializer(treeNode.ResourceType);
 
-            if (links != null || data.IsAssigned)
+        foreach (RelationshipAttribute relationship in treeNode.ResourceType.Relationships)
+        {
+            if (fieldSet.Contains(relationship))
             {
-                var relationshipObject = new RelationshipObject
-                {
-                    Links = links,
-                    Data = data
-                };
-
-                treeNode.ResourceObject.Relationships ??= new Dictionary<string, RelationshipObject?>();
-                treeNode.ResourceObject.Relationships.Add(relationship.PublicName, relationshipObject);
+                PopulateRelationshipInResourceObject(treeNode, relationship);
             }
         }
+    }
 
-        private static SingleOrManyData<ResourceIdentifierObject> GetRelationshipData(ResourceObjectTreeNode treeNode, RelationshipAttribute relationship)
-        {
-            ISet<ResourceObjectTreeNode>? rightNodes = treeNode.GetRightNodesInRelationship(relationship);
+    private void PopulateRelationshipInResourceObject(ResourceObjectTreeNode treeNode, RelationshipAttribute relationship)
+    {
+        SingleOrManyData<ResourceIdentifierObject> data = GetRelationshipData(treeNode, relationship);
+        RelationshipLinks? links = _linkBuilder.GetRelationshipLinks(relationship, treeNode.Resource);
 
-            if (rightNodes != null)
+        if (links != null || data.IsAssigned)
+        {
+            var relationshipObject = new RelationshipObject
             {
-                IEnumerable<ResourceIdentifierObject> resourceIdentifierObjects = rightNodes.Select(rightNode => new ResourceIdentifierObject
-                {
-                    Type = rightNode.ResourceType.PublicName,
-                    Id = rightNode.ResourceObject.Id
-                });
-
-                return relationship is HasOneAttribute
-                    ? new SingleOrManyData<ResourceIdentifierObject>(resourceIdentifierObjects.SingleOrDefault())
-                    : new SingleOrManyData<ResourceIdentifierObject>(resourceIdentifierObjects);
-            }
+                Links = links,
+                Data = data
+            };
 
-            return default;
+            treeNode.ResourceObject.Relationships ??= new Dictionary<string, RelationshipObject?>();
+            treeNode.ResourceObject.Relationships.Add(relationship.PublicName, relationshipObject);
         }
+    }
 
-        protected virtual JsonApiObject? GetApiObject()
+    private static SingleOrManyData<ResourceIdentifierObject> GetRelationshipData(ResourceObjectTreeNode treeNode, RelationshipAttribute relationship)
+    {
+        ISet<ResourceObjectTreeNode>? rightNodes = treeNode.GetRightNodesInRelationship(relationship);
+
+        if (rightNodes != null)
         {
-            if (!_options.IncludeJsonApiVersion)
+            IEnumerable<ResourceIdentifierObject> resourceIdentifierObjects = rightNodes.Select(rightNode => new ResourceIdentifierObject
             {
-                return null;
-            }
+                Type = rightNode.ResourceType.PublicName,
+                Id = rightNode.ResourceObject.Id
+            });
 
-            var jsonApiObject = new JsonApiObject
-            {
-                Version = "1.1"
-            };
+            return relationship is HasOneAttribute
+                ? new SingleOrManyData<ResourceIdentifierObject>(resourceIdentifierObjects.SingleOrDefault())
+                : new SingleOrManyData<ResourceIdentifierObject>(resourceIdentifierObjects);
+        }
 
-            if (_request.Kind == EndpointKind.AtomicOperations)
-            {
-                jsonApiObject.Ext = new List<string>
-                {
-                    "https://jsonapi.org/ext/atomic"
-                };
-            }
+        return default;
+    }
 
-            return jsonApiObject;
+    protected virtual JsonApiObject? GetApiObject()
+    {
+        if (!_options.IncludeJsonApiVersion)
+        {
+            return null;
         }
 
-        private IList<ResourceObject>? GetIncluded(ResourceObjectTreeNode rootNode)
+        var jsonApiObject = new JsonApiObject
         {
-            IList<ResourceObject> resourceObjects = rootNode.GetResponseIncluded();
+            Version = "1.1"
+        };
 
-            if (resourceObjects.Any())
+        if (_request.Kind == EndpointKind.AtomicOperations)
+        {
+            jsonApiObject.Ext = new List<string>
             {
-                return resourceObjects;
-            }
+                "https://jsonapi.org/ext/atomic"
+            };
+        }
+
+        return jsonApiObject;
+    }
 
-            return _requestQueryStringAccessor.Query.ContainsKey("include") ? Array.Empty<ResourceObject>() : null;
+    private IList<ResourceObject>? GetIncluded(ResourceObjectTreeNode rootNode)
+    {
+        IList<ResourceObject> resourceObjects = rootNode.GetResponseIncluded();
+
+        if (resourceObjects.Any())
+        {
+            return resourceObjects;
         }
+
+        return _requestQueryStringAccessor.Query.ContainsKey("include") ? Array.Empty<ResourceObject>() : null;
     }
 }
diff --git a/src/JsonApiDotNetCore/Services/AsyncCollectionExtensions.cs b/src/JsonApiDotNetCore/Services/AsyncCollectionExtensions.cs
index e93b294a22..3924999f63 100644
--- a/src/JsonApiDotNetCore/Services/AsyncCollectionExtensions.cs
+++ b/src/JsonApiDotNetCore/Services/AsyncCollectionExtensions.cs
@@ -1,36 +1,32 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+[PublicAPI]
+public static class AsyncCollectionExtensions
 {
-    [PublicAPI]
-    public static class AsyncCollectionExtensions
+    public static async Task AddRangeAsync<T>(this ICollection<T> source, IAsyncEnumerable<T> elementsToAdd, CancellationToken cancellationToken = default)
     {
-        public static async Task AddRangeAsync<T>(this ICollection<T> source, IAsyncEnumerable<T> elementsToAdd, CancellationToken cancellationToken = default)
-        {
-            ArgumentGuard.NotNull(source, nameof(source));
-            ArgumentGuard.NotNull(elementsToAdd, nameof(elementsToAdd));
+        ArgumentGuard.NotNull(source, nameof(source));
+        ArgumentGuard.NotNull(elementsToAdd, nameof(elementsToAdd));
 
-            await foreach (T missingResource in elementsToAdd.WithCancellation(cancellationToken))
-            {
-                source.Add(missingResource);
-            }
-        }
-
-        public static async Task<List<T>> ToListAsync<T>(this IAsyncEnumerable<T> source, CancellationToken cancellationToken = default)
+        await foreach (T missingResource in elementsToAdd.WithCancellation(cancellationToken))
         {
-            ArgumentGuard.NotNull(source, nameof(source));
+            source.Add(missingResource);
+        }
+    }
 
-            var list = new List<T>();
+    public static async Task<List<T>> ToListAsync<T>(this IAsyncEnumerable<T> source, CancellationToken cancellationToken = default)
+    {
+        ArgumentGuard.NotNull(source, nameof(source));
 
-            await foreach (T element in source.WithCancellation(cancellationToken))
-            {
-                list.Add(element);
-            }
+        var list = new List<T>();
 
-            return list;
+        await foreach (T element in source.WithCancellation(cancellationToken))
+        {
+            list.Add(element);
         }
+
+        return list;
     }
 }
diff --git a/src/JsonApiDotNetCore/Services/IAddToRelationshipService.cs b/src/JsonApiDotNetCore/Services/IAddToRelationshipService.cs
index bc0ae069ff..58fb122a50 100644
--- a/src/JsonApiDotNetCore/Services/IAddToRelationshipService.cs
+++ b/src/JsonApiDotNetCore/Services/IAddToRelationshipService.cs
@@ -1,33 +1,29 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 
 // ReSharper disable UnusedTypeParameter
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary />
+[PublicAPI]
+public interface IAddToRelationshipService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary />
-    [PublicAPI]
-    public interface IAddToRelationshipService<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Handles a JSON:API request to add resources to a to-many relationship.
-        /// </summary>
-        /// <param name="leftId">
-        /// Identifies the left side of the relationship.
-        /// </param>
-        /// <param name="relationshipName">
-        /// The relationship to add resources to.
-        /// </param>
-        /// <param name="rightResourceIds">
-        /// The set of resources to add to the relationship.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        Task AddToToManyRelationshipAsync(TId leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Handles a JSON:API request to add resources to a to-many relationship.
+    /// </summary>
+    /// <param name="leftId">
+    /// Identifies the left side of the relationship.
+    /// </param>
+    /// <param name="relationshipName">
+    /// The relationship to add resources to.
+    /// </param>
+    /// <param name="rightResourceIds">
+    /// The set of resources to add to the relationship.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    Task AddToToManyRelationshipAsync(TId leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/Services/ICreateService.cs b/src/JsonApiDotNetCore/Services/ICreateService.cs
index 56286f9fe7..7a75d6d4af 100644
--- a/src/JsonApiDotNetCore/Services/ICreateService.cs
+++ b/src/JsonApiDotNetCore/Services/ICreateService.cs
@@ -1,16 +1,13 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary />
+public interface ICreateService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary />
-    public interface ICreateService<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Handles a JSON:API request to create a new resource with attributes, relationships or both.
-        /// </summary>
-        Task<TResource?> CreateAsync(TResource resource, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Handles a JSON:API request to create a new resource with attributes, relationships or both.
+    /// </summary>
+    Task<TResource?> CreateAsync(TResource resource, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/Services/IDeleteService.cs b/src/JsonApiDotNetCore/Services/IDeleteService.cs
index a509f10caa..9bdfcd143b 100644
--- a/src/JsonApiDotNetCore/Services/IDeleteService.cs
+++ b/src/JsonApiDotNetCore/Services/IDeleteService.cs
@@ -1,18 +1,15 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Resources;
 
 // ReSharper disable UnusedTypeParameter
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary />
+public interface IDeleteService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary />
-    public interface IDeleteService<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Handles a JSON:API request to delete an existing resource.
-        /// </summary>
-        Task DeleteAsync(TId id, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Handles a JSON:API request to delete an existing resource.
+    /// </summary>
+    Task DeleteAsync(TId id, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/Services/IGetAllService.cs b/src/JsonApiDotNetCore/Services/IGetAllService.cs
index a81caadd80..4c6b1d59c4 100644
--- a/src/JsonApiDotNetCore/Services/IGetAllService.cs
+++ b/src/JsonApiDotNetCore/Services/IGetAllService.cs
@@ -1,17 +1,13 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary />
+public interface IGetAllService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary />
-    public interface IGetAllService<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Handles a JSON:API request to retrieve a collection of resources for a primary endpoint.
-        /// </summary>
-        Task<IReadOnlyCollection<TResource>> GetAsync(CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Handles a JSON:API request to retrieve a collection of resources for a primary endpoint.
+    /// </summary>
+    Task<IReadOnlyCollection<TResource>> GetAsync(CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/Services/IGetByIdService.cs b/src/JsonApiDotNetCore/Services/IGetByIdService.cs
index 3d942e15ce..4bf34788eb 100644
--- a/src/JsonApiDotNetCore/Services/IGetByIdService.cs
+++ b/src/JsonApiDotNetCore/Services/IGetByIdService.cs
@@ -1,16 +1,13 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary />
+public interface IGetByIdService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary />
-    public interface IGetByIdService<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Handles a JSON:API request to retrieve a single resource for a primary endpoint.
-        /// </summary>
-        Task<TResource> GetAsync(TId id, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Handles a JSON:API request to retrieve a single resource for a primary endpoint.
+    /// </summary>
+    Task<TResource> GetAsync(TId id, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/Services/IGetRelationshipService.cs b/src/JsonApiDotNetCore/Services/IGetRelationshipService.cs
index d57962b72d..afd284a7ce 100644
--- a/src/JsonApiDotNetCore/Services/IGetRelationshipService.cs
+++ b/src/JsonApiDotNetCore/Services/IGetRelationshipService.cs
@@ -1,18 +1,15 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Resources;
 
 // ReSharper disable UnusedTypeParameter
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary />
+public interface IGetRelationshipService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary />
-    public interface IGetRelationshipService<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Handles a JSON:API request to retrieve a single relationship.
-        /// </summary>
-        Task<object?> GetRelationshipAsync(TId id, string relationshipName, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Handles a JSON:API request to retrieve a single relationship.
+    /// </summary>
+    Task<object?> GetRelationshipAsync(TId id, string relationshipName, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/Services/IGetSecondaryService.cs b/src/JsonApiDotNetCore/Services/IGetSecondaryService.cs
index 1820f435bd..9f8c528552 100644
--- a/src/JsonApiDotNetCore/Services/IGetSecondaryService.cs
+++ b/src/JsonApiDotNetCore/Services/IGetSecondaryService.cs
@@ -1,19 +1,16 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Resources;
 
 // ReSharper disable UnusedTypeParameter
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary />
+public interface IGetSecondaryService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary />
-    public interface IGetSecondaryService<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Handles a JSON:API request to retrieve a single resource or a collection of resources for a secondary endpoint, such as /articles/1/author or
-        /// /articles/1/revisions.
-        /// </summary>
-        Task<object?> GetSecondaryAsync(TId id, string relationshipName, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Handles a JSON:API request to retrieve a single resource or a collection of resources for a secondary endpoint, such as /articles/1/author or
+    /// /articles/1/revisions.
+    /// </summary>
+    Task<object?> GetSecondaryAsync(TId id, string relationshipName, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/Services/IRemoveFromRelationshipService.cs b/src/JsonApiDotNetCore/Services/IRemoveFromRelationshipService.cs
index 923753ba44..cb572801bb 100644
--- a/src/JsonApiDotNetCore/Services/IRemoveFromRelationshipService.cs
+++ b/src/JsonApiDotNetCore/Services/IRemoveFromRelationshipService.cs
@@ -1,31 +1,27 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Resources;
 
 // ReSharper disable UnusedTypeParameter
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary />
+public interface IRemoveFromRelationshipService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary />
-    public interface IRemoveFromRelationshipService<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Handles a JSON:API request to remove resources from a to-many relationship.
-        /// </summary>
-        /// <param name="leftId">
-        /// Identifies the left side of the relationship.
-        /// </param>
-        /// <param name="relationshipName">
-        /// The relationship to remove resources from.
-        /// </param>
-        /// <param name="rightResourceIds">
-        /// The set of resources to remove from the relationship.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        Task RemoveFromToManyRelationshipAsync(TId leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Handles a JSON:API request to remove resources from a to-many relationship.
+    /// </summary>
+    /// <param name="leftId">
+    /// Identifies the left side of the relationship.
+    /// </param>
+    /// <param name="relationshipName">
+    /// The relationship to remove resources from.
+    /// </param>
+    /// <param name="rightResourceIds">
+    /// The set of resources to remove from the relationship.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    Task RemoveFromToManyRelationshipAsync(TId leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/Services/IResourceCommandService.cs b/src/JsonApiDotNetCore/Services/IResourceCommandService.cs
index 06ad5af8ca..6c6dc408c9 100644
--- a/src/JsonApiDotNetCore/Services/IResourceCommandService.cs
+++ b/src/JsonApiDotNetCore/Services/IResourceCommandService.cs
@@ -1,20 +1,19 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Groups write operations.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+public interface IResourceCommandService<TResource, in TId>
+    : ICreateService<TResource, TId>, IAddToRelationshipService<TResource, TId>, IUpdateService<TResource, TId>, ISetRelationshipService<TResource, TId>,
+        IDeleteService<TResource, TId>, IRemoveFromRelationshipService<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Groups write operations.
-    /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    public interface IResourceCommandService<TResource, in TId>
-        : ICreateService<TResource, TId>, IAddToRelationshipService<TResource, TId>, IUpdateService<TResource, TId>, ISetRelationshipService<TResource, TId>,
-            IDeleteService<TResource, TId>, IRemoveFromRelationshipService<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Services/IResourceQueryService.cs b/src/JsonApiDotNetCore/Services/IResourceQueryService.cs
index 55b210a7cc..7c9d32071f 100644
--- a/src/JsonApiDotNetCore/Services/IResourceQueryService.cs
+++ b/src/JsonApiDotNetCore/Services/IResourceQueryService.cs
@@ -1,19 +1,18 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Groups read operations.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+public interface IResourceQueryService<TResource, in TId>
+    : IGetAllService<TResource, TId>, IGetByIdService<TResource, TId>, IGetRelationshipService<TResource, TId>, IGetSecondaryService<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Groups read operations.
-    /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    public interface IResourceQueryService<TResource, in TId>
-        : IGetAllService<TResource, TId>, IGetByIdService<TResource, TId>, IGetRelationshipService<TResource, TId>, IGetSecondaryService<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Services/IResourceService.cs b/src/JsonApiDotNetCore/Services/IResourceService.cs
index d6910c93b8..87637e53a2 100644
--- a/src/JsonApiDotNetCore/Services/IResourceService.cs
+++ b/src/JsonApiDotNetCore/Services/IResourceService.cs
@@ -1,18 +1,17 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents the foundational Resource Service layer in the JsonApiDotNetCore architecture that uses a Resource Repository for data access.
+/// </summary>
+/// <typeparam name="TResource">
+/// The resource type.
+/// </typeparam>
+/// <typeparam name="TId">
+/// The resource identifier type.
+/// </typeparam>
+public interface IResourceService<TResource, in TId> : IResourceCommandService<TResource, TId>, IResourceQueryService<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Represents the foundational Resource Service layer in the JsonApiDotNetCore architecture that uses a Resource Repository for data access.
-    /// </summary>
-    /// <typeparam name="TResource">
-    /// The resource type.
-    /// </typeparam>
-    /// <typeparam name="TId">
-    /// The resource identifier type.
-    /// </typeparam>
-    public interface IResourceService<TResource, in TId> : IResourceCommandService<TResource, TId>, IResourceQueryService<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-    }
 }
diff --git a/src/JsonApiDotNetCore/Services/ISetRelationshipService.cs b/src/JsonApiDotNetCore/Services/ISetRelationshipService.cs
index 2f6f8aefad..3050394beb 100644
--- a/src/JsonApiDotNetCore/Services/ISetRelationshipService.cs
+++ b/src/JsonApiDotNetCore/Services/ISetRelationshipService.cs
@@ -1,30 +1,27 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Resources;
 
 // ReSharper disable UnusedTypeParameter
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary />
+public interface ISetRelationshipService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary />
-    public interface ISetRelationshipService<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Handles a JSON:API request to perform a complete replacement of a relationship on an existing resource.
-        /// </summary>
-        /// <param name="leftId">
-        /// Identifies the left side of the relationship.
-        /// </param>
-        /// <param name="relationshipName">
-        /// The relationship for which to perform a complete replacement.
-        /// </param>
-        /// <param name="rightValue">
-        /// The resource or set of resources to assign to the relationship.
-        /// </param>
-        /// <param name="cancellationToken">
-        /// Propagates notification that request handling should be canceled.
-        /// </param>
-        Task SetRelationshipAsync(TId leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Handles a JSON:API request to perform a complete replacement of a relationship on an existing resource.
+    /// </summary>
+    /// <param name="leftId">
+    /// Identifies the left side of the relationship.
+    /// </param>
+    /// <param name="relationshipName">
+    /// The relationship for which to perform a complete replacement.
+    /// </param>
+    /// <param name="rightValue">
+    /// The resource or set of resources to assign to the relationship.
+    /// </param>
+    /// <param name="cancellationToken">
+    /// Propagates notification that request handling should be canceled.
+    /// </param>
+    Task SetRelationshipAsync(TId leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/Services/IUpdateService.cs b/src/JsonApiDotNetCore/Services/IUpdateService.cs
index 93bb79bca3..f742a1fc2e 100644
--- a/src/JsonApiDotNetCore/Services/IUpdateService.cs
+++ b/src/JsonApiDotNetCore/Services/IUpdateService.cs
@@ -1,17 +1,14 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <summary />
+public interface IUpdateService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary />
-    public interface IUpdateService<TResource, in TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        /// <summary>
-        /// Handles a JSON:API request to update the attributes and/or relationships of an existing resource. Only the values of sent attributes are replaced.
-        /// And only the values of sent relationships are replaced.
-        /// </summary>
-        Task<TResource?> UpdateAsync(TId id, TResource resource, CancellationToken cancellationToken);
-    }
+    /// <summary>
+    /// Handles a JSON:API request to update the attributes and/or relationships of an existing resource. Only the values of sent attributes are replaced.
+    /// And only the values of sent relationships are replaced.
+    /// </summary>
+    Task<TResource?> UpdateAsync(TId id, TResource resource, CancellationToken cancellationToken);
 }
diff --git a/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs b/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs
index dab5cd54f2..87046783c5 100644
--- a/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs
+++ b/src/JsonApiDotNetCore/Services/JsonApiResourceService.cs
@@ -1,10 +1,5 @@
-using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Diagnostics;
@@ -18,548 +13,540 @@
 using Microsoft.Extensions.Logging;
 using SysNotNull = System.Diagnostics.CodeAnalysis.NotNullAttribute;
 
-namespace JsonApiDotNetCore.Services
+namespace JsonApiDotNetCore.Services;
+
+/// <inheritdoc />
+[PublicAPI]
+public class JsonApiResourceService<TResource, TId> : IResourceService<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <inheritdoc />
-    [PublicAPI]
-    public class JsonApiResourceService<TResource, TId> : IResourceService<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
+    private readonly CollectionConverter _collectionConverter = new();
+    private readonly IResourceRepositoryAccessor _repositoryAccessor;
+    private readonly IQueryLayerComposer _queryLayerComposer;
+    private readonly IPaginationContext _paginationContext;
+    private readonly IJsonApiOptions _options;
+    private readonly TraceLogWriter<JsonApiResourceService<TResource, TId>> _traceWriter;
+    private readonly IJsonApiRequest _request;
+    private readonly IResourceChangeTracker<TResource> _resourceChangeTracker;
+    private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
+
+    public JsonApiResourceService(IResourceRepositoryAccessor repositoryAccessor, IQueryLayerComposer queryLayerComposer, IPaginationContext paginationContext,
+        IJsonApiOptions options, ILoggerFactory loggerFactory, IJsonApiRequest request, IResourceChangeTracker<TResource> resourceChangeTracker,
+        IResourceDefinitionAccessor resourceDefinitionAccessor)
     {
-        private readonly CollectionConverter _collectionConverter = new();
-        private readonly IResourceRepositoryAccessor _repositoryAccessor;
-        private readonly IQueryLayerComposer _queryLayerComposer;
-        private readonly IPaginationContext _paginationContext;
-        private readonly IJsonApiOptions _options;
-        private readonly TraceLogWriter<JsonApiResourceService<TResource, TId>> _traceWriter;
-        private readonly IJsonApiRequest _request;
-        private readonly IResourceChangeTracker<TResource> _resourceChangeTracker;
-        private readonly IResourceDefinitionAccessor _resourceDefinitionAccessor;
-
-        public JsonApiResourceService(IResourceRepositoryAccessor repositoryAccessor, IQueryLayerComposer queryLayerComposer,
-            IPaginationContext paginationContext, IJsonApiOptions options, ILoggerFactory loggerFactory, IJsonApiRequest request,
-            IResourceChangeTracker<TResource> resourceChangeTracker, IResourceDefinitionAccessor resourceDefinitionAccessor)
-        {
-            ArgumentGuard.NotNull(repositoryAccessor, nameof(repositoryAccessor));
-            ArgumentGuard.NotNull(queryLayerComposer, nameof(queryLayerComposer));
-            ArgumentGuard.NotNull(paginationContext, nameof(paginationContext));
-            ArgumentGuard.NotNull(options, nameof(options));
-            ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
-            ArgumentGuard.NotNull(request, nameof(request));
-            ArgumentGuard.NotNull(resourceChangeTracker, nameof(resourceChangeTracker));
-            ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
-
-            _repositoryAccessor = repositoryAccessor;
-            _queryLayerComposer = queryLayerComposer;
-            _paginationContext = paginationContext;
-            _options = options;
-            _request = request;
-            _resourceChangeTracker = resourceChangeTracker;
-            _resourceDefinitionAccessor = resourceDefinitionAccessor;
-            _traceWriter = new TraceLogWriter<JsonApiResourceService<TResource, TId>>(loggerFactory);
-        }
-
-        /// <inheritdoc />
-        public virtual async Task<IReadOnlyCollection<TResource>> GetAsync(CancellationToken cancellationToken)
-        {
-            _traceWriter.LogMethodStart();
-
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Get resources");
+        ArgumentGuard.NotNull(repositoryAccessor, nameof(repositoryAccessor));
+        ArgumentGuard.NotNull(queryLayerComposer, nameof(queryLayerComposer));
+        ArgumentGuard.NotNull(paginationContext, nameof(paginationContext));
+        ArgumentGuard.NotNull(options, nameof(options));
+        ArgumentGuard.NotNull(loggerFactory, nameof(loggerFactory));
+        ArgumentGuard.NotNull(request, nameof(request));
+        ArgumentGuard.NotNull(resourceChangeTracker, nameof(resourceChangeTracker));
+        ArgumentGuard.NotNull(resourceDefinitionAccessor, nameof(resourceDefinitionAccessor));
+
+        _repositoryAccessor = repositoryAccessor;
+        _queryLayerComposer = queryLayerComposer;
+        _paginationContext = paginationContext;
+        _options = options;
+        _request = request;
+        _resourceChangeTracker = resourceChangeTracker;
+        _resourceDefinitionAccessor = resourceDefinitionAccessor;
+        _traceWriter = new TraceLogWriter<JsonApiResourceService<TResource, TId>>(loggerFactory);
+    }
 
-            AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
+    /// <inheritdoc />
+    public virtual async Task<IReadOnlyCollection<TResource>> GetAsync(CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart();
 
-            if (_options.IncludeTotalResourceCount)
-            {
-                FilterExpression? topFilter = _queryLayerComposer.GetPrimaryFilterFromConstraints(_request.PrimaryResourceType);
-                _paginationContext.TotalResourceCount = await _repositoryAccessor.CountAsync(_request.PrimaryResourceType, topFilter, cancellationToken);
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Get resources");
 
-                if (_paginationContext.TotalResourceCount == 0)
-                {
-                    return Array.Empty<TResource>();
-                }
-            }
+        AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
 
-            QueryLayer queryLayer = _queryLayerComposer.ComposeFromConstraints(_request.PrimaryResourceType);
-            IReadOnlyCollection<TResource> resources = await _repositoryAccessor.GetAsync<TResource>(queryLayer, cancellationToken);
+        if (_options.IncludeTotalResourceCount)
+        {
+            FilterExpression? topFilter = _queryLayerComposer.GetPrimaryFilterFromConstraints(_request.PrimaryResourceType);
+            _paginationContext.TotalResourceCount = await _repositoryAccessor.CountAsync(_request.PrimaryResourceType, topFilter, cancellationToken);
 
-            if (queryLayer.Pagination?.PageSize?.Value == resources.Count)
+            if (_paginationContext.TotalResourceCount == 0)
             {
-                _paginationContext.IsPageFull = true;
+                return Array.Empty<TResource>();
             }
-
-            return resources;
         }
 
-        /// <inheritdoc />
-        public virtual async Task<TResource> GetAsync(TId id, CancellationToken cancellationToken)
-        {
-            _traceWriter.LogMethodStart(new
-            {
-                id
-            });
-
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Get single resource");
+        QueryLayer queryLayer = _queryLayerComposer.ComposeFromConstraints(_request.PrimaryResourceType);
+        IReadOnlyCollection<TResource> resources = await _repositoryAccessor.GetAsync<TResource>(queryLayer, cancellationToken);
 
-            return await GetPrimaryResourceByIdAsync(id, TopFieldSelection.PreserveExisting, cancellationToken);
+        if (queryLayer.Pagination?.PageSize?.Value == resources.Count)
+        {
+            _paginationContext.IsPageFull = true;
         }
 
-        /// <inheritdoc />
-        public virtual async Task<object?> GetSecondaryAsync(TId id, string relationshipName, CancellationToken cancellationToken)
+        return resources;
+    }
+
+    /// <inheritdoc />
+    public virtual async Task<TResource> GetAsync(TId id, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                id,
-                relationshipName
-            });
+            id
+        });
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Get secondary resource(s)");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Get single resource");
 
-            AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
-            AssertHasRelationship(_request.Relationship, relationshipName);
+        return await GetPrimaryResourceByIdAsync(id, TopFieldSelection.PreserveExisting, cancellationToken);
+    }
 
-            if (_options.IncludeTotalResourceCount && _request.IsCollection)
-            {
-                await RetrieveResourceCountForNonPrimaryEndpointAsync(id, (HasManyAttribute)_request.Relationship, cancellationToken);
+    /// <inheritdoc />
+    public virtual async Task<object?> GetSecondaryAsync(TId id, string relationshipName, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
+        {
+            id,
+            relationshipName
+        });
 
-                // We cannot return early when _paginationContext.TotalResourceCount == 0, because we don't know whether
-                // the parent resource exists. In case the parent does not exist, an error is produced below.
-            }
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Get secondary resource(s)");
 
-            QueryLayer secondaryLayer = _queryLayerComposer.ComposeFromConstraints(_request.SecondaryResourceType!);
+        AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
+        AssertHasRelationship(_request.Relationship, relationshipName);
 
-            QueryLayer primaryLayer =
-                _queryLayerComposer.WrapLayerForSecondaryEndpoint(secondaryLayer, _request.PrimaryResourceType, id, _request.Relationship);
+        if (_options.IncludeTotalResourceCount && _request.IsCollection)
+        {
+            await RetrieveResourceCountForNonPrimaryEndpointAsync(id, (HasManyAttribute)_request.Relationship, cancellationToken);
 
-            IReadOnlyCollection<TResource> primaryResources = await _repositoryAccessor.GetAsync<TResource>(primaryLayer, cancellationToken);
+            // We cannot return early when _paginationContext.TotalResourceCount == 0, because we don't know whether
+            // the parent resource exists. In case the parent does not exist, an error is produced below.
+        }
 
-            TResource? primaryResource = primaryResources.SingleOrDefault();
-            AssertPrimaryResourceExists(primaryResource);
+        QueryLayer secondaryLayer = _queryLayerComposer.ComposeFromConstraints(_request.SecondaryResourceType!);
+        QueryLayer primaryLayer = _queryLayerComposer.WrapLayerForSecondaryEndpoint(secondaryLayer, _request.PrimaryResourceType, id, _request.Relationship);
+        IReadOnlyCollection<TResource> primaryResources = await _repositoryAccessor.GetAsync<TResource>(primaryLayer, cancellationToken);
 
-            object? rightValue = _request.Relationship.GetValue(primaryResource);
+        TResource? primaryResource = primaryResources.SingleOrDefault();
+        AssertPrimaryResourceExists(primaryResource);
 
-            if (rightValue is ICollection rightResources && secondaryLayer.Pagination?.PageSize?.Value == rightResources.Count)
-            {
-                _paginationContext.IsPageFull = true;
-            }
+        object? rightValue = _request.Relationship.GetValue(primaryResource);
 
-            return rightValue;
+        if (rightValue is ICollection rightResources && secondaryLayer.Pagination?.PageSize?.Value == rightResources.Count)
+        {
+            _paginationContext.IsPageFull = true;
         }
 
-        /// <inheritdoc />
-        public virtual async Task<object?> GetRelationshipAsync(TId id, string relationshipName, CancellationToken cancellationToken)
-        {
-            _traceWriter.LogMethodStart(new
-            {
-                id,
-                relationshipName
-            });
+        return rightValue;
+    }
 
-            ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
+    /// <inheritdoc />
+    public virtual async Task<object?> GetRelationshipAsync(TId id, string relationshipName, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
+        {
+            id,
+            relationshipName
+        });
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Get relationship");
+        ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
 
-            AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
-            AssertHasRelationship(_request.Relationship, relationshipName);
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Get relationship");
 
-            if (_options.IncludeTotalResourceCount && _request.IsCollection)
-            {
-                await RetrieveResourceCountForNonPrimaryEndpointAsync(id, (HasManyAttribute)_request.Relationship, cancellationToken);
+        AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
+        AssertHasRelationship(_request.Relationship, relationshipName);
 
-                // We cannot return early when _paginationContext.TotalResourceCount == 0, because we don't know whether
-                // the parent resource exists. In case the parent does not exist, an error is produced below.
-            }
+        if (_options.IncludeTotalResourceCount && _request.IsCollection)
+        {
+            await RetrieveResourceCountForNonPrimaryEndpointAsync(id, (HasManyAttribute)_request.Relationship, cancellationToken);
 
-            QueryLayer secondaryLayer = _queryLayerComposer.ComposeSecondaryLayerForRelationship(_request.SecondaryResourceType!);
+            // We cannot return early when _paginationContext.TotalResourceCount == 0, because we don't know whether
+            // the parent resource exists. In case the parent does not exist, an error is produced below.
+        }
 
-            QueryLayer primaryLayer =
-                _queryLayerComposer.WrapLayerForSecondaryEndpoint(secondaryLayer, _request.PrimaryResourceType, id, _request.Relationship);
+        QueryLayer secondaryLayer = _queryLayerComposer.ComposeSecondaryLayerForRelationship(_request.SecondaryResourceType!);
+        QueryLayer primaryLayer = _queryLayerComposer.WrapLayerForSecondaryEndpoint(secondaryLayer, _request.PrimaryResourceType, id, _request.Relationship);
+        IReadOnlyCollection<TResource> primaryResources = await _repositoryAccessor.GetAsync<TResource>(primaryLayer, cancellationToken);
 
-            IReadOnlyCollection<TResource> primaryResources = await _repositoryAccessor.GetAsync<TResource>(primaryLayer, cancellationToken);
+        TResource? primaryResource = primaryResources.SingleOrDefault();
+        AssertPrimaryResourceExists(primaryResource);
 
-            TResource? primaryResource = primaryResources.SingleOrDefault();
-            AssertPrimaryResourceExists(primaryResource);
+        object? rightValue = _request.Relationship.GetValue(primaryResource);
 
-            object? rightValue = _request.Relationship.GetValue(primaryResource);
+        if (rightValue is ICollection rightResources && secondaryLayer.Pagination?.PageSize?.Value == rightResources.Count)
+        {
+            _paginationContext.IsPageFull = true;
+        }
 
-            if (rightValue is ICollection rightResources && secondaryLayer.Pagination?.PageSize?.Value == rightResources.Count)
-            {
-                _paginationContext.IsPageFull = true;
-            }
+        return rightValue;
+    }
 
-            return rightValue;
-        }
+    private async Task RetrieveResourceCountForNonPrimaryEndpointAsync(TId id, HasManyAttribute relationship, CancellationToken cancellationToken)
+    {
+        FilterExpression? secondaryFilter = _queryLayerComposer.GetSecondaryFilterFromConstraints(id, relationship);
 
-        private async Task RetrieveResourceCountForNonPrimaryEndpointAsync(TId id, HasManyAttribute relationship, CancellationToken cancellationToken)
+        if (secondaryFilter != null)
         {
-            FilterExpression? secondaryFilter = _queryLayerComposer.GetSecondaryFilterFromConstraints(id, relationship);
-
-            if (secondaryFilter != null)
-            {
-                _paginationContext.TotalResourceCount = await _repositoryAccessor.CountAsync(relationship.RightType, secondaryFilter, cancellationToken);
-            }
+            _paginationContext.TotalResourceCount = await _repositoryAccessor.CountAsync(relationship.RightType, secondaryFilter, cancellationToken);
         }
+    }
 
-        /// <inheritdoc />
-        public virtual async Task<TResource?> CreateAsync(TResource resource, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task<TResource?> CreateAsync(TResource resource, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                resource
-            });
+            resource
+        });
 
-            ArgumentGuard.NotNull(resource, nameof(resource));
-            AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
+        ArgumentGuard.NotNull(resource, nameof(resource));
+        AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Create resource");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Create resource");
 
-            TResource resourceFromRequest = resource;
-            _resourceChangeTracker.SetRequestAttributeValues(resourceFromRequest);
+        TResource resourceFromRequest = resource;
+        _resourceChangeTracker.SetRequestAttributeValues(resourceFromRequest);
 
-            TResource resourceForDatabase = await _repositoryAccessor.GetForCreateAsync<TResource, TId>(resource.Id, cancellationToken);
+        TResource resourceForDatabase = await _repositoryAccessor.GetForCreateAsync<TResource, TId>(resource.Id, cancellationToken);
 
-            _resourceChangeTracker.SetInitiallyStoredAttributeValues(resourceForDatabase);
+        _resourceChangeTracker.SetInitiallyStoredAttributeValues(resourceForDatabase);
 
-            await InitializeResourceAsync(resourceForDatabase, cancellationToken);
+        await InitializeResourceAsync(resourceForDatabase, cancellationToken);
 
-            try
-            {
-                await _repositoryAccessor.CreateAsync(resourceFromRequest, resourceForDatabase, cancellationToken);
-            }
-            catch (DataStoreUpdateException)
-            {
-                await AssertPrimaryResourceDoesNotExistAsync(resourceFromRequest, cancellationToken);
-                await AssertResourcesToAssignInRelationshipsExistAsync(resourceFromRequest, cancellationToken);
-                throw;
-            }
+        try
+        {
+            await _repositoryAccessor.CreateAsync(resourceFromRequest, resourceForDatabase, cancellationToken);
+        }
+        catch (DataStoreUpdateException)
+        {
+            await AssertPrimaryResourceDoesNotExistAsync(resourceFromRequest, cancellationToken);
+            await AssertResourcesToAssignInRelationshipsExistAsync(resourceFromRequest, cancellationToken);
+            throw;
+        }
 
-            TResource resourceFromDatabase = await GetPrimaryResourceByIdAsync(resourceForDatabase.Id, TopFieldSelection.WithAllAttributes, cancellationToken);
+        TResource resourceFromDatabase = await GetPrimaryResourceByIdAsync(resourceForDatabase.Id, TopFieldSelection.WithAllAttributes, cancellationToken);
 
-            _resourceChangeTracker.SetFinallyStoredAttributeValues(resourceFromDatabase);
+        _resourceChangeTracker.SetFinallyStoredAttributeValues(resourceFromDatabase);
 
-            bool hasImplicitChanges = _resourceChangeTracker.HasImplicitChanges();
-            return hasImplicitChanges ? resourceFromDatabase : null;
-        }
+        bool hasImplicitChanges = _resourceChangeTracker.HasImplicitChanges();
+        return hasImplicitChanges ? resourceFromDatabase : null;
+    }
 
-        protected async Task AssertPrimaryResourceDoesNotExistAsync(TResource resource, CancellationToken cancellationToken)
+    protected async Task AssertPrimaryResourceDoesNotExistAsync(TResource resource, CancellationToken cancellationToken)
+    {
+        if (!Equals(resource.Id, default(TId)))
         {
-            if (!Equals(resource.Id, default(TId)))
-            {
-                TResource? existingResource = await GetPrimaryResourceByIdOrDefaultAsync(resource.Id, TopFieldSelection.OnlyIdAttribute, cancellationToken);
+            TResource? existingResource = await GetPrimaryResourceByIdOrDefaultAsync(resource.Id, TopFieldSelection.OnlyIdAttribute, cancellationToken);
 
-                if (existingResource != null)
-                {
-                    throw new ResourceAlreadyExistsException(resource.StringId!, _request.PrimaryResourceType!.PublicName);
-                }
+            if (existingResource != null)
+            {
+                throw new ResourceAlreadyExistsException(resource.StringId!, _request.PrimaryResourceType!.PublicName);
             }
         }
+    }
 
-        protected virtual async Task InitializeResourceAsync(TResource resourceForDatabase, CancellationToken cancellationToken)
-        {
-            await _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
-        }
-
-        protected async Task AssertResourcesToAssignInRelationshipsExistAsync(TResource primaryResource, CancellationToken cancellationToken)
-        {
-            var missingResources = new List<MissingResourceInRelationship>();
+    protected virtual async Task InitializeResourceAsync(TResource resourceForDatabase, CancellationToken cancellationToken)
+    {
+        await _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceForDatabase, WriteOperationKind.CreateResource, cancellationToken);
+    }
 
-            foreach ((QueryLayer queryLayer, RelationshipAttribute relationship) in _queryLayerComposer.ComposeForGetTargetedSecondaryResourceIds(
-                primaryResource))
-            {
-                object? rightValue = relationship.GetValue(primaryResource);
-                ICollection<IIdentifiable> rightResourceIds = _collectionConverter.ExtractResources(rightValue);
+    protected async Task AssertResourcesToAssignInRelationshipsExistAsync(TResource primaryResource, CancellationToken cancellationToken)
+    {
+        var missingResources = new List<MissingResourceInRelationship>();
 
-                IAsyncEnumerable<MissingResourceInRelationship> missingResourcesInRelationship =
-                    GetMissingRightResourcesAsync(queryLayer, relationship, rightResourceIds, cancellationToken);
+        foreach ((QueryLayer queryLayer, RelationshipAttribute relationship) in _queryLayerComposer.ComposeForGetTargetedSecondaryResourceIds(primaryResource))
+        {
+            object? rightValue = relationship.GetValue(primaryResource);
+            ICollection<IIdentifiable> rightResourceIds = _collectionConverter.ExtractResources(rightValue);
 
-                await missingResources.AddRangeAsync(missingResourcesInRelationship, cancellationToken);
-            }
+            IAsyncEnumerable<MissingResourceInRelationship> missingResourcesInRelationship =
+                GetMissingRightResourcesAsync(queryLayer, relationship, rightResourceIds, cancellationToken);
 
-            if (missingResources.Any())
-            {
-                throw new ResourcesInRelationshipsNotFoundException(missingResources);
-            }
+            await missingResources.AddRangeAsync(missingResourcesInRelationship, cancellationToken);
         }
 
-        private async IAsyncEnumerable<MissingResourceInRelationship> GetMissingRightResourcesAsync(QueryLayer existingRightResourceIdsQueryLayer,
-            RelationshipAttribute relationship, ICollection<IIdentifiable> rightResourceIds, [EnumeratorCancellation] CancellationToken cancellationToken)
+        if (missingResources.Any())
         {
-            IReadOnlyCollection<IIdentifiable> existingResources = await _repositoryAccessor.GetAsync(existingRightResourceIdsQueryLayer.ResourceType,
-                existingRightResourceIdsQueryLayer, cancellationToken);
+            throw new ResourcesInRelationshipsNotFoundException(missingResources);
+        }
+    }
+
+    private async IAsyncEnumerable<MissingResourceInRelationship> GetMissingRightResourcesAsync(QueryLayer existingRightResourceIdsQueryLayer,
+        RelationshipAttribute relationship, ICollection<IIdentifiable> rightResourceIds, [EnumeratorCancellation] CancellationToken cancellationToken)
+    {
+        IReadOnlyCollection<IIdentifiable> existingResources = await _repositoryAccessor.GetAsync(existingRightResourceIdsQueryLayer.ResourceType,
+            existingRightResourceIdsQueryLayer, cancellationToken);
 
-            string[] existingResourceIds = existingResources.Select(resource => resource.StringId!).ToArray();
+        string[] existingResourceIds = existingResources.Select(resource => resource.StringId!).ToArray();
 
-            foreach (IIdentifiable rightResourceId in rightResourceIds)
+        foreach (IIdentifiable rightResourceId in rightResourceIds)
+        {
+            if (!existingResourceIds.Contains(rightResourceId.StringId))
             {
-                if (!existingResourceIds.Contains(rightResourceId.StringId))
-                {
-                    yield return new MissingResourceInRelationship(relationship.PublicName, existingRightResourceIdsQueryLayer.ResourceType.PublicName,
-                        rightResourceId.StringId!);
-                }
+                yield return new MissingResourceInRelationship(relationship.PublicName, existingRightResourceIdsQueryLayer.ResourceType.PublicName,
+                    rightResourceId.StringId!);
             }
         }
+    }
 
-        /// <inheritdoc />
-        public virtual async Task AddToToManyRelationshipAsync(TId leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task AddToToManyRelationshipAsync(TId leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                leftId,
-                rightResourceIds
-            });
+            leftId,
+            rightResourceIds
+        });
 
-            ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
-            ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
+        ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
+        ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Add to to-many relationship");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Add to to-many relationship");
 
-            AssertHasRelationship(_request.Relationship, relationshipName);
-
-            if (rightResourceIds.Any() && _request.Relationship is HasManyAttribute { IsManyToMany: true } manyToManyRelationship)
-            {
-                // In the case of a many-to-many relationship, creating a duplicate entry in the join table results in a
-                // unique constraint violation. We avoid that by excluding already-existing entries from the set in advance.
-                await RemoveExistingIdsFromRelationshipRightSideAsync(manyToManyRelationship, leftId, rightResourceIds, cancellationToken);
-            }
+        AssertHasRelationship(_request.Relationship, relationshipName);
 
-            try
-            {
-                await _repositoryAccessor.AddToToManyRelationshipAsync<TResource, TId>(leftId, rightResourceIds, cancellationToken);
-            }
-            catch (DataStoreUpdateException)
-            {
-                await GetPrimaryResourceByIdAsync(leftId, TopFieldSelection.OnlyIdAttribute, cancellationToken);
-                await AssertRightResourcesExistAsync(rightResourceIds, cancellationToken);
-                throw;
-            }
+        if (rightResourceIds.Any() && _request.Relationship is HasManyAttribute { IsManyToMany: true } manyToManyRelationship)
+        {
+            // In the case of a many-to-many relationship, creating a duplicate entry in the join table results in a
+            // unique constraint violation. We avoid that by excluding already-existing entries from the set in advance.
+            await RemoveExistingIdsFromRelationshipRightSideAsync(manyToManyRelationship, leftId, rightResourceIds, cancellationToken);
         }
 
-        private async Task RemoveExistingIdsFromRelationshipRightSideAsync(HasManyAttribute hasManyRelationship, TId leftId,
-            ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+        try
+        {
+            await _repositoryAccessor.AddToToManyRelationshipAsync<TResource, TId>(leftId, rightResourceIds, cancellationToken);
+        }
+        catch (DataStoreUpdateException)
         {
-            AssertRelationshipInJsonApiRequestIsNotNull(_request.Relationship);
+            await GetPrimaryResourceByIdAsync(leftId, TopFieldSelection.OnlyIdAttribute, cancellationToken);
+            await AssertRightResourcesExistAsync(rightResourceIds, cancellationToken);
+            throw;
+        }
+    }
 
-            TResource leftResource = await GetForHasManyUpdateAsync(hasManyRelationship, leftId, rightResourceIds, cancellationToken);
+    private async Task RemoveExistingIdsFromRelationshipRightSideAsync(HasManyAttribute hasManyRelationship, TId leftId, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        AssertRelationshipInJsonApiRequestIsNotNull(_request.Relationship);
 
-            object? rightValue = _request.Relationship.GetValue(leftResource);
-            ICollection<IIdentifiable> existingRightResourceIds = _collectionConverter.ExtractResources(rightValue);
+        TResource leftResource = await GetForHasManyUpdateAsync(hasManyRelationship, leftId, rightResourceIds, cancellationToken);
 
-            rightResourceIds.ExceptWith(existingRightResourceIds);
-        }
+        object? rightValue = _request.Relationship.GetValue(leftResource);
+        ICollection<IIdentifiable> existingRightResourceIds = _collectionConverter.ExtractResources(rightValue);
 
-        private async Task<TResource> GetForHasManyUpdateAsync(HasManyAttribute hasManyRelationship, TId leftId, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-        {
-            QueryLayer queryLayer = _queryLayerComposer.ComposeForHasMany(hasManyRelationship, leftId, rightResourceIds);
-            var leftResource = await _repositoryAccessor.GetForUpdateAsync<TResource>(queryLayer, cancellationToken);
-            AssertPrimaryResourceExists(leftResource);
+        rightResourceIds.ExceptWith(existingRightResourceIds);
+    }
 
-            return leftResource;
-        }
+    private async Task<TResource> GetForHasManyUpdateAsync(HasManyAttribute hasManyRelationship, TId leftId, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        QueryLayer queryLayer = _queryLayerComposer.ComposeForHasMany(hasManyRelationship, leftId, rightResourceIds);
+        var leftResource = await _repositoryAccessor.GetForUpdateAsync<TResource>(queryLayer, cancellationToken);
+        AssertPrimaryResourceExists(leftResource);
 
-        protected async Task AssertRightResourcesExistAsync(object? rightValue, CancellationToken cancellationToken)
-        {
-            AssertRelationshipInJsonApiRequestIsNotNull(_request.Relationship);
+        return leftResource;
+    }
 
-            ICollection<IIdentifiable> rightResourceIds = _collectionConverter.ExtractResources(rightValue);
+    protected async Task AssertRightResourcesExistAsync(object? rightValue, CancellationToken cancellationToken)
+    {
+        AssertRelationshipInJsonApiRequestIsNotNull(_request.Relationship);
 
-            if (rightResourceIds.Any())
-            {
-                QueryLayer queryLayer = _queryLayerComposer.ComposeForGetRelationshipRightIds(_request.Relationship, rightResourceIds);
+        ICollection<IIdentifiable> rightResourceIds = _collectionConverter.ExtractResources(rightValue);
+
+        if (rightResourceIds.Any())
+        {
+            QueryLayer queryLayer = _queryLayerComposer.ComposeForGetRelationshipRightIds(_request.Relationship, rightResourceIds);
 
-                List<MissingResourceInRelationship> missingResources =
-                    await GetMissingRightResourcesAsync(queryLayer, _request.Relationship, rightResourceIds, cancellationToken).ToListAsync(cancellationToken);
+            List<MissingResourceInRelationship> missingResources =
+                await GetMissingRightResourcesAsync(queryLayer, _request.Relationship, rightResourceIds, cancellationToken).ToListAsync(cancellationToken);
 
-                if (missingResources.Any())
-                {
-                    throw new ResourcesInRelationshipsNotFoundException(missingResources);
-                }
+            if (missingResources.Any())
+            {
+                throw new ResourcesInRelationshipsNotFoundException(missingResources);
             }
         }
+    }
 
-        /// <inheritdoc />
-        public virtual async Task<TResource?> UpdateAsync(TId id, TResource resource, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task<TResource?> UpdateAsync(TId id, TResource resource, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                id,
-                resource
-            });
+            id,
+            resource
+        });
 
-            ArgumentGuard.NotNull(resource, nameof(resource));
+        ArgumentGuard.NotNull(resource, nameof(resource));
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Update resource");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Update resource");
 
-            TResource resourceFromRequest = resource;
-            _resourceChangeTracker.SetRequestAttributeValues(resourceFromRequest);
+        TResource resourceFromRequest = resource;
+        _resourceChangeTracker.SetRequestAttributeValues(resourceFromRequest);
 
-            TResource resourceFromDatabase = await GetPrimaryResourceForUpdateAsync(id, cancellationToken);
+        TResource resourceFromDatabase = await GetPrimaryResourceForUpdateAsync(id, cancellationToken);
 
-            _resourceChangeTracker.SetInitiallyStoredAttributeValues(resourceFromDatabase);
+        _resourceChangeTracker.SetInitiallyStoredAttributeValues(resourceFromDatabase);
 
-            await _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceFromDatabase, WriteOperationKind.UpdateResource, cancellationToken);
+        await _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceFromDatabase, WriteOperationKind.UpdateResource, cancellationToken);
 
-            try
-            {
-                await _repositoryAccessor.UpdateAsync(resourceFromRequest, resourceFromDatabase, cancellationToken);
-            }
-            catch (DataStoreUpdateException)
-            {
-                await AssertResourcesToAssignInRelationshipsExistAsync(resourceFromRequest, cancellationToken);
-                throw;
-            }
+        try
+        {
+            await _repositoryAccessor.UpdateAsync(resourceFromRequest, resourceFromDatabase, cancellationToken);
+        }
+        catch (DataStoreUpdateException)
+        {
+            await AssertResourcesToAssignInRelationshipsExistAsync(resourceFromRequest, cancellationToken);
+            throw;
+        }
 
-            TResource afterResourceFromDatabase = await GetPrimaryResourceByIdAsync(id, TopFieldSelection.WithAllAttributes, cancellationToken);
+        TResource afterResourceFromDatabase = await GetPrimaryResourceByIdAsync(id, TopFieldSelection.WithAllAttributes, cancellationToken);
 
-            _resourceChangeTracker.SetFinallyStoredAttributeValues(afterResourceFromDatabase);
+        _resourceChangeTracker.SetFinallyStoredAttributeValues(afterResourceFromDatabase);
 
-            bool hasImplicitChanges = _resourceChangeTracker.HasImplicitChanges();
-            return hasImplicitChanges ? afterResourceFromDatabase : null;
-        }
+        bool hasImplicitChanges = _resourceChangeTracker.HasImplicitChanges();
+        return hasImplicitChanges ? afterResourceFromDatabase : null;
+    }
 
-        /// <inheritdoc />
-        public virtual async Task SetRelationshipAsync(TId leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task SetRelationshipAsync(TId leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                leftId,
-                relationshipName,
-                rightValue
-            });
+            leftId,
+            relationshipName,
+            rightValue
+        });
 
-            ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
+        ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Set relationship");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Service - Set relationship");
 
-            AssertHasRelationship(_request.Relationship, relationshipName);
+        AssertHasRelationship(_request.Relationship, relationshipName);
 
-            TResource resourceFromDatabase = await GetPrimaryResourceForUpdateAsync(leftId, cancellationToken);
+        TResource resourceFromDatabase = await GetPrimaryResourceForUpdateAsync(leftId, cancellationToken);
 
-            await _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceFromDatabase, WriteOperationKind.SetRelationship, cancellationToken);
+        await _resourceDefinitionAccessor.OnPrepareWriteAsync(resourceFromDatabase, WriteOperationKind.SetRelationship, cancellationToken);
 
-            try
-            {
-                await _repositoryAccessor.SetRelationshipAsync(resourceFromDatabase, rightValue, cancellationToken);
-            }
-            catch (DataStoreUpdateException)
-            {
-                await AssertRightResourcesExistAsync(rightValue, cancellationToken);
-                throw;
-            }
+        try
+        {
+            await _repositoryAccessor.SetRelationshipAsync(resourceFromDatabase, rightValue, cancellationToken);
         }
+        catch (DataStoreUpdateException)
+        {
+            await AssertRightResourcesExistAsync(rightValue, cancellationToken);
+            throw;
+        }
+    }
 
-        /// <inheritdoc />
-        public virtual async Task DeleteAsync(TId id, CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task DeleteAsync(TId id, CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                id
-            });
+            id
+        });
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Delete resource");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Delete resource");
 
-            try
-            {
-                await _repositoryAccessor.DeleteAsync<TResource, TId>(id, cancellationToken);
-            }
-            catch (DataStoreUpdateException)
-            {
-                await GetPrimaryResourceByIdAsync(id, TopFieldSelection.OnlyIdAttribute, cancellationToken);
-                throw;
-            }
+        try
+        {
+            await _repositoryAccessor.DeleteAsync<TResource, TId>(id, cancellationToken);
+        }
+        catch (DataStoreUpdateException)
+        {
+            await GetPrimaryResourceByIdAsync(id, TopFieldSelection.OnlyIdAttribute, cancellationToken);
+            throw;
         }
+    }
 
-        /// <inheritdoc />
-        public virtual async Task RemoveFromToManyRelationshipAsync(TId leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
+    /// <inheritdoc />
+    public virtual async Task RemoveFromToManyRelationshipAsync(TId leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        _traceWriter.LogMethodStart(new
         {
-            _traceWriter.LogMethodStart(new
-            {
-                leftId,
-                relationshipName,
-                rightResourceIds
-            });
+            leftId,
+            relationshipName,
+            rightResourceIds
+        });
 
-            ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
-            ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
+        ArgumentGuard.NotNullNorEmpty(relationshipName, nameof(relationshipName));
+        ArgumentGuard.NotNull(rightResourceIds, nameof(rightResourceIds));
 
-            using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Remove from to-many relationship");
+        using IDisposable _ = CodeTimingSessionManager.Current.Measure("Repository - Remove from to-many relationship");
 
-            AssertHasRelationship(_request.Relationship, relationshipName);
-            var hasManyRelationship = (HasManyAttribute)_request.Relationship;
+        AssertHasRelationship(_request.Relationship, relationshipName);
+        var hasManyRelationship = (HasManyAttribute)_request.Relationship;
 
-            TResource resourceFromDatabase = await GetForHasManyUpdateAsync(hasManyRelationship, leftId, rightResourceIds, cancellationToken);
+        TResource resourceFromDatabase = await GetForHasManyUpdateAsync(hasManyRelationship, leftId, rightResourceIds, cancellationToken);
 
-            await AssertRightResourcesExistAsync(rightResourceIds, cancellationToken);
+        await AssertRightResourcesExistAsync(rightResourceIds, cancellationToken);
 
-            await _repositoryAccessor.RemoveFromToManyRelationshipAsync(resourceFromDatabase, rightResourceIds, cancellationToken);
-        }
+        await _repositoryAccessor.RemoveFromToManyRelationshipAsync(resourceFromDatabase, rightResourceIds, cancellationToken);
+    }
 
-        protected async Task<TResource> GetPrimaryResourceByIdAsync(TId id, TopFieldSelection fieldSelection, CancellationToken cancellationToken)
-        {
-            TResource? primaryResource = await GetPrimaryResourceByIdOrDefaultAsync(id, fieldSelection, cancellationToken);
-            AssertPrimaryResourceExists(primaryResource);
+    protected async Task<TResource> GetPrimaryResourceByIdAsync(TId id, TopFieldSelection fieldSelection, CancellationToken cancellationToken)
+    {
+        TResource? primaryResource = await GetPrimaryResourceByIdOrDefaultAsync(id, fieldSelection, cancellationToken);
+        AssertPrimaryResourceExists(primaryResource);
 
-            return primaryResource;
-        }
+        return primaryResource;
+    }
 
-        private async Task<TResource?> GetPrimaryResourceByIdOrDefaultAsync(TId id, TopFieldSelection fieldSelection, CancellationToken cancellationToken)
-        {
-            AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
+    private async Task<TResource?> GetPrimaryResourceByIdOrDefaultAsync(TId id, TopFieldSelection fieldSelection, CancellationToken cancellationToken)
+    {
+        AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
 
-            QueryLayer primaryLayer = _queryLayerComposer.ComposeForGetById(id, _request.PrimaryResourceType, fieldSelection);
+        QueryLayer primaryLayer = _queryLayerComposer.ComposeForGetById(id, _request.PrimaryResourceType, fieldSelection);
 
-            IReadOnlyCollection<TResource> primaryResources = await _repositoryAccessor.GetAsync<TResource>(primaryLayer, cancellationToken);
-            return primaryResources.SingleOrDefault();
-        }
+        IReadOnlyCollection<TResource> primaryResources = await _repositoryAccessor.GetAsync<TResource>(primaryLayer, cancellationToken);
+        return primaryResources.SingleOrDefault();
+    }
 
-        protected async Task<TResource> GetPrimaryResourceForUpdateAsync(TId id, CancellationToken cancellationToken)
-        {
-            AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
+    protected async Task<TResource> GetPrimaryResourceForUpdateAsync(TId id, CancellationToken cancellationToken)
+    {
+        AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
 
-            QueryLayer queryLayer = _queryLayerComposer.ComposeForUpdate(id, _request.PrimaryResourceType);
-            var resource = await _repositoryAccessor.GetForUpdateAsync<TResource>(queryLayer, cancellationToken);
-            AssertPrimaryResourceExists(resource);
+        QueryLayer queryLayer = _queryLayerComposer.ComposeForUpdate(id, _request.PrimaryResourceType);
+        var resource = await _repositoryAccessor.GetForUpdateAsync<TResource>(queryLayer, cancellationToken);
+        AssertPrimaryResourceExists(resource);
 
-            return resource;
-        }
+        return resource;
+    }
 
-        [AssertionMethod]
-        private void AssertPrimaryResourceExists([SysNotNull] TResource? resource)
-        {
-            AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
+    [AssertionMethod]
+    private void AssertPrimaryResourceExists([SysNotNull] TResource? resource)
+    {
+        AssertPrimaryResourceTypeInJsonApiRequestIsNotNull(_request.PrimaryResourceType);
 
-            if (resource == null)
-            {
-                throw new ResourceNotFoundException(_request.PrimaryId!, _request.PrimaryResourceType.PublicName);
-            }
+        if (resource == null)
+        {
+            throw new ResourceNotFoundException(_request.PrimaryId!, _request.PrimaryResourceType.PublicName);
         }
+    }
 
-        [AssertionMethod]
-        private void AssertHasRelationship([SysNotNull] RelationshipAttribute? relationship, string name)
+    [AssertionMethod]
+    private void AssertHasRelationship([SysNotNull] RelationshipAttribute? relationship, string name)
+    {
+        if (relationship == null)
         {
-            if (relationship == null)
-            {
-                throw new RelationshipNotFoundException(name, _request.PrimaryResourceType!.PublicName);
-            }
+            throw new RelationshipNotFoundException(name, _request.PrimaryResourceType!.PublicName);
         }
+    }
 
-        [AssertionMethod]
-        private void AssertPrimaryResourceTypeInJsonApiRequestIsNotNull([SysNotNull] ResourceType? resourceType)
+    [AssertionMethod]
+    private void AssertPrimaryResourceTypeInJsonApiRequestIsNotNull([SysNotNull] ResourceType? resourceType)
+    {
+        if (resourceType == null)
         {
-            if (resourceType == null)
-            {
-                throw new InvalidOperationException(
-                    $"Expected {nameof(IJsonApiRequest)}.{nameof(IJsonApiRequest.PrimaryResourceType)} not to be null at this point.");
-            }
+            throw new InvalidOperationException(
+                $"Expected {nameof(IJsonApiRequest)}.{nameof(IJsonApiRequest.PrimaryResourceType)} not to be null at this point.");
         }
+    }
 
-        [AssertionMethod]
-        private void AssertRelationshipInJsonApiRequestIsNotNull([SysNotNull] RelationshipAttribute? relationship)
+    [AssertionMethod]
+    private void AssertRelationshipInJsonApiRequestIsNotNull([SysNotNull] RelationshipAttribute? relationship)
+    {
+        if (relationship == null)
         {
-            if (relationship == null)
-            {
-                throw new InvalidOperationException($"Expected {nameof(IJsonApiRequest)}.{nameof(IJsonApiRequest.Relationship)} not to be null at this point.");
-            }
+            throw new InvalidOperationException($"Expected {nameof(IJsonApiRequest)}.{nameof(IJsonApiRequest.Relationship)} not to be null at this point.");
         }
     }
 }
diff --git a/src/JsonApiDotNetCore/TypeExtensions.cs b/src/JsonApiDotNetCore/TypeExtensions.cs
deleted file mode 100644
index 18e6dc6967..0000000000
--- a/src/JsonApiDotNetCore/TypeExtensions.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System;
-using System.Linq;
-
-namespace JsonApiDotNetCore
-{
-    internal static class TypeExtensions
-    {
-        /// <summary>
-        /// Whether the specified source type implements or equals the specified interface.
-        /// </summary>
-        public static bool IsOrImplementsInterface<TInterface>(this Type? source)
-        {
-            return IsOrImplementsInterface(source, typeof(TInterface));
-        }
-
-        /// <summary>
-        /// Whether the specified source type implements or equals the specified interface. This overload enables to test for an open generic interface.
-        /// </summary>
-        private static bool IsOrImplementsInterface(this Type? source, Type interfaceType)
-        {
-            ArgumentGuard.NotNull(interfaceType, nameof(interfaceType));
-
-            if (source == null)
-            {
-                return false;
-            }
-
-            return AreTypesEqual(interfaceType, source, interfaceType.IsGenericType) ||
-                source.GetInterfaces().Any(type => AreTypesEqual(interfaceType, type, interfaceType.IsGenericType));
-        }
-
-        private static bool AreTypesEqual(Type left, Type right, bool isLeftGeneric)
-        {
-            return isLeftGeneric ? right.IsGenericType && right.GetGenericTypeDefinition() == left : left == right;
-        }
-
-        /// <summary>
-        /// Gets the name of a type, including the names of its generic type parameters.
-        /// <example>
-        /// <code><![CDATA[
-        /// KeyValuePair<TimeSpan, Nullable<DateTimeOffset>>
-        /// ]]></code>
-        /// </example>
-        /// </summary>
-        public static string GetFriendlyTypeName(this Type type)
-        {
-            ArgumentGuard.NotNull(type, nameof(type));
-
-            // Based on https://stackoverflow.com/questions/2581642/how-do-i-get-the-type-name-of-a-generic-type-argument.
-
-            if (type.IsGenericType)
-            {
-                string genericArguments = type.GetGenericArguments().Select(GetFriendlyTypeName)
-                    .Aggregate((firstType, secondType) => $"{firstType}, {secondType}");
-
-                return $"{type.Name[..type.Name.IndexOf("`", StringComparison.Ordinal)]}<{genericArguments}>";
-            }
-
-            return type.Name;
-        }
-    }
-}
diff --git a/test/DiscoveryTests/DiscoveryTests.csproj b/test/DiscoveryTests/DiscoveryTests.csproj
index d9c503c784..2f1048de3f 100644
--- a/test/DiscoveryTests/DiscoveryTests.csproj
+++ b/test/DiscoveryTests/DiscoveryTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -19,4 +19,4 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/test/DiscoveryTests/PrivateResource.cs b/test/DiscoveryTests/PrivateResource.cs
index 065c63afbd..ed6dc23204 100644
--- a/test/DiscoveryTests/PrivateResource.cs
+++ b/test/DiscoveryTests/PrivateResource.cs
@@ -1,10 +1,9 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 
-namespace DiscoveryTests
+namespace DiscoveryTests;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class PrivateResource : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class PrivateResource : Identifiable<int>
-    {
-    }
 }
diff --git a/test/DiscoveryTests/PrivateResourceDefinition.cs b/test/DiscoveryTests/PrivateResourceDefinition.cs
index b3a33f556c..25ff719718 100644
--- a/test/DiscoveryTests/PrivateResourceDefinition.cs
+++ b/test/DiscoveryTests/PrivateResourceDefinition.cs
@@ -2,14 +2,13 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
 
-namespace DiscoveryTests
+namespace DiscoveryTests;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class PrivateResourceDefinition : JsonApiResourceDefinition<PrivateResource, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class PrivateResourceDefinition : JsonApiResourceDefinition<PrivateResource, int>
+    public PrivateResourceDefinition(IResourceGraph resourceGraph)
+        : base(resourceGraph)
     {
-        public PrivateResourceDefinition(IResourceGraph resourceGraph)
-            : base(resourceGraph)
-        {
-        }
     }
 }
diff --git a/test/DiscoveryTests/PrivateResourceRepository.cs b/test/DiscoveryTests/PrivateResourceRepository.cs
index 1d5b4a4a4e..cb654ea724 100644
--- a/test/DiscoveryTests/PrivateResourceRepository.cs
+++ b/test/DiscoveryTests/PrivateResourceRepository.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries;
@@ -6,16 +5,15 @@
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.Logging;
 
-namespace DiscoveryTests
+namespace DiscoveryTests;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class PrivateResourceRepository : EntityFrameworkCoreRepository<PrivateResource, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class PrivateResourceRepository : EntityFrameworkCoreRepository<PrivateResource, int>
+    public PrivateResourceRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
+        IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
+        IResourceDefinitionAccessor resourceDefinitionAccessor)
+        : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
     {
-        public PrivateResourceRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
-            IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
-        {
-        }
     }
 }
diff --git a/test/DiscoveryTests/PrivateResourceService.cs b/test/DiscoveryTests/PrivateResourceService.cs
index 47df356881..6d289eafb1 100644
--- a/test/DiscoveryTests/PrivateResourceService.cs
+++ b/test/DiscoveryTests/PrivateResourceService.cs
@@ -7,17 +7,15 @@
 using JsonApiDotNetCore.Services;
 using Microsoft.Extensions.Logging;
 
-namespace DiscoveryTests
+namespace DiscoveryTests;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class PrivateResourceService : JsonApiResourceService<PrivateResource, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class PrivateResourceService : JsonApiResourceService<PrivateResource, int>
+    public PrivateResourceService(IResourceRepositoryAccessor repositoryAccessor, IQueryLayerComposer queryLayerComposer, IPaginationContext paginationContext,
+        IJsonApiOptions options, ILoggerFactory loggerFactory, IJsonApiRequest request, IResourceChangeTracker<PrivateResource> resourceChangeTracker,
+        IResourceDefinitionAccessor resourceDefinitionAccessor)
+        : base(repositoryAccessor, queryLayerComposer, paginationContext, options, loggerFactory, request, resourceChangeTracker, resourceDefinitionAccessor)
     {
-        public PrivateResourceService(IResourceRepositoryAccessor repositoryAccessor, IQueryLayerComposer queryLayerComposer,
-            IPaginationContext paginationContext, IJsonApiOptions options, ILoggerFactory loggerFactory, IJsonApiRequest request,
-            IResourceChangeTracker<PrivateResource> resourceChangeTracker, IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(repositoryAccessor, queryLayerComposer, paginationContext, options, loggerFactory, request, resourceChangeTracker,
-                resourceDefinitionAccessor)
-        {
-        }
     }
 }
diff --git a/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs b/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs
index 668cf7d66f..3396aed54b 100644
--- a/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs
+++ b/test/DiscoveryTests/ServiceDiscoveryFacadeTests.cs
@@ -14,123 +14,122 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace DiscoveryTests
+namespace DiscoveryTests;
+
+public sealed class ServiceDiscoveryFacadeTests
 {
-    public sealed class ServiceDiscoveryFacadeTests
+    private static readonly ILoggerFactory LoggerFactory = NullLoggerFactory.Instance;
+    private readonly IServiceCollection _services = new ServiceCollection();
+    private readonly ResourceGraphBuilder _resourceGraphBuilder;
+
+    public ServiceDiscoveryFacadeTests()
+    {
+        var dbResolverMock = new Mock<IDbContextResolver>();
+        dbResolverMock.Setup(resolver => resolver.GetContext()).Returns(new Mock<DbContext>().Object);
+        _services.AddScoped(_ => dbResolverMock.Object);
+
+        IJsonApiOptions options = new JsonApiOptions();
+
+        _services.AddSingleton(options);
+        _services.AddSingleton(LoggerFactory);
+        _services.AddScoped(_ => new Mock<IJsonApiRequest>().Object);
+        _services.AddScoped(_ => new Mock<ITargetedFields>().Object);
+        _services.AddScoped(_ => new Mock<IResourceGraph>().Object);
+        _services.AddScoped(typeof(IResourceChangeTracker<>), typeof(ResourceChangeTracker<>));
+        _services.AddScoped(_ => new Mock<IResourceFactory>().Object);
+        _services.AddScoped(_ => new Mock<IPaginationContext>().Object);
+        _services.AddScoped(_ => new Mock<IQueryLayerComposer>().Object);
+        _services.AddScoped(_ => new Mock<IResourceRepositoryAccessor>().Object);
+        _services.AddScoped(_ => new Mock<IResourceDefinitionAccessor>().Object);
+
+        _resourceGraphBuilder = new ResourceGraphBuilder(options, LoggerFactory);
+    }
+
+    [Fact]
+    public void Can_add_resources_from_assembly_to_graph()
     {
-        private static readonly ILoggerFactory LoggerFactory = NullLoggerFactory.Instance;
-        private readonly IServiceCollection _services = new ServiceCollection();
-        private readonly ResourceGraphBuilder _resourceGraphBuilder;
-
-        public ServiceDiscoveryFacadeTests()
-        {
-            var dbResolverMock = new Mock<IDbContextResolver>();
-            dbResolverMock.Setup(resolver => resolver.GetContext()).Returns(new Mock<DbContext>().Object);
-            _services.AddScoped(_ => dbResolverMock.Object);
-
-            IJsonApiOptions options = new JsonApiOptions();
-
-            _services.AddSingleton(options);
-            _services.AddSingleton(LoggerFactory);
-            _services.AddScoped(_ => new Mock<IJsonApiRequest>().Object);
-            _services.AddScoped(_ => new Mock<ITargetedFields>().Object);
-            _services.AddScoped(_ => new Mock<IResourceGraph>().Object);
-            _services.AddScoped(typeof(IResourceChangeTracker<>), typeof(ResourceChangeTracker<>));
-            _services.AddScoped(_ => new Mock<IResourceFactory>().Object);
-            _services.AddScoped(_ => new Mock<IPaginationContext>().Object);
-            _services.AddScoped(_ => new Mock<IQueryLayerComposer>().Object);
-            _services.AddScoped(_ => new Mock<IResourceRepositoryAccessor>().Object);
-            _services.AddScoped(_ => new Mock<IResourceDefinitionAccessor>().Object);
-
-            _resourceGraphBuilder = new ResourceGraphBuilder(options, LoggerFactory);
-        }
-
-        [Fact]
-        public void Can_add_resources_from_assembly_to_graph()
-        {
-            // Arrange
-            var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, LoggerFactory);
-            facade.AddAssembly(typeof(Person).Assembly);
-
-            // Act
-            facade.DiscoverResources();
-
-            // Assert
-            IResourceGraph resourceGraph = _resourceGraphBuilder.Build();
-
-            ResourceType? personType = resourceGraph.FindResourceType(typeof(Person));
-            personType.ShouldNotBeNull();
-
-            ResourceType? todoItemType = resourceGraph.FindResourceType(typeof(TodoItem));
-            todoItemType.ShouldNotBeNull();
-        }
-
-        [Fact]
-        public void Can_add_resource_from_current_assembly_to_graph()
-        {
-            // Arrange
-            var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, LoggerFactory);
-            facade.AddCurrentAssembly();
-
-            // Act
-            facade.DiscoverResources();
-
-            // Assert
-            IResourceGraph resourceGraph = _resourceGraphBuilder.Build();
-
-            ResourceType? testResourceType = resourceGraph.FindResourceType(typeof(PrivateResource));
-            testResourceType.ShouldNotBeNull();
-        }
-
-        [Fact]
-        public void Can_add_resource_service_from_current_assembly_to_container()
-        {
-            // Arrange
-            var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, LoggerFactory);
-            facade.AddCurrentAssembly();
-
-            // Act
-            facade.DiscoverInjectables();
-
-            // Assert
-            ServiceProvider services = _services.BuildServiceProvider();
-
-            var resourceService = services.GetRequiredService<IResourceService<PrivateResource, int>>();
-            resourceService.Should().BeOfType<PrivateResourceService>();
-        }
-
-        [Fact]
-        public void Can_add_resource_repository_from_current_assembly_to_container()
-        {
-            // Arrange
-            var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, LoggerFactory);
-            facade.AddCurrentAssembly();
-
-            // Act
-            facade.DiscoverInjectables();
-
-            // Assert
-            ServiceProvider services = _services.BuildServiceProvider();
-
-            var resourceRepository = services.GetRequiredService<IResourceRepository<PrivateResource, int>>();
-            resourceRepository.Should().BeOfType<PrivateResourceRepository>();
-        }
-
-        [Fact]
-        public void Can_add_resource_definition_from_current_assembly_to_container()
-        {
-            // Arrange
-            var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, LoggerFactory);
-            facade.AddCurrentAssembly();
-
-            // Act
-            facade.DiscoverInjectables();
-
-            // Assert
-            ServiceProvider services = _services.BuildServiceProvider();
-
-            var resourceDefinition = services.GetRequiredService<IResourceDefinition<PrivateResource, int>>();
-            resourceDefinition.Should().BeOfType<PrivateResourceDefinition>();
-        }
+        // Arrange
+        var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, LoggerFactory);
+        facade.AddAssembly(typeof(Person).Assembly);
+
+        // Act
+        facade.DiscoverResources();
+
+        // Assert
+        IResourceGraph resourceGraph = _resourceGraphBuilder.Build();
+
+        ResourceType? personType = resourceGraph.FindResourceType(typeof(Person));
+        personType.ShouldNotBeNull();
+
+        ResourceType? todoItemType = resourceGraph.FindResourceType(typeof(TodoItem));
+        todoItemType.ShouldNotBeNull();
+    }
+
+    [Fact]
+    public void Can_add_resource_from_current_assembly_to_graph()
+    {
+        // Arrange
+        var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, LoggerFactory);
+        facade.AddCurrentAssembly();
+
+        // Act
+        facade.DiscoverResources();
+
+        // Assert
+        IResourceGraph resourceGraph = _resourceGraphBuilder.Build();
+
+        ResourceType? testResourceType = resourceGraph.FindResourceType(typeof(PrivateResource));
+        testResourceType.ShouldNotBeNull();
+    }
+
+    [Fact]
+    public void Can_add_resource_service_from_current_assembly_to_container()
+    {
+        // Arrange
+        var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, LoggerFactory);
+        facade.AddCurrentAssembly();
+
+        // Act
+        facade.DiscoverInjectables();
+
+        // Assert
+        ServiceProvider services = _services.BuildServiceProvider();
+
+        var resourceService = services.GetRequiredService<IResourceService<PrivateResource, int>>();
+        resourceService.Should().BeOfType<PrivateResourceService>();
+    }
+
+    [Fact]
+    public void Can_add_resource_repository_from_current_assembly_to_container()
+    {
+        // Arrange
+        var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, LoggerFactory);
+        facade.AddCurrentAssembly();
+
+        // Act
+        facade.DiscoverInjectables();
+
+        // Assert
+        ServiceProvider services = _services.BuildServiceProvider();
+
+        var resourceRepository = services.GetRequiredService<IResourceRepository<PrivateResource, int>>();
+        resourceRepository.Should().BeOfType<PrivateResourceRepository>();
+    }
+
+    [Fact]
+    public void Can_add_resource_definition_from_current_assembly_to_container()
+    {
+        // Arrange
+        var facade = new ServiceDiscoveryFacade(_services, _resourceGraphBuilder, LoggerFactory);
+        facade.AddCurrentAssembly();
+
+        // Act
+        facade.DiscoverInjectables();
+
+        // Assert
+        ServiceProvider services = _services.BuildServiceProvider();
+
+        var resourceDefinition = services.GetRequiredService<IResourceDefinition<PrivateResource, int>>();
+        resourceDefinition.Should().BeOfType<PrivateResourceDefinition>();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/ArchiveTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/ArchiveTests.cs
index 039cd0840e..5053d17e09 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/ArchiveTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/ArchiveTests.cs
@@ -1,681 +1,663 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
+namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
+
+public sealed class ArchiveTests : IClassFixture<IntegrationTestContext<TestableStartup<TelevisionDbContext>, TelevisionDbContext>>
 {
-    public sealed class ArchiveTests : IClassFixture<IntegrationTestContext<TestableStartup<TelevisionDbContext>, TelevisionDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<TelevisionDbContext>, TelevisionDbContext> _testContext;
+    private readonly TelevisionFakers _fakers = new();
+
+    public ArchiveTests(IntegrationTestContext<TestableStartup<TelevisionDbContext>, TelevisionDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<TelevisionDbContext>, TelevisionDbContext> _testContext;
-        private readonly TelevisionFakers _fakers = new();
+        _testContext = testContext;
 
-        public ArchiveTests(IntegrationTestContext<TestableStartup<TelevisionDbContext>, TelevisionDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<TelevisionNetworksController>();
+        testContext.UseController<TelevisionStationsController>();
+        testContext.UseController<TelevisionBroadcastsController>();
+        testContext.UseController<BroadcastCommentsController>();
 
-            testContext.UseController<TelevisionNetworksController>();
-            testContext.UseController<TelevisionStationsController>();
-            testContext.UseController<TelevisionBroadcastsController>();
-            testContext.UseController<BroadcastCommentsController>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<TelevisionBroadcastDefinition>();
+        });
+    }
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<TelevisionBroadcastDefinition>();
-            });
-        }
+    [Fact]
+    public async Task Can_get_archived_resource_by_ID()
+    {
+        // Arrange
+        TelevisionBroadcast broadcast = _fakers.TelevisionBroadcast.Generate();
 
-        [Fact]
-        public async Task Can_get_archived_resource_by_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            TelevisionBroadcast broadcast = _fakers.TelevisionBroadcast.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Broadcasts.Add(broadcast);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Broadcasts.Add(broadcast);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/televisionBroadcasts/{broadcast.StringId}";
+        string route = $"/televisionBroadcasts/{broadcast.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(broadcast.StringId);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(broadcast.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("archivedAt").With(value => value.Should().Be(broadcast.ArchivedAt));
+    }
 
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("archivedAt")
-                .With(value => value.As<DateTimeOffset?>().Should().BeCloseTo(broadcast.ArchivedAt!.Value));
-        }
+    [Fact]
+    public async Task Can_get_unarchived_resource_by_ID()
+    {
+        // Arrange
+        TelevisionBroadcast broadcast = _fakers.TelevisionBroadcast.Generate();
+        broadcast.ArchivedAt = null;
 
-        [Fact]
-        public async Task Can_get_unarchived_resource_by_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            TelevisionBroadcast broadcast = _fakers.TelevisionBroadcast.Generate();
-            broadcast.ArchivedAt = null;
+            dbContext.Broadcasts.Add(broadcast);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Broadcasts.Add(broadcast);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/televisionBroadcasts/{broadcast.StringId}";
 
-            string route = $"/televisionBroadcasts/{broadcast.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(broadcast.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
+    }
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(broadcast.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("archivedAt").With(value => value.As<DateTimeOffset?>().Should().BeNull());
-        }
+    [Fact]
+    public async Task Get_primary_resources_excludes_archived()
+    {
+        // Arrange
+        List<TelevisionBroadcast> broadcasts = _fakers.TelevisionBroadcast.Generate(2);
+        broadcasts[1].ArchivedAt = null;
 
-        [Fact]
-        public async Task Get_primary_resources_excludes_archived()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<TelevisionBroadcast> broadcasts = _fakers.TelevisionBroadcast.Generate(2);
-            broadcasts[1].ArchivedAt = null;
+            await dbContext.ClearTableAsync<TelevisionBroadcast>();
+            dbContext.Broadcasts.AddRange(broadcasts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<TelevisionBroadcast>();
-                dbContext.Broadcasts.AddRange(broadcasts);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/televisionBroadcasts";
 
-            const string route = "/televisionBroadcasts";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(broadcasts[1].StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(broadcasts[1].StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("archivedAt").With(value => value.As<DateTimeOffset?>().Should().BeNull());
-        }
+    [Fact]
+    public async Task Get_primary_resources_with_filter_includes_archived()
+    {
+        // Arrange
+        List<TelevisionBroadcast> broadcasts = _fakers.TelevisionBroadcast.Generate(2);
+        broadcasts[1].ArchivedAt = null;
 
-        [Fact]
-        public async Task Get_primary_resources_with_filter_includes_archived()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<TelevisionBroadcast> broadcasts = _fakers.TelevisionBroadcast.Generate(2);
-            broadcasts[1].ArchivedAt = null;
+            await dbContext.ClearTableAsync<TelevisionBroadcast>();
+            dbContext.Broadcasts.AddRange(broadcasts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<TelevisionBroadcast>();
-                dbContext.Broadcasts.AddRange(broadcasts);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/televisionBroadcasts?filter=or(equals(archivedAt,null),not(equals(archivedAt,null)))";
+        const string route = "/televisionBroadcasts?filter=or(equals(archivedAt,null),not(equals(archivedAt,null)))";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(broadcasts[0].StringId);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(broadcasts[0].StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().Be(broadcasts[0].ArchivedAt));
 
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("archivedAt")
-                .With(value => value.As<DateTimeOffset?>().Should().BeCloseTo(broadcasts[0].ArchivedAt!.Value));
+        responseDocument.Data.ManyValue[1].Id.Should().Be(broadcasts[1].StringId);
+        responseDocument.Data.ManyValue[1].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
+    }
 
-            responseDocument.Data.ManyValue[1].Id.Should().Be(broadcasts[1].StringId);
-            responseDocument.Data.ManyValue[1].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
-        }
+    [Fact]
+    public async Task Get_primary_resource_by_ID_with_include_excludes_archived()
+    {
+        // Arrange
+        TelevisionStation station = _fakers.TelevisionStation.Generate();
+        station.Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
+        station.Broadcasts.ElementAt(1).ArchivedAt = null;
 
-        [Fact]
-        public async Task Get_primary_resource_by_ID_with_include_excludes_archived()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            TelevisionStation station = _fakers.TelevisionStation.Generate();
-            station.Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
-            station.Broadcasts.ElementAt(1).ArchivedAt = null;
+            dbContext.Stations.Add(station);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Stations.Add(station);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/televisionStations/{station.StringId}?include=broadcasts";
 
-            string route = $"/televisionStations/{station.StringId}?include=broadcasts";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(station.StringId);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(station.StringId);
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
+    }
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
-        }
+    [Fact]
+    public async Task Get_primary_resource_by_ID_with_include_and_filter_includes_archived()
+    {
+        // Arrange
+        TelevisionStation station = _fakers.TelevisionStation.Generate();
+        station.Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
+        station.Broadcasts.ElementAt(1).ArchivedAt = null;
 
-        [Fact]
-        public async Task Get_primary_resource_by_ID_with_include_and_filter_includes_archived()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            TelevisionStation station = _fakers.TelevisionStation.Generate();
-            station.Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
-            station.Broadcasts.ElementAt(1).ArchivedAt = null;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Stations.Add(station);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Stations.Add(station);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route =
-                $"/televisionStations/{station.StringId}?include=broadcasts&filter[broadcasts]=or(equals(archivedAt,null),not(equals(archivedAt,null)))";
+        string route = $"/televisionStations/{station.StringId}?include=broadcasts&filter[broadcasts]=or(equals(archivedAt,null),not(equals(archivedAt,null)))";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            DateTimeOffset archivedAt0 = station.Broadcasts.ElementAt(0).ArchivedAt!.Value;
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(station.StringId);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(station.StringId);
+        responseDocument.Included.ShouldHaveCount(2);
+        responseDocument.Included[0].Id.Should().Be(station.Broadcasts.ElementAt(0).StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().Be(station.Broadcasts.ElementAt(0).ArchivedAt));
+        responseDocument.Included[1].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
+        responseDocument.Included[1].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
+    }
 
-            responseDocument.Included.ShouldHaveCount(2);
-            responseDocument.Included[0].Id.Should().Be(station.Broadcasts.ElementAt(0).StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("archivedAt").With(value => value.As<DateTimeOffset?>().Should().BeCloseTo(archivedAt0));
-            responseDocument.Included[1].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
-            responseDocument.Included[1].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
-        }
+    [Fact]
+    public async Task Get_secondary_resource_includes_archived()
+    {
+        // Arrange
+        BroadcastComment comment = _fakers.BroadcastComment.Generate();
+        comment.AppliesTo = _fakers.TelevisionBroadcast.Generate();
 
-        [Fact]
-        public async Task Get_secondary_resource_includes_archived()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BroadcastComment comment = _fakers.BroadcastComment.Generate();
-            comment.AppliesTo = _fakers.TelevisionBroadcast.Generate();
+            dbContext.Comments.Add(comment);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Comments.Add(comment);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/broadcastComments/{comment.StringId}/appliesTo";
+        string route = $"/broadcastComments/{comment.StringId}/appliesTo";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(comment.AppliesTo.StringId);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(comment.AppliesTo.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("archivedAt").With(value => value.Should().Be(comment.AppliesTo.ArchivedAt));
+    }
 
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("archivedAt")
-                .With(value => value.As<DateTimeOffset?>().Should().BeCloseTo(comment.AppliesTo.ArchivedAt!.Value));
-        }
+    [Fact]
+    public async Task Get_secondary_resources_excludes_archived()
+    {
+        // Arrange
+        TelevisionStation station = _fakers.TelevisionStation.Generate();
+        station.Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
+        station.Broadcasts.ElementAt(1).ArchivedAt = null;
 
-        [Fact]
-        public async Task Get_secondary_resources_excludes_archived()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            TelevisionStation station = _fakers.TelevisionStation.Generate();
-            station.Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
-            station.Broadcasts.ElementAt(1).ArchivedAt = null;
+            dbContext.Stations.Add(station);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Stations.Add(station);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/televisionStations/{station.StringId}/broadcasts";
 
-            string route = $"/televisionStations/{station.StringId}/broadcasts";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
-        }
+    [Fact]
+    public async Task Get_secondary_resources_with_filter_includes_archived()
+    {
+        // Arrange
+        TelevisionStation station = _fakers.TelevisionStation.Generate();
+        station.Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
+        station.Broadcasts.ElementAt(1).ArchivedAt = null;
 
-        [Fact]
-        public async Task Get_secondary_resources_with_filter_includes_archived()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            TelevisionStation station = _fakers.TelevisionStation.Generate();
-            station.Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
-            station.Broadcasts.ElementAt(1).ArchivedAt = null;
+            dbContext.Stations.Add(station);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Stations.Add(station);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/televisionStations/{station.StringId}/broadcasts?filter=or(equals(archivedAt,null),not(equals(archivedAt,null)))";
 
-            string route = $"/televisionStations/{station.StringId}/broadcasts?filter=or(equals(archivedAt,null),not(equals(archivedAt,null)))";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        DateTimeOffset archivedAt0 = station.Broadcasts.ElementAt(0).ArchivedAt!.Value;
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(station.Broadcasts.ElementAt(0).StringId);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(station.Broadcasts.ElementAt(0).StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().Be(archivedAt0));
 
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("archivedAt").With(value =>
-                value.As<DateTimeOffset?>().Should().BeCloseTo(station.Broadcasts.ElementAt(0).ArchivedAt!.Value));
+        responseDocument.Data.ManyValue[1].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
+        responseDocument.Data.ManyValue[1].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
+    }
 
-            responseDocument.Data.ManyValue[1].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
-            responseDocument.Data.ManyValue[1].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
-        }
+    [Fact]
+    public async Task Get_secondary_resource_by_ID_with_include_excludes_archived()
+    {
+        // Arrange
+        TelevisionNetwork network = _fakers.TelevisionNetwork.Generate();
+        network.Stations = _fakers.TelevisionStation.Generate(1).ToHashSet();
+        network.Stations.ElementAt(0).Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
+        network.Stations.ElementAt(0).Broadcasts.ElementAt(1).ArchivedAt = null;
 
-        [Fact]
-        public async Task Get_secondary_resource_by_ID_with_include_excludes_archived()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            TelevisionNetwork network = _fakers.TelevisionNetwork.Generate();
-            network.Stations = _fakers.TelevisionStation.Generate(1).ToHashSet();
-            network.Stations.ElementAt(0).Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
-            network.Stations.ElementAt(0).Broadcasts.ElementAt(1).ArchivedAt = null;
+            dbContext.Networks.Add(network);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Networks.Add(network);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/televisionNetworks/{network.StringId}/stations?include=broadcasts";
 
-            string route = $"/televisionNetworks/{network.StringId}/stations?include=broadcasts";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(network.Stations.ElementAt(0).StringId);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(network.Stations.ElementAt(0).StringId);
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Id.Should().Be(network.Stations.ElementAt(0).Broadcasts.ElementAt(1).StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
+    }
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Id.Should().Be(network.Stations.ElementAt(0).Broadcasts.ElementAt(1).StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
-        }
+    [Fact]
+    public async Task Get_secondary_resource_by_ID_with_include_and_filter_includes_archived()
+    {
+        TelevisionNetwork network = _fakers.TelevisionNetwork.Generate();
+        network.Stations = _fakers.TelevisionStation.Generate(1).ToHashSet();
+        network.Stations.ElementAt(0).Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
+        network.Stations.ElementAt(0).Broadcasts.ElementAt(1).ArchivedAt = null;
 
-        [Fact]
-        public async Task Get_secondary_resource_by_ID_with_include_and_filter_includes_archived()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            TelevisionNetwork network = _fakers.TelevisionNetwork.Generate();
-            network.Stations = _fakers.TelevisionStation.Generate(1).ToHashSet();
-            network.Stations.ElementAt(0).Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
-            network.Stations.ElementAt(0).Broadcasts.ElementAt(1).ArchivedAt = null;
+            dbContext.Networks.Add(network);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Networks.Add(network);
-                await dbContext.SaveChangesAsync();
-            });
+        string route =
+            $"/televisionNetworks/{network.StringId}/stations?include=broadcasts&filter[broadcasts]=or(equals(archivedAt,null),not(equals(archivedAt,null)))";
 
-            string route =
-                $"/televisionNetworks/{network.StringId}/stations?include=broadcasts&filter[broadcasts]=or(equals(archivedAt,null),not(equals(archivedAt,null)))";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        DateTimeOffset archivedAt0 = network.Stations.ElementAt(0).Broadcasts.ElementAt(0).ArchivedAt!.Value;
 
-            DateTimeOffset archivedAt0 = network.Stations.ElementAt(0).Broadcasts.ElementAt(0).ArchivedAt!.Value;
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(network.Stations.ElementAt(0).StringId);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(network.Stations.ElementAt(0).StringId);
+        responseDocument.Included.ShouldHaveCount(2);
+        responseDocument.Included[0].Id.Should().Be(network.Stations.ElementAt(0).Broadcasts.ElementAt(0).StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().Be(archivedAt0));
+        responseDocument.Included[1].Id.Should().Be(network.Stations.ElementAt(0).Broadcasts.ElementAt(1).StringId);
+        responseDocument.Included[1].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
+    }
 
-            responseDocument.Included.ShouldHaveCount(2);
-            responseDocument.Included[0].Id.Should().Be(network.Stations.ElementAt(0).Broadcasts.ElementAt(0).StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("archivedAt").With(value => value.As<DateTimeOffset?>().Should().BeCloseTo(archivedAt0));
-            responseDocument.Included[1].Id.Should().Be(network.Stations.ElementAt(0).Broadcasts.ElementAt(1).StringId);
-            responseDocument.Included[1].Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
-        }
+    [Fact]
+    public async Task Get_ToMany_relationship_excludes_archived()
+    {
+        // Arrange
+        TelevisionStation station = _fakers.TelevisionStation.Generate();
+        station.Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
+        station.Broadcasts.ElementAt(1).ArchivedAt = null;
 
-        [Fact]
-        public async Task Get_ToMany_relationship_excludes_archived()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            TelevisionStation station = _fakers.TelevisionStation.Generate();
-            station.Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
-            station.Broadcasts.ElementAt(1).ArchivedAt = null;
+            dbContext.Stations.Add(station);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Stations.Add(station);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/televisionStations/{station.StringId}/relationships/broadcasts";
 
-            string route = $"/televisionStations/{station.StringId}/relationships/broadcasts";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
-        }
+    [Fact]
+    public async Task Get_ToMany_relationship_with_filter_includes_archived()
+    {
+        // Arrange
+        TelevisionStation station = _fakers.TelevisionStation.Generate();
+        station.Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
+        station.Broadcasts.ElementAt(1).ArchivedAt = null;
 
-        [Fact]
-        public async Task Get_ToMany_relationship_with_filter_includes_archived()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            TelevisionStation station = _fakers.TelevisionStation.Generate();
-            station.Broadcasts = _fakers.TelevisionBroadcast.Generate(2).ToHashSet();
-            station.Broadcasts.ElementAt(1).ArchivedAt = null;
+            dbContext.Stations.Add(station);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Stations.Add(station);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/televisionStations/{station.StringId}/relationships/broadcasts?filter=or(equals(archivedAt,null),not(equals(archivedAt,null)))";
 
-            string route = $"/televisionStations/{station.StringId}/relationships/broadcasts?filter=or(equals(archivedAt,null),not(equals(archivedAt,null)))";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(station.Broadcasts.ElementAt(0).StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(station.Broadcasts.ElementAt(0).StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(station.Broadcasts.ElementAt(1).StringId);
-        }
+    [Fact]
+    public async Task Can_create_unarchived_resource()
+    {
+        // Arrange
+        TelevisionBroadcast newBroadcast = _fakers.TelevisionBroadcast.Generate();
 
-        [Fact]
-        public async Task Can_create_unarchived_resource()
+        var requestBody = new
         {
-            // Arrange
-            TelevisionBroadcast newBroadcast = _fakers.TelevisionBroadcast.Generate();
-
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "televisionBroadcasts",
+                attributes = new
                 {
-                    type = "televisionBroadcasts",
-                    attributes = new
-                    {
-                        title = newBroadcast.Title,
-                        airedAt = newBroadcast.AiredAt
-                    }
+                    title = newBroadcast.Title,
+                    airedAt = newBroadcast.AiredAt
                 }
-            };
-
-            const string route = "/televisionBroadcasts";
+            }
+        };
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        const string route = "/televisionBroadcasts";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newBroadcast.Title));
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("airedAt")
-                .With(value => value.As<DateTimeOffset>().Should().BeCloseTo(newBroadcast.AiredAt));
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newBroadcast.Title));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("airedAt").With(value => value.Should().Be(newBroadcast.AiredAt));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
+    }
 
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("archivedAt").With(value => value.Should().BeNull());
-        }
+    [Fact]
+    public async Task Cannot_create_archived_resource()
+    {
+        // Arrange
+        TelevisionBroadcast newBroadcast = _fakers.TelevisionBroadcast.Generate();
 
-        [Fact]
-        public async Task Cannot_create_archived_resource()
+        var requestBody = new
         {
-            // Arrange
-            TelevisionBroadcast newBroadcast = _fakers.TelevisionBroadcast.Generate();
-
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "televisionBroadcasts",
+                attributes = new
                 {
-                    type = "televisionBroadcasts",
-                    attributes = new
-                    {
-                        title = newBroadcast.Title,
-                        airedAt = newBroadcast.AiredAt,
-                        archivedAt = newBroadcast.ArchivedAt
-                    }
+                    title = newBroadcast.Title,
+                    airedAt = newBroadcast.AiredAt,
+                    archivedAt = newBroadcast.ArchivedAt
                 }
-            };
+            }
+        };
 
-            const string route = "/televisionBroadcasts";
+        const string route = "/televisionBroadcasts";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("Television broadcasts cannot be created in archived state.");
-            error.Detail.Should().BeNull();
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("Television broadcasts cannot be created in archived state.");
+        error.Detail.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Can_archive_resource()
-        {
-            // Arrange
-            TelevisionBroadcast existingBroadcast = _fakers.TelevisionBroadcast.Generate();
-            existingBroadcast.ArchivedAt = null;
+    [Fact]
+    public async Task Can_archive_resource()
+    {
+        // Arrange
+        TelevisionBroadcast existingBroadcast = _fakers.TelevisionBroadcast.Generate();
+        existingBroadcast.ArchivedAt = null;
 
-            DateTimeOffset newArchivedAt = _fakers.TelevisionBroadcast.Generate().ArchivedAt!.Value;
+        DateTimeOffset newArchivedAt = _fakers.TelevisionBroadcast.Generate().ArchivedAt!.Value;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Broadcasts.Add(existingBroadcast);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Broadcasts.Add(existingBroadcast);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "televisionBroadcasts",
+                id = existingBroadcast.StringId,
+                attributes = new
                 {
-                    type = "televisionBroadcasts",
-                    id = existingBroadcast.StringId,
-                    attributes = new
-                    {
-                        archivedAt = newArchivedAt
-                    }
+                    archivedAt = newArchivedAt
                 }
-            };
+            }
+        };
 
-            string route = $"/televisionBroadcasts/{existingBroadcast.StringId}";
+        string route = $"/televisionBroadcasts/{existingBroadcast.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                TelevisionBroadcast broadcastInDatabase = await dbContext.Broadcasts.FirstWithIdAsync(existingBroadcast.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            TelevisionBroadcast broadcastInDatabase = await dbContext.Broadcasts.FirstWithIdAsync(existingBroadcast.Id);
 
-                broadcastInDatabase.ArchivedAt.Should().BeCloseTo(newArchivedAt);
-            });
-        }
+            broadcastInDatabase.ArchivedAt.Should().Be(newArchivedAt);
+        });
+    }
 
-        [Fact]
-        public async Task Can_unarchive_resource()
-        {
-            // Arrange
-            TelevisionBroadcast broadcast = _fakers.TelevisionBroadcast.Generate();
+    [Fact]
+    public async Task Can_unarchive_resource()
+    {
+        // Arrange
+        TelevisionBroadcast broadcast = _fakers.TelevisionBroadcast.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Broadcasts.Add(broadcast);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Broadcasts.Add(broadcast);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "televisionBroadcasts",
+                id = broadcast.StringId,
+                attributes = new
                 {
-                    type = "televisionBroadcasts",
-                    id = broadcast.StringId,
-                    attributes = new
-                    {
-                        archivedAt = (DateTimeOffset?)null
-                    }
+                    archivedAt = (DateTimeOffset?)null
                 }
-            };
+            }
+        };
 
-            string route = $"/televisionBroadcasts/{broadcast.StringId}";
+        string route = $"/televisionBroadcasts/{broadcast.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                TelevisionBroadcast broadcastInDatabase = await dbContext.Broadcasts.FirstWithIdAsync(broadcast.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            TelevisionBroadcast broadcastInDatabase = await dbContext.Broadcasts.FirstWithIdAsync(broadcast.Id);
 
-                broadcastInDatabase.ArchivedAt.Should().BeNull();
-            });
-        }
+            broadcastInDatabase.ArchivedAt.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_shift_archive_date()
-        {
-            // Arrange
-            TelevisionBroadcast broadcast = _fakers.TelevisionBroadcast.Generate();
+    [Fact]
+    public async Task Cannot_shift_archive_date()
+    {
+        // Arrange
+        TelevisionBroadcast broadcast = _fakers.TelevisionBroadcast.Generate();
 
-            DateTimeOffset? newArchivedAt = _fakers.TelevisionBroadcast.Generate().ArchivedAt;
+        DateTimeOffset? newArchivedAt = _fakers.TelevisionBroadcast.Generate().ArchivedAt;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Broadcasts.Add(broadcast);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Broadcasts.Add(broadcast);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "televisionBroadcasts",
+                id = broadcast.StringId,
+                attributes = new
                 {
-                    type = "televisionBroadcasts",
-                    id = broadcast.StringId,
-                    attributes = new
-                    {
-                        archivedAt = newArchivedAt
-                    }
+                    archivedAt = newArchivedAt
                 }
-            };
+            }
+        };
 
-            string route = $"/televisionBroadcasts/{broadcast.StringId}";
+        string route = $"/televisionBroadcasts/{broadcast.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("Archive date of television broadcasts cannot be shifted. Unarchive it first.");
-            error.Detail.Should().BeNull();
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("Archive date of television broadcasts cannot be shifted. Unarchive it first.");
+        error.Detail.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Can_delete_archived_resource()
+    {
+        // Arrange
+        TelevisionBroadcast broadcast = _fakers.TelevisionBroadcast.Generate();
 
-        [Fact]
-        public async Task Can_delete_archived_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            TelevisionBroadcast broadcast = _fakers.TelevisionBroadcast.Generate();
+            dbContext.Broadcasts.Add(broadcast);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Broadcasts.Add(broadcast);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/televisionBroadcasts/{broadcast.StringId}";
 
-            string route = $"/televisionBroadcasts/{broadcast.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            TelevisionBroadcast? broadcastInDatabase = await dbContext.Broadcasts.FirstWithIdOrDefaultAsync(broadcast.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                TelevisionBroadcast? broadcastInDatabase = await dbContext.Broadcasts.FirstWithIdOrDefaultAsync(broadcast.Id);
+            broadcastInDatabase.Should().BeNull();
+        });
+    }
 
-                broadcastInDatabase.Should().BeNull();
-            });
-        }
+    [Fact]
+    public async Task Cannot_delete_unarchived_resource()
+    {
+        // Arrange
+        TelevisionBroadcast broadcast = _fakers.TelevisionBroadcast.Generate();
+        broadcast.ArchivedAt = null;
 
-        [Fact]
-        public async Task Cannot_delete_unarchived_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            TelevisionBroadcast broadcast = _fakers.TelevisionBroadcast.Generate();
-            broadcast.ArchivedAt = null;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Broadcasts.Add(broadcast);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Broadcasts.Add(broadcast);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/televisionBroadcasts/{broadcast.StringId}";
+        string route = $"/televisionBroadcasts/{broadcast.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("Television broadcasts must first be archived before they can be deleted.");
-            error.Detail.Should().BeNull();
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("Television broadcasts must first be archived before they can be deleted.");
+        error.Detail.Should().BeNull();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastComment.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastComment.cs
index 1a5e733de0..b7ed37341f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastComment.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastComment.cs
@@ -1,20 +1,19 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
+namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Archiving")]
+public sealed class BroadcastComment : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class BroadcastComment : Identifiable<int>
-    {
-        [Attr]
-        public string Text { get; set; } = null!;
+    [Attr]
+    public string Text { get; set; } = null!;
 
-        [Attr]
-        public DateTimeOffset CreatedAt { get; set; }
+    [Attr]
+    public DateTimeOffset CreatedAt { get; set; }
 
-        [HasOne]
-        public TelevisionBroadcast AppliesTo { get; set; } = null!;
-    }
+    [HasOne]
+    public TelevisionBroadcast AppliesTo { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastCommentsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastCommentsController.cs
deleted file mode 100644
index d801d2eaa5..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/BroadcastCommentsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
-{
-    public sealed class BroadcastCommentsController : JsonApiController<BroadcastComment, int>
-    {
-        public BroadcastCommentsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<BroadcastComment, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcast.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcast.cs
index 07c57183cc..c6c6dc2a44 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcast.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcast.cs
@@ -1,27 +1,25 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
+namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Archiving")]
+public sealed class TelevisionBroadcast : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class TelevisionBroadcast : Identifiable<int>
-    {
-        [Attr]
-        public string Title { get; set; } = null!;
+    [Attr]
+    public string Title { get; set; } = null!;
 
-        [Attr]
-        public DateTimeOffset AiredAt { get; set; }
+    [Attr]
+    public DateTimeOffset AiredAt { get; set; }
 
-        [Attr]
-        public DateTimeOffset? ArchivedAt { get; set; }
+    [Attr]
+    public DateTimeOffset? ArchivedAt { get; set; }
 
-        [HasOne]
-        public TelevisionStation? AiredOn { get; set; }
+    [HasOne]
+    public TelevisionStation? AiredOn { get; set; }
 
-        [HasMany]
-        public ISet<BroadcastComment> Comments { get; set; } = new HashSet<BroadcastComment>();
-    }
+    [HasMany]
+    public ISet<BroadcastComment> Comments { get; set; } = new HashSet<BroadcastComment>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastDefinition.cs
index 35df2904e3..4037f59b62 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastDefinition.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Errors;
@@ -15,185 +10,184 @@
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
+namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class TelevisionBroadcastDefinition : JsonApiResourceDefinition<TelevisionBroadcast, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class TelevisionBroadcastDefinition : JsonApiResourceDefinition<TelevisionBroadcast, int>
-    {
-        private readonly TelevisionDbContext _dbContext;
-        private readonly IJsonApiRequest _request;
-        private readonly IEnumerable<IQueryConstraintProvider> _constraintProviders;
+    private readonly TelevisionDbContext _dbContext;
+    private readonly IJsonApiRequest _request;
+    private readonly IEnumerable<IQueryConstraintProvider> _constraintProviders;
 
-        private DateTimeOffset? _storedArchivedAt;
+    private DateTimeOffset? _storedArchivedAt;
 
-        public TelevisionBroadcastDefinition(IResourceGraph resourceGraph, TelevisionDbContext dbContext, IJsonApiRequest request,
-            IEnumerable<IQueryConstraintProvider> constraintProviders)
-            : base(resourceGraph)
-        {
-            _dbContext = dbContext;
-            _request = request;
-            _constraintProviders = constraintProviders;
-        }
+    public TelevisionBroadcastDefinition(IResourceGraph resourceGraph, TelevisionDbContext dbContext, IJsonApiRequest request,
+        IEnumerable<IQueryConstraintProvider> constraintProviders)
+        : base(resourceGraph)
+    {
+        _dbContext = dbContext;
+        _request = request;
+        _constraintProviders = constraintProviders;
+    }
 
-        public override FilterExpression? OnApplyFilter(FilterExpression? existingFilter)
+    public override FilterExpression? OnApplyFilter(FilterExpression? existingFilter)
+    {
+        if (_request.IsReadOnly)
         {
-            if (_request.IsReadOnly)
-            {
-                // Rule: hide archived broadcasts in collections, unless a filter is specified.
+            // Rule: hide archived broadcasts in collections, unless a filter is specified.
 
-                if (IsReturningCollectionOfTelevisionBroadcasts() && !HasFilterOnArchivedAt(existingFilter))
-                {
-                    AttrAttribute archivedAtAttribute = ResourceType.GetAttributeByPropertyName(nameof(TelevisionBroadcast.ArchivedAt));
-                    var archivedAtChain = new ResourceFieldChainExpression(archivedAtAttribute);
+            if (IsReturningCollectionOfTelevisionBroadcasts() && !HasFilterOnArchivedAt(existingFilter))
+            {
+                AttrAttribute archivedAtAttribute = ResourceType.GetAttributeByPropertyName(nameof(TelevisionBroadcast.ArchivedAt));
+                var archivedAtChain = new ResourceFieldChainExpression(archivedAtAttribute);
 
-                    FilterExpression isUnarchived = new ComparisonExpression(ComparisonOperator.Equals, archivedAtChain, NullConstantExpression.Instance);
+                FilterExpression isUnarchived = new ComparisonExpression(ComparisonOperator.Equals, archivedAtChain, NullConstantExpression.Instance);
 
-                    return LogicalExpression.Compose(LogicalOperator.And, existingFilter, isUnarchived);
-                }
+                return LogicalExpression.Compose(LogicalOperator.And, existingFilter, isUnarchived);
             }
-
-            return existingFilter;
         }
 
-        private bool IsReturningCollectionOfTelevisionBroadcasts()
-        {
-            return IsRequestingCollectionOfTelevisionBroadcasts() || IsIncludingCollectionOfTelevisionBroadcasts();
-        }
+        return existingFilter;
+    }
 
-        private bool IsRequestingCollectionOfTelevisionBroadcasts()
+    private bool IsReturningCollectionOfTelevisionBroadcasts()
+    {
+        return IsRequestingCollectionOfTelevisionBroadcasts() || IsIncludingCollectionOfTelevisionBroadcasts();
+    }
+
+    private bool IsRequestingCollectionOfTelevisionBroadcasts()
+    {
+        if (_request.IsCollection)
         {
-            if (_request.IsCollection)
+            if (ResourceType.Equals(_request.PrimaryResourceType) || ResourceType.Equals(_request.SecondaryResourceType))
             {
-                if (ResourceType.Equals(_request.PrimaryResourceType) || ResourceType.Equals(_request.SecondaryResourceType))
-                {
-                    return true;
-                }
+                return true;
             }
-
-            return false;
         }
 
-        private bool IsIncludingCollectionOfTelevisionBroadcasts()
-        {
-            // @formatter:wrap_chained_method_calls chop_always
-            // @formatter:keep_existing_linebreaks true
+        return false;
+    }
 
-            IncludeElementExpression[] includeElements = _constraintProviders
-                .SelectMany(provider => provider.GetConstraints())
-                .Select(expressionInScope => expressionInScope.Expression)
-                .OfType<IncludeExpression>()
-                .SelectMany(include => include.Elements)
-                .ToArray();
+    private bool IsIncludingCollectionOfTelevisionBroadcasts()
+    {
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
 
-            // @formatter:keep_existing_linebreaks restore
-            // @formatter:wrap_chained_method_calls restore
+        IncludeElementExpression[] includeElements = _constraintProviders
+            .SelectMany(provider => provider.GetConstraints())
+            .Select(expressionInScope => expressionInScope.Expression)
+            .OfType<IncludeExpression>()
+            .SelectMany(include => include.Elements)
+            .ToArray();
 
-            foreach (IncludeElementExpression includeElement in includeElements)
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        foreach (IncludeElementExpression includeElement in includeElements)
+        {
+            if (includeElement.Relationship is HasManyAttribute && includeElement.Relationship.RightType.Equals(ResourceType))
             {
-                if (includeElement.Relationship is HasManyAttribute && includeElement.Relationship.RightType.Equals(ResourceType))
-                {
-                    return true;
-                }
+                return true;
             }
+        }
 
+        return false;
+    }
+
+    private bool HasFilterOnArchivedAt(FilterExpression? existingFilter)
+    {
+        if (existingFilter == null)
+        {
             return false;
         }
 
-        private bool HasFilterOnArchivedAt(FilterExpression? existingFilter)
-        {
-            if (existingFilter == null)
-            {
-                return false;
-            }
+        var walker = new FilterWalker();
+        walker.Visit(existingFilter, null);
 
-            var walker = new FilterWalker();
-            walker.Visit(existingFilter, null);
+        return walker.HasFilterOnArchivedAt;
+    }
 
-            return walker.HasFilterOnArchivedAt;
+    public override Task OnPrepareWriteAsync(TelevisionBroadcast broadcast, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (writeOperation == WriteOperationKind.UpdateResource)
+        {
+            _storedArchivedAt = broadcast.ArchivedAt;
         }
 
-        public override Task OnPrepareWriteAsync(TelevisionBroadcast broadcast, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            if (writeOperation == WriteOperationKind.UpdateResource)
-            {
-                _storedArchivedAt = broadcast.ArchivedAt;
-            }
+        return Task.CompletedTask;
+    }
 
-            return Task.CompletedTask;
+    public override async Task OnWritingAsync(TelevisionBroadcast broadcast, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (writeOperation == WriteOperationKind.CreateResource)
+        {
+            AssertIsNotArchived(broadcast);
         }
-
-        public override async Task OnWritingAsync(TelevisionBroadcast broadcast, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        else if (writeOperation == WriteOperationKind.UpdateResource)
         {
-            if (writeOperation == WriteOperationKind.CreateResource)
-            {
-                AssertIsNotArchived(broadcast);
-            }
-            else if (writeOperation == WriteOperationKind.UpdateResource)
-            {
-                AssertIsNotShiftingArchiveDate(broadcast);
-            }
-            else if (writeOperation == WriteOperationKind.DeleteResource)
-            {
-                TelevisionBroadcast? broadcastToDelete = await _dbContext.Broadcasts.FirstWithIdAsync(broadcast.Id, cancellationToken);
+            AssertIsNotShiftingArchiveDate(broadcast);
+        }
+        else if (writeOperation == WriteOperationKind.DeleteResource)
+        {
+            TelevisionBroadcast? broadcastToDelete = await _dbContext.Broadcasts.FirstWithIdAsync(broadcast.Id, cancellationToken);
 
-                if (broadcastToDelete != null)
-                {
-                    AssertIsArchived(broadcastToDelete);
-                }
+            if (broadcastToDelete != null)
+            {
+                AssertIsArchived(broadcastToDelete);
             }
-
-            await base.OnWritingAsync(broadcast, writeOperation, cancellationToken);
         }
 
-        [AssertionMethod]
-        private static void AssertIsNotArchived(TelevisionBroadcast broadcast)
+        await base.OnWritingAsync(broadcast, writeOperation, cancellationToken);
+    }
+
+    [AssertionMethod]
+    private static void AssertIsNotArchived(TelevisionBroadcast broadcast)
+    {
+        if (broadcast.ArchivedAt != null)
         {
-            if (broadcast.ArchivedAt != null)
+            throw new JsonApiException(new ErrorObject(HttpStatusCode.Forbidden)
             {
-                throw new JsonApiException(new ErrorObject(HttpStatusCode.Forbidden)
-                {
-                    Title = "Television broadcasts cannot be created in archived state."
-                });
-            }
+                Title = "Television broadcasts cannot be created in archived state."
+            });
         }
+    }
 
-        [AssertionMethod]
-        private void AssertIsNotShiftingArchiveDate(TelevisionBroadcast broadcast)
+    [AssertionMethod]
+    private void AssertIsNotShiftingArchiveDate(TelevisionBroadcast broadcast)
+    {
+        if (_storedArchivedAt != null && broadcast.ArchivedAt != null && _storedArchivedAt != broadcast.ArchivedAt)
         {
-            if (_storedArchivedAt != null && broadcast.ArchivedAt != null && _storedArchivedAt != broadcast.ArchivedAt)
+            throw new JsonApiException(new ErrorObject(HttpStatusCode.Forbidden)
             {
-                throw new JsonApiException(new ErrorObject(HttpStatusCode.Forbidden)
-                {
-                    Title = "Archive date of television broadcasts cannot be shifted. Unarchive it first."
-                });
-            }
+                Title = "Archive date of television broadcasts cannot be shifted. Unarchive it first."
+            });
         }
+    }
 
-        [AssertionMethod]
-        private static void AssertIsArchived(TelevisionBroadcast broadcast)
+    [AssertionMethod]
+    private static void AssertIsArchived(TelevisionBroadcast broadcast)
+    {
+        if (broadcast.ArchivedAt == null)
         {
-            if (broadcast.ArchivedAt == null)
+            throw new JsonApiException(new ErrorObject(HttpStatusCode.Forbidden)
             {
-                throw new JsonApiException(new ErrorObject(HttpStatusCode.Forbidden)
-                {
-                    Title = "Television broadcasts must first be archived before they can be deleted."
-                });
-            }
+                Title = "Television broadcasts must first be archived before they can be deleted."
+            });
         }
+    }
 
-        private sealed class FilterWalker : QueryExpressionRewriter<object?>
-        {
-            public bool HasFilterOnArchivedAt { get; private set; }
+    private sealed class FilterWalker : QueryExpressionRewriter<object?>
+    {
+        public bool HasFilterOnArchivedAt { get; private set; }
 
-            public override QueryExpression? VisitResourceFieldChain(ResourceFieldChainExpression expression, object? argument)
+        public override QueryExpression? VisitResourceFieldChain(ResourceFieldChainExpression expression, object? argument)
+        {
+            if (expression.Fields[0].Property.Name == nameof(TelevisionBroadcast.ArchivedAt))
             {
-                if (expression.Fields[0].Property.Name == nameof(TelevisionBroadcast.ArchivedAt))
-                {
-                    HasFilterOnArchivedAt = true;
-                }
-
-                return base.VisitResourceFieldChain(expression, argument);
+                HasFilterOnArchivedAt = true;
             }
+
+            return base.VisitResourceFieldChain(expression, argument);
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastsController.cs
deleted file mode 100644
index d5cd933b56..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionBroadcastsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
-{
-    public sealed class TelevisionBroadcastsController : JsonApiController<TelevisionBroadcast, int>
-    {
-        public TelevisionBroadcastsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<TelevisionBroadcast, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionDbContext.cs
index 5ff8a1406c..471f471028 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionDbContext.cs
@@ -1,19 +1,18 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
+namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class TelevisionDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class TelevisionDbContext : DbContext
-    {
-        public DbSet<TelevisionNetwork> Networks => Set<TelevisionNetwork>();
-        public DbSet<TelevisionStation> Stations => Set<TelevisionStation>();
-        public DbSet<TelevisionBroadcast> Broadcasts => Set<TelevisionBroadcast>();
-        public DbSet<BroadcastComment> Comments => Set<BroadcastComment>();
+    public DbSet<TelevisionNetwork> Networks => Set<TelevisionNetwork>();
+    public DbSet<TelevisionStation> Stations => Set<TelevisionStation>();
+    public DbSet<TelevisionBroadcast> Broadcasts => Set<TelevisionBroadcast>();
+    public DbSet<BroadcastComment> Comments => Set<BroadcastComment>();
 
-        public TelevisionDbContext(DbContextOptions<TelevisionDbContext> options)
-            : base(options)
-        {
-        }
+    public TelevisionDbContext(DbContextOptions<TelevisionDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs
index 84f7be5288..6c3116d789 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs
@@ -1,43 +1,41 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
+namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
+
+internal sealed class TelevisionFakers : FakerContainer
 {
-    internal sealed class TelevisionFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<TelevisionNetwork>> _lazyTelevisionNetworkFaker = new(() =>
-            new Faker<TelevisionNetwork>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(network => network.Name, faker => faker.Company.CompanyName()));
+    private readonly Lazy<Faker<TelevisionNetwork>> _lazyTelevisionNetworkFaker = new(() =>
+        new Faker<TelevisionNetwork>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(network => network.Name, faker => faker.Company.CompanyName()));
 
-        private readonly Lazy<Faker<TelevisionStation>> _lazyTelevisionStationFaker = new(() =>
-            new Faker<TelevisionStation>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(station => station.Name, faker => faker.Company.CompanyName()));
+    private readonly Lazy<Faker<TelevisionStation>> _lazyTelevisionStationFaker = new(() =>
+        new Faker<TelevisionStation>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(station => station.Name, faker => faker.Company.CompanyName()));
 
-        private readonly Lazy<Faker<TelevisionBroadcast>> _lazyTelevisionBroadcastFaker = new(() =>
-            new Faker<TelevisionBroadcast>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(broadcast => broadcast.Title, faker => faker.Lorem.Sentence())
-                .RuleFor(broadcast => broadcast.AiredAt, faker => faker.Date.PastOffset()
-                    .TruncateToWholeMilliseconds())
-                .RuleFor(broadcast => broadcast.ArchivedAt, faker => faker.Date.RecentOffset()
-                    .TruncateToWholeMilliseconds()));
+    private readonly Lazy<Faker<TelevisionBroadcast>> _lazyTelevisionBroadcastFaker = new(() =>
+        new Faker<TelevisionBroadcast>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(broadcast => broadcast.Title, faker => faker.Lorem.Sentence())
+            .RuleFor(broadcast => broadcast.AiredAt, faker => faker.Date.PastOffset()
+                .TruncateToWholeMilliseconds())
+            .RuleFor(broadcast => broadcast.ArchivedAt, faker => faker.Date.RecentOffset()
+                .TruncateToWholeMilliseconds()));
 
-        private readonly Lazy<Faker<BroadcastComment>> _lazyBroadcastCommentFaker = new(() =>
-            new Faker<BroadcastComment>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(comment => comment.Text, faker => faker.Lorem.Paragraph())
-                .RuleFor(comment => comment.CreatedAt, faker => faker.Date.PastOffset()
-                    .TruncateToWholeMilliseconds()));
+    private readonly Lazy<Faker<BroadcastComment>> _lazyBroadcastCommentFaker = new(() =>
+        new Faker<BroadcastComment>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(comment => comment.Text, faker => faker.Lorem.Paragraph())
+            .RuleFor(comment => comment.CreatedAt, faker => faker.Date.PastOffset()
+                .TruncateToWholeMilliseconds()));
 
-        public Faker<TelevisionNetwork> TelevisionNetwork => _lazyTelevisionNetworkFaker.Value;
-        public Faker<TelevisionStation> TelevisionStation => _lazyTelevisionStationFaker.Value;
-        public Faker<TelevisionBroadcast> TelevisionBroadcast => _lazyTelevisionBroadcastFaker.Value;
-        public Faker<BroadcastComment> BroadcastComment => _lazyBroadcastCommentFaker.Value;
-    }
+    public Faker<TelevisionNetwork> TelevisionNetwork => _lazyTelevisionNetworkFaker.Value;
+    public Faker<TelevisionStation> TelevisionStation => _lazyTelevisionStationFaker.Value;
+    public Faker<TelevisionBroadcast> TelevisionBroadcast => _lazyTelevisionBroadcastFaker.Value;
+    public Faker<BroadcastComment> BroadcastComment => _lazyBroadcastCommentFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetwork.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetwork.cs
index fb4dafda39..cf6404f039 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetwork.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetwork.cs
@@ -1,17 +1,16 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
+namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Archiving")]
+public sealed class TelevisionNetwork : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class TelevisionNetwork : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [HasMany]
-        public ISet<TelevisionStation> Stations { get; set; } = new HashSet<TelevisionStation>();
-    }
+    [HasMany]
+    public ISet<TelevisionStation> Stations { get; set; } = new HashSet<TelevisionStation>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetworksController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetworksController.cs
deleted file mode 100644
index 4b981a8586..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionNetworksController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
-{
-    public sealed class TelevisionNetworksController : JsonApiController<TelevisionNetwork, int>
-    {
-        public TelevisionNetworksController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<TelevisionNetwork, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStation.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStation.cs
index 9f49047ddc..47000c5733 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStation.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStation.cs
@@ -1,17 +1,16 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
+namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Archiving")]
+public sealed class TelevisionStation : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class TelevisionStation : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [HasMany]
-        public ISet<TelevisionBroadcast> Broadcasts { get; set; } = new HashSet<TelevisionBroadcast>();
-    }
+    [HasMany]
+    public ISet<TelevisionBroadcast> Broadcasts { get; set; } = new HashSet<TelevisionBroadcast>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStationsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStationsController.cs
deleted file mode 100644
index 4ab018ea8d..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionStationsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving
-{
-    public sealed class TelevisionStationsController : JsonApiController<TelevisionStation, int>
-    {
-        public TelevisionStationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<TelevisionStation, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/AtomicConstrainedOperationsControllerTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/AtomicConstrainedOperationsControllerTests.cs
index 022ae35c3c..6908a2b296 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/AtomicConstrainedOperationsControllerTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/AtomicConstrainedOperationsControllerTests.cs
@@ -1,218 +1,215 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Controllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Controllers;
+
+public sealed class AtomicConstrainedOperationsControllerTests
+    : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicConstrainedOperationsControllerTests
-        : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicConstrainedOperationsControllerTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicConstrainedOperationsControllerTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<CreateMusicTrackOperationsController>();
+    }
 
-            testContext.UseController<CreateMusicTrackOperationsController>();
-        }
+    [Fact]
+    public async Task Can_create_resources_for_matching_resource_type()
+    {
+        // Arrange
+        string newTitle1 = _fakers.MusicTrack.Generate().Title;
+        string newTitle2 = _fakers.MusicTrack.Generate().Title;
 
-        [Fact]
-        public async Task Can_create_resources_for_matching_resource_type()
+        var requestBody = new
         {
-            // Arrange
-            string newTitle1 = _fakers.MusicTrack.Generate().Title;
-            string newTitle2 = _fakers.MusicTrack.Generate().Title;
-
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTitle1
-                            }
+                            title = newTitle1
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTitle2
-                            }
+                            title = newTitle2
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations/musicTracks/create";
+        const string route = "/operations/musicTracks/create";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(2);
-        }
+        responseDocument.Results.ShouldHaveCount(2);
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_mismatching_resource_type()
+    [Fact]
+    public async Task Cannot_create_resource_for_mismatching_resource_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        attributes = new
                         {
-                            type = "performers",
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations/musicTracks/create";
+        const string route = "/operations/musicTracks/create";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Unsupported combination of operation code and resource type at this endpoint.");
-            error.Detail.Should().Be("This endpoint can only be used to create resources of type 'musicTracks'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Unsupported combination of operation code and resource type at this endpoint.");
+        error.Detail.Should().Be("This endpoint can only be used to create resources of type 'musicTracks'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+    }
 
-        [Fact]
-        public async Task Cannot_update_resources_for_matching_resource_type()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_update_resources_for_matching_resource_type()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations/musicTracks/create";
+        const string route = "/operations/musicTracks/create";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Unsupported combination of operation code and resource type at this endpoint.");
-            error.Detail.Should().Be("This endpoint can only be used to create resources of type 'musicTracks'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Unsupported combination of operation code and resource type at this endpoint.");
+        error.Detail.Should().Be("This endpoint can only be used to create resources of type 'musicTracks'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+    }
 
-        [Fact]
-        public async Task Cannot_add_to_ToMany_relationship_for_matching_resource_type()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            Performer existingPerformer = _fakers.Performer.Generate();
+    [Fact]
+    public async Task Cannot_add_to_ToMany_relationship_for_matching_resource_type()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        Performer existingPerformer = _fakers.Performer.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingTrack, existingPerformer);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingTrack, existingPerformer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "performers",
-                                id = existingPerformer.StringId
-                            }
+                            type = "performers",
+                            id = existingPerformer.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations/musicTracks/create";
+        const string route = "/operations/musicTracks/create";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Unsupported combination of operation code and resource type at this endpoint.");
-            error.Detail.Should().Be("This endpoint can only be used to create resources of type 'musicTracks'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Unsupported combination of operation code and resource type at this endpoint.");
+        error.Detail.Should().Be("This endpoint can only be used to create resources of type 'musicTracks'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs
index 257920b48f..517cf4c792 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Controllers/CreateMusicTrackOperationsController.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.AtomicOperations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
@@ -13,46 +10,45 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Controllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Controllers;
+
+[DisableRoutingConvention]
+[Route("/operations/musicTracks/create")]
+public sealed class CreateMusicTrackOperationsController : JsonApiOperationsController
 {
-    [DisableRoutingConvention]
-    [Route("/operations/musicTracks/create")]
-    public sealed class CreateMusicTrackOperationsController : JsonApiOperationsController
+    public CreateMusicTrackOperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IOperationsProcessor processor, IJsonApiRequest request, ITargetedFields targetedFields)
+        : base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
     {
-        public CreateMusicTrackOperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IOperationsProcessor processor, IJsonApiRequest request, ITargetedFields targetedFields)
-            : base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
-        {
-        }
+    }
 
-        public override async Task<IActionResult> PostOperationsAsync(IList<OperationContainer> operations, CancellationToken cancellationToken)
-        {
-            AssertOnlyCreatingMusicTracks(operations);
+    public override async Task<IActionResult> PostOperationsAsync(IList<OperationContainer> operations, CancellationToken cancellationToken)
+    {
+        AssertOnlyCreatingMusicTracks(operations);
 
-            return await base.PostOperationsAsync(operations, cancellationToken);
-        }
+        return await base.PostOperationsAsync(operations, cancellationToken);
+    }
 
-        private static void AssertOnlyCreatingMusicTracks(IEnumerable<OperationContainer> operations)
-        {
-            int index = 0;
+    private static void AssertOnlyCreatingMusicTracks(IEnumerable<OperationContainer> operations)
+    {
+        int index = 0;
 
-            foreach (OperationContainer operation in operations)
+        foreach (OperationContainer operation in operations)
+        {
+            if (operation.Request.WriteOperation != WriteOperationKind.CreateResource || operation.Resource.GetType() != typeof(MusicTrack))
             {
-                if (operation.Request.WriteOperation != WriteOperationKind.CreateResource || operation.Resource.GetType() != typeof(MusicTrack))
+                throw new JsonApiException(new ErrorObject(HttpStatusCode.UnprocessableEntity)
                 {
-                    throw new JsonApiException(new ErrorObject(HttpStatusCode.UnprocessableEntity)
+                    Title = "Unsupported combination of operation code and resource type at this endpoint.",
+                    Detail = "This endpoint can only be used to create resources of type 'musicTracks'.",
+                    Source = new ErrorSource
                     {
-                        Title = "Unsupported combination of operation code and resource type at this endpoint.",
-                        Detail = "This endpoint can only be used to create resources of type 'musicTracks'.",
-                        Source = new ErrorSource
-                        {
-                            Pointer = $"/atomic:operations[{index}]"
-                        }
-                    });
-                }
-
-                index++;
+                        Pointer = $"/atomic:operations[{index}]"
+                    }
+                });
             }
+
+            index++;
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceTests.cs
index fc963b2fae..f37d53b275 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Extensions;
 using JsonApiDotNetCore.Configuration;
@@ -13,989 +8,986 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Creating
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Creating;
+
+public sealed class AtomicCreateResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicCreateResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicCreateResourceTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicCreateResourceTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
 
-            testContext.UseController<OperationsController>();
+        // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
+        testContext.UseController<LyricsController>();
+        testContext.UseController<MusicTracksController>();
+        testContext.UseController<PlaylistsController>();
 
-            // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
-            testContext.UseController<LyricsController>();
-            testContext.UseController<MusicTracksController>();
-            testContext.UseController<PlaylistsController>();
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownFieldsInRequestBody = false;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownFieldsInRequestBody = false;
-        }
+    [Fact]
+    public async Task Can_create_resource()
+    {
+        // Arrange
+        string newArtistName = _fakers.Performer.Generate().ArtistName!;
+        DateTimeOffset newBornAt = _fakers.Performer.Generate().BornAt;
 
-        [Fact]
-        public async Task Can_create_resource()
+        var requestBody = new
         {
-            // Arrange
-            string newArtistName = _fakers.Performer.Generate().ArtistName!;
-            DateTimeOffset newBornAt = _fakers.Performer.Generate().BornAt;
-
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        attributes = new
                         {
-                            type = "performers",
-                            attributes = new
-                            {
-                                artistName = newArtistName,
-                                bornAt = newBornAt
-                            }
+                            artistName = newArtistName,
+                            bornAt = newBornAt
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("performers");
-                resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName));
-                resource.Attributes.ShouldContainKey("bornAt").With(value => value.As<DateTimeOffset>().Should().BeCloseTo(newBornAt));
-                resource.Relationships.Should().BeNull();
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("performers");
+            resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName));
+            resource.Attributes.ShouldContainKey("bornAt").With(value => value.Should().Be(newBornAt));
+            resource.Relationships.Should().BeNull();
+        });
 
-            int newPerformerId = int.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        int newPerformerId = int.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Performer performerInDatabase = await dbContext.Performers.FirstWithIdAsync(newPerformerId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Performer performerInDatabase = await dbContext.Performers.FirstWithIdAsync(newPerformerId);
 
-                performerInDatabase.ArtistName.Should().Be(newArtistName);
-                performerInDatabase.BornAt.Should().BeCloseTo(newBornAt);
-            });
-        }
+            performerInDatabase.ArtistName.Should().Be(newArtistName);
+            performerInDatabase.BornAt.Should().Be(newBornAt);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_resources()
-        {
-            // Arrange
-            const int elementCount = 5;
+    [Fact]
+    public async Task Can_create_resources()
+    {
+        // Arrange
+        const int elementCount = 5;
 
-            List<MusicTrack> newTracks = _fakers.MusicTrack.Generate(elementCount);
+        List<MusicTrack> newTracks = _fakers.MusicTrack.Generate(elementCount);
 
-            var operationElements = new List<object>(elementCount);
+        var operationElements = new List<object>(elementCount);
 
-            for (int index = 0; index < elementCount; index++)
+        for (int index = 0; index < elementCount; index++)
+        {
+            operationElements.Add(new
             {
-                operationElements.Add(new
+                op = "add",
+                data = new
                 {
-                    op = "add",
-                    data = new
+                    type = "musicTracks",
+                    attributes = new
                     {
-                        type = "musicTracks",
-                        attributes = new
-                        {
-                            title = newTracks[index].Title,
-                            lengthInSeconds = newTracks[index].LengthInSeconds,
-                            genre = newTracks[index].Genre,
-                            releasedAt = newTracks[index].ReleasedAt
-                        }
+                        title = newTracks[index].Title,
+                        lengthInSeconds = newTracks[index].LengthInSeconds,
+                        genre = newTracks[index].Genre,
+                        releasedAt = newTracks[index].ReleasedAt
                     }
-                });
-            }
+                }
+            });
+        }
 
-            var requestBody = new
-            {
-                atomic__operations = operationElements
-            };
+        var requestBody = new
+        {
+            atomic__operations = operationElements
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(elementCount);
+        responseDocument.Results.ShouldHaveCount(elementCount);
 
-            for (int index = 0; index < elementCount; index++)
+        for (int index = 0; index < elementCount; index++)
+        {
+            responseDocument.Results[index].Data.SingleValue.ShouldNotBeNull().With(resource =>
             {
-                responseDocument.Results[index].Data.SingleValue.ShouldNotBeNull().With(resource =>
-                {
-                    resource.ShouldNotBeNull();
-                    resource.Type.Should().Be("musicTracks");
-                    resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTracks[index].Title));
-
-                    resource.Attributes.ShouldContainKey("lengthInSeconds")
-                        .With(value => value.As<decimal?>().Should().BeApproximately(newTracks[index].LengthInSeconds));
+                resource.ShouldNotBeNull();
+                resource.Type.Should().Be("musicTracks");
+                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTracks[index].Title));
 
-                    resource.Attributes.ShouldContainKey("genre").With(value => value.Should().Be(newTracks[index].Genre));
+                resource.Attributes.ShouldContainKey("lengthInSeconds")
+                    .With(value => value.As<decimal?>().Should().BeApproximately(newTracks[index].LengthInSeconds));
 
-                    resource.Attributes.ShouldContainKey("releasedAt")
-                        .With(value => value.As<DateTimeOffset>().Should().BeCloseTo(newTracks[index].ReleasedAt));
+                resource.Attributes.ShouldContainKey("genre").With(value => value.Should().Be(newTracks[index].Genre));
+                resource.Attributes.ShouldContainKey("releasedAt").With(value => value.Should().Be(newTracks[index].ReleasedAt));
 
-                    resource.Relationships.ShouldNotBeEmpty();
-                });
-            }
+                resource.Relationships.ShouldNotBeEmpty();
+            });
+        }
 
-            Guid[] newTrackIds = responseDocument.Results.Select(result => Guid.Parse(result.Data.SingleValue!.Id.ShouldNotBeNull())).ToArray();
+        Guid[] newTrackIds = responseDocument.Results.Select(result => Guid.Parse(result.Data.SingleValue!.Id.ShouldNotBeNull())).ToArray();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.Where(musicTrack => newTrackIds.Contains(musicTrack.Id)).ToListAsync();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.Where(musicTrack => newTrackIds.Contains(musicTrack.Id)).ToListAsync();
 
-                tracksInDatabase.ShouldHaveCount(elementCount);
+            tracksInDatabase.ShouldHaveCount(elementCount);
 
-                for (int index = 0; index < elementCount; index++)
-                {
-                    MusicTrack trackInDatabase = tracksInDatabase.Single(musicTrack => musicTrack.Id == newTrackIds[index]);
+            for (int index = 0; index < elementCount; index++)
+            {
+                MusicTrack trackInDatabase = tracksInDatabase.Single(musicTrack => musicTrack.Id == newTrackIds[index]);
 
-                    trackInDatabase.Title.Should().Be(newTracks[index].Title);
-                    trackInDatabase.LengthInSeconds.Should().BeApproximately(newTracks[index].LengthInSeconds);
-                    trackInDatabase.Genre.Should().Be(newTracks[index].Genre);
-                    trackInDatabase.ReleasedAt.Should().BeCloseTo(newTracks[index].ReleasedAt);
-                }
-            });
-        }
+                trackInDatabase.Title.Should().Be(newTracks[index].Title);
+                trackInDatabase.LengthInSeconds.Should().BeApproximately(newTracks[index].LengthInSeconds);
+                trackInDatabase.Genre.Should().Be(newTracks[index].Genre);
+                trackInDatabase.ReleasedAt.Should().Be(newTracks[index].ReleasedAt);
+            }
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_resource_without_attributes_or_relationships()
+    [Fact]
+    public async Task Can_create_resource_without_attributes_or_relationships()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        attributes = new
+                        {
+                        },
+                        relationship = new
                         {
-                            type = "performers",
-                            attributes = new
-                            {
-                            },
-                            relationship = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("performers");
-                resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().BeNull());
-                resource.Attributes.ShouldContainKey("bornAt").With(value => value.As<DateTimeOffset>().Should().BeCloseTo(default));
-                resource.Relationships.Should().BeNull();
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("performers");
+            resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().BeNull());
+            resource.Attributes.ShouldContainKey("bornAt").With(value => value.Should().Be(default(DateTimeOffset)));
+            resource.Relationships.Should().BeNull();
+        });
 
-            int newPerformerId = int.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        int newPerformerId = int.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Performer performerInDatabase = await dbContext.Performers.FirstWithIdAsync(newPerformerId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Performer performerInDatabase = await dbContext.Performers.FirstWithIdAsync(newPerformerId);
 
-                performerInDatabase.ArtistName.Should().BeNull();
-                performerInDatabase.BornAt.Should().Be(default);
-            });
-        }
+            performerInDatabase.ArtistName.Should().BeNull();
+            performerInDatabase.BornAt.Should().Be(default);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_unknown_attribute()
-        {
-            // Arrange
-            string newName = _fakers.Playlist.Generate().Name;
+    [Fact]
+    public async Task Cannot_create_resource_with_unknown_attribute()
+    {
+        // Arrange
+        string newName = _fakers.Playlist.Generate().Name;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        attributes = new
                         {
-                            type = "playlists",
-                            attributes = new
-                            {
-                                doesNotExist = "ignored",
-                                name = newName
-                            }
+                            doesNotExist = "ignored",
+                            name = newName
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown attribute found.");
-            error.Detail.Should().Be("Attribute 'doesNotExist' does not exist on resource type 'playlists'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/doesNotExist");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown attribute found.");
+        error.Detail.Should().Be("Attribute 'doesNotExist' does not exist on resource type 'playlists'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/doesNotExist");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_unknown_attribute()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownFieldsInRequestBody = true;
+    [Fact]
+    public async Task Can_create_resource_with_unknown_attribute()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownFieldsInRequestBody = true;
 
-            string newName = _fakers.Playlist.Generate().Name;
+        string newName = _fakers.Playlist.Generate().Name;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        attributes = new
                         {
-                            type = "playlists",
-                            attributes = new
-                            {
-                                doesNotExist = "ignored",
-                                name = newName
-                            }
+                            doesNotExist = "ignored",
+                            name = newName
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("playlists");
-                resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newName));
-                resource.Relationships.ShouldNotBeEmpty();
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("playlists");
+            resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newName));
+            resource.Relationships.ShouldNotBeEmpty();
+        });
 
-            long newPlaylistId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        long newPlaylistId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist performerInDatabase = await dbContext.Playlists.FirstWithIdAsync(newPlaylistId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist performerInDatabase = await dbContext.Playlists.FirstWithIdAsync(newPlaylistId);
 
-                performerInDatabase.Name.Should().Be(newName);
-            });
-        }
+            performerInDatabase.Name.Should().Be(newName);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_unknown_relationship()
+    [Fact]
+    public async Task Cannot_create_resource_with_unknown_relationship()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "lyrics",
+                        relationships = new
                         {
-                            type = "lyrics",
-                            relationships = new
+                            doesNotExist = new
                             {
-                                doesNotExist = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = Unknown.ResourceType,
-                                        id = Unknown.StringId.Int32
-                                    }
+                                    type = Unknown.ResourceType,
+                                    id = Unknown.StringId.Int32
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
-            error.Detail.Should().Be("Relationship 'doesNotExist' does not exist on resource type 'lyrics'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/doesNotExist");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
+        error.Detail.Should().Be("Relationship 'doesNotExist' does not exist on resource type 'lyrics'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/doesNotExist");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_unknown_relationship()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownFieldsInRequestBody = true;
+    [Fact]
+    public async Task Can_create_resource_with_unknown_relationship()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownFieldsInRequestBody = true;
 
-            string newLyricText = _fakers.Lyric.Generate().Text;
+        string newLyricText = _fakers.Lyric.Generate().Text;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "lyrics",
+                        attributes = new
                         {
-                            type = "lyrics",
-                            attributes = new
-                            {
-                                text = newLyricText
-                            },
-                            relationships = new
+                            text = newLyricText
+                        },
+                        relationships = new
+                        {
+                            doesNotExist = new
                             {
-                                doesNotExist = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = Unknown.ResourceType,
-                                        id = Unknown.StringId.Int32
-                                    }
+                                    type = Unknown.ResourceType,
+                                    id = Unknown.StringId.Int32
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("lyrics");
-                resource.Attributes.ShouldNotBeEmpty();
-                resource.Relationships.ShouldNotBeEmpty();
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("lyrics");
+            resource.Attributes.ShouldNotBeEmpty();
+            resource.Relationships.ShouldNotBeEmpty();
+        });
 
-            long newLyricId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        long newLyricId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Lyric lyricInDatabase = await dbContext.Lyrics.FirstWithIdAsync(newLyricId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Lyric lyricInDatabase = await dbContext.Lyrics.FirstWithIdAsync(newLyricId);
 
-                lyricInDatabase.ShouldNotBeNull();
-            });
-        }
+            lyricInDatabase.ShouldNotBeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_client_generated_ID()
-        {
-            // Arrange
-            MusicTrack newTrack = _fakers.MusicTrack.Generate();
-            newTrack.Id = Guid.NewGuid();
+    [Fact]
+    public async Task Cannot_create_resource_with_client_generated_ID()
+    {
+        // Arrange
+        MusicTrack newTrack = _fakers.MusicTrack.Generate();
+        newTrack.Id = Guid.NewGuid();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        id = newTrack.StringId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            id = newTrack.StringId,
-                            attributes = new
-                            {
-                                title = newTrack.Title
-                            }
+                            title = newTrack.Title
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("Failed to deserialize request body: The use of client-generated IDs is disabled.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("Failed to deserialize request body: The use of client-generated IDs is disabled.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_href_element()
+    [Fact]
+    public async Task Cannot_create_resource_for_href_element()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
-                    {
-                        op = "add",
-                        href = "/api/v1/musicTracks"
-                    }
+                    op = "add",
+                    href = "/api/v1/musicTracks"
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_ref_element()
+    [Fact]
+    public async Task Cannot_create_resource_for_ref_element()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks"
-                        }
+                        type = "musicTracks"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'relationship' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'relationship' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_missing_data()
+    [Fact]
+    public async Task Cannot_create_resource_for_missing_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
-                    {
-                        op = "add"
-                    }
+                    op = "add"
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_null_data()
+    [Fact]
+    public async Task Cannot_create_resource_for_null_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
-                    {
-                        op = "add",
-                        data = (object?)null
-                    }
+                    op = "add",
+                    data = (object?)null
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_array_data()
-        {
-            // Arrange
-            string newArtistName = _fakers.Performer.Generate().ArtistName!;
+    [Fact]
+    public async Task Cannot_create_resource_for_array_data()
+    {
+        // Arrange
+        string newArtistName = _fakers.Performer.Generate().ArtistName!;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new[]
                     {
-                        op = "add",
-                        data = new[]
+                        new
                         {
-                            new
+                            type = "performers",
+                            attributes = new
                             {
-                                type = "performers",
-                                attributes = new
-                                {
-                                    artistName = newArtistName
-                                }
+                                artistName = newArtistName
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of an array.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of an array.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_missing_type()
+    [Fact]
+    public async Task Cannot_create_resource_for_missing_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        attributes = new
                         {
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_unknown_type()
+    [Fact]
+    public async Task Cannot_create_resource_for_unknown_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
-                        {
-                            type = Unknown.ResourceType
-                        }
+                        type = Unknown.ResourceType
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_attribute_with_blocked_capability()
+    [Fact]
+    public async Task Cannot_create_resource_attribute_with_blocked_capability()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "lyrics",
+                        attributes = new
                         {
-                            type = "lyrics",
-                            attributes = new
-                            {
-                                createdAt = 12.July(1980)
-                            }
+                            createdAt = 12.July(1980)
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Attribute value cannot be assigned when creating resource.");
-            error.Detail.Should().Be("The attribute 'createdAt' on resource type 'lyrics' cannot be assigned to.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/createdAt");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Attribute value cannot be assigned when creating resource.");
+        error.Detail.Should().Be("The attribute 'createdAt' on resource type 'lyrics' cannot be assigned to.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/createdAt");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_readonly_attribute()
-        {
-            // Arrange
-            string newPlaylistName = _fakers.Playlist.Generate().Name;
+    [Fact]
+    public async Task Cannot_create_resource_with_readonly_attribute()
+    {
+        // Arrange
+        string newPlaylistName = _fakers.Playlist.Generate().Name;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        attributes = new
                         {
-                            type = "playlists",
-                            attributes = new
-                            {
-                                name = newPlaylistName,
-                                isArchived = true
-                            }
+                            name = newPlaylistName,
+                            isArchived = true
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Attribute is read-only.");
-            error.Detail.Should().Be("Attribute 'isArchived' on resource type 'playlists' is read-only.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/isArchived");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Attribute is read-only.");
+        error.Detail.Should().Be("Attribute 'isArchived' on resource type 'playlists' is read-only.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/isArchived");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_incompatible_attribute_value()
+    [Fact]
+    public async Task Cannot_create_resource_with_incompatible_attribute_value()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        attributes = new
                         {
-                            type = "performers",
-                            attributes = new
-                            {
-                                bornAt = 12345
-                            }
+                            bornAt = 12345
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible attribute value found.");
-            error.Detail.Should().Be("Failed to convert attribute 'bornAt' with value '12345' of type 'Number' to type 'DateTimeOffset'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/bornAt");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible attribute value found.");
+        error.Detail.Should().Be("Failed to convert attribute 'bornAt' with value '12345' of type 'Number' to type 'DateTimeOffset'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/bornAt");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_attributes_and_multiple_relationship_types()
-        {
-            // Arrange
-            Lyric existingLyric = _fakers.Lyric.Generate();
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
-            Performer existingPerformer = _fakers.Performer.Generate();
+    [Fact]
+    public async Task Can_create_resource_with_attributes_and_multiple_relationship_types()
+    {
+        // Arrange
+        Lyric existingLyric = _fakers.Lyric.Generate();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+        Performer existingPerformer = _fakers.Performer.Generate();
 
-            string newTitle = _fakers.MusicTrack.Generate().Title;
+        string newTitle = _fakers.MusicTrack.Generate().Title;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingLyric, existingCompany, existingPerformer);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingLyric, existingCompany, existingPerformer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
+                            title = newTitle
+                        },
+                        relationships = new
+                        {
+                            lyric = new
                             {
-                                title = newTitle
+                                data = new
+                                {
+                                    type = "lyrics",
+                                    id = existingLyric.StringId
+                                }
                             },
-                            relationships = new
+                            ownedBy = new
                             {
-                                lyric = new
-                                {
-                                    data = new
-                                    {
-                                        type = "lyrics",
-                                        id = existingLyric.StringId
-                                    }
-                                },
-                                ownedBy = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        id = existingCompany.StringId
-                                    }
-                                },
-                                performers = new
+                                    type = "recordCompanies",
+                                    id = existingCompany.StringId
+                                }
+                            },
+                            performers = new
+                            {
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = existingPerformer.StringId
-                                        }
+                                        type = "performers",
+                                        id = existingPerformer.StringId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTitle));
-                resource.Relationships.ShouldNotBeEmpty();
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTitle));
+            resource.Relationships.ShouldNotBeEmpty();
+        });
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                MusicTrack trackInDatabase = await dbContext.MusicTracks
-                    .Include(musicTrack => musicTrack.Lyric)
-                    .Include(musicTrack => musicTrack.OwnedBy)
-                    .Include(musicTrack => musicTrack.Performers)
-                    .FirstWithIdAsync(newTrackId);
+            MusicTrack trackInDatabase = await dbContext.MusicTracks
+                .Include(musicTrack => musicTrack.Lyric)
+                .Include(musicTrack => musicTrack.OwnedBy)
+                .Include(musicTrack => musicTrack.Performers)
+                .FirstWithIdAsync(newTrackId);
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                trackInDatabase.Title.Should().Be(newTitle);
+            trackInDatabase.Title.Should().Be(newTitle);
 
-                trackInDatabase.Lyric.ShouldNotBeNull();
-                trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
+            trackInDatabase.Lyric.ShouldNotBeNull();
+            trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
 
-                trackInDatabase.Performers.ShouldHaveCount(1);
-                trackInDatabase.Performers[0].Id.Should().Be(existingPerformer.Id);
-            });
-        }
+            trackInDatabase.Performers.ShouldHaveCount(1);
+            trackInDatabase.Performers[0].Id.Should().Be(existingPerformer.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs
index cc663f92f8..ef64ebc64a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithClientGeneratedIdTests.cs
@@ -1,7 +1,4 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -9,274 +6,273 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Creating
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Creating;
+
+public sealed class AtomicCreateResourceWithClientGeneratedIdTests
+    : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicCreateResourceWithClientGeneratedIdTests
-        : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicCreateResourceWithClientGeneratedIdTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicCreateResourceWithClientGeneratedIdTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
 
-            testContext.UseController<OperationsController>();
+        // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
+        testContext.UseController<TextLanguagesController>();
 
-            // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
-            testContext.UseController<TextLanguagesController>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<ImplicitlyChangingTextLanguageDefinition>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<ImplicitlyChangingTextLanguageDefinition>();
+            services.AddSingleton<ResourceDefinitionHitCounter>();
+        });
 
-                services.AddSingleton<ResourceDefinitionHitCounter>();
-            });
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowClientGeneratedIds = true;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowClientGeneratedIds = true;
-        }
+    [Fact]
+    public async Task Can_create_resource_with_client_generated_guid_ID_having_side_effects()
+    {
+        // Arrange
+        TextLanguage newLanguage = _fakers.TextLanguage.Generate();
+        newLanguage.Id = Guid.NewGuid();
 
-        [Fact]
-        public async Task Can_create_resource_with_client_generated_guid_ID_having_side_effects()
+        var requestBody = new
         {
-            // Arrange
-            TextLanguage newLanguage = _fakers.TextLanguage.Generate();
-            newLanguage.Id = Guid.NewGuid();
-
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "textLanguages",
+                        id = newLanguage.StringId,
+                        attributes = new
                         {
-                            type = "textLanguages",
-                            id = newLanguage.StringId,
-                            attributes = new
-                            {
-                                isoCode = newLanguage.IsoCode
-                            }
+                            isoCode = newLanguage.IsoCode
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            string isoCode = $"{newLanguage.IsoCode}{ImplicitlyChangingTextLanguageDefinition.Suffix}";
+        string isoCode = $"{newLanguage.IsoCode}{ImplicitlyChangingTextLanguageDefinition.Suffix}";
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("textLanguages");
-                resource.Attributes.ShouldContainKey("isoCode").With(value => value.Should().Be(isoCode));
-                resource.Attributes.Should().NotContainKey("isRightToLeft");
-                resource.Relationships.ShouldNotBeEmpty();
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("textLanguages");
+            resource.Attributes.ShouldContainKey("isoCode").With(value => value.Should().Be(isoCode));
+            resource.Attributes.Should().NotContainKey("isRightToLeft");
+            resource.Relationships.ShouldNotBeEmpty();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                TextLanguage languageInDatabase = await dbContext.TextLanguages.FirstWithIdAsync(newLanguage.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            TextLanguage languageInDatabase = await dbContext.TextLanguages.FirstWithIdAsync(newLanguage.Id);
 
-                languageInDatabase.IsoCode.Should().Be(isoCode);
-            });
-        }
+            languageInDatabase.IsoCode.Should().Be(isoCode);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_client_generated_string_ID_having_no_side_effects()
-        {
-            // Arrange
-            MusicTrack newTrack = _fakers.MusicTrack.Generate();
-            newTrack.Id = Guid.NewGuid();
+    [Fact]
+    public async Task Can_create_resource_with_client_generated_string_ID_having_no_side_effects()
+    {
+        // Arrange
+        MusicTrack newTrack = _fakers.MusicTrack.Generate();
+        newTrack.Id = Guid.NewGuid();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        id = newTrack.StringId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            id = newTrack.StringId,
-                            attributes = new
-                            {
-                                title = newTrack.Title,
-                                lengthInSeconds = newTrack.LengthInSeconds,
-                                releasedAt = newTrack.ReleasedAt
-                            }
+                            title = newTrack.Title,
+                            lengthInSeconds = newTrack.LengthInSeconds,
+                            releasedAt = newTrack.ReleasedAt
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.FirstWithIdAsync(newTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.FirstWithIdAsync(newTrack.Id);
 
-                trackInDatabase.Title.Should().Be(newTrack.Title);
-                trackInDatabase.LengthInSeconds.Should().BeApproximately(newTrack.LengthInSeconds);
-            });
-        }
+            trackInDatabase.Title.Should().Be(newTrack.Title);
+            trackInDatabase.LengthInSeconds.Should().BeApproximately(newTrack.LengthInSeconds);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_existing_client_generated_ID()
-        {
-            // Arrange
-            TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
-            existingLanguage.Id = Guid.NewGuid();
+    [Fact]
+    public async Task Cannot_create_resource_for_existing_client_generated_ID()
+    {
+        // Arrange
+        TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
+        existingLanguage.Id = Guid.NewGuid();
 
-            TextLanguage languageToCreate = _fakers.TextLanguage.Generate();
-            languageToCreate.Id = existingLanguage.Id;
+        TextLanguage languageToCreate = _fakers.TextLanguage.Generate();
+        languageToCreate.Id = existingLanguage.Id;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.TextLanguages.Add(languageToCreate);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.TextLanguages.Add(languageToCreate);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "textLanguages",
+                        id = languageToCreate.StringId,
+                        attributes = new
                         {
-                            type = "textLanguages",
-                            id = languageToCreate.StringId,
-                            attributes = new
-                            {
-                                isoCode = languageToCreate.IsoCode
-                            }
+                            isoCode = languageToCreate.IsoCode
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Another resource with the specified ID already exists.");
-            error.Detail.Should().Be($"Another resource of type 'textLanguages' with ID '{languageToCreate.StringId}' already exists.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Another resource with the specified ID already exists.");
+        error.Detail.Should().Be($"Another resource of type 'textLanguages' with ID '{languageToCreate.StringId}' already exists.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_incompatible_ID()
-        {
-            // Arrange
-            string guid = Unknown.StringId.Guid;
+    [Fact]
+    public async Task Cannot_create_resource_for_incompatible_ID()
+    {
+        // Arrange
+        string guid = Unknown.StringId.Guid;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        id = guid,
+                        attributes = new
                         {
-                            type = "performers",
-                            id = guid,
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
-            error.Detail.Should().Be($"Failed to convert '{guid}' of type 'String' to type 'Int32'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
+        error.Detail.Should().Be($"Failed to convert '{guid}' of type 'String' to type 'Int32'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_ID_and_local_ID()
+    [Fact]
+    public async Task Cannot_create_resource_for_ID_and_local_ID()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>(),
-                            lid = "local-1"
-                        }
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>(),
+                        lid = "local-1"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs
index ebb7dbc272..465f39cee1 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToManyRelationshipTests.cs
@@ -1,692 +1,687 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Creating
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Creating;
+
+public sealed class AtomicCreateResourceWithToManyRelationshipTests
+    : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicCreateResourceWithToManyRelationshipTests
-        : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicCreateResourceWithToManyRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicCreateResourceWithToManyRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
 
-            testContext.UseController<OperationsController>();
+        // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
+        testContext.UseController<PlaylistsController>();
+        testContext.UseController<MusicTracksController>();
+    }
 
-            // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
-            testContext.UseController<PlaylistsController>();
-            testContext.UseController<MusicTracksController>();
-        }
+    [Fact]
+    public async Task Can_create_OneToMany_relationship()
+    {
+        // Arrange
+        List<Performer> existingPerformers = _fakers.Performer.Generate(2);
+        string newTitle = _fakers.MusicTrack.Generate().Title;
 
-        [Fact]
-        public async Task Can_create_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Performer> existingPerformers = _fakers.Performer.Generate(2);
-            string newTitle = _fakers.MusicTrack.Generate().Title;
+            dbContext.Performers.AddRange(existingPerformers);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Performers.AddRange(existingPerformers);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTitle
-                            },
-                            relationships = new
+                            title = newTitle
+                        },
+                        relationships = new
+                        {
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = existingPerformers[0].StringId
-                                        },
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = existingPerformers[1].StringId
-                                        }
+                                        type = "performers",
+                                        id = existingPerformers[0].StringId
+                                    },
+                                    new
+                                    {
+                                        type = "performers",
+                                        id = existingPerformers[1].StringId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Attributes.ShouldNotBeEmpty();
-                resource.Relationships.ShouldNotBeEmpty();
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Attributes.ShouldNotBeEmpty();
+            resource.Relationships.ShouldNotBeEmpty();
+        });
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
 
-                trackInDatabase.Performers.ShouldHaveCount(2);
-                trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[0].Id);
-                trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[1].Id);
-            });
-        }
+            trackInDatabase.Performers.ShouldHaveCount(2);
+            trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[0].Id);
+            trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[1].Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_ManyToMany_relationship()
-        {
-            // Arrange
-            List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(3);
-            string newName = _fakers.Playlist.Generate().Name;
+    [Fact]
+    public async Task Can_create_ManyToMany_relationship()
+    {
+        // Arrange
+        List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(3);
+        string newName = _fakers.Playlist.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.AddRange(existingTracks);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.AddRange(existingTracks);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        attributes = new
                         {
-                            type = "playlists",
-                            attributes = new
-                            {
-                                name = newName
-                            },
-                            relationships = new
+                            name = newName
+                        },
+                        relationships = new
+                        {
+                            tracks = new
                             {
-                                tracks = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
+                                    {
+                                        type = "musicTracks",
+                                        id = existingTracks[0].StringId
+                                    },
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            id = existingTracks[0].StringId
-                                        },
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            id = existingTracks[1].StringId
-                                        },
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            id = existingTracks[2].StringId
-                                        }
+                                        type = "musicTracks",
+                                        id = existingTracks[1].StringId
+                                    },
+                                    new
+                                    {
+                                        type = "musicTracks",
+                                        id = existingTracks[2].StringId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("playlists");
-                resource.Attributes.ShouldNotBeEmpty();
-                resource.Relationships.ShouldNotBeEmpty();
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("playlists");
+            resource.Attributes.ShouldNotBeEmpty();
+            resource.Relationships.ShouldNotBeEmpty();
+        });
 
-            long newPlaylistId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        long newPlaylistId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(newPlaylistId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(newPlaylistId);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(3);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[0].Id);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[1].Id);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[2].Id);
-            });
-        }
+            playlistInDatabase.Tracks.ShouldHaveCount(3);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[0].Id);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[1].Id);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[2].Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_relationship_type()
+    [Fact]
+    public async Task Cannot_create_for_missing_relationship_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            id = Unknown.StringId.For<Performer, int>()
-                                        }
+                                        id = Unknown.StringId.For<Performer, int>()
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_relationship_type()
+    [Fact]
+    public async Task Cannot_create_for_unknown_relationship_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = Unknown.ResourceType,
-                                            id = Unknown.StringId.For<Performer, int>()
-                                        }
+                                        type = Unknown.ResourceType,
+                                        id = Unknown.StringId.For<Performer, int>()
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_relationship_ID()
+    [Fact]
+    public async Task Cannot_create_for_missing_relationship_ID()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers"
-                                        }
+                                        type = "performers"
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_relationship_IDs()
-        {
-            // Arrange
-            string newTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Cannot_create_for_unknown_relationship_IDs()
+    {
+        // Arrange
+        string newTitle = _fakers.MusicTrack.Generate().Title;
 
-            string performerId1 = Unknown.StringId.For<Performer, int>();
-            string performerId2 = Unknown.StringId.AltFor<Performer, int>();
+        string performerId1 = Unknown.StringId.For<Performer, int>();
+        string performerId2 = Unknown.StringId.AltFor<Performer, int>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTitle
-                            },
-                            relationships = new
+                            title = newTitle
+                        },
+                        relationships = new
+                        {
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = performerId1
-                                        },
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = performerId2
-                                        }
+                                        type = "performers",
+                                        id = performerId1
+                                    },
+                                    new
+                                    {
+                                        type = "performers",
+                                        id = performerId2
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
-
-            const string route = "/operations";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
-
-            responseDocument.Errors.ShouldHaveCount(2);
-
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'performers' with ID '{performerId1}' in relationship 'performers' does not exist.");
-            error1.Source.ShouldNotBeNull();
-            error1.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error1.Meta.Should().NotContainKey("requestBody");
-
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'performers' with ID '{performerId2}' in relationship 'performers' does not exist.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error2.Meta.Should().NotContainKey("requestBody");
-        }
+            }
+        };
+
+        const string route = "/operations";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+
+        responseDocument.Errors.ShouldHaveCount(2);
+
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'performers' with ID '{performerId1}' in relationship 'performers' does not exist.");
+        error1.Source.ShouldNotBeNull();
+        error1.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error1.Meta.Should().NotContainKey("requestBody");
+
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'performers' with ID '{performerId2}' in relationship 'performers' does not exist.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error2.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_create_on_relationship_type_mismatch()
+    [Fact]
+    public async Task Cannot_create_on_relationship_type_mismatch()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "playlists",
-                                            id = Unknown.StringId.For<Playlist, long>()
-                                        }
+                                        type = "playlists",
+                                        id = Unknown.StringId.For<Playlist, long>()
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'playlists' is incompatible with type 'performers' of relationship 'performers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'playlists' is incompatible with type 'performers' of relationship 'performers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_create_with_duplicates()
-        {
-            // Arrange
-            Performer existingPerformer = _fakers.Performer.Generate();
-            string newTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Can_create_with_duplicates()
+    {
+        // Arrange
+        Performer existingPerformer = _fakers.Performer.Generate();
+        string newTitle = _fakers.MusicTrack.Generate().Title;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Performers.Add(existingPerformer);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Performers.Add(existingPerformer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTitle
-                            },
-                            relationships = new
+                            title = newTitle
+                        },
+                        relationships = new
+                        {
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
+                                    {
+                                        type = "performers",
+                                        id = existingPerformer.StringId
+                                    },
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = existingPerformer.StringId
-                                        },
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = existingPerformer.StringId
-                                        }
+                                        type = "performers",
+                                        id = existingPerformer.StringId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Attributes.ShouldNotBeEmpty();
-                resource.Relationships.ShouldNotBeEmpty();
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Attributes.ShouldNotBeEmpty();
+            resource.Relationships.ShouldNotBeEmpty();
+        });
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
 
-                trackInDatabase.Performers.ShouldHaveCount(1);
-                trackInDatabase.Performers[0].Id.Should().Be(existingPerformer.Id);
-            });
-        }
+            trackInDatabase.Performers.ShouldHaveCount(1);
+            trackInDatabase.Performers[0].Id.Should().Be(existingPerformer.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_missing_data_in_OneToMany_relationship()
+    [Fact]
+    public async Task Cannot_create_with_missing_data_in_OneToMany_relationship()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
-                                {
-                                }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_null_data_in_ManyToMany_relationship()
+    [Fact]
+    public async Task Cannot_create_with_null_data_in_ManyToMany_relationship()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        relationships = new
                         {
-                            type = "playlists",
-                            relationships = new
+                            tracks = new
                             {
-                                tracks = new
-                                {
-                                    data = (object?)null
-                                }
+                                data = (object?)null
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/tracks/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/tracks/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_object_data_in_ManyToMany_relationship()
+    [Fact]
+    public async Task Cannot_create_with_object_data_in_ManyToMany_relationship()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        relationships = new
                         {
-                            type = "playlists",
-                            relationships = new
+                            tracks = new
                             {
-                                tracks = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                    }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/tracks/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/tracks/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs
index 776947b303..64fc6e66d3 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Creating/AtomicCreateResourceWithToOneRelationshipTests.cs
@@ -1,743 +1,737 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Creating
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Creating;
+
+public sealed class AtomicCreateResourceWithToOneRelationshipTests
+    : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicCreateResourceWithToOneRelationshipTests
-        : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
 
-        public AtomicCreateResourceWithToOneRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+    public AtomicCreateResourceWithToOneRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<OperationsController>();
+        testContext.UseController<OperationsController>();
 
-            // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
-            testContext.UseController<MusicTracksController>();
-            testContext.UseController<LyricsController>();
-        }
+        // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
+        testContext.UseController<MusicTracksController>();
+        testContext.UseController<LyricsController>();
+    }
 
-        [Fact]
-        public async Task Can_create_OneToOne_relationship_from_principal_side()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Can_create_OneToOne_relationship_from_principal_side()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            string newLyricText = _fakers.Lyric.Generate().Text;
+        string newLyricText = _fakers.Lyric.Generate().Text;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "lyrics",
+                        attributes = new
                         {
-                            type = "lyrics",
-                            attributes = new
-                            {
-                                text = newLyricText
-                            },
-                            relationships = new
+                            text = newLyricText
+                        },
+                        relationships = new
+                        {
+                            track = new
                             {
-                                track = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "musicTracks",
-                                        id = existingTrack.StringId
-                                    }
+                                    type = "musicTracks",
+                                    id = existingTrack.StringId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("lyrics");
-                resource.Attributes.ShouldNotBeEmpty();
-                resource.Relationships.ShouldNotBeEmpty();
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("lyrics");
+            resource.Attributes.ShouldNotBeEmpty();
+            resource.Relationships.ShouldNotBeEmpty();
+        });
 
-            long newLyricId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        long newLyricId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(newLyricId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(newLyricId);
 
-                lyricInDatabase.Track.ShouldNotBeNull();
-                lyricInDatabase.Track.Id.Should().Be(existingTrack.Id);
-            });
-        }
+            lyricInDatabase.Track.ShouldNotBeNull();
+            lyricInDatabase.Track.Id.Should().Be(existingTrack.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_OneToOne_relationship_from_dependent_side()
-        {
-            // Arrange
-            Lyric existingLyric = _fakers.Lyric.Generate();
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Can_create_OneToOne_relationship_from_dependent_side()
+    {
+        // Arrange
+        Lyric existingLyric = _fakers.Lyric.Generate();
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Lyrics.Add(existingLyric);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Lyrics.Add(existingLyric);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            },
-                            relationships = new
+                            title = newTrackTitle
+                        },
+                        relationships = new
+                        {
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "lyrics",
-                                        id = existingLyric.StringId
-                                    }
+                                    type = "lyrics",
+                                    id = existingLyric.StringId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Attributes.ShouldNotBeEmpty();
-                resource.Relationships.ShouldNotBeEmpty();
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Attributes.ShouldNotBeEmpty();
+            resource.Relationships.ShouldNotBeEmpty();
+        });
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(newTrackId);
 
-                trackInDatabase.Lyric.ShouldNotBeNull();
-                trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
-            });
-        }
+            trackInDatabase.Lyric.ShouldNotBeNull();
+            trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_resources_with_ToOne_relationship()
-        {
-            // Arrange
-            const int elementCount = 5;
+    [Fact]
+    public async Task Can_create_resources_with_ToOne_relationship()
+    {
+        // Arrange
+        const int elementCount = 5;
 
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
-            string[] newTrackTitles = _fakers.MusicTrack.Generate(elementCount).Select(musicTrack => musicTrack.Title).ToArray();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+        string[] newTrackTitles = _fakers.MusicTrack.Generate(elementCount).Select(musicTrack => musicTrack.Title).ToArray();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RecordCompanies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RecordCompanies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var operationElements = new List<object>(elementCount);
+        var operationElements = new List<object>(elementCount);
 
-            for (int index = 0; index < elementCount; index++)
+        for (int index = 0; index < elementCount; index++)
+        {
+            operationElements.Add(new
             {
-                operationElements.Add(new
+                op = "add",
+                data = new
                 {
-                    op = "add",
-                    data = new
+                    type = "musicTracks",
+                    attributes = new
                     {
-                        type = "musicTracks",
-                        attributes = new
-                        {
-                            title = newTrackTitles[index]
-                        },
-                        relationships = new
+                        title = newTrackTitles[index]
+                    },
+                    relationships = new
+                    {
+                        ownedBy = new
                         {
-                            ownedBy = new
+                            data = new
                             {
-                                data = new
-                                {
-                                    type = "recordCompanies",
-                                    id = existingCompany.StringId
-                                }
+                                type = "recordCompanies",
+                                id = existingCompany.StringId
                             }
                         }
                     }
-                });
-            }
+                }
+            });
+        }
 
-            var requestBody = new
-            {
-                atomic__operations = operationElements
-            };
+        var requestBody = new
+        {
+            atomic__operations = operationElements
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(elementCount);
+        responseDocument.Results.ShouldHaveCount(elementCount);
 
-            for (int index = 0; index < elementCount; index++)
+        for (int index = 0; index < elementCount; index++)
+        {
+            responseDocument.Results[index].Data.SingleValue.ShouldNotBeNull().With(resource =>
             {
-                responseDocument.Results[index].Data.SingleValue.ShouldNotBeNull().With(resource =>
-                {
-                    resource.Type.Should().Be("musicTracks");
-                    resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitles[index]));
-                });
-            }
+                resource.Type.Should().Be("musicTracks");
+                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitles[index]));
+            });
+        }
 
-            Guid[] newTrackIds = responseDocument.Results.Select(result => Guid.Parse(result.Data.SingleValue!.Id.ShouldNotBeNull())).ToArray();
+        Guid[] newTrackIds = responseDocument.Results.Select(result => Guid.Parse(result.Data.SingleValue!.Id.ShouldNotBeNull())).ToArray();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks
-                    .Include(musicTrack => musicTrack.OwnedBy)
-                    .Where(musicTrack => newTrackIds.Contains(musicTrack.Id))
-                    .ToListAsync();
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks
+                .Include(musicTrack => musicTrack.OwnedBy)
+                .Where(musicTrack => newTrackIds.Contains(musicTrack.Id))
+                .ToListAsync();
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                tracksInDatabase.ShouldHaveCount(elementCount);
+            tracksInDatabase.ShouldHaveCount(elementCount);
 
-                for (int index = 0; index < elementCount; index++)
-                {
-                    MusicTrack trackInDatabase = tracksInDatabase.Single(musicTrack => musicTrack.Id == newTrackIds[index]);
+            for (int index = 0; index < elementCount; index++)
+            {
+                MusicTrack trackInDatabase = tracksInDatabase.Single(musicTrack => musicTrack.Id == newTrackIds[index]);
 
-                    trackInDatabase.Title.Should().Be(newTrackTitles[index]);
+                trackInDatabase.Title.Should().Be(newTrackTitles[index]);
 
-                    trackInDatabase.OwnedBy.ShouldNotBeNull();
-                    trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
-                }
-            });
-        }
+                trackInDatabase.OwnedBy.ShouldNotBeNull();
+                trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
+            }
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_null_relationship()
+    [Fact]
+    public async Task Cannot_create_for_null_relationship()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            relationships = new
-                            {
-                                lyric = (object?)null
-                            }
+                            lyric = (object?)null
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_data_in_relationship()
+    [Fact]
+    public async Task Cannot_create_for_missing_data_in_relationship()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
-                                {
-                                }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_array_data_in_relationship()
+    [Fact]
+    public async Task Cannot_create_for_array_data_in_relationship()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "lyrics",
-                                            id = Unknown.StringId.For<Lyric, long>()
-                                        }
+                                        type = "lyrics",
+                                        id = Unknown.StringId.For<Lyric, long>()
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object or 'null', instead of an array.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object or 'null', instead of an array.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_relationship_type()
+    [Fact]
+    public async Task Cannot_create_for_missing_relationship_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        id = Unknown.StringId.For<Lyric, long>()
-                                    }
+                                    id = Unknown.StringId.For<Lyric, long>()
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_relationship_type()
+    [Fact]
+    public async Task Cannot_create_for_unknown_relationship_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = Unknown.ResourceType,
-                                        id = Unknown.StringId.For<Lyric, long>()
-                                    }
+                                    type = Unknown.ResourceType,
+                                    id = Unknown.StringId.For<Lyric, long>()
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_relationship_ID()
+    [Fact]
+    public async Task Cannot_create_for_missing_relationship_ID()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "lyrics"
-                                    }
+                                    type = "lyrics"
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_unknown_relationship_ID()
-        {
-            // Arrange
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Cannot_create_with_unknown_relationship_ID()
+    {
+        // Arrange
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            string lyricId = Unknown.StringId.For<Lyric, long>();
+        string lyricId = Unknown.StringId.For<Lyric, long>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            },
-                            relationships = new
+                            title = newTrackTitle
+                        },
+                        relationships = new
+                        {
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "lyrics",
-                                        id = lyricId
-                                    }
+                                    type = "lyrics",
+                                    id = lyricId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'lyrics' with ID '{lyricId}' in relationship 'lyric' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'lyrics' with ID '{lyricId}' in relationship 'lyric' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_create_on_relationship_type_mismatch()
+    [Fact]
+    public async Task Cannot_create_on_relationship_type_mismatch()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "playlists",
-                                        id = Unknown.StringId.For<Playlist, long>()
-                                    }
+                                    type = "playlists",
+                                    id = Unknown.StringId.For<Playlist, long>()
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'playlists' is incompatible with type 'lyrics' of relationship 'lyric'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'playlists' is incompatible with type 'lyrics' of relationship 'lyric'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_duplicate_relationship()
-        {
-            // Arrange
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Can_create_resource_with_duplicate_relationship()
+    {
+        // Arrange
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RecordCompanies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RecordCompanies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
+                        {
+                            title = newTrackTitle
+                        },
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            attributes = new
+                            ownedBy = new
                             {
-                                title = newTrackTitle
+                                data = new
+                                {
+                                    type = "recordCompanies",
+                                    id = existingCompany.StringId
+                                }
                             },
-                            relationships = new
+                            ownedBy_duplicate = new
                             {
-                                ownedBy = new
-                                {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        id = existingCompany.StringId
-                                    }
-                                },
-                                ownedBy_duplicate = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        id = existingCompany.StringId
-                                    }
+                                    type = "recordCompanies",
+                                    id = existingCompany.StringId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string requestBodyText = JsonSerializer.Serialize(requestBody).Replace("ownedBy_duplicate", "ownedBy");
+        string requestBodyText = JsonSerializer.Serialize(requestBody).Replace("ownedBy_duplicate", "ownedBy");
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBodyText);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBodyText);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Attributes.ShouldNotBeEmpty();
-                resource.Relationships.ShouldNotBeEmpty();
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Attributes.ShouldNotBeEmpty();
+            resource.Relationships.ShouldNotBeEmpty();
+        });
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(newTrackId);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
-            });
-        }
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs
index e17e0966bc..45dbb11f5e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Deleting/AtomicDeleteResourceTests.cs
@@ -1,637 +1,631 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Deleting
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Deleting;
+
+public sealed class AtomicDeleteResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicDeleteResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicDeleteResourceTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicDeleteResourceTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
+    }
 
-            testContext.UseController<OperationsController>();
-        }
+    [Fact]
+    public async Task Can_delete_existing_resource()
+    {
+        // Arrange
+        Performer existingPerformer = _fakers.Performer.Generate();
 
-        [Fact]
-        public async Task Can_delete_existing_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Performer existingPerformer = _fakers.Performer.Generate();
+            dbContext.Performers.Add(existingPerformer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Performers.Add(existingPerformer);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "performers",
-                            id = existingPerformer.StringId
-                        }
+                        type = "performers",
+                        id = existingPerformer.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Performer? performerInDatabase = await dbContext.Performers.FirstWithIdOrDefaultAsync(existingPerformer.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Performer? performerInDatabase = await dbContext.Performers.FirstWithIdOrDefaultAsync(existingPerformer.Id);
 
-                performerInDatabase.Should().BeNull();
-            });
-        }
+            performerInDatabase.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Can_delete_existing_resources()
-        {
-            // Arrange
-            const int elementCount = 5;
+    [Fact]
+    public async Task Can_delete_existing_resources()
+    {
+        // Arrange
+        const int elementCount = 5;
 
-            List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(elementCount);
+        List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(elementCount);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<MusicTrack>();
-                dbContext.MusicTracks.AddRange(existingTracks);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<MusicTrack>();
+            dbContext.MusicTracks.AddRange(existingTracks);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var operationElements = new List<object>(elementCount);
+        var operationElements = new List<object>(elementCount);
 
-            for (int index = 0; index < elementCount; index++)
+        for (int index = 0; index < elementCount; index++)
+        {
+            operationElements.Add(new
             {
-                operationElements.Add(new
+                op = "remove",
+                @ref = new
                 {
-                    op = "remove",
-                    @ref = new
-                    {
-                        type = "musicTracks",
-                        id = existingTracks[index].StringId
-                    }
-                });
-            }
+                    type = "musicTracks",
+                    id = existingTracks[index].StringId
+                }
+            });
+        }
 
-            var requestBody = new
-            {
-                atomic__operations = operationElements
-            };
+        var requestBody = new
+        {
+            atomic__operations = operationElements
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
 
-                tracksInDatabase.Should().BeEmpty();
-            });
-        }
+            tracksInDatabase.Should().BeEmpty();
+        });
+    }
 
-        [Fact]
-        public async Task Can_delete_resource_with_OneToOne_relationship_from_principal_side()
-        {
-            // Arrange
-            Lyric existingLyric = _fakers.Lyric.Generate();
-            existingLyric.Track = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Can_delete_resource_with_OneToOne_relationship_from_principal_side()
+    {
+        // Arrange
+        Lyric existingLyric = _fakers.Lyric.Generate();
+        existingLyric.Track = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Lyrics.Add(existingLyric);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Lyrics.Add(existingLyric);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = existingLyric.StringId
-                        }
+                        type = "lyrics",
+                        id = existingLyric.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Lyric? lyricInDatabase = await dbContext.Lyrics.FirstWithIdOrDefaultAsync(existingLyric.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Lyric? lyricInDatabase = await dbContext.Lyrics.FirstWithIdOrDefaultAsync(existingLyric.Id);
 
-                lyricInDatabase.Should().BeNull();
+            lyricInDatabase.Should().BeNull();
 
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.FirstWithIdAsync(existingLyric.Track.Id);
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.FirstWithIdAsync(existingLyric.Track.Id);
 
-                trackInDatabase.Lyric.Should().BeNull();
-            });
-        }
+            trackInDatabase.Lyric.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Can_delete_resource_with_OneToOne_relationship_from_dependent_side()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Lyric = _fakers.Lyric.Generate();
+    [Fact]
+    public async Task Can_delete_resource_with_OneToOne_relationship_from_dependent_side()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Lyric = _fakers.Lyric.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack? trackInDatabase = await dbContext.MusicTracks.FirstWithIdOrDefaultAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack? trackInDatabase = await dbContext.MusicTracks.FirstWithIdOrDefaultAsync(existingTrack.Id);
 
-                trackInDatabase.Should().BeNull();
+            trackInDatabase.Should().BeNull();
 
-                Lyric lyricInDatabase = await dbContext.Lyrics.FirstWithIdAsync(existingTrack.Lyric.Id);
+            Lyric lyricInDatabase = await dbContext.Lyrics.FirstWithIdAsync(existingTrack.Lyric.Id);
 
-                lyricInDatabase.Track.Should().BeNull();
-            });
-        }
+            lyricInDatabase.Track.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Can_delete_existing_resource_with_OneToMany_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Performers = _fakers.Performer.Generate(2);
+    [Fact]
+    public async Task Can_delete_existing_resource_with_OneToMany_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Performers = _fakers.Performer.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack? trackInDatabase = await dbContext.MusicTracks.FirstWithIdOrDefaultAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack? trackInDatabase = await dbContext.MusicTracks.FirstWithIdOrDefaultAsync(existingTrack.Id);
 
-                trackInDatabase.Should().BeNull();
+            trackInDatabase.Should().BeNull();
 
-                List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
+            List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
 
-                performersInDatabase.Should().ContainSingle(userAccount => userAccount.Id == existingTrack.Performers.ElementAt(0).Id);
-                performersInDatabase.Should().ContainSingle(userAccount => userAccount.Id == existingTrack.Performers.ElementAt(1).Id);
-            });
-        }
+            performersInDatabase.Should().ContainSingle(userAccount => userAccount.Id == existingTrack.Performers.ElementAt(0).Id);
+            performersInDatabase.Should().ContainSingle(userAccount => userAccount.Id == existingTrack.Performers.ElementAt(1).Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_delete_existing_resource_with_ManyToMany_relationship()
-        {
-            // Arrange
-            Playlist existingPlaylist = _fakers.Playlist.Generate();
-            existingPlaylist.Tracks = _fakers.MusicTrack.Generate(1);
+    [Fact]
+    public async Task Can_delete_existing_resource_with_ManyToMany_relationship()
+    {
+        // Arrange
+        Playlist existingPlaylist = _fakers.Playlist.Generate();
+        existingPlaylist.Tracks = _fakers.MusicTrack.Generate(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Playlists.Add(existingPlaylist);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Playlists.Add(existingPlaylist);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            id = existingPlaylist.StringId
-                        }
+                        type = "playlists",
+                        id = existingPlaylist.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist? playlistInDatabase = await dbContext.Playlists.FirstWithIdOrDefaultAsync(existingPlaylist.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist? playlistInDatabase = await dbContext.Playlists.FirstWithIdOrDefaultAsync(existingPlaylist.Id);
 
-                playlistInDatabase.Should().BeNull();
+            playlistInDatabase.Should().BeNull();
 
-                MusicTrack? trackInDatabase = await dbContext.MusicTracks.FirstWithIdOrDefaultAsync(existingPlaylist.Tracks[0].Id);
+            MusicTrack? trackInDatabase = await dbContext.MusicTracks.FirstWithIdOrDefaultAsync(existingPlaylist.Tracks[0].Id);
 
-                trackInDatabase.ShouldNotBeNull();
-            });
-        }
+            trackInDatabase.ShouldNotBeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_delete_resource_for_href_element()
+    [Fact]
+    public async Task Cannot_delete_resource_for_href_element()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
-                    {
-                        op = "remove",
-                        href = "/api/v1/musicTracks/1"
-                    }
+                    op = "remove",
+                    href = "/api/v1/musicTracks/1"
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_delete_resource_for_missing_ref_element()
+    [Fact]
+    public async Task Cannot_delete_resource_for_missing_ref_element()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
-                    {
-                        op = "remove"
-                    }
+                    op = "remove"
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'ref' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'ref' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_delete_resource_for_missing_type()
+    [Fact]
+    public async Task Cannot_delete_resource_for_missing_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            id = Unknown.StringId.Int32
-                        }
+                        id = Unknown.StringId.Int32
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_delete_resource_for_unknown_type()
+    [Fact]
+    public async Task Cannot_delete_resource_for_unknown_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = Unknown.ResourceType,
-                            id = Unknown.StringId.Int32
-                        }
+                        type = Unknown.ResourceType,
+                        id = Unknown.StringId.Int32
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_delete_resource_for_missing_ID()
+    [Fact]
+    public async Task Cannot_delete_resource_for_missing_ID()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks"
-                        }
+                        type = "musicTracks"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_delete_resource_for_unknown_ID()
-        {
-            // Arrange
-            string performerId = Unknown.StringId.For<Performer, int>();
+    [Fact]
+    public async Task Cannot_delete_resource_for_unknown_ID()
+    {
+        // Arrange
+        string performerId = Unknown.StringId.For<Performer, int>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "performers",
-                            id = performerId
-                        }
+                        type = "performers",
+                        id = performerId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'performers' with ID '{performerId}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'performers' with ID '{performerId}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_delete_resource_for_incompatible_ID()
-        {
-            // Arrange
-            string guid = Unknown.StringId.Guid;
+    [Fact]
+    public async Task Cannot_delete_resource_for_incompatible_ID()
+    {
+        // Arrange
+        string guid = Unknown.StringId.Guid;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            id = guid
-                        }
+                        type = "playlists",
+                        id = guid
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
-            error.Detail.Should().Be($"Failed to convert '{guid}' of type 'String' to type 'Int64'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
+        error.Detail.Should().Be($"Failed to convert '{guid}' of type 'String' to type 'Int64'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_delete_resource_for_ID_and_local_ID()
+    [Fact]
+    public async Task Cannot_delete_resource_for_ID_and_local_ID()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            lid = "local-1"
-                        }
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        lid = "local-1"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ImplicitlyChangingTextLanguageDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ImplicitlyChangingTextLanguageDefinition.cs
index ec80bc14b8..4548e31c16 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ImplicitlyChangingTextLanguageDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ImplicitlyChangingTextLanguageDefinition.cs
@@ -1,38 +1,34 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations;
+
+/// <summary>
+/// Used to simulate side effects that occur in the database while saving, typically caused by database triggers.
+/// </summary>
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public class ImplicitlyChangingTextLanguageDefinition : HitCountingResourceDefinition<TextLanguage, Guid>
 {
-    /// <summary>
-    /// Used to simulate side effects that occur in the database while saving, typically caused by database triggers.
-    /// </summary>
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public class ImplicitlyChangingTextLanguageDefinition : HitCountingResourceDefinition<TextLanguage, Guid>
-    {
-        internal const string Suffix = " (changed)";
+    internal const string Suffix = " (changed)";
 
-        private readonly OperationsDbContext _dbContext;
+    private readonly OperationsDbContext _dbContext;
 
-        public ImplicitlyChangingTextLanguageDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter, OperationsDbContext dbContext)
-            : base(resourceGraph, hitCounter)
-        {
-            _dbContext = dbContext;
-        }
+    public ImplicitlyChangingTextLanguageDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter, OperationsDbContext dbContext)
+        : base(resourceGraph, hitCounter)
+    {
+        _dbContext = dbContext;
+    }
 
-        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)
-            {
-                string statement = $"Update \"TextLanguages\" SET \"IsoCode\" = '{resource.IsoCode}{Suffix}' WHERE \"Id\" = '{resource.StringId}'";
-                await _dbContext.Database.ExecuteSqlRawAsync(statement, cancellationToken);
-            }
+        if (writeOperation is not WriteOperationKind.DeleteResource)
+        {
+            string statement = $"Update \"TextLanguages\" SET \"IsoCode\" = '{resource.IsoCode}{Suffix}' WHERE \"Id\" = '{resource.StringId}'";
+            await _dbContext.Database.ExecuteSqlRawAsync(statement, cancellationToken);
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicAbsoluteLinksTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicAbsoluteLinksTests.cs
index 8331548d1f..792e565f3a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicAbsoluteLinksTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicAbsoluteLinksTests.cs
@@ -1,6 +1,4 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -8,167 +6,166 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Links
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Links;
+
+public sealed class AtomicAbsoluteLinksTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicAbsoluteLinksTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
-    {
-        private const string HostPrefix = "http://localhost";
+    private const string HostPrefix = "http://localhost";
 
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
 
-        public AtomicAbsoluteLinksTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+    public AtomicAbsoluteLinksTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<OperationsController>();
+        testContext.UseController<OperationsController>();
 
-            // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
-            testContext.UseController<TextLanguagesController>();
-            testContext.UseController<RecordCompaniesController>();
+        // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
+        testContext.UseController<TextLanguagesController>();
+        testContext.UseController<RecordCompaniesController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-            });
-        }
-
-        [Fact]
-        public async Task Update_resource_with_side_effects_returns_absolute_links()
+        testContext.ConfigureServicesAfterStartup(services =>
         {
-            // Arrange
-            TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingLanguage, existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+    [Fact]
+    public async Task Update_resource_with_side_effects_returns_absolute_links()
+    {
+        // Arrange
+        TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingLanguage, existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "textLanguages",
+                        id = existingLanguage.StringId,
+                        attributes = new
                         {
-                            type = "textLanguages",
-                            id = existingLanguage.StringId,
-                            attributes = new
-                            {
-                            }
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "recordCompanies",
+                        id = existingCompany.StringId,
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            id = existingCompany.StringId,
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
-
-            const string route = "/operations";
+            }
+        };
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        const string route = "/operations";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            responseDocument.Results.ShouldHaveCount(2);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                string languageLink = $"{HostPrefix}/textLanguages/{existingLanguage.StringId}";
+        responseDocument.Results.ShouldHaveCount(2);
 
-                resource.ShouldNotBeNull();
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(languageLink);
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            string languageLink = $"{HostPrefix}/textLanguages/{existingLanguage.StringId}";
 
-                resource.Relationships.ShouldContainKey("lyrics").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{languageLink}/relationships/lyrics");
-                    value.Links.Related.Should().Be($"{languageLink}/lyrics");
-                });
-            });
+            resource.ShouldNotBeNull();
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(languageLink);
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+            resource.Relationships.ShouldContainKey("lyrics").With(value =>
             {
-                string companyLink = $"{HostPrefix}/recordCompanies/{existingCompany.StringId}";
-
-                resource.ShouldNotBeNull();
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(companyLink);
-
-                resource.Relationships.ShouldContainKey("tracks").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{companyLink}/relationships/tracks");
-                    value.Links.Related.Should().Be($"{companyLink}/tracks");
-                });
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{languageLink}/relationships/lyrics");
+                value.Links.Related.Should().Be($"{languageLink}/lyrics");
             });
-        }
+        });
 
-        [Fact]
-        public async Task Update_resource_with_side_effects_and_missing_resource_controller_hides_links()
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
         {
-            // Arrange
-            Playlist existingPlaylist = _fakers.Playlist.Generate();
+            string companyLink = $"{HostPrefix}/recordCompanies/{existingCompany.StringId}";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+            resource.ShouldNotBeNull();
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(companyLink);
+
+            resource.Relationships.ShouldContainKey("tracks").With(value =>
             {
-                dbContext.Playlists.Add(existingPlaylist);
-                await dbContext.SaveChangesAsync();
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{companyLink}/relationships/tracks");
+                value.Links.Related.Should().Be($"{companyLink}/tracks");
             });
+        });
+    }
 
-            var requestBody = new
+    [Fact]
+    public async Task Update_resource_with_side_effects_and_missing_resource_controller_hides_links()
+    {
+        // Arrange
+        Playlist existingPlaylist = _fakers.Playlist.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Playlists.Add(existingPlaylist);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        attributes = new
                         {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.ShouldNotBeNull();
-                resource.Links.Should().BeNull();
-                resource.Relationships.Should().BeNull();
-            });
-        }
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.ShouldNotBeNull();
+            resource.Links.Should().BeNull();
+            resource.Relationships.Should().BeNull();
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicRelativeLinksWithNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicRelativeLinksWithNamespaceTests.cs
index 06ebfbab3c..4fa5027418 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicRelativeLinksWithNamespaceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Links/AtomicRelativeLinksWithNamespaceTests.cs
@@ -1,7 +1,4 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -10,112 +7,111 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Links
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Links;
+
+public sealed class AtomicRelativeLinksWithNamespaceTests
+    : IClassFixture<IntegrationTestContext<RelativeLinksInApiNamespaceStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicRelativeLinksWithNamespaceTests
-        : IClassFixture<IntegrationTestContext<RelativeLinksInApiNamespaceStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<RelativeLinksInApiNamespaceStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicRelativeLinksWithNamespaceTests(
+        IntegrationTestContext<RelativeLinksInApiNamespaceStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<RelativeLinksInApiNamespaceStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicRelativeLinksWithNamespaceTests(
-            IntegrationTestContext<RelativeLinksInApiNamespaceStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
 
-            testContext.UseController<OperationsController>();
+        // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
+        testContext.UseController<TextLanguagesController>();
+        testContext.UseController<RecordCompaniesController>();
 
-            // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
-            testContext.UseController<TextLanguagesController>();
-            testContext.UseController<RecordCompaniesController>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+        });
+    }
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-            });
-        }
+    [Fact]
+    public async Task Create_resource_with_side_effects_returns_relative_links()
+    {
+        // Arrange
+        string newCompanyName = _fakers.RecordCompany.Generate().Name;
 
-        [Fact]
-        public async Task Create_resource_with_side_effects_returns_relative_links()
+        var requestBody = new
         {
-            // Arrange
-            string newCompanyName = _fakers.RecordCompany.Generate().Name;
-
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "textLanguages",
+                        attributes = new
                         {
-                            type = "textLanguages",
-                            attributes = new
-                            {
-                            }
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            attributes = new
-                            {
-                                name = newCompanyName
-                            }
+                            name = newCompanyName
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/api/operations";
+        const string route = "/api/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(2);
+        responseDocument.Results.ShouldHaveCount(2);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull();
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                string languageLink = $"/api/textLanguages/{Guid.Parse(resource.Id.ShouldNotBeNull())}";
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            string languageLink = $"/api/textLanguages/{Guid.Parse(resource.Id.ShouldNotBeNull())}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(languageLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(languageLink);
 
-                resource.Relationships.ShouldContainKey("lyrics").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{languageLink}/relationships/lyrics");
-                    value.Links.Related.Should().Be($"{languageLink}/lyrics");
-                });
+            resource.Relationships.ShouldContainKey("lyrics").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{languageLink}/relationships/lyrics");
+                value.Links.Related.Should().Be($"{languageLink}/lyrics");
             });
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull();
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                string companyLink = $"/api/recordCompanies/{short.Parse(resource.Id.ShouldNotBeNull())}";
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            string companyLink = $"/api/recordCompanies/{short.Parse(resource.Id.ShouldNotBeNull())}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(companyLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(companyLink);
 
-                resource.Relationships.ShouldContainKey("tracks").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{companyLink}/relationships/tracks");
-                    value.Links.Related.Should().Be($"{companyLink}/tracks");
-                });
+            resource.Relationships.ShouldContainKey("tracks").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{companyLink}/relationships/tracks");
+                value.Links.Related.Should().Be($"{companyLink}/tracks");
             });
-        }
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LocalIds/AtomicLocalIdTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LocalIds/AtomicLocalIdTests.cs
index 11af30d546..05b7c22ae1 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LocalIds/AtomicLocalIdTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LocalIds/AtomicLocalIdTests.cs
@@ -1,2556 +1,2551 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.LocalIds
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.LocalIds;
+
+public sealed class AtomicLocalIdTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicLocalIdTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
 
-        public AtomicLocalIdTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+    public AtomicLocalIdTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<OperationsController>();
-        }
+        testContext.UseController<OperationsController>();
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_ManyToOne_relationship_using_local_ID()
-        {
-            // Arrange
-            RecordCompany newCompany = _fakers.RecordCompany.Generate();
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Can_create_resource_with_ManyToOne_relationship_using_local_ID()
+    {
+        // Arrange
+        RecordCompany newCompany = _fakers.RecordCompany.Generate();
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            const string companyLocalId = "company-1";
+        const string companyLocalId = "company-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        lid = companyLocalId,
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            lid = companyLocalId,
-                            attributes = new
-                            {
-                                name = newCompany.Name,
-                                countryOfResidence = newCompany.CountryOfResidence
-                            }
+                            name = newCompany.Name,
+                            countryOfResidence = newCompany.CountryOfResidence
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            },
-                            relationships = new
+                            title = newTrackTitle
+                        },
+                        relationships = new
+                        {
+                            ownedBy = new
                             {
-                                ownedBy = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        lid = companyLocalId
-                                    }
+                                    type = "recordCompanies",
+                                    lid = companyLocalId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(2);
+        responseDocument.Results.ShouldHaveCount(2);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("recordCompanies");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newCompany.Name));
-                resource.Attributes.ShouldContainKey("countryOfResidence").With(value => value.Should().Be(newCompany.CountryOfResidence));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("recordCompanies");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newCompany.Name));
+            resource.Attributes.ShouldContainKey("countryOfResidence").With(value => value.Should().Be(newCompany.CountryOfResidence));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            short newCompanyId = short.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
-            Guid newTrackId = Guid.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
+        short newCompanyId = short.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(newTrackId);
 
-                trackInDatabase.Title.Should().Be(newTrackTitle);
+            trackInDatabase.Title.Should().Be(newTrackTitle);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(newCompanyId);
-                trackInDatabase.OwnedBy.Name.Should().Be(newCompany.Name);
-                trackInDatabase.OwnedBy.CountryOfResidence.Should().Be(newCompany.CountryOfResidence);
-            });
-        }
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(newCompanyId);
+            trackInDatabase.OwnedBy.Name.Should().Be(newCompany.Name);
+            trackInDatabase.OwnedBy.CountryOfResidence.Should().Be(newCompany.CountryOfResidence);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_OneToMany_relationship_using_local_ID()
-        {
-            // Arrange
-            Performer newPerformer = _fakers.Performer.Generate();
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Can_create_resource_with_OneToMany_relationship_using_local_ID()
+    {
+        // Arrange
+        Performer newPerformer = _fakers.Performer.Generate();
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            const string performerLocalId = "performer-1";
+        const string performerLocalId = "performer-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        lid = performerLocalId,
+                        attributes = new
                         {
-                            type = "performers",
-                            lid = performerLocalId,
-                            attributes = new
-                            {
-                                artistName = newPerformer.ArtistName,
-                                bornAt = newPerformer.BornAt
-                            }
+                            artistName = newPerformer.ArtistName,
+                            bornAt = newPerformer.BornAt
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            },
-                            relationships = new
+                            title = newTrackTitle
+                        },
+                        relationships = new
+                        {
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            lid = performerLocalId
-                                        }
+                                        type = "performers",
+                                        lid = performerLocalId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(2);
+        responseDocument.Results.ShouldHaveCount(2);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("performers");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newPerformer.ArtistName));
-                resource.Attributes.ShouldContainKey("bornAt").With(value => value.As<DateTimeOffset>().Should().BeCloseTo(newPerformer.BornAt));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("performers");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newPerformer.ArtistName));
+            resource.Attributes.ShouldContainKey("bornAt").With(value => value.Should().Be(newPerformer.BornAt));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            int newPerformerId = int.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
-            Guid newTrackId = Guid.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
+        int newPerformerId = int.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
 
-                trackInDatabase.Title.Should().Be(newTrackTitle);
+            trackInDatabase.Title.Should().Be(newTrackTitle);
 
-                trackInDatabase.Performers.ShouldHaveCount(1);
-                trackInDatabase.Performers[0].Id.Should().Be(newPerformerId);
-                trackInDatabase.Performers[0].ArtistName.Should().Be(newPerformer.ArtistName);
-                trackInDatabase.Performers[0].BornAt.Should().BeCloseTo(newPerformer.BornAt);
-            });
-        }
+            trackInDatabase.Performers.ShouldHaveCount(1);
+            trackInDatabase.Performers[0].Id.Should().Be(newPerformerId);
+            trackInDatabase.Performers[0].ArtistName.Should().Be(newPerformer.ArtistName);
+            trackInDatabase.Performers[0].BornAt.Should().Be(newPerformer.BornAt);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_ManyToMany_relationship_using_local_ID()
-        {
-            // Arrange
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
-            string newPlaylistName = _fakers.Playlist.Generate().Name;
+    [Fact]
+    public async Task Can_create_resource_with_ManyToMany_relationship_using_local_ID()
+    {
+        // Arrange
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+        string newPlaylistName = _fakers.Playlist.Generate().Name;
 
-            const string trackLocalId = "track-1";
+        const string trackLocalId = "track-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        attributes = new
                         {
-                            type = "playlists",
-                            attributes = new
-                            {
-                                name = newPlaylistName
-                            },
-                            relationships = new
+                            name = newPlaylistName
+                        },
+                        relationships = new
+                        {
+                            tracks = new
                             {
-                                tracks = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            lid = trackLocalId
-                                        }
+                                        type = "musicTracks",
+                                        lid = trackLocalId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(2);
+        responseDocument.Results.ShouldHaveCount(2);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("playlists");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newPlaylistName));
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("playlists");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newPlaylistName));
+        });
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
-            long newPlaylistId = long.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        long newPlaylistId = long.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(newPlaylistId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(newPlaylistId);
 
-                playlistInDatabase.Name.Should().Be(newPlaylistName);
+            playlistInDatabase.Name.Should().Be(newPlaylistName);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(1);
-                playlistInDatabase.Tracks[0].Id.Should().Be(newTrackId);
-                playlistInDatabase.Tracks[0].Title.Should().Be(newTrackTitle);
-            });
-        }
+            playlistInDatabase.Tracks.ShouldHaveCount(1);
+            playlistInDatabase.Tracks[0].Id.Should().Be(newTrackId);
+            playlistInDatabase.Tracks[0].Title.Should().Be(newTrackTitle);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_consume_local_ID_that_is_assigned_in_same_operation()
-        {
-            // Arrange
-            const string companyLocalId = "company-1";
+    [Fact]
+    public async Task Cannot_consume_local_ID_that_is_assigned_in_same_operation()
+    {
+        // Arrange
+        const string companyLocalId = "company-1";
 
-            string newCompanyName = _fakers.RecordCompany.Generate().Name;
+        string newCompanyName = _fakers.RecordCompany.Generate().Name;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
-                    },
-                    new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        lid = companyLocalId,
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            lid = companyLocalId,
-                            attributes = new
-                            {
-                                name = newCompanyName
-                            },
-                            relationships = new
+                            name = newCompanyName
+                        },
+                        relationships = new
+                        {
+                            parent = new
                             {
-                                parent = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        lid = companyLocalId
-                                    }
+                                    type = "recordCompanies",
+                                    lid = companyLocalId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
+
+        const string route = "/operations";
 
-            const string route = "/operations";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Local ID cannot be both defined and used within the same operation.");
+        error.Detail.Should().Be("Local ID 'company-1' cannot be both defined and used within the same operation.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[1]");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Local ID cannot be both defined and used within the same operation.");
-            error.Detail.Should().Be("Local ID 'company-1' cannot be both defined and used within the same operation.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[1]");
-        }
+    [Fact]
+    public async Task Cannot_reassign_local_ID()
+    {
+        // Arrange
+        string newPlaylistName = _fakers.Playlist.Generate().Name;
+        const string playlistLocalId = "playlist-1";
 
-        [Fact]
-        public async Task Cannot_reassign_local_ID()
+        var requestBody = new
         {
-            // Arrange
-            string newPlaylistName = _fakers.Playlist.Generate().Name;
-            const string playlistLocalId = "playlist-1";
-
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
-                    },
-                    new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        lid = playlistLocalId,
+                        attributes = new
                         {
-                            type = "playlists",
-                            lid = playlistLocalId,
-                            attributes = new
-                            {
-                                name = newPlaylistName
-                            }
+                            name = newPlaylistName
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        lid = playlistLocalId,
+                        attributes = new
                         {
-                            type = "playlists",
-                            lid = playlistLocalId,
-                            attributes = new
-                            {
-                                name = newPlaylistName
-                            }
+                            name = newPlaylistName
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Another local ID with the same name is already defined at this point.");
-            error.Detail.Should().Be("Another local ID with name 'playlist-1' is already defined at this point.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[2]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Another local ID with the same name is already defined at this point.");
+        error.Detail.Should().Be("Another local ID with name 'playlist-1' is already defined at this point.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[2]");
+    }
 
-        [Fact]
-        public async Task Can_update_resource_using_local_ID()
-        {
-            // Arrange
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
-            string newTrackGenre = _fakers.MusicTrack.Generate().Genre!;
+    [Fact]
+    public async Task Can_update_resource_using_local_ID()
+    {
+        // Arrange
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+        string newTrackGenre = _fakers.MusicTrack.Generate().Genre!;
 
-            const string trackLocalId = "track-1";
+        const string trackLocalId = "track-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                genre = newTrackGenre
-                            }
+                            genre = newTrackGenre
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(2);
+        responseDocument.Results.ShouldHaveCount(2);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-                resource.Attributes.ShouldContainKey("genre").With(value => value.Should().BeNull());
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+            resource.Attributes.ShouldContainKey("genre").With(value => value.Should().BeNull());
+        });
 
-            responseDocument.Results[1].Data.Value.Should().BeNull();
+        responseDocument.Results[1].Data.Value.Should().BeNull();
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.FirstWithIdAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.FirstWithIdAsync(newTrackId);
 
-                trackInDatabase.Title.Should().Be(newTrackTitle);
-                trackInDatabase.Genre.Should().Be(newTrackGenre);
-            });
-        }
+            trackInDatabase.Title.Should().Be(newTrackTitle);
+            trackInDatabase.Genre.Should().Be(newTrackGenre);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_relationships_using_local_ID()
-        {
-            // Arrange
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
-            string newArtistName = _fakers.Performer.Generate().ArtistName!;
-            string newCompanyName = _fakers.RecordCompany.Generate().Name;
+    [Fact]
+    public async Task Can_update_resource_with_relationships_using_local_ID()
+    {
+        // Arrange
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+        string newArtistName = _fakers.Performer.Generate().ArtistName!;
+        string newCompanyName = _fakers.RecordCompany.Generate().Name;
 
-            const string trackLocalId = "track-1";
-            const string performerLocalId = "performer-1";
-            const string companyLocalId = "company-1";
+        const string trackLocalId = "track-1";
+        const string performerLocalId = "performer-1";
+        const string companyLocalId = "company-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        lid = performerLocalId,
+                        attributes = new
                         {
-                            type = "performers",
-                            lid = performerLocalId,
-                            attributes = new
-                            {
-                                artistName = newArtistName
-                            }
+                            artistName = newArtistName
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        lid = companyLocalId,
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            lid = companyLocalId,
-                            attributes = new
-                            {
-                                name = newCompanyName
-                            }
+                            name = newCompanyName
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            relationships = new
+                            ownedBy = new
                             {
-                                ownedBy = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        lid = companyLocalId
-                                    }
-                                },
-                                performers = new
+                                    type = "recordCompanies",
+                                    lid = companyLocalId
+                                }
+                            },
+                            performers = new
+                            {
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            lid = performerLocalId
-                                        }
+                                        type = "performers",
+                                        lid = performerLocalId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(4);
+        responseDocument.Results.ShouldHaveCount(4);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("performers");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName));
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("performers");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName));
+        });
 
-            responseDocument.Results[2].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("recordCompanies");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newCompanyName));
-            });
+        responseDocument.Results[2].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("recordCompanies");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newCompanyName));
+        });
 
-            responseDocument.Results[3].Data.Value.Should().BeNull();
+        responseDocument.Results[3].Data.Value.Should().BeNull();
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
-            int newPerformerId = int.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
-            short newCompanyId = short.Parse(responseDocument.Results[2].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        int newPerformerId = int.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
+        short newCompanyId = short.Parse(responseDocument.Results[2].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                MusicTrack trackInDatabase = await dbContext.MusicTracks
-                    .Include(musicTrack => musicTrack.OwnedBy)
-                    .Include(musicTrack => musicTrack.Performers)
-                    .FirstWithIdAsync(newTrackId);
+            MusicTrack trackInDatabase = await dbContext.MusicTracks
+                .Include(musicTrack => musicTrack.OwnedBy)
+                .Include(musicTrack => musicTrack.Performers)
+                .FirstWithIdAsync(newTrackId);
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                trackInDatabase.Title.Should().Be(newTrackTitle);
+            trackInDatabase.Title.Should().Be(newTrackTitle);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(newCompanyId);
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(newCompanyId);
 
-                trackInDatabase.Performers.ShouldHaveCount(1);
-                trackInDatabase.Performers[0].Id.Should().Be(newPerformerId);
-                trackInDatabase.Performers[0].ArtistName.Should().Be(newArtistName);
-            });
-        }
+            trackInDatabase.Performers.ShouldHaveCount(1);
+            trackInDatabase.Performers[0].Id.Should().Be(newPerformerId);
+            trackInDatabase.Performers[0].ArtistName.Should().Be(newArtistName);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_ManyToOne_relationship_using_local_ID()
-        {
-            // Arrange
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
-            string newCompanyName = _fakers.RecordCompany.Generate().Name;
+    [Fact]
+    public async Task Can_create_ManyToOne_relationship_using_local_ID()
+    {
+        // Arrange
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+        string newCompanyName = _fakers.RecordCompany.Generate().Name;
 
-            const string trackLocalId = "track-1";
-            const string companyLocalId = "company-1";
+        const string trackLocalId = "track-1";
+        const string companyLocalId = "company-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        lid = companyLocalId,
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            lid = companyLocalId,
-                            attributes = new
-                            {
-                                name = newCompanyName
-                            }
+                            name = newCompanyName
                         }
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        relationship = "ownedBy"
                     },
-                    new
+                    data = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            relationship = "ownedBy"
-                        },
-                        data = new
-                        {
-                            type = "recordCompanies",
-                            lid = companyLocalId
-                        }
+                        type = "recordCompanies",
+                        lid = companyLocalId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(3);
+        responseDocument.Results.ShouldHaveCount(3);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("recordCompanies");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newCompanyName));
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("recordCompanies");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newCompanyName));
+        });
 
-            responseDocument.Results[2].Data.Value.Should().BeNull();
+        responseDocument.Results[2].Data.Value.Should().BeNull();
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
-            short newCompanyId = short.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        short newCompanyId = short.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(newTrackId);
 
-                trackInDatabase.Title.Should().Be(newTrackTitle);
+            trackInDatabase.Title.Should().Be(newTrackTitle);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(newCompanyId);
-                trackInDatabase.OwnedBy.Name.Should().Be(newCompanyName);
-            });
-        }
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(newCompanyId);
+            trackInDatabase.OwnedBy.Name.Should().Be(newCompanyName);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_OneToMany_relationship_using_local_ID()
-        {
-            // Arrange
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
-            string newArtistName = _fakers.Performer.Generate().ArtistName!;
+    [Fact]
+    public async Task Can_create_OneToMany_relationship_using_local_ID()
+    {
+        // Arrange
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+        string newArtistName = _fakers.Performer.Generate().ArtistName!;
 
-            const string trackLocalId = "track-1";
-            const string performerLocalId = "performer-1";
+        const string trackLocalId = "track-1";
+        const string performerLocalId = "performer-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        lid = performerLocalId,
+                        attributes = new
                         {
-                            type = "performers",
-                            lid = performerLocalId,
-                            attributes = new
-                            {
-                                artistName = newArtistName
-                            }
+                            artistName = newArtistName
                         }
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        relationship = "performers"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "performers",
-                                lid = performerLocalId
-                            }
+                            type = "performers",
+                            lid = performerLocalId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(3);
+        responseDocument.Results.ShouldHaveCount(3);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("performers");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName));
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("performers");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName));
+        });
 
-            responseDocument.Results[2].Data.Value.Should().BeNull();
+        responseDocument.Results[2].Data.Value.Should().BeNull();
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
-            int newPerformerId = int.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        int newPerformerId = int.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
 
-                trackInDatabase.Title.Should().Be(newTrackTitle);
+            trackInDatabase.Title.Should().Be(newTrackTitle);
 
-                trackInDatabase.Performers.ShouldHaveCount(1);
-                trackInDatabase.Performers[0].Id.Should().Be(newPerformerId);
-                trackInDatabase.Performers[0].ArtistName.Should().Be(newArtistName);
-            });
-        }
+            trackInDatabase.Performers.ShouldHaveCount(1);
+            trackInDatabase.Performers[0].Id.Should().Be(newPerformerId);
+            trackInDatabase.Performers[0].ArtistName.Should().Be(newArtistName);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_ManyToMany_relationship_using_local_ID()
-        {
-            // Arrange
-            string newPlaylistName = _fakers.Playlist.Generate().Name;
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Can_create_ManyToMany_relationship_using_local_ID()
+    {
+        // Arrange
+        string newPlaylistName = _fakers.Playlist.Generate().Name;
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            const string playlistLocalId = "playlist-1";
-            const string trackLocalId = "track-1";
+        const string playlistLocalId = "playlist-1";
+        const string trackLocalId = "track-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        lid = playlistLocalId,
+                        attributes = new
                         {
-                            type = "playlists",
-                            lid = playlistLocalId,
-                            attributes = new
-                            {
-                                name = newPlaylistName
-                            }
+                            name = newPlaylistName
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    @ref = new
+                    {
+                        type = "playlists",
+                        lid = playlistLocalId,
+                        relationship = "tracks"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            lid = playlistLocalId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                lid = trackLocalId
-                            }
+                            type = "musicTracks",
+                            lid = trackLocalId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(3);
+        responseDocument.Results.ShouldHaveCount(3);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("playlists");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newPlaylistName));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("playlists");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newPlaylistName));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            responseDocument.Results[2].Data.Value.Should().BeNull();
+        responseDocument.Results[2].Data.Value.Should().BeNull();
 
-            long newPlaylistId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
-            Guid newTrackId = Guid.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
+        long newPlaylistId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(newPlaylistId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(newPlaylistId);
 
-                playlistInDatabase.Name.Should().Be(newPlaylistName);
+            playlistInDatabase.Name.Should().Be(newPlaylistName);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(1);
-                playlistInDatabase.Tracks[0].Id.Should().Be(newTrackId);
-                playlistInDatabase.Tracks[0].Title.Should().Be(newTrackTitle);
-            });
-        }
+            playlistInDatabase.Tracks.ShouldHaveCount(1);
+            playlistInDatabase.Tracks[0].Id.Should().Be(newTrackId);
+            playlistInDatabase.Tracks[0].Title.Should().Be(newTrackTitle);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_OneToMany_relationship_using_local_ID()
-        {
-            // Arrange
-            Performer existingPerformer = _fakers.Performer.Generate();
+    [Fact]
+    public async Task Can_replace_OneToMany_relationship_using_local_ID()
+    {
+        // Arrange
+        Performer existingPerformer = _fakers.Performer.Generate();
 
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
-            string newArtistName = _fakers.Performer.Generate().ArtistName!;
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+        string newArtistName = _fakers.Performer.Generate().ArtistName!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Performers.Add(existingPerformer);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Performers.Add(existingPerformer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string trackLocalId = "track-1";
-            const string performerLocalId = "performer-1";
+        const string trackLocalId = "track-1";
+        const string performerLocalId = "performer-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            },
-                            relationships = new
+                            title = newTrackTitle
+                        },
+                        relationships = new
+                        {
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = existingPerformer.StringId
-                                        }
+                                        type = "performers",
+                                        id = existingPerformer.StringId
                                     }
                                 }
                             }
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        lid = performerLocalId,
+                        attributes = new
                         {
-                            type = "performers",
-                            lid = performerLocalId,
-                            attributes = new
-                            {
-                                artistName = newArtistName
-                            }
+                            artistName = newArtistName
                         }
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        relationship = "performers"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "update",
-                        @ref = new
+                        new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            relationship = "performers"
-                        },
-                        data = new[]
-                        {
-                            new
-                            {
-                                type = "performers",
-                                lid = performerLocalId
-                            }
+                            type = "performers",
+                            lid = performerLocalId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(3);
+        responseDocument.Results.ShouldHaveCount(3);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("performers");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName));
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("performers");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName));
+        });
 
-            responseDocument.Results[2].Data.Value.Should().BeNull();
+        responseDocument.Results[2].Data.Value.Should().BeNull();
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
-            int newPerformerId = int.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        int newPerformerId = int.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
 
-                trackInDatabase.Title.Should().Be(newTrackTitle);
+            trackInDatabase.Title.Should().Be(newTrackTitle);
 
-                trackInDatabase.Performers.ShouldHaveCount(1);
-                trackInDatabase.Performers[0].Id.Should().Be(newPerformerId);
-                trackInDatabase.Performers[0].ArtistName.Should().Be(newArtistName);
-            });
-        }
+            trackInDatabase.Performers.ShouldHaveCount(1);
+            trackInDatabase.Performers[0].Id.Should().Be(newPerformerId);
+            trackInDatabase.Performers[0].ArtistName.Should().Be(newArtistName);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_ManyToMany_relationship_using_local_ID()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Can_replace_ManyToMany_relationship_using_local_ID()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            string newPlaylistName = _fakers.Playlist.Generate().Name;
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+        string newPlaylistName = _fakers.Playlist.Generate().Name;
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string playlistLocalId = "playlist-1";
-            const string trackLocalId = "track-1";
+        const string playlistLocalId = "playlist-1";
+        const string trackLocalId = "track-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        lid = playlistLocalId,
+                        attributes = new
                         {
-                            type = "playlists",
-                            lid = playlistLocalId,
-                            attributes = new
-                            {
-                                name = newPlaylistName
-                            },
-                            relationships = new
+                            name = newPlaylistName
+                        },
+                        relationships = new
+                        {
+                            tracks = new
                             {
-                                tracks = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            id = existingTrack.StringId
-                                        }
+                                        type = "musicTracks",
+                                        id = existingTrack.StringId
                                     }
                                 }
                             }
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    @ref = new
+                    {
+                        type = "playlists",
+                        lid = playlistLocalId,
+                        relationship = "tracks"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "update",
-                        @ref = new
+                        new
                         {
-                            type = "playlists",
-                            lid = playlistLocalId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
-                        {
-                            new
-                            {
-                                type = "musicTracks",
-                                lid = trackLocalId
-                            }
+                            type = "musicTracks",
+                            lid = trackLocalId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(3);
+        responseDocument.Results.ShouldHaveCount(3);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("playlists");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newPlaylistName));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("playlists");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newPlaylistName));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            responseDocument.Results[2].Data.Value.Should().BeNull();
+        responseDocument.Results[2].Data.Value.Should().BeNull();
 
-            long newPlaylistId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
-            Guid newTrackId = Guid.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
+        long newPlaylistId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(newPlaylistId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(newPlaylistId);
 
-                playlistInDatabase.Name.Should().Be(newPlaylistName);
+            playlistInDatabase.Name.Should().Be(newPlaylistName);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(1);
-                playlistInDatabase.Tracks[0].Id.Should().Be(newTrackId);
-                playlistInDatabase.Tracks[0].Title.Should().Be(newTrackTitle);
-            });
-        }
+            playlistInDatabase.Tracks.ShouldHaveCount(1);
+            playlistInDatabase.Tracks[0].Id.Should().Be(newTrackId);
+            playlistInDatabase.Tracks[0].Title.Should().Be(newTrackTitle);
+        });
+    }
 
-        [Fact]
-        public async Task Can_add_to_OneToMany_relationship_using_local_ID()
-        {
-            // Arrange
-            Performer existingPerformer = _fakers.Performer.Generate();
+    [Fact]
+    public async Task Can_add_to_OneToMany_relationship_using_local_ID()
+    {
+        // Arrange
+        Performer existingPerformer = _fakers.Performer.Generate();
 
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
-            string newArtistName = _fakers.Performer.Generate().ArtistName!;
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+        string newArtistName = _fakers.Performer.Generate().ArtistName!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Performers.Add(existingPerformer);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Performers.Add(existingPerformer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string trackLocalId = "track-1";
-            const string performerLocalId = "performer-1";
+        const string trackLocalId = "track-1";
+        const string performerLocalId = "performer-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            },
-                            relationships = new
+                            title = newTrackTitle
+                        },
+                        relationships = new
+                        {
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = existingPerformer.StringId
-                                        }
+                                        type = "performers",
+                                        id = existingPerformer.StringId
                                     }
                                 }
                             }
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        lid = performerLocalId,
+                        attributes = new
                         {
-                            type = "performers",
-                            lid = performerLocalId,
-                            attributes = new
-                            {
-                                artistName = newArtistName
-                            }
+                            artistName = newArtistName
                         }
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        relationship = "performers"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "add",
-                        @ref = new
+                        new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            relationship = "performers"
-                        },
-                        data = new[]
-                        {
-                            new
-                            {
-                                type = "performers",
-                                lid = performerLocalId
-                            }
+                            type = "performers",
+                            lid = performerLocalId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(3);
+        responseDocument.Results.ShouldHaveCount(3);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("performers");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName));
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("performers");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName));
+        });
 
-            responseDocument.Results[2].Data.Value.Should().BeNull();
+        responseDocument.Results[2].Data.Value.Should().BeNull();
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
-            int newPerformerId = int.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        int newPerformerId = int.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
 
-                trackInDatabase.Title.Should().Be(newTrackTitle);
+            trackInDatabase.Title.Should().Be(newTrackTitle);
 
-                trackInDatabase.Performers.ShouldHaveCount(2);
+            trackInDatabase.Performers.ShouldHaveCount(2);
 
-                trackInDatabase.Performers[0].Id.Should().Be(existingPerformer.Id);
-                trackInDatabase.Performers[0].ArtistName.Should().Be(existingPerformer.ArtistName);
+            trackInDatabase.Performers[0].Id.Should().Be(existingPerformer.Id);
+            trackInDatabase.Performers[0].ArtistName.Should().Be(existingPerformer.ArtistName);
 
-                trackInDatabase.Performers[1].Id.Should().Be(newPerformerId);
-                trackInDatabase.Performers[1].ArtistName.Should().Be(newArtistName);
-            });
-        }
+            trackInDatabase.Performers[1].Id.Should().Be(newPerformerId);
+            trackInDatabase.Performers[1].ArtistName.Should().Be(newArtistName);
+        });
+    }
 
-        [Fact]
-        public async Task Can_add_to_ManyToMany_relationship_using_local_ID()
-        {
-            // Arrange
-            List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(2);
+    [Fact]
+    public async Task Can_add_to_ManyToMany_relationship_using_local_ID()
+    {
+        // Arrange
+        List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(2);
 
-            string newPlaylistName = _fakers.Playlist.Generate().Name;
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+        string newPlaylistName = _fakers.Playlist.Generate().Name;
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            const string playlistLocalId = "playlist-1";
-            const string trackLocalId = "track-1";
+        const string playlistLocalId = "playlist-1";
+        const string trackLocalId = "track-1";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.AddRange(existingTracks);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.AddRange(existingTracks);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        lid = playlistLocalId,
+                        attributes = new
                         {
-                            type = "playlists",
-                            lid = playlistLocalId,
-                            attributes = new
-                            {
-                                name = newPlaylistName
-                            },
-                            relationships = new
+                            name = newPlaylistName
+                        },
+                        relationships = new
+                        {
+                            tracks = new
                             {
-                                tracks = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            id = existingTracks[0].StringId
-                                        }
+                                        type = "musicTracks",
+                                        id = existingTracks[0].StringId
                                     }
                                 }
                             }
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    @ref = new
+                    {
+                        type = "playlists",
+                        lid = playlistLocalId,
+                        relationship = "tracks"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            lid = playlistLocalId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                lid = trackLocalId
-                            }
+                            type = "musicTracks",
+                            lid = trackLocalId
                         }
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    @ref = new
+                    {
+                        type = "playlists",
+                        lid = playlistLocalId,
+                        relationship = "tracks"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            lid = playlistLocalId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingTracks[1].StringId
-                            }
+                            type = "musicTracks",
+                            id = existingTracks[1].StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(4);
+        responseDocument.Results.ShouldHaveCount(4);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("playlists");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newPlaylistName));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("playlists");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newPlaylistName));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            responseDocument.Results[2].Data.Value.Should().BeNull();
+        responseDocument.Results[2].Data.Value.Should().BeNull();
 
-            responseDocument.Results[3].Data.Value.Should().BeNull();
+        responseDocument.Results[3].Data.Value.Should().BeNull();
 
-            long newPlaylistId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
-            Guid newTrackId = Guid.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
+        long newPlaylistId = long.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[1].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(newPlaylistId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(newPlaylistId);
 
-                playlistInDatabase.Name.Should().Be(newPlaylistName);
+            playlistInDatabase.Name.Should().Be(newPlaylistName);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(3);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[0].Id);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[1].Id);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == newTrackId);
-            });
-        }
+            playlistInDatabase.Tracks.ShouldHaveCount(3);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[0].Id);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[1].Id);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == newTrackId);
+        });
+    }
 
-        [Fact]
-        public async Task Can_remove_from_OneToMany_relationship_using_local_ID()
-        {
-            // Arrange
-            Performer existingPerformer = _fakers.Performer.Generate();
+    [Fact]
+    public async Task Can_remove_from_OneToMany_relationship_using_local_ID()
+    {
+        // Arrange
+        Performer existingPerformer = _fakers.Performer.Generate();
 
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
-            string newArtistName1 = _fakers.Performer.Generate().ArtistName!;
-            string newArtistName2 = _fakers.Performer.Generate().ArtistName!;
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+        string newArtistName1 = _fakers.Performer.Generate().ArtistName!;
+        string newArtistName2 = _fakers.Performer.Generate().ArtistName!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Performers.Add(existingPerformer);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Performers.Add(existingPerformer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string trackLocalId = "track-1";
-            const string performerLocalId1 = "performer-1";
-            const string performerLocalId2 = "performer-2";
+        const string trackLocalId = "track-1";
+        const string performerLocalId1 = "performer-1";
+        const string performerLocalId2 = "performer-2";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        lid = performerLocalId1,
+                        attributes = new
                         {
-                            type = "performers",
-                            lid = performerLocalId1,
-                            attributes = new
-                            {
-                                artistName = newArtistName1
-                            }
+                            artistName = newArtistName1
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        lid = performerLocalId2,
+                        attributes = new
                         {
-                            type = "performers",
-                            lid = performerLocalId2,
-                            attributes = new
-                            {
-                                artistName = newArtistName2
-                            }
+                            artistName = newArtistName2
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            },
-                            relationships = new
+                            title = newTrackTitle
+                        },
+                        relationships = new
+                        {
+                            performers = new
                             {
-                                performers = new
+                                data = new object[]
                                 {
-                                    data = new object[]
+                                    new
+                                    {
+                                        type = "performers",
+                                        id = existingPerformer.StringId
+                                    },
+                                    new
+                                    {
+                                        type = "performers",
+                                        lid = performerLocalId1
+                                    },
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = existingPerformer.StringId
-                                        },
-                                        new
-                                        {
-                                            type = "performers",
-                                            lid = performerLocalId1
-                                        },
-                                        new
-                                        {
-                                            type = "performers",
-                                            lid = performerLocalId2
-                                        }
+                                        type = "performers",
+                                        lid = performerLocalId2
                                     }
                                 }
                             }
                         }
+                    }
+                },
+                new
+                {
+                    op = "remove",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        relationship = "performers"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "remove",
-                        @ref = new
+                        new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            relationship = "performers"
+                            type = "performers",
+                            lid = performerLocalId1
                         },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "performers",
-                                lid = performerLocalId1
-                            },
-                            new
-                            {
-                                type = "performers",
-                                lid = performerLocalId2
-                            }
+                            type = "performers",
+                            lid = performerLocalId2
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(4);
+        responseDocument.Results.ShouldHaveCount(4);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("performers");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName1));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("performers");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName1));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("performers");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName2));
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("performers");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("artistName").With(value => value.Should().Be(newArtistName2));
+        });
 
-            responseDocument.Results[2].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[2].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            responseDocument.Results[3].Data.Value.Should().BeNull();
+        responseDocument.Results[3].Data.Value.Should().BeNull();
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[2].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[2].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(newTrackId);
 
-                trackInDatabase.Title.Should().Be(newTrackTitle);
+            trackInDatabase.Title.Should().Be(newTrackTitle);
 
-                trackInDatabase.Performers.ShouldHaveCount(1);
-                trackInDatabase.Performers[0].Id.Should().Be(existingPerformer.Id);
-                trackInDatabase.Performers[0].ArtistName.Should().Be(existingPerformer.ArtistName);
-            });
-        }
+            trackInDatabase.Performers.ShouldHaveCount(1);
+            trackInDatabase.Performers[0].Id.Should().Be(existingPerformer.Id);
+            trackInDatabase.Performers[0].ArtistName.Should().Be(existingPerformer.ArtistName);
+        });
+    }
 
-        [Fact]
-        public async Task Can_remove_from_ManyToMany_relationship_using_local_ID()
-        {
-            // Arrange
-            Playlist existingPlaylist = _fakers.Playlist.Generate();
-            existingPlaylist.Tracks = _fakers.MusicTrack.Generate(2);
+    [Fact]
+    public async Task Can_remove_from_ManyToMany_relationship_using_local_ID()
+    {
+        // Arrange
+        Playlist existingPlaylist = _fakers.Playlist.Generate();
+        existingPlaylist.Tracks = _fakers.MusicTrack.Generate(2);
 
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            const string trackLocalId = "track-1";
+        const string trackLocalId = "track-1";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Playlists.Add(existingPlaylist);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Playlists.Add(existingPlaylist);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    @ref = new
+                    {
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationship = "tracks"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                lid = trackLocalId
-                            }
+                            type = "musicTracks",
+                            lid = trackLocalId
                         }
+                    }
+                },
+                new
+                {
+                    op = "remove",
+                    @ref = new
+                    {
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationship = "tracks"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingPlaylist.Tracks[1].StringId
-                            }
+                            type = "musicTracks",
+                            id = existingPlaylist.Tracks[1].StringId
                         }
+                    }
+                },
+                new
+                {
+                    op = "remove",
+                    @ref = new
+                    {
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationship = "tracks"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "remove",
-                        @ref = new
+                        new
                         {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
-                        {
-                            new
-                            {
-                                type = "musicTracks",
-                                lid = trackLocalId
-                            }
+                            type = "musicTracks",
+                            lid = trackLocalId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(4);
+        responseDocument.Results.ShouldHaveCount(4);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            responseDocument.Results[1].Data.Value.Should().BeNull();
+        responseDocument.Results[1].Data.Value.Should().BeNull();
 
-            responseDocument.Results[2].Data.Value.Should().BeNull();
+        responseDocument.Results[2].Data.Value.Should().BeNull();
 
-            responseDocument.Results[3].Data.Value.Should().BeNull();
+        responseDocument.Results[3].Data.Value.Should().BeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(1);
-                playlistInDatabase.Tracks[0].Id.Should().Be(existingPlaylist.Tracks[0].Id);
-            });
-        }
+            playlistInDatabase.Tracks.ShouldHaveCount(1);
+            playlistInDatabase.Tracks[0].Id.Should().Be(existingPlaylist.Tracks[0].Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_delete_resource_using_local_ID()
-        {
-            // Arrange
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Can_delete_resource_using_local_ID()
+    {
+        // Arrange
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            const string trackLocalId = "track-1";
+        const string trackLocalId = "track-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            lid = trackLocalId
-                        }
+                        type = "musicTracks",
+                        lid = trackLocalId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(2);
+        responseDocument.Results.ShouldHaveCount(2);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("musicTracks");
-                resource.Lid.Should().BeNull();
-                resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("musicTracks");
+            resource.Lid.Should().BeNull();
+            resource.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTrackTitle));
+        });
 
-            responseDocument.Results[1].Data.Value.Should().BeNull();
+        responseDocument.Results[1].Data.Value.Should().BeNull();
 
-            Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
+        Guid newTrackId = Guid.Parse(responseDocument.Results[0].Data.SingleValue!.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack? trackInDatabase = await dbContext.MusicTracks.FirstWithIdOrDefaultAsync(newTrackId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack? trackInDatabase = await dbContext.MusicTracks.FirstWithIdOrDefaultAsync(newTrackId);
 
-                trackInDatabase.Should().BeNull();
-            });
-        }
+            trackInDatabase.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_consume_unassigned_local_ID_in_ref()
+    [Fact]
+    public async Task Cannot_consume_unassigned_local_ID_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
-                    },
-                    new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            lid = Unknown.LocalId
-                        }
+                        type = "musicTracks",
+                        lid = Unknown.LocalId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Server-generated value for local ID is not available at this point.");
-            error.Detail.Should().Be($"Server-generated value for local ID '{Unknown.LocalId}' is not available at this point.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[1]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Server-generated value for local ID is not available at this point.");
+        error.Detail.Should().Be($"Server-generated value for local ID '{Unknown.LocalId}' is not available at this point.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[1]");
+    }
 
-        [Fact]
-        public async Task Cannot_consume_unassigned_local_ID_in_data_element()
+    [Fact]
+    public async Task Cannot_consume_unassigned_local_ID_in_data_element()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
-                    },
-                    new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        lid = Unknown.LocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = Unknown.LocalId,
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Server-generated value for local ID is not available at this point.");
-            error.Detail.Should().Be($"Server-generated value for local ID '{Unknown.LocalId}' is not available at this point.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[1]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Server-generated value for local ID is not available at this point.");
+        error.Detail.Should().Be($"Server-generated value for local ID '{Unknown.LocalId}' is not available at this point.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[1]");
+    }
 
-        [Fact]
-        public async Task Cannot_consume_unassigned_local_ID_in_data_array()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_consume_unassigned_local_ID_in_data_array()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "performers",
-                                lid = Unknown.LocalId
-                            }
+                            type = "performers",
+                            lid = Unknown.LocalId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Server-generated value for local ID is not available at this point.");
-            error.Detail.Should().Be($"Server-generated value for local ID '{Unknown.LocalId}' is not available at this point.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[1]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Server-generated value for local ID is not available at this point.");
+        error.Detail.Should().Be($"Server-generated value for local ID '{Unknown.LocalId}' is not available at this point.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[1]");
+    }
 
-        [Fact]
-        public async Task Cannot_consume_unassigned_local_ID_in_relationship_data_element()
-        {
-            // Arrange
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Cannot_consume_unassigned_local_ID_in_relationship_data_element()
+    {
+        // Arrange
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
-                    },
-                    new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            },
-                            relationships = new
+                            title = newTrackTitle
+                        },
+                        relationships = new
+                        {
+                            ownedBy = new
                             {
-                                ownedBy = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        lid = Unknown.LocalId
-                                    }
+                                    type = "recordCompanies",
+                                    lid = Unknown.LocalId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Server-generated value for local ID is not available at this point.");
-            error.Detail.Should().Be($"Server-generated value for local ID '{Unknown.LocalId}' is not available at this point.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[1]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Server-generated value for local ID is not available at this point.");
+        error.Detail.Should().Be($"Server-generated value for local ID '{Unknown.LocalId}' is not available at this point.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[1]");
+    }
 
-        [Fact]
-        public async Task Cannot_consume_unassigned_local_ID_in_relationship_data_array()
-        {
-            // Arrange
-            string newPlaylistName = _fakers.Playlist.Generate().Name;
+    [Fact]
+    public async Task Cannot_consume_unassigned_local_ID_in_relationship_data_array()
+    {
+        // Arrange
+        string newPlaylistName = _fakers.Playlist.Generate().Name;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
-                    },
-                    new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        attributes = new
                         {
-                            type = "playlists",
-                            attributes = new
-                            {
-                                name = newPlaylistName
-                            },
-                            relationships = new
+                            name = newPlaylistName
+                        },
+                        relationships = new
+                        {
+                            tracks = new
                             {
-                                tracks = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            lid = Unknown.LocalId
-                                        }
+                                        type = "musicTracks",
+                                        lid = Unknown.LocalId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Server-generated value for local ID is not available at this point.");
-            error.Detail.Should().Be($"Server-generated value for local ID '{Unknown.LocalId}' is not available at this point.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[1]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Server-generated value for local ID is not available at this point.");
+        error.Detail.Should().Be($"Server-generated value for local ID '{Unknown.LocalId}' is not available at this point.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[1]");
+    }
 
-        [Fact]
-        public async Task Cannot_consume_local_ID_of_different_type_in_same_operation()
-        {
-            // Arrange
-            const string trackLocalId = "track-1";
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Cannot_consume_local_ID_of_different_type_in_same_operation()
+    {
+        // Arrange
+        const string trackLocalId = "track-1";
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
-                    },
-                    new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLocalId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLocalId,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            },
-                            relationships = new
+                            title = newTrackTitle
+                        },
+                        relationships = new
+                        {
+                            ownedBy = new
                             {
-                                ownedBy = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        lid = trackLocalId
-                                    }
+                                    type = "recordCompanies",
+                                    lid = trackLocalId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Incompatible type in Local ID usage.");
-            error.Detail.Should().Be("Local ID 'track-1' belongs to resource type 'musicTracks' instead of 'recordCompanies'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[1]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Incompatible type in Local ID usage.");
+        error.Detail.Should().Be("Local ID 'track-1' belongs to resource type 'musicTracks' instead of 'recordCompanies'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[1]");
+    }
 
-        [Fact]
-        public async Task Cannot_consume_local_ID_of_different_type_in_ref()
-        {
-            // Arrange
-            const string companyLocalId = "company-1";
+    [Fact]
+    public async Task Cannot_consume_local_ID_of_different_type_in_ref()
+    {
+        // Arrange
+        const string companyLocalId = "company-1";
 
-            string newCompanyName = _fakers.RecordCompany.Generate().Name;
+        string newCompanyName = _fakers.RecordCompany.Generate().Name;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
-                    },
-                    new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        lid = companyLocalId,
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            lid = companyLocalId,
-                            attributes = new
-                            {
-                                name = newCompanyName
-                            }
+                            name = newCompanyName
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            lid = companyLocalId
-                        }
+                        type = "musicTracks",
+                        lid = companyLocalId
                     }
                 }
-            };
+            }
+        };
+
+        const string route = "/operations";
 
-            const string route = "/operations";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Incompatible type in Local ID usage.");
+        error.Detail.Should().Be("Local ID 'company-1' belongs to resource type 'recordCompanies' instead of 'musicTracks'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[2]");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Incompatible type in Local ID usage.");
-            error.Detail.Should().Be("Local ID 'company-1' belongs to resource type 'recordCompanies' instead of 'musicTracks'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[2]");
-        }
+    [Fact]
+    public async Task Cannot_consume_local_ID_of_different_type_in_data_element()
+    {
+        // Arrange
+        const string performerLocalId = "performer-1";
 
-        [Fact]
-        public async Task Cannot_consume_local_ID_of_different_type_in_data_element()
+        var requestBody = new
         {
-            // Arrange
-            const string performerLocalId = "performer-1";
-
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
-                    },
-                    new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
-                        {
-                            type = "performers",
-                            lid = performerLocalId
-                        }
-                    },
-                    new
+                        type = "performers",
+                        lid = performerLocalId
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "playlists",
+                        lid = performerLocalId,
+                        attributes = new
                         {
-                            type = "playlists",
-                            lid = performerLocalId,
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Incompatible type in Local ID usage.");
-            error.Detail.Should().Be("Local ID 'performer-1' belongs to resource type 'performers' instead of 'playlists'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[2]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Incompatible type in Local ID usage.");
+        error.Detail.Should().Be("Local ID 'performer-1' belongs to resource type 'performers' instead of 'playlists'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[2]");
+    }
 
-        [Fact]
-        public async Task Cannot_consume_local_ID_of_different_type_in_data_array()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_consume_local_ID_of_different_type_in_data_array()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            const string companyLocalId = "company-1";
+        const string companyLocalId = "company-1";
 
-            string newCompanyName = _fakers.RecordCompany.Generate().Name;
+        string newCompanyName = _fakers.RecordCompany.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
-                    },
-                    new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        lid = companyLocalId,
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            lid = companyLocalId,
-                            attributes = new
-                            {
-                                name = newCompanyName
-                            }
+                            name = newCompanyName
                         }
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "add",
-                        @ref = new
+                        new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new[]
-                        {
-                            new
-                            {
-                                type = "performers",
-                                lid = companyLocalId
-                            }
+                            type = "performers",
+                            lid = companyLocalId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Incompatible type in Local ID usage.");
-            error.Detail.Should().Be("Local ID 'company-1' belongs to resource type 'recordCompanies' instead of 'performers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[2]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Incompatible type in Local ID usage.");
+        error.Detail.Should().Be("Local ID 'company-1' belongs to resource type 'recordCompanies' instead of 'performers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[2]");
+    }
 
-        [Fact]
-        public async Task Cannot_consume_local_ID_of_different_type_in_relationship_data_element()
-        {
-            // Arrange
-            string newPlaylistName = _fakers.Playlist.Generate().Name;
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Cannot_consume_local_ID_of_different_type_in_relationship_data_element()
+    {
+        // Arrange
+        string newPlaylistName = _fakers.Playlist.Generate().Name;
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            const string playlistLocalId = "playlist-1";
+        const string playlistLocalId = "playlist-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
-                    },
-                    new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        lid = playlistLocalId,
+                        attributes = new
                         {
-                            type = "playlists",
-                            lid = playlistLocalId,
-                            attributes = new
-                            {
-                                name = newPlaylistName
-                            }
+                            name = newPlaylistName
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            },
-                            relationships = new
+                            title = newTrackTitle
+                        },
+                        relationships = new
+                        {
+                            ownedBy = new
                             {
-                                ownedBy = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        lid = playlistLocalId
-                                    }
+                                    type = "recordCompanies",
+                                    lid = playlistLocalId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Incompatible type in Local ID usage.");
-            error.Detail.Should().Be("Local ID 'playlist-1' belongs to resource type 'playlists' instead of 'recordCompanies'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[2]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Incompatible type in Local ID usage.");
+        error.Detail.Should().Be("Local ID 'playlist-1' belongs to resource type 'playlists' instead of 'recordCompanies'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[2]");
+    }
 
-        [Fact]
-        public async Task Cannot_consume_local_ID_of_different_type_in_relationship_data_array()
-        {
-            // Arrange
-            const string performerLocalId = "performer-1";
-            string newPlaylistName = _fakers.Playlist.Generate().Name;
+    [Fact]
+    public async Task Cannot_consume_local_ID_of_different_type_in_relationship_data_array()
+    {
+        // Arrange
+        const string performerLocalId = "performer-1";
+        string newPlaylistName = _fakers.Playlist.Generate().Name;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
-                    },
-                    new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>()
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
-                        {
-                            type = "performers",
-                            lid = performerLocalId
-                        }
-                    },
-                    new
+                        type = "performers",
+                        lid = performerLocalId
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        attributes = new
                         {
-                            type = "playlists",
-                            attributes = new
-                            {
-                                name = newPlaylistName
-                            },
-                            relationships = new
+                            name = newPlaylistName
+                        },
+                        relationships = new
+                        {
+                            tracks = new
                             {
-                                tracks = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            lid = performerLocalId
-                                        }
+                                        type = "musicTracks",
+                                        lid = performerLocalId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Incompatible type in Local ID usage.");
-            error.Detail.Should().Be("Local ID 'performer-1' belongs to resource type 'performers' instead of 'musicTracks'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[2]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Incompatible type in Local ID usage.");
+        error.Detail.Should().Be("Local ID 'performer-1' belongs to resource type 'performers' instead of 'musicTracks'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[2]");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Lyric.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Lyric.cs
index e39e52ffdd..2baa9ac431 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Lyric.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Lyric.cs
@@ -1,26 +1,25 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations")]
+public sealed class Lyric : Identifiable<long>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Lyric : Identifiable<long>
-    {
-        [Attr]
-        public string? Format { get; set; }
+    [Attr]
+    public string? Format { get; set; }
 
-        [Attr]
-        public string Text { get; set; } = null!;
+    [Attr]
+    public string Text { get; set; } = null!;
 
-        [Attr(Capabilities = AttrCapabilities.None)]
-        public DateTimeOffset CreatedAt { get; set; }
+    [Attr(Capabilities = AttrCapabilities.None)]
+    public DateTimeOffset CreatedAt { get; set; }
 
-        [HasOne]
-        public TextLanguage? Language { get; set; }
+    [HasOne]
+    public TextLanguage? Language { get; set; }
 
-        [HasOne]
-        public MusicTrack? Track { get; set; }
-    }
+    [HasOne]
+    public MusicTrack? Track { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LyricsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LyricsController.cs
deleted file mode 100644
index 24936babb9..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/LyricsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
-{
-    public sealed class LyricsController : JsonApiController<Lyric, long>
-    {
-        public LyricsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Lyric, long> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs
index 6f26bd8b9b..8fcda54494 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResourceMetaTests.cs
@@ -1,7 +1,5 @@
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Extensions;
 using JsonApiDotNetCore.Configuration;
@@ -10,170 +8,169 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta;
+
+public sealed class AtomicResourceMetaTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicResourceMetaTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicResourceMetaTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
+
+        testContext.UseController<OperationsController>();
 
-        public AtomicResourceMetaTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+        testContext.ConfigureServicesAfterStartup(services =>
         {
-            _testContext = testContext;
+            services.AddResourceDefinition<MusicTrackMetaDefinition>();
+            services.AddResourceDefinition<TextLanguageMetaDefinition>();
 
-            testContext.UseController<OperationsController>();
+            services.AddSingleton<ResourceDefinitionHitCounter>();
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<MusicTrackMetaDefinition>();
-                services.AddResourceDefinition<TextLanguageMetaDefinition>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        hitCounter.Reset();
+    }
 
-                services.AddSingleton<ResourceDefinitionHitCounter>();
-            });
+    [Fact]
+    public async Task Returns_resource_meta_in_create_resource_with_side_effects()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            hitCounter.Reset();
-        }
+        string newTitle1 = _fakers.MusicTrack.Generate().Title;
+        string newTitle2 = _fakers.MusicTrack.Generate().Title;
 
-        [Fact]
-        public async Task Returns_resource_meta_in_create_resource_with_side_effects()
+        var requestBody = new
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            string newTitle1 = _fakers.MusicTrack.Generate().Title;
-            string newTitle2 = _fakers.MusicTrack.Generate().Title;
-
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTitle1,
-                                releasedAt = 1.January(2018)
-                            }
+                            title = newTitle1,
+                            releasedAt = 1.January(2018).AsUtc()
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTitle2,
-                                releasedAt = 23.August(1994)
-                            }
+                            title = newTitle2,
+                            releasedAt = 23.August(1994).AsUtc()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(2);
-
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Meta.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(2);
 
-                resource.Meta.ShouldContainKey("copyright").With(value =>
-                {
-                    JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                    element.GetString().Should().Be("(C) 2018. All rights reserved.");
-                });
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Meta.ShouldHaveCount(1);
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+            resource.Meta.ShouldContainKey("copyright").With(value =>
             {
-                resource.Meta.ShouldHaveCount(1);
-
-                resource.Meta.ShouldContainKey("copyright").With(value =>
-                {
-                    JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                    element.GetString().Should().Be("(C) 1994. All rights reserved.");
-                });
+                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+                element.GetString().Should().Be("(C) 2018. All rights reserved.");
             });
+        });
+
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Meta.ShouldHaveCount(1);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+            resource.Meta.ShouldContainKey("copyright").With(value =>
             {
-                (typeof(MusicTrack), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(MusicTrack), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
+                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+                element.GetString().Should().Be("(C) 1994. All rights reserved.");
+            });
+        });
 
-        [Fact]
-        public async Task Returns_resource_meta_in_update_resource_with_side_effects()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            (typeof(MusicTrack), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(MusicTrack), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
 
-            TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
+    [Fact]
+    public async Task Returns_resource_meta_in_update_resource_with_side_effects()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.TextLanguages.Add(existingLanguage);
-                await dbContext.SaveChangesAsync();
-            });
+        TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
 
-            var requestBody = new
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.TextLanguages.Add(existingLanguage);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "textLanguages",
+                        id = existingLanguage.StringId,
+                        attributes = new
                         {
-                            type = "textLanguages",
-                            id = existingLanguage.StringId,
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Meta.ShouldHaveCount(1);
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Meta.ShouldHaveCount(1);
 
-                resource.Meta.ShouldContainKey("notice").With(value =>
-                {
-                    JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                    element.GetString().Should().Be(TextLanguageMetaDefinition.NoticeText);
-                });
+            resource.Meta.ShouldContainKey("notice").With(value =>
+            {
+                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+                element.GetString().Should().Be(TextLanguageMetaDefinition.NoticeText);
             });
+        });
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(TextLanguage), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(TextLanguage), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMeta.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMeta.cs
index f1b4d771b1..a41a2bb22c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMeta.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMeta.cs
@@ -1,24 +1,22 @@
-using System.Collections.Generic;
 using JsonApiDotNetCore.Serialization.Response;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta;
+
+public sealed class AtomicResponseMeta : IResponseMeta
 {
-    public sealed class AtomicResponseMeta : IResponseMeta
+    public IReadOnlyDictionary<string, object?> GetMeta()
     {
-        public IReadOnlyDictionary<string, object?> GetMeta()
+        return new Dictionary<string, object?>
         {
-            return new Dictionary<string, object?>
+            ["license"] = "MIT",
+            ["projectUrl"] = "https://github.com/json-api-dotnet/JsonApiDotNetCore/",
+            ["versions"] = new[]
             {
-                ["license"] = "MIT",
-                ["projectUrl"] = "https://github.com/json-api-dotnet/JsonApiDotNetCore/",
-                ["versions"] = new[]
-                {
-                    "v4.0.0",
-                    "v3.1.0",
-                    "v2.5.2",
-                    "v1.3.1"
-                }
-            };
-        }
+                "v4.0.0",
+                "v3.1.0",
+                "v2.5.2",
+                "v1.3.1"
+            }
+        };
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMetaTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMetaTests.cs
index 5f74d971fa..327ff8e18c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMetaTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/AtomicResponseMetaTests.cs
@@ -1,8 +1,5 @@
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -11,149 +8,148 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta;
+
+public sealed class AtomicResponseMetaTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicResponseMetaTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
 
-        public AtomicResponseMetaTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+    public AtomicResponseMetaTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<OperationsController>();
+        testContext.UseController<OperationsController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<ImplicitlyChangingTextLanguageDefinition>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<ImplicitlyChangingTextLanguageDefinition>();
 
-                services.AddSingleton<ResourceDefinitionHitCounter>();
-                services.AddSingleton<IResponseMeta, AtomicResponseMeta>();
-            });
-        }
+            services.AddSingleton<ResourceDefinitionHitCounter>();
+            services.AddSingleton<IResponseMeta, AtomicResponseMeta>();
+        });
+    }
 
-        [Fact]
-        public async Task Returns_top_level_meta_in_create_resource_with_side_effects()
+    [Fact]
+    public async Task Returns_top_level_meta_in_create_resource_with_side_effects()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        attributes = new
                         {
-                            type = "performers",
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Meta.ShouldHaveCount(3);
+        responseDocument.Meta.ShouldHaveCount(3);
 
-            responseDocument.Meta.ShouldContainKey("license").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetString().Should().Be("MIT");
-            });
+        responseDocument.Meta.ShouldContainKey("license").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetString().Should().Be("MIT");
+        });
 
-            responseDocument.Meta.ShouldContainKey("projectUrl").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetString().Should().Be("https://github.com/json-api-dotnet/JsonApiDotNetCore/");
-            });
+        responseDocument.Meta.ShouldContainKey("projectUrl").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetString().Should().Be("https://github.com/json-api-dotnet/JsonApiDotNetCore/");
+        });
 
-            responseDocument.Meta.ShouldContainKey("versions").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                string?[] versionArray = element.EnumerateArray().Select(arrayItem => arrayItem.GetString()).ToArray();
-
-                versionArray.ShouldHaveCount(4);
-                versionArray.Should().Contain("v4.0.0");
-                versionArray.Should().Contain("v3.1.0");
-                versionArray.Should().Contain("v2.5.2");
-                versionArray.Should().Contain("v1.3.1");
-            });
-        }
-
-        [Fact]
-        public async Task Returns_top_level_meta_in_update_resource_with_side_effects()
+        responseDocument.Meta.ShouldContainKey("versions").With(value =>
         {
-            // Arrange
-            TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            string?[] versionArray = element.EnumerateArray().Select(arrayItem => arrayItem.GetString()).ToArray();
+
+            versionArray.ShouldHaveCount(4);
+            versionArray.Should().Contain("v4.0.0");
+            versionArray.Should().Contain("v3.1.0");
+            versionArray.Should().Contain("v2.5.2");
+            versionArray.Should().Contain("v1.3.1");
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.TextLanguages.Add(existingLanguage);
-                await dbContext.SaveChangesAsync();
-            });
+    [Fact]
+    public async Task Returns_top_level_meta_in_update_resource_with_side_effects()
+    {
+        // Arrange
+        TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
 
-            var requestBody = new
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.TextLanguages.Add(existingLanguage);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "textLanguages",
+                        id = existingLanguage.StringId,
+                        attributes = new
                         {
-                            type = "textLanguages",
-                            id = existingLanguage.StringId,
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Meta.ShouldHaveCount(3);
+        responseDocument.Meta.ShouldHaveCount(3);
 
-            responseDocument.Meta.ShouldContainKey("license").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetString().Should().Be("MIT");
-            });
+        responseDocument.Meta.ShouldContainKey("license").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetString().Should().Be("MIT");
+        });
 
-            responseDocument.Meta.ShouldContainKey("projectUrl").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetString().Should().Be("https://github.com/json-api-dotnet/JsonApiDotNetCore/");
-            });
+        responseDocument.Meta.ShouldContainKey("projectUrl").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetString().Should().Be("https://github.com/json-api-dotnet/JsonApiDotNetCore/");
+        });
 
-            responseDocument.Meta.ShouldContainKey("versions").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                string?[] versionArray = element.EnumerateArray().Select(arrayItem => arrayItem.GetString()).ToArray();
-
-                versionArray.ShouldHaveCount(4);
-                versionArray.Should().Contain("v4.0.0");
-                versionArray.Should().Contain("v3.1.0");
-                versionArray.Should().Contain("v2.5.2");
-                versionArray.Should().Contain("v1.3.1");
-            });
-        }
+        responseDocument.Meta.ShouldContainKey("versions").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            string?[] versionArray = element.EnumerateArray().Select(arrayItem => arrayItem.GetString()).ToArray();
+
+            versionArray.ShouldHaveCount(4);
+            versionArray.Should().Contain("v4.0.0");
+            versionArray.Should().Contain("v3.1.0");
+            versionArray.Should().Contain("v2.5.2");
+            versionArray.Should().Contain("v1.3.1");
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/MusicTrackMetaDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/MusicTrackMetaDefinition.cs
index 69557713bd..be59668c1c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/MusicTrackMetaDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/MusicTrackMetaDefinition.cs
@@ -1,28 +1,25 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class MusicTrackMetaDefinition : HitCountingResourceDefinition<MusicTrack, Guid>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class MusicTrackMetaDefinition : HitCountingResourceDefinition<MusicTrack, Guid>
+    protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.GetMeta;
+
+    public MusicTrackMetaDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, hitCounter)
     {
-        protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.GetMeta;
+    }
 
-        public MusicTrackMetaDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, hitCounter)
-        {
-        }
+    public override IDictionary<string, object?> GetMeta(MusicTrack resource)
+    {
+        base.GetMeta(resource);
 
-        public override IDictionary<string, object?> GetMeta(MusicTrack resource)
+        return new Dictionary<string, object?>
         {
-            base.GetMeta(resource);
-
-            return new Dictionary<string, object?>
-            {
-                ["Copyright"] = $"(C) {resource.ReleasedAt.Year}. All rights reserved."
-            };
-        }
+            ["Copyright"] = $"(C) {resource.ReleasedAt.Year}. All rights reserved."
+        };
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/TextLanguageMetaDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/TextLanguageMetaDefinition.cs
index 2badcd6f88..f46b2940a6 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/TextLanguageMetaDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Meta/TextLanguageMetaDefinition.cs
@@ -1,29 +1,27 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Meta;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class TextLanguageMetaDefinition : ImplicitlyChangingTextLanguageDefinition
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    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.";
+    internal const string NoticeText = "See https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes for ISO 639-1 language codes.";
 
-        protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.GetMeta;
+    protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.GetMeta;
 
-        public TextLanguageMetaDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter, OperationsDbContext dbContext)
-            : base(resourceGraph, hitCounter, dbContext)
-        {
-        }
+    public TextLanguageMetaDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter, OperationsDbContext dbContext)
+        : base(resourceGraph, hitCounter, dbContext)
+    {
+    }
 
-        public override IDictionary<string, object?> GetMeta(TextLanguage resource)
-        {
-            base.GetMeta(resource);
+    public override IDictionary<string, object?> GetMeta(TextLanguage resource)
+    {
+        base.GetMeta(resource);
 
-            return new Dictionary<string, object?>
-            {
-                ["Notice"] = NoticeText
-            };
-        }
+        return new Dictionary<string, object?>
+        {
+            ["Notice"] = NoticeText
+        };
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicLoggingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicLoggingTests.cs
index f37cbd170f..19c9b2d872 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicLoggingTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicLoggingTests.cs
@@ -1,8 +1,4 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.AtomicOperations;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -11,176 +7,175 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Mixed
-{
-    public sealed class AtomicLoggingTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Mixed;
 
-        public AtomicLoggingTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+public sealed class AtomicLoggingTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+{
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
 
-            testContext.UseController<OperationsController>();
+    public AtomicLoggingTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            var loggerFactory = new FakeLoggerFactory(LogLevel.Information);
+        testContext.UseController<OperationsController>();
 
-            testContext.ConfigureLogging(options =>
-            {
-                options.ClearProviders();
-                options.AddProvider(loggerFactory);
-                options.SetMinimumLevel(LogLevel.Information);
-            });
+        var loggerFactory = new FakeLoggerFactory(LogLevel.Information);
 
-            testContext.ConfigureServicesBeforeStartup(services =>
-            {
-                services.AddSingleton(loggerFactory);
-            });
+        testContext.ConfigureLogging(options =>
+        {
+            options.ClearProviders();
+            options.AddProvider(loggerFactory);
+            options.SetMinimumLevel(LogLevel.Information);
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddSingleton<IOperationsTransactionFactory, ThrowingOperationsTransactionFactory>();
-            });
-        }
+        testContext.ConfigureServicesBeforeStartup(services =>
+        {
+            services.AddSingleton(loggerFactory);
+        });
 
-        [Fact]
-        public async Task Logs_at_error_level_on_unhandled_exception()
+        testContext.ConfigureServicesAfterStartup(services =>
         {
-            // Arrange
-            var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
-            loggerFactory.Logger.Clear();
+            services.AddSingleton<IOperationsTransactionFactory, ThrowingOperationsTransactionFactory>();
+        });
+    }
+
+    [Fact]
+    public async Task Logs_at_error_level_on_unhandled_exception()
+    {
+        // Arrange
+        var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
+        loggerFactory.Logger.Clear();
 
-            var transactionFactory = (ThrowingOperationsTransactionFactory)_testContext.Factory.Services.GetRequiredService<IOperationsTransactionFactory>();
-            transactionFactory.ThrowOnOperationStart = true;
+        var transactionFactory = (ThrowingOperationsTransactionFactory)_testContext.Factory.Services.GetRequiredService<IOperationsTransactionFactory>();
+        transactionFactory.ThrowOnOperationStart = true;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        attributes = new
                         {
-                            type = "performers",
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.InternalServerError);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.InternalServerError);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
-            error.Title.Should().Be("An unhandled error occurred while processing an operation in this request.");
-            error.Detail.Should().Be("Simulated failure.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
+        error.Title.Should().Be("An unhandled error occurred while processing an operation in this request.");
+        error.Detail.Should().Be("Simulated failure.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
 
-            loggerFactory.Logger.Messages.ShouldNotBeEmpty();
+        loggerFactory.Logger.Messages.ShouldNotBeEmpty();
 
-            loggerFactory.Logger.Messages.Should().ContainSingle(message => message.LogLevel == LogLevel.Error &&
-                message.Text.Contains("Simulated failure.", StringComparison.Ordinal));
-        }
+        loggerFactory.Logger.Messages.Should().ContainSingle(message => message.LogLevel == LogLevel.Error &&
+            message.Text.Contains("Simulated failure.", StringComparison.Ordinal));
+    }
 
-        [Fact]
-        public async Task Logs_at_info_level_on_invalid_request_body()
-        {
-            // Arrange
-            var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
-            loggerFactory.Logger.Clear();
+    [Fact]
+    public async Task Logs_at_info_level_on_invalid_request_body()
+    {
+        // Arrange
+        var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
+        loggerFactory.Logger.Clear();
 
-            var transactionFactory = (ThrowingOperationsTransactionFactory)_testContext.Factory.Services.GetRequiredService<IOperationsTransactionFactory>();
-            transactionFactory.ThrowOnOperationStart = false;
+        var transactionFactory = (ThrowingOperationsTransactionFactory)_testContext.Factory.Services.GetRequiredService<IOperationsTransactionFactory>();
+        transactionFactory.ThrowOnOperationStart = false;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
-                    {
-                        op = "update"
-                    }
+                    op = "update"
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            loggerFactory.Logger.Messages.ShouldNotBeEmpty();
+        loggerFactory.Logger.Messages.ShouldNotBeEmpty();
 
-            loggerFactory.Logger.Messages.Should().ContainSingle(message => message.LogLevel == LogLevel.Information &&
-                message.Text.Contains("Failed to deserialize request body", StringComparison.Ordinal));
+        loggerFactory.Logger.Messages.Should().ContainSingle(message => message.LogLevel == LogLevel.Information &&
+            message.Text.Contains("Failed to deserialize request body", StringComparison.Ordinal));
+    }
+
+    private sealed class ThrowingOperationsTransactionFactory : IOperationsTransactionFactory
+    {
+        public bool ThrowOnOperationStart { get; set; }
+
+        public Task<IOperationsTransaction> BeginTransactionAsync(CancellationToken cancellationToken)
+        {
+            IOperationsTransaction transaction = new ThrowingOperationsTransaction(this);
+            return Task.FromResult(transaction);
         }
 
-        private sealed class ThrowingOperationsTransactionFactory : IOperationsTransactionFactory
+        private sealed class ThrowingOperationsTransaction : IOperationsTransaction
         {
-            public bool ThrowOnOperationStart { get; set; }
+            private readonly ThrowingOperationsTransactionFactory _owner;
 
-            public Task<IOperationsTransaction> BeginTransactionAsync(CancellationToken cancellationToken)
+            public string TransactionId => "some";
+
+            public ThrowingOperationsTransaction(ThrowingOperationsTransactionFactory owner)
             {
-                IOperationsTransaction transaction = new ThrowingOperationsTransaction(this);
-                return Task.FromResult(transaction);
+                _owner = owner;
             }
 
-            private sealed class ThrowingOperationsTransaction : IOperationsTransaction
+            public ValueTask DisposeAsync()
             {
-                private readonly ThrowingOperationsTransactionFactory _owner;
-
-                public string TransactionId => "some";
-
-                public ThrowingOperationsTransaction(ThrowingOperationsTransactionFactory owner)
-                {
-                    _owner = owner;
-                }
+                return ValueTask.CompletedTask;
+            }
 
-                public ValueTask DisposeAsync()
-                {
-                    return ValueTask.CompletedTask;
-                }
+            public Task BeforeProcessOperationAsync(CancellationToken cancellationToken)
+            {
+                return ThrowIfEnabled();
+            }
 
-                public Task BeforeProcessOperationAsync(CancellationToken cancellationToken)
-                {
-                    return ThrowIfEnabled();
-                }
+            public Task AfterProcessOperationAsync(CancellationToken cancellationToken)
+            {
+                return ThrowIfEnabled();
+            }
 
-                public Task AfterProcessOperationAsync(CancellationToken cancellationToken)
-                {
-                    return ThrowIfEnabled();
-                }
+            public Task CommitAsync(CancellationToken cancellationToken)
+            {
+                return ThrowIfEnabled();
+            }
 
-                public Task CommitAsync(CancellationToken cancellationToken)
+            private Task ThrowIfEnabled()
+            {
+                if (_owner.ThrowOnOperationStart)
                 {
-                    return ThrowIfEnabled();
+                    throw new Exception("Simulated failure.");
                 }
 
-                private Task ThrowIfEnabled()
-                {
-                    if (_owner.ThrowOnOperationStart)
-                    {
-                        throw new Exception("Simulated failure.");
-                    }
-
-                    return Task.CompletedTask;
-                }
+                return Task.CompletedTask;
             }
         }
     }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicRequestBodyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicRequestBodyTests.cs
index 8bc07968e8..aaf3722093 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicRequestBodyTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicRequestBodyTests.cs
@@ -1,219 +1,215 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Mixed
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Mixed;
+
+public sealed class AtomicRequestBodyTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicRequestBodyTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+
+    public AtomicRequestBodyTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+        _testContext = testContext;
 
-        public AtomicRequestBodyTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
+    }
 
-            testContext.UseController<OperationsController>();
-        }
+    [Fact]
+    public async Task Cannot_process_for_missing_request_body()
+    {
+        // Arrange
+        const string route = "/operations";
 
-        [Fact]
-        public async Task Cannot_process_for_missing_request_body()
-        {
-            // Arrange
-            const string route = "/operations";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, null!);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, null!);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+    [Fact]
+    public async Task Cannot_process_for_null_request_body()
+    {
+        // Arrange
+        const string requestBody = "null";
 
-        [Fact]
-        public async Task Cannot_process_for_null_request_body()
-        {
-            // Arrange
-            const string requestBody = "null";
+        const string route = "/operations";
 
-            const string route = "/operations";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_process_for_broken_JSON_request_body()
+    {
+        // Arrange
+        const string requestBody = "{\"atomic__operations\":[{\"op\":";
 
-        [Fact]
-        public async Task Cannot_process_for_broken_JSON_request_body()
-        {
-            // Arrange
-            const string requestBody = "{\"atomic__operations\":[{\"op\":";
+        const string route = "/operations";
 
-            const string route = "/operations";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body.");
+        error.Detail.Should().Match("* There is an open JSON object or array that should be closed. *");
+        error.Source.Should().BeNull();
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body.");
-            error.Detail.Should().Match("* There is an open JSON object or array that should be closed. *");
-            error.Source.Should().BeNull();
-        }
+    [Fact]
+    public async Task Cannot_process_for_missing_operations_array()
+    {
+        // Arrange
+        const string route = "/operations";
 
-        [Fact]
-        public async Task Cannot_process_for_missing_operations_array()
+        var requestBody = new
         {
-            // Arrange
-            const string route = "/operations";
-
-            var requestBody = new
+            meta = new
             {
-                meta = new
-                {
-                    key = "value"
-                }
-            };
+                key = "value"
+            }
+        };
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: No operations found.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: No operations found.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_process_empty_operations_array()
+    [Fact]
+    public async Task Cannot_process_empty_operations_array()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
-            {
-                atomic__operations = Array.Empty<object>()
-            };
+            atomic__operations = Array.Empty<object>()
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: No operations found.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: No operations found.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_process_null_operation()
+    [Fact]
+    public async Task Cannot_process_null_operation()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
-                {
-                    (object?)null
-                }
-            };
+                (object?)null
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_process_for_unknown_operation_code()
+    [Fact]
+    public async Task Cannot_process_for_unknown_operation_code()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "merge",
+                    data = new
                     {
-                        op = "merge",
-                        data = new
+                        type = "performers",
+                        attributes = new
                         {
-                            type = "performers",
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body.");
-            error.Detail.Should().StartWith("The JSON value could not be converted to ");
-            error.Source.Should().BeNull();
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body.");
+        error.Detail.Should().StartWith("The JSON value could not be converted to ");
+        error.Source.Should().BeNull();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicSerializationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicSerializationTests.cs
index 358bb9935d..314e14746e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicSerializationTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/AtomicSerializationTests.cs
@@ -1,98 +1,95 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Mixed
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Mixed;
+
+public sealed class AtomicSerializationTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicSerializationTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
 
-        public AtomicSerializationTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+    public AtomicSerializationTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<OperationsController>();
+        testContext.UseController<OperationsController>();
 
-            // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
-            testContext.UseController<TextLanguagesController>();
+        // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
+        testContext.UseController<TextLanguagesController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<ImplicitlyChangingTextLanguageDefinition>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<ImplicitlyChangingTextLanguageDefinition>();
 
-                services.AddSingleton<ResourceDefinitionHitCounter>();
-            });
+            services.AddSingleton<ResourceDefinitionHitCounter>();
+        });
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeExceptionStackTraceInErrors = false;
-            options.IncludeJsonApiVersion = true;
-            options.AllowClientGeneratedIds = true;
-        }
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeExceptionStackTraceInErrors = false;
+        options.IncludeJsonApiVersion = true;
+        options.AllowClientGeneratedIds = true;
+    }
 
-        [Fact]
-        public async Task Hides_data_for_void_operation()
-        {
-            // Arrange
-            Performer existingPerformer = _fakers.Performer.Generate();
+    [Fact]
+    public async Task Hides_data_for_void_operation()
+    {
+        // Arrange
+        Performer existingPerformer = _fakers.Performer.Generate();
 
-            TextLanguage newLanguage = _fakers.TextLanguage.Generate();
-            newLanguage.Id = Guid.NewGuid();
+        TextLanguage newLanguage = _fakers.TextLanguage.Generate();
+        newLanguage.Id = Guid.NewGuid();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Performers.Add(existingPerformer);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Performers.Add(existingPerformer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "performers",
+                        id = existingPerformer.StringId,
+                        attributes = new
                         {
-                            type = "performers",
-                            id = existingPerformer.StringId,
-                            attributes = new
-                            {
-                            }
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "textLanguages",
+                        id = newLanguage.StringId,
+                        attributes = new
                         {
-                            type = "textLanguages",
-                            id = newLanguage.StringId,
-                            attributes = new
-                            {
-                                isoCode = newLanguage.IsoCode
-                            }
+                            isoCode = newLanguage.IsoCode
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""jsonapi"": {
     ""version"": ""1.1"",
     ""ext"": [
@@ -128,41 +125,41 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     }
   ]
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Includes_version_with_ext_on_error_in_operations_endpoint()
-        {
-            // Arrange
-            string musicTrackId = Unknown.StringId.For<MusicTrack, Guid>();
+    [Fact]
+    public async Task Includes_version_with_ext_on_error_in_operations_endpoint()
+    {
+        // Arrange
+        string musicTrackId = Unknown.StringId.For<MusicTrack, Guid>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = musicTrackId
-                        }
+                        type = "musicTracks",
+                        id = musicTrackId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            string errorId = JsonApiStringConverter.ExtractErrorId(responseDocument);
+        string errorId = JsonApiStringConverter.ExtractErrorId(responseDocument);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""jsonapi"": {
     ""version"": ""1.1"",
     ""ext"": [
@@ -184,6 +181,5 @@ public async Task Includes_version_with_ext_on_error_in_operations_endpoint()
     }
   ]
 }");
-        }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/MaximumOperationsPerRequestTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/MaximumOperationsPerRequestTests.cs
index b15a8215e2..818fda8a70 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/MaximumOperationsPerRequestTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Mixed/MaximumOperationsPerRequestTests.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -9,159 +6,158 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Mixed
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Mixed;
+
+public sealed class MaximumOperationsPerRequestTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class MaximumOperationsPerRequestTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+
+    public MaximumOperationsPerRequestTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+        _testContext = testContext;
 
-        public MaximumOperationsPerRequestTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
+    }
 
-            testContext.UseController<OperationsController>();
-        }
+    [Fact]
+    public async Task Cannot_process_more_operations_than_maximum()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.MaximumOperationsPerRequest = 2;
 
-        [Fact]
-        public async Task Cannot_process_more_operations_than_maximum()
+        var requestBody = new
         {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.MaximumOperationsPerRequest = 2;
-
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
-                        {
-                            type = "performers"
-                        }
-                    },
-                    new
+                        type = "performers"
+                    }
+                },
+                new
+                {
+                    op = "remove",
+                    data = new
                     {
-                        op = "remove",
-                        data = new
-                        {
-                            type = "performers"
-                        }
-                    },
-                    new
+                        type = "performers"
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
-                        {
-                            type = "performers"
-                        }
+                        type = "performers"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Too many operations in request.");
-            error.Detail.Should().Be("The number of operations in this request (3) is higher than the maximum of 2.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Too many operations in request.");
+        error.Detail.Should().Be("The number of operations in this request (3) is higher than the maximum of 2.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_process_operations_same_as_maximum()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.MaximumOperationsPerRequest = 2;
+    [Fact]
+    public async Task Can_process_operations_same_as_maximum()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.MaximumOperationsPerRequest = 2;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        attributes = new
                         {
-                            type = "performers",
-                            attributes = new
-                            {
-                            }
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        attributes = new
                         {
-                            type = "performers",
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-        [Fact]
-        public async Task Can_process_high_number_of_operations_when_unconstrained()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.MaximumOperationsPerRequest = null;
+    [Fact]
+    public async Task Can_process_high_number_of_operations_when_unconstrained()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.MaximumOperationsPerRequest = null;
 
-            const int elementCount = 100;
+        const int elementCount = 100;
 
-            var operationElements = new List<object>(elementCount);
+        var operationElements = new List<object>(elementCount);
 
-            for (int index = 0; index < elementCount; index++)
+        for (int index = 0; index < elementCount; index++)
+        {
+            operationElements.Add(new
             {
-                operationElements.Add(new
+                op = "add",
+                data = new
                 {
-                    op = "add",
-                    data = new
+                    type = "performers",
+                    attributes = new
                     {
-                        type = "performers",
-                        attributes = new
-                        {
-                        }
                     }
-                });
-            }
+                }
+            });
+        }
 
-            var requestBody = new
-            {
-                atomic__operations = operationElements
-            };
+        var requestBody = new
+        {
+            atomic__operations = operationElements
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ModelStateValidation/AtomicModelStateValidationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ModelStateValidation/AtomicModelStateValidationTests.cs
index 9fad376626..9c69af2f71 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ModelStateValidation/AtomicModelStateValidationTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ModelStateValidation/AtomicModelStateValidationTests.cs
@@ -1,574 +1,571 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ModelStateValidation
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ModelStateValidation;
+
+public sealed class AtomicModelStateValidationTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicModelStateValidationTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
 
-        public AtomicModelStateValidationTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+    public AtomicModelStateValidationTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<OperationsController>();
-        }
+        testContext.UseController<OperationsController>();
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_multiple_violations()
+    [Fact]
+    public async Task Cannot_create_resource_with_multiple_violations()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                lengthInSeconds = -1
-                            }
+                            lengthInSeconds = -1
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error1.Title.Should().Be("Input validation failed.");
-            error1.Detail.Should().Be("The Title field is required.");
-            error1.Source.ShouldNotBeNull();
-            error1.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/title");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error1.Title.Should().Be("Input validation failed.");
+        error1.Detail.Should().Be("The Title field is required.");
+        error1.Source.ShouldNotBeNull();
+        error1.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/title");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error2.Title.Should().Be("Input validation failed.");
-            error2.Detail.Should().Be("The field LengthInSeconds must be between 1 and 1440.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/lengthInSeconds");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error2.Title.Should().Be("Input validation failed.");
+        error2.Detail.Should().Be("The field LengthInSeconds must be between 1 and 1440.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/lengthInSeconds");
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_annotated_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            string newPlaylistName = _fakers.Playlist.Generate().Name;
+    [Fact]
+    public async Task Can_create_resource_with_annotated_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        string newPlaylistName = _fakers.Playlist.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        attributes = new
                         {
-                            type = "playlists",
-                            attributes = new
-                            {
-                                name = newPlaylistName
-                            },
-                            relationships = new
+                            name = newPlaylistName
+                        },
+                        relationships = new
+                        {
+                            tracks = new
                             {
-                                tracks = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            id = existingTrack.StringId
-                                        }
+                                        type = "musicTracks",
+                                        id = existingTrack.StringId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            long newPlaylistId = long.Parse(responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().Id.ShouldNotBeNull());
+        long newPlaylistId = long.Parse(responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(newPlaylistId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(newPlaylistId);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(1);
-                playlistInDatabase.Tracks[0].Id.Should().Be(existingTrack.Id);
-            });
-        }
+            playlistInDatabase.Tracks.ShouldHaveCount(1);
+            playlistInDatabase.Tracks[0].Id.Should().Be(existingTrack.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_multiple_violations()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_with_multiple_violations()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            attributes = new
-                            {
-                                title = (string?)null,
-                                lengthInSeconds = -1
-                            }
+                            title = (string?)null,
+                            lengthInSeconds = -1
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error1.Title.Should().Be("Input validation failed.");
-            error1.Detail.Should().Be("The Title field is required.");
-            error1.Source.ShouldNotBeNull();
-            error1.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/title");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error1.Title.Should().Be("Input validation failed.");
+        error1.Detail.Should().Be("The Title field is required.");
+        error1.Source.ShouldNotBeNull();
+        error1.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/title");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error2.Title.Should().Be("Input validation failed.");
-            error2.Detail.Should().Be("The field LengthInSeconds must be between 1 and 1440.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/lengthInSeconds");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error2.Title.Should().Be("Input validation failed.");
+        error2.Detail.Should().Be("The field LengthInSeconds must be between 1 and 1440.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/lengthInSeconds");
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_omitted_required_attribute()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            string newTrackGenre = _fakers.MusicTrack.Generate().Genre!;
+    [Fact]
+    public async Task Can_update_resource_with_omitted_required_attribute()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        string newTrackGenre = _fakers.MusicTrack.Generate().Genre!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            attributes = new
-                            {
-                                genre = newTrackGenre
-                            }
+                            genre = newTrackGenre
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Title.Should().Be(existingTrack.Title);
-                trackInDatabase.Genre.Should().Be(newTrackGenre);
-            });
-        }
+            trackInDatabase.Title.Should().Be(existingTrack.Title);
+            trackInDatabase.Genre.Should().Be(newTrackGenre);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_annotated_relationship()
-        {
-            // Arrange
-            Playlist existingPlaylist = _fakers.Playlist.Generate();
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Can_update_resource_with_annotated_relationship()
+    {
+        // Arrange
+        Playlist existingPlaylist = _fakers.Playlist.Generate();
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingPlaylist, existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingPlaylist, existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationships = new
                         {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationships = new
+                            tracks = new
                             {
-                                tracks = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            id = existingTrack.StringId
-                                        }
+                                        type = "musicTracks",
+                                        id = existingTrack.StringId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(1);
-                playlistInDatabase.Tracks[0].Id.Should().Be(existingTrack.Id);
-            });
-        }
+            playlistInDatabase.Tracks.ShouldHaveCount(1);
+            playlistInDatabase.Tracks[0].Id.Should().Be(existingTrack.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_ManyToOne_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Can_update_ManyToOne_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingTrack, existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingTrack, existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "ownedBy"
-                        },
-                        data = new
-                        {
-                            type = "recordCompanies",
-                            id = existingCompany.StringId
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "ownedBy"
+                    },
+                    data = new
+                    {
+                        type = "recordCompanies",
+                        id = existingCompany.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
-            });
-        }
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_ManyToMany_relationship()
-        {
-            // Arrange
-            Playlist existingPlaylist = _fakers.Playlist.Generate();
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Can_update_ManyToMany_relationship()
+    {
+        // Arrange
+        Playlist existingPlaylist = _fakers.Playlist.Generate();
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingPlaylist, existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingPlaylist, existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationship = "tracks"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingTrack.StringId
-                            }
+                            type = "musicTracks",
+                            id = existingTrack.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(1);
-                playlistInDatabase.Tracks[0].Id.Should().Be(existingTrack.Id);
-            });
-        }
+            playlistInDatabase.Tracks.ShouldHaveCount(1);
+            playlistInDatabase.Tracks[0].Id.Should().Be(existingTrack.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Validates_all_operations_before_execution_starts()
+    [Fact]
+    public async Task Validates_all_operations_before_execution_starts()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "playlists",
+                        id = Unknown.StringId.For<Playlist, long>(),
+                        attributes = new
                         {
-                            type = "playlists",
-                            id = Unknown.StringId.For<Playlist, long>(),
-                            attributes = new
-                            {
-                                name = (string?)null
-                            }
+                            name = (string?)null
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = "some",
-                                lengthInSeconds = -1
-                            }
+                            title = "some",
+                            lengthInSeconds = -1
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error1.Title.Should().Be("Input validation failed.");
-            error1.Detail.Should().Be("The Name field is required.");
-            error1.Source.ShouldNotBeNull();
-            error1.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/name");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error1.Title.Should().Be("Input validation failed.");
+        error1.Detail.Should().Be("The Name field is required.");
+        error1.Source.ShouldNotBeNull();
+        error1.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/name");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error2.Title.Should().Be("Input validation failed.");
-            error2.Detail.Should().Be("The field LengthInSeconds must be between 1 and 1440.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/atomic:operations[1]/data/attributes/lengthInSeconds");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error2.Title.Should().Be("Input validation failed.");
+        error2.Detail.Should().Be("The field LengthInSeconds must be between 1 and 1440.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/atomic:operations[1]/data/attributes/lengthInSeconds");
+    }
 
-        [Fact]
-        public async Task Does_not_exceed_MaxModelValidationErrors()
+    [Fact]
+    public async Task Does_not_exceed_MaxModelValidationErrors()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        attributes = new
                         {
-                            type = "playlists",
-                            attributes = new
-                            {
-                                name = (string?)null
-                            }
+                            name = (string?)null
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        attributes = new
                         {
-                            type = "playlists",
-                            attributes = new
-                            {
-                                name = (string?)null
-                            }
+                            name = (string?)null
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                lengthInSeconds = -1
-                            }
+                            lengthInSeconds = -1
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "playlists",
+                        attributes = new
                         {
-                            type = "playlists",
-                            attributes = new
-                            {
-                                name = (string?)null
-                            }
+                            name = (string?)null
                         }
                     }
                 }
-            };
-
-            const string route = "/operations";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
-
-            responseDocument.Errors.ShouldHaveCount(3);
-
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error1.Title.Should().Be("Input validation failed.");
-            error1.Detail.Should().Be("The maximum number of allowed model errors has been reached.");
-            error1.Source.Should().BeNull();
-
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error2.Title.Should().Be("Input validation failed.");
-            error2.Detail.Should().Be("The Name field is required.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/name");
-
-            ErrorObject error3 = responseDocument.Errors[2];
-            error3.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error3.Title.Should().Be("Input validation failed.");
-            error3.Detail.Should().Be("The Name field is required.");
-            error3.Source.ShouldNotBeNull();
-            error3.Source.Pointer.Should().Be("/atomic:operations[1]/data/attributes/name");
-        }
+            }
+        };
+
+        const string route = "/operations";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+
+        responseDocument.Errors.ShouldHaveCount(3);
+
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error1.Title.Should().Be("Input validation failed.");
+        error1.Detail.Should().Be("The maximum number of allowed model errors has been reached.");
+        error1.Source.Should().BeNull();
+
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error2.Title.Should().Be("Input validation failed.");
+        error2.Detail.Should().Be("The Name field is required.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/name");
+
+        ErrorObject error3 = responseDocument.Errors[2];
+        error3.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error3.Title.Should().Be("Input validation failed.");
+        error3.Detail.Should().Be("The Name field is required.");
+        error3.Source.ShouldNotBeNull();
+        error3.Source.Pointer.Should().Be("/atomic:operations[1]/data/attributes/name");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTrack.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTrack.cs
index 8e3071aeb7..42bbbdfd3b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTrack.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTrack.cs
@@ -1,41 +1,39 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations")]
+public sealed class MusicTrack : Identifiable<Guid>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class MusicTrack : Identifiable<Guid>
-    {
-        [RegularExpression(@"(?im)^[{(]?[0-9A-F]{8}[-]?(?:[0-9A-F]{4}[-]?){3}[0-9A-F]{12}[)}]?$")]
-        public override Guid Id { get; set; }
+    [RegularExpression(@"(?im)^[{(]?[0-9A-F]{8}[-]?(?:[0-9A-F]{4}[-]?){3}[0-9A-F]{12}[)}]?$")]
+    public override Guid Id { get; set; }
 
-        [Attr]
-        public string Title { get; set; } = null!;
+    [Attr]
+    public string Title { get; set; } = null!;
 
-        [Attr]
-        [Range(1, 24 * 60)]
-        public decimal? LengthInSeconds { get; set; }
+    [Attr]
+    [Range(1, 24 * 60)]
+    public decimal? LengthInSeconds { get; set; }
 
-        [Attr]
-        public string? Genre { get; set; }
+    [Attr]
+    public string? Genre { get; set; }
 
-        [Attr]
-        public DateTimeOffset ReleasedAt { get; set; }
+    [Attr]
+    public DateTimeOffset ReleasedAt { get; set; }
 
-        [HasOne]
-        public Lyric? Lyric { get; set; }
+    [HasOne]
+    public Lyric? Lyric { get; set; }
 
-        [HasOne]
-        public RecordCompany? OwnedBy { get; set; }
+    [HasOne]
+    public RecordCompany? OwnedBy { get; set; }
 
-        [HasMany]
-        public IList<Performer> Performers { get; set; } = new List<Performer>();
+    [HasMany]
+    public IList<Performer> Performers { get; set; } = new List<Performer>();
 
-        [HasMany]
-        public IList<Playlist> OccursIn { get; set; } = new List<Playlist>();
-    }
+    [HasMany]
+    public IList<Playlist> OccursIn { get; set; } = new List<Playlist>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTracksController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTracksController.cs
deleted file mode 100644
index 697ba4a00e..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/MusicTracksController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
-{
-    public sealed class MusicTracksController : JsonApiController<MusicTrack, Guid>
-    {
-        public MusicTracksController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<MusicTrack, Guid> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsController.cs
index eb1aa68911..08ef7b169b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsController.cs
@@ -5,14 +5,13 @@
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations;
+
+public sealed class OperationsController : JsonApiOperationsController
 {
-    public sealed class OperationsController : JsonApiOperationsController
+    public OperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor,
+        IJsonApiRequest request, ITargetedFields targetedFields)
+        : base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
     {
-        public OperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor,
-            IJsonApiRequest request, ITargetedFields targetedFields)
-            : base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
-        {
-        }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsDbContext.cs
index dc46d4e672..45be92ce8b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsDbContext.cs
@@ -3,33 +3,32 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class OperationsDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class OperationsDbContext : DbContext
-    {
-        public DbSet<Playlist> Playlists => Set<Playlist>();
-        public DbSet<MusicTrack> MusicTracks => Set<MusicTrack>();
-        public DbSet<Lyric> Lyrics => Set<Lyric>();
-        public DbSet<TextLanguage> TextLanguages => Set<TextLanguage>();
-        public DbSet<Performer> Performers => Set<Performer>();
-        public DbSet<RecordCompany> RecordCompanies => Set<RecordCompany>();
+    public DbSet<Playlist> Playlists => Set<Playlist>();
+    public DbSet<MusicTrack> MusicTracks => Set<MusicTrack>();
+    public DbSet<Lyric> Lyrics => Set<Lyric>();
+    public DbSet<TextLanguage> TextLanguages => Set<TextLanguage>();
+    public DbSet<Performer> Performers => Set<Performer>();
+    public DbSet<RecordCompany> RecordCompanies => Set<RecordCompany>();
 
-        public OperationsDbContext(DbContextOptions<OperationsDbContext> options)
-            : base(options)
-        {
-        }
+    public OperationsDbContext(DbContextOptions<OperationsDbContext> options)
+        : base(options)
+    {
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<MusicTrack>()
-                .HasOne(musicTrack => musicTrack.Lyric)
-                .WithOne(lyric => lyric!.Track!)
-                .HasForeignKey<MusicTrack>("LyricId");
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<MusicTrack>()
+            .HasOne(musicTrack => musicTrack.Lyric)
+            .WithOne(lyric => lyric.Track!)
+            .HasForeignKey<MusicTrack>("LyricId");
 
-            builder.Entity<MusicTrack>()
-                .HasMany(musicTrack => musicTrack.OccursIn)
-                .WithMany(playlist => playlist.Tracks);
-        }
+        builder.Entity<MusicTrack>()
+            .HasMany(musicTrack => musicTrack.OccursIn)
+            .WithMany(playlist => playlist.Tracks);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsFakers.cs
index 1632eb6af8..8cf3c07e41 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsFakers.cs
@@ -1,67 +1,63 @@
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
-{
-    internal sealed class OperationsFakers : FakerContainer
-    {
-        private static readonly Lazy<IReadOnlyList<string>> LazyLanguageIsoCodes =
-            new(() => CultureInfo
-                .GetCultures(CultureTypes.NeutralCultures)
-                .Where(culture => !string.IsNullOrEmpty(culture.Name))
-                .Select(culture => culture.Name)
-                .ToArray());
-
-        private readonly Lazy<Faker<Playlist>> _lazyPlaylistFaker = new(() =>
-            new Faker<Playlist>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(playlist => playlist.Name, faker => faker.Lorem.Sentence()));
-
-        private readonly Lazy<Faker<MusicTrack>> _lazyMusicTrackFaker = new(() =>
-            new Faker<MusicTrack>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(musicTrack => musicTrack.Title, faker => faker.Lorem.Word())
-                .RuleFor(musicTrack => musicTrack.LengthInSeconds, faker => faker.Random.Decimal(3 * 60, 5 * 60))
-                .RuleFor(musicTrack => musicTrack.Genre, faker => faker.Lorem.Word())
-                .RuleFor(musicTrack => musicTrack.ReleasedAt, faker => faker.Date.PastOffset()
-                    .TruncateToWholeMilliseconds()));
-
-        private readonly Lazy<Faker<Lyric>> _lazyLyricFaker = new(() =>
-            new Faker<Lyric>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(lyric => lyric.Text, faker => faker.Lorem.Text())
-                .RuleFor(lyric => lyric.Format, "LRC"));
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations;
 
-        private readonly Lazy<Faker<TextLanguage>> _lazyTextLanguageFaker = new(() =>
-            new Faker<TextLanguage>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(textLanguage => textLanguage.IsoCode, faker => faker.PickRandom<string>(LazyLanguageIsoCodes.Value)));
-
-        private readonly Lazy<Faker<Performer>> _lazyPerformerFaker = new(() =>
-            new Faker<Performer>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(performer => performer.ArtistName, faker => faker.Name.FullName())
-                .RuleFor(performer => performer.BornAt, faker => faker.Date.PastOffset()
-                    .TruncateToWholeMilliseconds()));
-
-        private readonly Lazy<Faker<RecordCompany>> _lazyRecordCompanyFaker = new(() =>
-            new Faker<RecordCompany>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(recordCompany => recordCompany.Name, faker => faker.Company.CompanyName())
-                .RuleFor(recordCompany => recordCompany.CountryOfResidence, faker => faker.Address.Country()));
-
-        public Faker<Playlist> Playlist => _lazyPlaylistFaker.Value;
-        public Faker<MusicTrack> MusicTrack => _lazyMusicTrackFaker.Value;
-        public Faker<Lyric> Lyric => _lazyLyricFaker.Value;
-        public Faker<TextLanguage> TextLanguage => _lazyTextLanguageFaker.Value;
-        public Faker<Performer> Performer => _lazyPerformerFaker.Value;
-        public Faker<RecordCompany> RecordCompany => _lazyRecordCompanyFaker.Value;
-    }
+internal sealed class OperationsFakers : FakerContainer
+{
+    private static readonly Lazy<IReadOnlyList<string>> LazyLanguageIsoCodes =
+        new(() => CultureInfo
+            .GetCultures(CultureTypes.NeutralCultures)
+            .Where(culture => !string.IsNullOrEmpty(culture.Name))
+            .Select(culture => culture.Name)
+            .ToArray());
+
+    private readonly Lazy<Faker<Playlist>> _lazyPlaylistFaker = new(() =>
+        new Faker<Playlist>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(playlist => playlist.Name, faker => faker.Lorem.Sentence()));
+
+    private readonly Lazy<Faker<MusicTrack>> _lazyMusicTrackFaker = new(() =>
+        new Faker<MusicTrack>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(musicTrack => musicTrack.Title, faker => faker.Lorem.Word())
+            .RuleFor(musicTrack => musicTrack.LengthInSeconds, faker => faker.Random.Decimal(3 * 60, 5 * 60))
+            .RuleFor(musicTrack => musicTrack.Genre, faker => faker.Lorem.Word())
+            .RuleFor(musicTrack => musicTrack.ReleasedAt, faker => faker.Date.PastOffset()
+                .TruncateToWholeMilliseconds()));
+
+    private readonly Lazy<Faker<Lyric>> _lazyLyricFaker = new(() =>
+        new Faker<Lyric>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(lyric => lyric.Text, faker => faker.Lorem.Text())
+            .RuleFor(lyric => lyric.Format, "LRC"));
+
+    private readonly Lazy<Faker<TextLanguage>> _lazyTextLanguageFaker = new(() =>
+        new Faker<TextLanguage>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(textLanguage => textLanguage.IsoCode, faker => faker.PickRandom<string>(LazyLanguageIsoCodes.Value)));
+
+    private readonly Lazy<Faker<Performer>> _lazyPerformerFaker = new(() =>
+        new Faker<Performer>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(performer => performer.ArtistName, faker => faker.Name.FullName())
+            .RuleFor(performer => performer.BornAt, faker => faker.Date.PastOffset()
+                .TruncateToWholeMilliseconds()));
+
+    private readonly Lazy<Faker<RecordCompany>> _lazyRecordCompanyFaker = new(() =>
+        new Faker<RecordCompany>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(recordCompany => recordCompany.Name, faker => faker.Company.CompanyName())
+            .RuleFor(recordCompany => recordCompany.CountryOfResidence, faker => faker.Address.Country()));
+
+    public Faker<Playlist> Playlist => _lazyPlaylistFaker.Value;
+    public Faker<MusicTrack> MusicTrack => _lazyMusicTrackFaker.Value;
+    public Faker<Lyric> Lyric => _lazyLyricFaker.Value;
+    public Faker<TextLanguage> TextLanguage => _lazyTextLanguageFaker.Value;
+    public Faker<Performer> Performer => _lazyPerformerFaker.Value;
+    public Faker<RecordCompany> RecordCompany => _lazyRecordCompanyFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Performer.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Performer.cs
index d0403e340b..97e5a8d1d3 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Performer.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Performer.cs
@@ -1,17 +1,16 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations")]
+public sealed class Performer : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Performer : Identifiable<int>
-    {
-        [Attr]
-        public string? ArtistName { get; set; }
+    [Attr]
+    public string? ArtistName { get; set; }
 
-        [Attr]
-        public DateTimeOffset BornAt { get; set; }
-    }
+    [Attr]
+    public DateTimeOffset BornAt { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PerformersController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PerformersController.cs
deleted file mode 100644
index 59c5dfc60c..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PerformersController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
-{
-    public sealed class PerformersController : JsonApiController<Performer, int>
-    {
-        public PerformersController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Performer, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Playlist.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Playlist.cs
index 43d05609a9..e8baf731d0 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Playlist.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Playlist.cs
@@ -1,22 +1,21 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations")]
+public sealed class Playlist : Identifiable<long>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Playlist : Identifiable<long>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [NotMapped]
-        [Attr]
-        public bool IsArchived => false;
+    [NotMapped]
+    [Attr]
+    public bool IsArchived => false;
 
-        [HasMany]
-        public IList<MusicTrack> Tracks { get; set; } = new List<MusicTrack>();
-    }
+    [HasMany]
+    public IList<MusicTrack> Tracks { get; set; } = new List<MusicTrack>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PlaylistsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PlaylistsController.cs
deleted file mode 100644
index 1b893615f3..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/PlaylistsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
-{
-    public sealed class PlaylistsController : JsonApiController<Playlist, long>
-    {
-        public PlaylistsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Playlist, long> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/AtomicQueryStringTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/AtomicQueryStringTests.cs
index a9d0f8a1c7..cf0db00e3e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/AtomicQueryStringTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/AtomicQueryStringTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Extensions;
 using JsonApiDotNetCore.Configuration;
@@ -12,345 +8,344 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.QueryStrings;
+
+public sealed class AtomicQueryStringTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicQueryStringTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
-    {
-        private static readonly DateTime FrozenTime = 30.July(2018).At(13, 46, 12);
+    private static readonly DateTime FrozenTime = 30.July(2018).At(13, 46, 12).AsUtc();
 
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
 
-        public AtomicQueryStringTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+    public AtomicQueryStringTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<OperationsController>();
-            testContext.UseController<MusicTracksController>();
+        testContext.UseController<OperationsController>();
+        testContext.UseController<MusicTracksController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddSingleton<ISystemClock>(new FrozenSystemClock
             {
-                services.AddSingleton<ISystemClock>(new FrozenSystemClock
-                {
-                    UtcNow = FrozenTime
-                });
-
-                services.AddResourceDefinition<MusicTrackReleaseDefinition>();
+                UtcNow = FrozenTime
             });
-        }
 
-        [Fact]
-        public async Task Cannot_include_on_operations_endpoint()
+            services.AddResourceDefinition<MusicTrackReleaseDefinition>();
+        });
+    }
+
+    [Fact]
+    public async Task Cannot_include_on_operations_endpoint()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations?include=recordCompanies";
+        const string route = "/operations?include=recordCompanies";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
-            error.Detail.Should().Be("The parameter 'include' cannot be used at this endpoint.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("include");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
+        error.Detail.Should().Be("The parameter 'include' cannot be used at this endpoint.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("include");
+    }
 
-        [Fact]
-        public async Task Cannot_filter_on_operations_endpoint()
+    [Fact]
+    public async Task Cannot_filter_on_operations_endpoint()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations?filter=equals(id,'1')";
+        const string route = "/operations?filter=equals(id,'1')";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
-            error.Detail.Should().Be("The parameter 'filter' cannot be used at this endpoint.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("filter");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
+        error.Detail.Should().Be("The parameter 'filter' cannot be used at this endpoint.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("filter");
+    }
 
-        [Fact]
-        public async Task Cannot_sort_on_operations_endpoint()
+    [Fact]
+    public async Task Cannot_sort_on_operations_endpoint()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations?sort=-id";
+        const string route = "/operations?sort=-id";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
-            error.Detail.Should().Be("The parameter 'sort' cannot be used at this endpoint.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("sort");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
+        error.Detail.Should().Be("The parameter 'sort' cannot be used at this endpoint.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("sort");
+    }
 
-        [Fact]
-        public async Task Cannot_use_pagination_number_on_operations_endpoint()
+    [Fact]
+    public async Task Cannot_use_pagination_number_on_operations_endpoint()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations?page[number]=1";
+        const string route = "/operations?page[number]=1";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
-            error.Detail.Should().Be("The parameter 'page[number]' cannot be used at this endpoint.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[number]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
+        error.Detail.Should().Be("The parameter 'page[number]' cannot be used at this endpoint.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[number]");
+    }
 
-        [Fact]
-        public async Task Cannot_use_pagination_size_on_operations_endpoint()
+    [Fact]
+    public async Task Cannot_use_pagination_size_on_operations_endpoint()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations?page[size]=1";
+        const string route = "/operations?page[size]=1";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
-            error.Detail.Should().Be("The parameter 'page[size]' cannot be used at this endpoint.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[size]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
+        error.Detail.Should().Be("The parameter 'page[size]' cannot be used at this endpoint.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[size]");
+    }
 
-        [Fact]
-        public async Task Cannot_use_sparse_fieldset_on_operations_endpoint()
+    [Fact]
+    public async Task Cannot_use_sparse_fieldset_on_operations_endpoint()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
+
+        const string route = "/operations?fields[recordCompanies]=id";
 
-            const string route = "/operations?fields[recordCompanies]=id";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
+        error.Detail.Should().Be("The parameter 'fields[recordCompanies]' cannot be used at this endpoint.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("fields[recordCompanies]");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
-            error.Detail.Should().Be("The parameter 'fields[recordCompanies]' cannot be used at this endpoint.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("fields[recordCompanies]");
-        }
+    [Fact]
+    public async Task Can_use_Queryable_handler_on_resource_endpoint()
+    {
+        // Arrange
+        List<MusicTrack> musicTracks = _fakers.MusicTrack.Generate(3);
+        musicTracks[0].ReleasedAt = FrozenTime.AddMonths(5);
+        musicTracks[1].ReleasedAt = FrozenTime.AddMonths(-5);
+        musicTracks[2].ReleasedAt = FrozenTime.AddMonths(-1);
 
-        [Fact]
-        public async Task Can_use_Queryable_handler_on_resource_endpoint()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<MusicTrack> musicTracks = _fakers.MusicTrack.Generate(3);
-            musicTracks[0].ReleasedAt = FrozenTime.AddMonths(5);
-            musicTracks[1].ReleasedAt = FrozenTime.AddMonths(-5);
-            musicTracks[2].ReleasedAt = FrozenTime.AddMonths(-1);
+            await dbContext.ClearTableAsync<MusicTrack>();
+            dbContext.MusicTracks.AddRange(musicTracks);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<MusicTrack>();
-                dbContext.MusicTracks.AddRange(musicTracks);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/musicTracks?isRecentlyReleased=true";
 
-            const string route = "/musicTracks?isRecentlyReleased=true";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(musicTracks[2].StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(musicTracks[2].StringId);
-        }
+    [Fact]
+    public async Task Cannot_use_Queryable_handler_on_operations_endpoint()
+    {
+        // Arrange
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-        [Fact]
-        public async Task Cannot_use_Queryable_handler_on_operations_endpoint()
+        var requestBody = new
         {
-            // Arrange
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
-
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations?isRecentlyReleased=true";
+        const string route = "/operations?isRecentlyReleased=true";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Unknown query string parameter.");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Unknown query string parameter.");
 
-            error.Detail.Should().Be("Query string parameter 'isRecentlyReleased' is unknown. " +
-                "Set 'AllowUnknownQueryStringParameters' to 'true' in options to ignore unknown parameters.");
+        error.Detail.Should().Be("Query string parameter 'isRecentlyReleased' is unknown. " +
+            "Set 'AllowUnknownQueryStringParameters' to 'true' in options to ignore unknown parameters.");
 
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("isRecentlyReleased");
-        }
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("isRecentlyReleased");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs
index 1d3264bda7..fdf91e9744 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/QueryStrings/MusicTrackReleaseDefinition.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore;
 using JsonApiDotNetCore.Configuration;
@@ -7,39 +5,38 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.QueryStrings;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class MusicTrackReleaseDefinition : JsonApiResourceDefinition<MusicTrack, Guid>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class MusicTrackReleaseDefinition : JsonApiResourceDefinition<MusicTrack, Guid>
+    private readonly ISystemClock _systemClock;
+
+    public MusicTrackReleaseDefinition(IResourceGraph resourceGraph, ISystemClock systemClock)
+        : base(resourceGraph)
     {
-        private readonly ISystemClock _systemClock;
+        ArgumentGuard.NotNull(systemClock, nameof(systemClock));
+
+        _systemClock = systemClock;
+    }
 
-        public MusicTrackReleaseDefinition(IResourceGraph resourceGraph, ISystemClock systemClock)
-            : base(resourceGraph)
+    public override QueryStringParameterHandlers<MusicTrack> OnRegisterQueryableHandlersForQueryStringParameters()
+    {
+        return new QueryStringParameterHandlers<MusicTrack>
         {
-            ArgumentGuard.NotNull(systemClock, nameof(systemClock));
+            ["isRecentlyReleased"] = FilterOnRecentlyReleased
+        };
+    }
 
-            _systemClock = systemClock;
-        }
+    private IQueryable<MusicTrack> FilterOnRecentlyReleased(IQueryable<MusicTrack> source, StringValues parameterValue)
+    {
+        IQueryable<MusicTrack> tracks = source;
 
-        public override QueryStringParameterHandlers<MusicTrack> OnRegisterQueryableHandlersForQueryStringParameters()
+        if (bool.Parse(parameterValue))
         {
-            return new QueryStringParameterHandlers<MusicTrack>
-            {
-                ["isRecentlyReleased"] = FilterOnRecentlyReleased
-            };
+            tracks = tracks.Where(musicTrack => musicTrack.ReleasedAt < _systemClock.UtcNow && musicTrack.ReleasedAt > _systemClock.UtcNow.AddMonths(-3));
         }
 
-        private IQueryable<MusicTrack> FilterOnRecentlyReleased(IQueryable<MusicTrack> source, StringValues parameterValue)
-        {
-            IQueryable<MusicTrack> tracks = source;
-
-            if (bool.Parse(parameterValue))
-            {
-                tracks = tracks.Where(musicTrack => musicTrack.ReleasedAt < _systemClock.UtcNow && musicTrack.ReleasedAt > _systemClock.UtcNow.AddMonths(-3));
-            }
-
-            return tracks;
-        }
+        return tracks;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompaniesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompaniesController.cs
deleted file mode 100644
index 6cc63b23db..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompaniesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
-{
-    public sealed class RecordCompaniesController : JsonApiController<RecordCompany, short>
-    {
-        public RecordCompaniesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<RecordCompany, short> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompany.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompany.cs
index b8ab7be551..5e0509a57f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompany.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/RecordCompany.cs
@@ -1,23 +1,22 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations")]
+public sealed class RecordCompany : Identifiable<short>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class RecordCompany : Identifiable<short>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [Attr]
-        public string? CountryOfResidence { get; set; }
+    [Attr]
+    public string? CountryOfResidence { get; set; }
 
-        [HasMany]
-        public IList<MusicTrack> Tracks { get; set; } = new List<MusicTrack>();
+    [HasMany]
+    public IList<MusicTrack> Tracks { get; set; } = new List<MusicTrack>();
 
-        [HasOne]
-        public RecordCompany? Parent { get; set; }
-    }
+    [HasOne]
+    public RecordCompany? Parent { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/AtomicSerializationResourceDefinitionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/AtomicSerializationResourceDefinitionTests.cs
index 277b3f6122..acbd3e0895 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/AtomicSerializationResourceDefinitionTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/AtomicSerializationResourceDefinitionTests.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
@@ -11,383 +8,382 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.Serialization;
+
+public sealed class AtomicSerializationResourceDefinitionTests
+    : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicSerializationResourceDefinitionTests
-        : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicSerializationResourceDefinitionTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
+
+        testContext.UseController<OperationsController>();
 
-        public AtomicSerializationResourceDefinitionTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+        testContext.ConfigureServicesAfterStartup(services =>
         {
-            _testContext = testContext;
+            services.AddResourceDefinition<RecordCompanyDefinition>();
 
-            testContext.UseController<OperationsController>();
+            services.AddSingleton<ResourceDefinitionHitCounter>();
+            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<RecordCompanyDefinition>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        hitCounter.Reset();
+    }
 
-                services.AddSingleton<ResourceDefinitionHitCounter>();
-                services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-            });
+    [Fact]
+    public async Task Transforms_on_create_resource_with_side_effects()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            hitCounter.Reset();
-        }
+        List<RecordCompany> newCompanies = _fakers.RecordCompany.Generate(2);
 
-        [Fact]
-        public async Task Transforms_on_create_resource_with_side_effects()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            List<RecordCompany> newCompanies = _fakers.RecordCompany.Generate(2);
+            await dbContext.ClearTableAsync<RecordCompany>();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<RecordCompany>();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            attributes = new
-                            {
-                                name = newCompanies[0].Name,
-                                countryOfResidence = newCompanies[0].CountryOfResidence
-                            }
+                            name = newCompanies[0].Name,
+                            countryOfResidence = newCompanies[0].CountryOfResidence
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "recordCompanies",
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            attributes = new
-                            {
-                                name = newCompanies[1].Name,
-                                countryOfResidence = newCompanies[1].CountryOfResidence
-                            }
+                            name = newCompanies[1].Name,
+                            countryOfResidence = newCompanies[1].CountryOfResidence
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(2);
+        responseDocument.Results.ShouldHaveCount(2);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newCompanies[0].Name.ToUpperInvariant()));
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newCompanies[0].Name.ToUpperInvariant()));
 
-                string countryOfResidence = newCompanies[0].CountryOfResidence!.ToUpperInvariant();
-                resource.Attributes.ShouldContainKey("countryOfResidence").With(value => value.Should().Be(countryOfResidence));
-            });
+            string countryOfResidence = newCompanies[0].CountryOfResidence!.ToUpperInvariant();
+            resource.Attributes.ShouldContainKey("countryOfResidence").With(value => value.Should().Be(countryOfResidence));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newCompanies[1].Name.ToUpperInvariant()));
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newCompanies[1].Name.ToUpperInvariant()));
 
-                string countryOfResidence = newCompanies[1].CountryOfResidence!.ToUpperInvariant();
-                resource.Attributes.ShouldContainKey("countryOfResidence").With(value => value.Should().Be(countryOfResidence));
-            });
+            string countryOfResidence = newCompanies[1].CountryOfResidence!.ToUpperInvariant();
+            resource.Attributes.ShouldContainKey("countryOfResidence").With(value => value.Should().Be(countryOfResidence));
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<RecordCompany> companiesInDatabase = await dbContext.RecordCompanies.ToListAsync();
-                companiesInDatabase.ShouldHaveCount(2);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<RecordCompany> companiesInDatabase = await dbContext.RecordCompanies.ToListAsync();
+            companiesInDatabase.ShouldHaveCount(2);
 
-                companiesInDatabase[0].Name.Should().Be(newCompanies[0].Name.ToUpperInvariant());
-                companiesInDatabase[0].CountryOfResidence.Should().Be(newCompanies[0].CountryOfResidence);
+            companiesInDatabase[0].Name.Should().Be(newCompanies[0].Name.ToUpperInvariant());
+            companiesInDatabase[0].CountryOfResidence.Should().Be(newCompanies[0].CountryOfResidence);
 
-                companiesInDatabase[1].Name.Should().Be(newCompanies[1].Name.ToUpperInvariant());
-                companiesInDatabase[1].CountryOfResidence.Should().Be(newCompanies[1].CountryOfResidence);
-            });
+            companiesInDatabase[1].Name.Should().Be(newCompanies[1].Name.ToUpperInvariant());
+            companiesInDatabase[1].CountryOfResidence.Should().Be(newCompanies[1].CountryOfResidence);
+        });
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnDeserialize),
-                (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnDeserialize),
-                (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnSerialize),
-                (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnSerialize)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Skips_on_create_resource_with_ToOne_relationship()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnDeserialize),
+            (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnDeserialize),
+            (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnSerialize),
+            (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnSerialize)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Skips_on_create_resource_with_ToOne_relationship()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RecordCompanies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RecordCompanies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            },
-                            relationships = new
+                            title = newTrackTitle
+                        },
+                        relationships = new
+                        {
+                            ownedBy = new
                             {
-                                ownedBy = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        id = existingCompany.StringId
-                                    }
+                                    type = "recordCompanies",
+                                    id = existingCompany.StringId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEmpty();
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Transforms_on_update_resource_with_side_effects()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+    [Fact]
+    public async Task Transforms_on_update_resource_with_side_effects()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            List<RecordCompany> existingCompanies = _fakers.RecordCompany.Generate(2);
+        List<RecordCompany> existingCompanies = _fakers.RecordCompany.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<RecordCompany>();
-                dbContext.RecordCompanies.AddRange(existingCompanies);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<RecordCompany>();
+            dbContext.RecordCompanies.AddRange(existingCompanies);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "recordCompanies",
+                        id = existingCompanies[0].StringId,
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            id = existingCompanies[0].StringId,
-                            attributes = new
-                            {
-                            }
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "recordCompanies",
+                        id = existingCompanies[1].StringId,
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            id = existingCompanies[1].StringId,
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(2);
+        responseDocument.Results.ShouldHaveCount(2);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(existingCompanies[0].Name));
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(existingCompanies[0].Name));
 
-                string countryOfResidence = existingCompanies[0].CountryOfResidence!.ToUpperInvariant();
-                resource.Attributes.ShouldContainKey("countryOfResidence").With(value => value.Should().Be(countryOfResidence));
-            });
+            string countryOfResidence = existingCompanies[0].CountryOfResidence!.ToUpperInvariant();
+            resource.Attributes.ShouldContainKey("countryOfResidence").With(value => value.Should().Be(countryOfResidence));
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(existingCompanies[1].Name));
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Attributes.ShouldContainKey("name").With(value => value.Should().Be(existingCompanies[1].Name));
 
-                string countryOfResidence = existingCompanies[1].CountryOfResidence!.ToUpperInvariant();
-                resource.Attributes.ShouldContainKey("countryOfResidence").With(value => value.Should().Be(countryOfResidence));
-            });
+            string countryOfResidence = existingCompanies[1].CountryOfResidence!.ToUpperInvariant();
+            resource.Attributes.ShouldContainKey("countryOfResidence").With(value => value.Should().Be(countryOfResidence));
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<RecordCompany> companiesInDatabase = await dbContext.RecordCompanies.ToListAsync();
-                companiesInDatabase.ShouldHaveCount(2);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<RecordCompany> companiesInDatabase = await dbContext.RecordCompanies.ToListAsync();
+            companiesInDatabase.ShouldHaveCount(2);
 
-                companiesInDatabase[0].Name.Should().Be(existingCompanies[0].Name);
-                companiesInDatabase[0].CountryOfResidence.Should().Be(existingCompanies[0].CountryOfResidence);
+            companiesInDatabase[0].Name.Should().Be(existingCompanies[0].Name);
+            companiesInDatabase[0].CountryOfResidence.Should().Be(existingCompanies[0].CountryOfResidence);
 
-                companiesInDatabase[1].Name.Should().Be(existingCompanies[1].Name);
-                companiesInDatabase[1].CountryOfResidence.Should().Be(existingCompanies[1].CountryOfResidence);
-            });
+            companiesInDatabase[1].Name.Should().Be(existingCompanies[1].Name);
+            companiesInDatabase[1].CountryOfResidence.Should().Be(existingCompanies[1].CountryOfResidence);
+        });
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnDeserialize),
-                (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnDeserialize),
-                (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnSerialize),
-                (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnSerialize)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Skips_on_update_resource_with_ToOne_relationship()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnDeserialize),
+            (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnDeserialize),
+            (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnSerialize),
+            (typeof(RecordCompany), ResourceDefinitionExtensibilityPoints.OnSerialize)
+        }, options => options.WithStrictOrdering());
+    }
 
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Skips_on_update_resource_with_ToOne_relationship()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingTrack, existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            var requestBody = new
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingTrack, existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            attributes = new
-                            {
-                            },
-                            relationships = new
+                        },
+                        relationships = new
+                        {
+                            ownedBy = new
                             {
-                                ownedBy = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        id = existingCompany.StringId
-                                    }
+                                    type = "recordCompanies",
+                                    id = existingCompany.StringId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEmpty();
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Skips_on_update_ToOne_relationship()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+    [Fact]
+    public async Task Skips_on_update_ToOne_relationship()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingTrack, existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingTrack, existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "ownedBy"
-                        },
-                        data = new
-                        {
-                            type = "recordCompanies",
-                            id = existingCompany.StringId
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "ownedBy"
+                    },
+                    data = new
+                    {
+                        type = "recordCompanies",
+                        id = existingCompany.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEmpty();
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEmpty();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/RecordCompanyDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/RecordCompanyDefinition.cs
index 8f46b69336..4db0e6fe3c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/RecordCompanyDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/Serialization/RecordCompanyDefinition.cs
@@ -1,36 +1,35 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.Serialization;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class RecordCompanyDefinition : HitCountingResourceDefinition<RecordCompany, short>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class RecordCompanyDefinition : HitCountingResourceDefinition<RecordCompany, short>
+    protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Serialization;
+
+    public RecordCompanyDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, hitCounter)
     {
-        protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Serialization;
+    }
 
-        public RecordCompanyDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, hitCounter)
-        {
-        }
+    public override void OnDeserialize(RecordCompany resource)
+    {
+        base.OnDeserialize(resource);
 
-        public override void OnDeserialize(RecordCompany resource)
+        if (!string.IsNullOrEmpty(resource.Name))
         {
-            base.OnDeserialize(resource);
-
-            if (!string.IsNullOrEmpty(resource.Name))
-            {
-                resource.Name = resource.Name.ToUpperInvariant();
-            }
+            resource.Name = resource.Name.ToUpperInvariant();
         }
+    }
 
-        public override void OnSerialize(RecordCompany resource)
-        {
-            base.OnSerialize(resource);
+    public override void OnSerialize(RecordCompany resource)
+    {
+        base.OnSerialize(resource);
 
-            if (!string.IsNullOrEmpty(resource.CountryOfResidence))
-            {
-                resource.CountryOfResidence = resource.CountryOfResidence.ToUpperInvariant();
-            }
+        if (!string.IsNullOrEmpty(resource.CountryOfResidence))
+        {
+            resource.CountryOfResidence = resource.CountryOfResidence.ToUpperInvariant();
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/AtomicSparseFieldSetResourceDefinitionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/AtomicSparseFieldSetResourceDefinitionTests.cs
index 1d6f4127ce..a25100b414 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/AtomicSparseFieldSetResourceDefinitionTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/AtomicSparseFieldSetResourceDefinitionTests.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
@@ -10,185 +7,184 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.SparseFieldSets
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.SparseFieldSets;
+
+public sealed class AtomicSparseFieldSetResourceDefinitionTests
+    : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicSparseFieldSetResourceDefinitionTests
-        : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
 
-        public AtomicSparseFieldSetResourceDefinitionTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+    public AtomicSparseFieldSetResourceDefinitionTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<OperationsController>();
+        testContext.UseController<OperationsController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<LyricTextDefinition>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<LyricTextDefinition>();
 
-                services.AddSingleton<LyricPermissionProvider>();
-                services.AddSingleton<ResourceDefinitionHitCounter>();
-                services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-            });
+            services.AddSingleton<LyricPermissionProvider>();
+            services.AddSingleton<ResourceDefinitionHitCounter>();
+            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+        });
 
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            hitCounter.Reset();
-        }
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        hitCounter.Reset();
+    }
 
-        [Fact]
-        public async Task Hides_text_in_create_resource_with_side_effects()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+    [Fact]
+    public async Task Hides_text_in_create_resource_with_side_effects()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            var provider = _testContext.Factory.Services.GetRequiredService<LyricPermissionProvider>();
-            provider.CanViewText = false;
+        var provider = _testContext.Factory.Services.GetRequiredService<LyricPermissionProvider>();
+        provider.CanViewText = false;
 
-            List<Lyric> newLyrics = _fakers.Lyric.Generate(2);
+        List<Lyric> newLyrics = _fakers.Lyric.Generate(2);
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "lyrics",
+                        attributes = new
                         {
-                            type = "lyrics",
-                            attributes = new
-                            {
-                                format = newLyrics[0].Format,
-                                text = newLyrics[0].Text
-                            }
+                            format = newLyrics[0].Format,
+                            text = newLyrics[0].Text
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "lyrics",
+                        attributes = new
                         {
-                            type = "lyrics",
-                            attributes = new
-                            {
-                                format = newLyrics[1].Format,
-                                text = newLyrics[1].Text
-                            }
+                            format = newLyrics[1].Format,
+                            text = newLyrics[1].Text
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(2);
+        responseDocument.Results.ShouldHaveCount(2);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Attributes.ShouldContainKey("format").With(value => value.Should().Be(newLyrics[0].Format));
-                resource.Attributes.Should().NotContainKey("text");
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Attributes.ShouldContainKey("format").With(value => value.Should().Be(newLyrics[0].Format));
+            resource.Attributes.Should().NotContainKey("text");
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Attributes.ShouldContainKey("format").With(value => value.Should().Be(newLyrics[1].Format));
-                resource.Attributes.Should().NotContainKey("text");
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Attributes.ShouldContainKey("format").With(value => value.Should().Be(newLyrics[1].Format));
+            resource.Attributes.Should().NotContainKey("text");
+        });
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Hides_text_in_update_resource_with_side_effects()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet)
+        }, options => options.WithStrictOrdering());
+    }
 
-            var provider = _testContext.Factory.Services.GetRequiredService<LyricPermissionProvider>();
-            provider.CanViewText = false;
+    [Fact]
+    public async Task Hides_text_in_update_resource_with_side_effects()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            List<Lyric> existingLyrics = _fakers.Lyric.Generate(2);
+        var provider = _testContext.Factory.Services.GetRequiredService<LyricPermissionProvider>();
+        provider.CanViewText = false;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Lyrics.AddRange(existingLyrics);
-                await dbContext.SaveChangesAsync();
-            });
+        List<Lyric> existingLyrics = _fakers.Lyric.Generate(2);
 
-            var requestBody = new
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Lyrics.AddRange(existingLyrics);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "lyrics",
+                        id = existingLyrics[0].StringId,
+                        attributes = new
                         {
-                            type = "lyrics",
-                            id = existingLyrics[0].StringId,
-                            attributes = new
-                            {
-                            }
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "lyrics",
+                        id = existingLyrics[1].StringId,
+                        attributes = new
                         {
-                            type = "lyrics",
-                            id = existingLyrics[1].StringId,
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(2);
+        responseDocument.Results.ShouldHaveCount(2);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Attributes.ShouldContainKey("format").With(value => value.Should().Be(existingLyrics[0].Format));
-                resource.Attributes.Should().NotContainKey("text");
-            });
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Attributes.ShouldContainKey("format").With(value => value.Should().Be(existingLyrics[0].Format));
+            resource.Attributes.Should().NotContainKey("text");
+        });
 
-            responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Attributes.ShouldContainKey("format").With(value => value.Should().Be(existingLyrics[1].Format));
-                resource.Attributes.Should().NotContainKey("text");
-            });
+        responseDocument.Results[1].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Attributes.ShouldContainKey("format").With(value => value.Should().Be(existingLyrics[1].Format));
+            resource.Attributes.Should().NotContainKey("text");
+        });
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet)
-            }, options => options.WithStrictOrdering());
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Lyric), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet)
+        }, options => options.WithStrictOrdering());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricPermissionProvider.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricPermissionProvider.cs
index 070ced4646..beea40bb3d 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricPermissionProvider.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricPermissionProvider.cs
@@ -1,7 +1,6 @@
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.SparseFieldSets
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.SparseFieldSets;
+
+public sealed class LyricPermissionProvider
 {
-    public sealed class LyricPermissionProvider
-    {
-        internal bool CanViewText { get; set; }
-    }
+    internal bool CanViewText { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricTextDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricTextDefinition.cs
index 8bab070619..3abc4a134c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricTextDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/ResourceDefinitions/SparseFieldSets/LyricTextDefinition.cs
@@ -2,26 +2,25 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.SparseFieldSets
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.ResourceDefinitions.SparseFieldSets;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class LyricTextDefinition : HitCountingResourceDefinition<Lyric, long>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class LyricTextDefinition : HitCountingResourceDefinition<Lyric, long>
-    {
-        private readonly LyricPermissionProvider _lyricPermissionProvider;
+    private readonly LyricPermissionProvider _lyricPermissionProvider;
 
-        protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet;
+    protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet;
 
-        public LyricTextDefinition(IResourceGraph resourceGraph, LyricPermissionProvider lyricPermissionProvider, ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, hitCounter)
-        {
-            _lyricPermissionProvider = lyricPermissionProvider;
-        }
+    public LyricTextDefinition(IResourceGraph resourceGraph, LyricPermissionProvider lyricPermissionProvider, ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, hitCounter)
+    {
+        _lyricPermissionProvider = lyricPermissionProvider;
+    }
 
-        public override SparseFieldSetExpression? OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet)
-        {
-            base.OnApplySparseFieldSet(existingSparseFieldSet);
+    public override SparseFieldSetExpression? OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet)
+    {
+        base.OnApplySparseFieldSet(existingSparseFieldSet);
 
-            return _lyricPermissionProvider.CanViewText ? existingSparseFieldSet : existingSparseFieldSet.Excluding<Lyric>(lyric => lyric.Text, ResourceGraph);
-        }
+        return _lyricPermissionProvider.CanViewText ? existingSparseFieldSet : existingSparseFieldSet.Excluding<Lyric>(lyric => lyric.Text, ResourceGraph);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguage.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguage.cs
index 4606858341..02e8bf6278 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguage.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguage.cs
@@ -1,21 +1,19 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations")]
+public sealed class TextLanguage : Identifiable<Guid>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class TextLanguage : Identifiable<Guid>
-    {
-        [Attr]
-        public string? IsoCode { get; set; }
+    [Attr]
+    public string? IsoCode { get; set; }
 
-        [Attr(Capabilities = AttrCapabilities.None)]
-        public bool IsRightToLeft { get; set; }
+    [Attr(Capabilities = AttrCapabilities.None)]
+    public bool IsRightToLeft { get; set; }
 
-        [HasMany]
-        public ICollection<Lyric> Lyrics { get; set; } = new List<Lyric>();
-    }
+    [HasMany]
+    public ICollection<Lyric> Lyrics { get; set; } = new List<Lyric>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguagesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguagesController.cs
deleted file mode 100644
index b2d2683313..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/TextLanguagesController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations
-{
-    public sealed class TextLanguagesController : JsonApiController<TextLanguage, Guid>
-    {
-        public TextLanguagesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<TextLanguage, Guid> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs
index 8b4c1d49f1..8e4baf0cef 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicRollbackTests.cs
@@ -1,194 +1,189 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions;
+
+public sealed class AtomicRollbackTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicRollbackTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicRollbackTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicRollbackTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
+    }
 
-            testContext.UseController<OperationsController>();
-        }
+    [Fact]
+    public async Task Can_rollback_on_error()
+    {
+        // Arrange
+        string newArtistName = _fakers.Performer.Generate().ArtistName!;
+        DateTimeOffset newBornAt = _fakers.Performer.Generate().BornAt;
+        string newTitle = _fakers.MusicTrack.Generate().Title;
 
-        [Fact]
-        public async Task Can_rollback_on_error()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            string newArtistName = _fakers.Performer.Generate().ArtistName!;
-            DateTimeOffset newBornAt = _fakers.Performer.Generate().BornAt;
-            string newTitle = _fakers.MusicTrack.Generate().Title;
+            await dbContext.ClearTablesAsync<Performer, MusicTrack>();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTablesAsync<Performer, MusicTrack>();
-            });
-
-            string unknownPerformerId = Unknown.StringId.For<Performer, int>();
+        string unknownPerformerId = Unknown.StringId.For<Performer, int>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        attributes = new
                         {
-                            type = "performers",
-                            attributes = new
-                            {
-                                artistName = newArtistName,
-                                bornAt = newBornAt
-                            }
+                            artistName = newArtistName,
+                            bornAt = newBornAt
                         }
-                    },
-                    new
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTitle
-                            },
-                            relationships = new
+                            title = newTitle
+                        },
+                        relationships = new
+                        {
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = unknownPerformerId
-                                        }
+                                        type = "performers",
+                                        id = unknownPerformerId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'performers' with ID '{unknownPerformerId}' in relationship 'performers' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[1]");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'performers' with ID '{unknownPerformerId}' in relationship 'performers' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[1]");
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
-                performersInDatabase.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
+            performersInDatabase.Should().BeEmpty();
 
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
-                tracksInDatabase.Should().BeEmpty();
-            });
-        }
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+            tracksInDatabase.Should().BeEmpty();
+        });
+    }
 
-        [Fact]
-        public async Task Can_restore_to_previous_savepoint_on_error()
-        {
-            // Arrange
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Can_restore_to_previous_savepoint_on_error()
+    {
+        // Arrange
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTablesAsync<Performer, MusicTrack>();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTablesAsync<Performer, MusicTrack>();
+        });
 
-            const string trackLid = "track-1";
+        const string trackLid = "track-1";
 
-            string unknownPerformerId = Unknown.StringId.For<Performer, int>();
+        string unknownPerformerId = Unknown.StringId.For<Performer, int>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        lid = trackLid,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            lid = trackLid,
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        lid = trackLid,
+                        relationship = "performers"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "add",
-                        @ref = new
+                        new
                         {
-                            type = "musicTracks",
-                            lid = trackLid,
-                            relationship = "performers"
-                        },
-                        data = new[]
-                        {
-                            new
-                            {
-                                type = "performers",
-                                id = unknownPerformerId
-                            }
+                            type = "performers",
+                            id = unknownPerformerId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'performers' with ID '{unknownPerformerId}' in relationship 'performers' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[1]");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'performers' with ID '{unknownPerformerId}' in relationship 'performers' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[1]");
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
-                performersInDatabase.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
+            performersInDatabase.Should().BeEmpty();
 
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
-                tracksInDatabase.Should().BeEmpty();
-            });
-        }
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+            tracksInDatabase.Should().BeEmpty();
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs
index 1f7cc37cef..711c45de00 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/AtomicTransactionConsistencyTests.cs
@@ -1,7 +1,4 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -10,156 +7,155 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions;
+
+public sealed class AtomicTransactionConsistencyTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicTransactionConsistencyTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
 
-        public AtomicTransactionConsistencyTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+    public AtomicTransactionConsistencyTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<OperationsController>();
+        testContext.UseController<OperationsController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceRepository<PerformerRepository>();
-                services.AddResourceRepository<MusicTrackRepository>();
-                services.AddResourceRepository<LyricRepository>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceRepository<PerformerRepository>();
+            services.AddResourceRepository<MusicTrackRepository>();
+            services.AddResourceRepository<LyricRepository>();
 
-                string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
-                string dbConnectionString = $"Host=localhost;Port=5432;Database=JsonApiTest-{Guid.NewGuid():N};User ID=postgres;Password={postgresPassword}";
+            string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
+            string dbConnectionString = $"Host=localhost;Port=5432;Database=JsonApiTest-{Guid.NewGuid():N};User ID=postgres;Password={postgresPassword}";
 
-                services.AddDbContext<ExtraDbContext>(options => options.UseNpgsql(dbConnectionString));
-            });
-        }
+            services.AddDbContext<ExtraDbContext>(options => options.UseNpgsql(dbConnectionString));
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_use_non_transactional_repository()
+    [Fact]
+    public async Task Cannot_use_non_transactional_repository()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "performers",
+                        attributes = new
                         {
-                            type = "performers",
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Unsupported resource type in atomic:operations request.");
-            error.Detail.Should().Be("Operations on resources of type 'performers' cannot be used because transaction support is unavailable.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Unsupported resource type in atomic:operations request.");
+        error.Detail.Should().Be("Operations on resources of type 'performers' cannot be used because transaction support is unavailable.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+    }
 
-        [Fact]
-        public async Task Cannot_use_transactional_repository_without_active_transaction()
-        {
-            // Arrange
-            string newTrackTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Cannot_use_transactional_repository_without_active_transaction()
+    {
+        // Arrange
+        string newTrackTitle = _fakers.MusicTrack.Generate().Title;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "musicTracks",
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            attributes = new
-                            {
-                                title = newTrackTitle
-                            }
+                            title = newTrackTitle
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Unsupported combination of resource types in atomic:operations request.");
-            error.Detail.Should().Be("All operations need to participate in a single shared transaction, which is not the case for this request.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Unsupported combination of resource types in atomic:operations request.");
+        error.Detail.Should().Be("All operations need to participate in a single shared transaction, which is not the case for this request.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+    }
 
-        [Fact]
-        public async Task Cannot_use_distributed_transaction()
-        {
-            // Arrange
-            string newLyricText = _fakers.Lyric.Generate().Text;
+    [Fact]
+    public async Task Cannot_use_distributed_transaction()
+    {
+        // Arrange
+        string newLyricText = _fakers.Lyric.Generate().Text;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new object[]
             {
-                atomic__operations = new object[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "lyrics",
+                        attributes = new
                         {
-                            type = "lyrics",
-                            attributes = new
-                            {
-                                text = newLyricText
-                            }
+                            text = newLyricText
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Unsupported combination of resource types in atomic:operations request.");
-            error.Detail.Should().Be("All operations need to participate in a single shared transaction, which is not the case for this request.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Unsupported combination of resource types in atomic:operations request.");
+        error.Detail.Should().Be("All operations need to participate in a single shared transaction, which is not the case for this request.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/ExtraDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/ExtraDbContext.cs
index 2808f95c28..85fe191e86 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/ExtraDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/ExtraDbContext.cs
@@ -1,14 +1,13 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class ExtraDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ExtraDbContext : DbContext
+    public ExtraDbContext(DbContextOptions<ExtraDbContext> options)
+        : base(options)
     {
-        public ExtraDbContext(DbContextOptions<ExtraDbContext> options)
-            : base(options)
-        {
-        }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs
index d6e25823bf..98be0da662 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/LyricRepository.cs
@@ -1,4 +1,3 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries;
@@ -6,24 +5,23 @@
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class LyricRepository : EntityFrameworkCoreRepository<Lyric, long>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class LyricRepository : EntityFrameworkCoreRepository<Lyric, long>
-    {
-        private readonly ExtraDbContext _extraDbContext;
+    private readonly ExtraDbContext _extraDbContext;
 
-        public override string? TransactionId => _extraDbContext.Database.CurrentTransaction?.TransactionId.ToString();
+    public override string? TransactionId => _extraDbContext.Database.CurrentTransaction?.TransactionId.ToString();
 
-        public LyricRepository(ExtraDbContext extraDbContext, ITargetedFields targetedFields, IDbContextResolver dbContextResolver,
-            IResourceGraph resourceGraph, IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders,
-            ILoggerFactory loggerFactory, IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
-        {
-            _extraDbContext = extraDbContext;
+    public LyricRepository(ExtraDbContext extraDbContext, ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
+        IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
+        IResourceDefinitionAccessor resourceDefinitionAccessor)
+        : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
+    {
+        _extraDbContext = extraDbContext;
 
-            extraDbContext.Database.EnsureCreated();
-            extraDbContext.Database.BeginTransaction();
-        }
+        extraDbContext.Database.EnsureCreated();
+        extraDbContext.Database.BeginTransaction();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs
index 524439bc18..6512b3fb27 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/MusicTrackRepository.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries;
@@ -7,18 +5,17 @@
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class MusicTrackRepository : EntityFrameworkCoreRepository<MusicTrack, Guid>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class MusicTrackRepository : EntityFrameworkCoreRepository<MusicTrack, Guid>
-    {
-        public override string? TransactionId => null;
+    public override string? TransactionId => null;
 
-        public MusicTrackRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
-            IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
-        {
-        }
+    public MusicTrackRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
+        IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
+        IResourceDefinitionAccessor resourceDefinitionAccessor)
+        : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs
index ead5d9234a..c50c52e08e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Transactions/PerformerRepository.cs
@@ -1,66 +1,61 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Queries.Expressions;
 using JsonApiDotNetCore.Repositories;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Transactions;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class PerformerRepository : IResourceRepository<Performer, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class PerformerRepository : IResourceRepository<Performer, int>
+    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(int id, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task<Performer> GetForCreateAsync(int 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(int id, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task DeleteAsync(int 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(int leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
-        {
-            throw new NotImplementedException();
-        }
+    public Task AddToToManyRelationshipAsync(int 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/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicAddToToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicAddToToManyRelationshipTests.cs
index 1dac3f571d..bd97c23411 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicAddToToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicAddToToManyRelationshipTests.cs
@@ -1,1089 +1,1084 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Relationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Relationships;
+
+public sealed class AtomicAddToToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicAddToToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicAddToToManyRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicAddToToManyRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
+    }
 
-            testContext.UseController<OperationsController>();
-        }
+    [Fact]
+    public async Task Cannot_add_to_ManyToOne_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-        [Fact]
-        public async Task Cannot_add_to_ManyToOne_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingTrack, existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.AddInRange(existingTrack, existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "ownedBy"
-                        },
-                        data = new
-                        {
-                            type = "recordCompanies",
-                            id = existingCompany.StringId
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "ownedBy"
+                    },
+                    data = new
+                    {
+                        type = "recordCompanies",
+                        id = existingCompany.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("Failed to deserialize request body: Only to-many relationships can be targeted through this operation.");
-            error.Detail.Should().Be("Relationship 'ownedBy' is not a to-many relationship.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/relationship");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("Failed to deserialize request body: Only to-many relationships can be targeted through this operation.");
+        error.Detail.Should().Be("Relationship 'ownedBy' is not a to-many relationship.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/relationship");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_add_to_OneToMany_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Performers = _fakers.Performer.Generate(1);
+    [Fact]
+    public async Task Can_add_to_OneToMany_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Performers = _fakers.Performer.Generate(1);
 
-            List<Performer> existingPerformers = _fakers.Performer.Generate(2);
+        List<Performer> existingPerformers = _fakers.Performer.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                dbContext.Performers.AddRange(existingPerformers);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            dbContext.Performers.AddRange(existingPerformers);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "performers",
-                                id = existingPerformers[0].StringId
-                            }
+                            type = "performers",
+                            id = existingPerformers[0].StringId
                         }
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "performers",
-                                id = existingPerformers[1].StringId
-                            }
+                            type = "performers",
+                            id = existingPerformers[1].StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Performers.ShouldHaveCount(3);
-                trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingTrack.Performers[0].Id);
-                trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[0].Id);
-                trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[1].Id);
-            });
-        }
+            trackInDatabase.Performers.ShouldHaveCount(3);
+            trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingTrack.Performers[0].Id);
+            trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[0].Id);
+            trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[1].Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_add_to_ManyToMany_relationship()
-        {
-            // Arrange
-            Playlist existingPlaylist = _fakers.Playlist.Generate();
-            existingPlaylist.Tracks = _fakers.MusicTrack.Generate(1);
+    [Fact]
+    public async Task Can_add_to_ManyToMany_relationship()
+    {
+        // Arrange
+        Playlist existingPlaylist = _fakers.Playlist.Generate();
+        existingPlaylist.Tracks = _fakers.MusicTrack.Generate(1);
 
-            List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(2);
+        List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Playlists.Add(existingPlaylist);
-                dbContext.MusicTracks.AddRange(existingTracks);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Playlists.Add(existingPlaylist);
+            dbContext.MusicTracks.AddRange(existingTracks);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationship = "tracks"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingTracks[0].StringId
-                            }
+                            type = "musicTracks",
+                            id = existingTracks[0].StringId
                         }
+                    }
+                },
+                new
+                {
+                    op = "add",
+                    @ref = new
+                    {
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationship = "tracks"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "add",
-                        @ref = new
+                        new
                         {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
-                        {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingTracks[1].StringId
-                            }
+                            type = "musicTracks",
+                            id = existingTracks[1].StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(3);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingPlaylist.Tracks[0].Id);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[0].Id);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[1].Id);
-            });
-        }
+            playlistInDatabase.Tracks.ShouldHaveCount(3);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingPlaylist.Tracks[0].Id);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[0].Id);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[1].Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_href_element()
+    [Fact]
+    public async Task Cannot_add_for_href_element()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
-                    {
-                        op = "add",
-                        href = "/api/v1/musicTracks/1/relationships/performers"
-                    }
+                    op = "add",
+                    href = "/api/v1/musicTracks/1/relationships/performers"
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_missing_type_in_ref()
+    [Fact]
+    public async Task Cannot_add_for_missing_type_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            id = Unknown.StringId.For<Playlist, long>(),
-                            relationship = "tracks"
-                        }
+                        id = Unknown.StringId.For<Playlist, long>(),
+                        relationship = "tracks"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_unknown_type_in_ref()
+    [Fact]
+    public async Task Cannot_add_for_unknown_type_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = Unknown.ResourceType,
-                            id = Unknown.StringId.For<Playlist, long>(),
-                            relationship = "tracks"
-                        }
+                        type = Unknown.ResourceType,
+                        id = Unknown.StringId.For<Playlist, long>(),
+                        relationship = "tracks"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_missing_ID_in_ref()
+    [Fact]
+    public async Task Cannot_add_for_missing_ID_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            relationship = "performers"
-                        }
+                        type = "musicTracks",
+                        relationship = "performers"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_unknown_ID_in_ref()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_add_for_unknown_ID_in_ref()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string companyId = Unknown.StringId.For<RecordCompany, short>();
+        string companyId = Unknown.StringId.For<RecordCompany, short>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "recordCompanies",
-                            id = companyId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        type = "recordCompanies",
+                        id = companyId,
+                        relationship = "tracks"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingTrack.StringId
-                            }
+                            type = "musicTracks",
+                            id = existingTrack.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'recordCompanies' with ID '{companyId}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'recordCompanies' with ID '{companyId}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_ID_and_local_ID_in_ref()
+    [Fact]
+    public async Task Cannot_add_for_ID_and_local_ID_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            lid = "local-1",
-                            relationship = "performers"
-                        }
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        lid = "local-1",
+                        relationship = "performers"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_missing_relationship_in_ref()
+    [Fact]
+    public async Task Cannot_add_for_missing_relationship_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>()
-                        }
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>()
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'relationship' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'relationship' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_unknown_relationship_in_ref()
+    [Fact]
+    public async Task Cannot_add_for_unknown_relationship_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "performers",
-                            id = Unknown.StringId.For<Performer, int>(),
-                            relationship = Unknown.Relationship
-                        }
+                        type = "performers",
+                        id = Unknown.StringId.For<Performer, int>(),
+                        relationship = Unknown.Relationship
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
-            error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'performers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/relationship");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
+        error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'performers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/relationship");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_missing_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_add_for_missing_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_null_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_add_for_null_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = (object?)null
-                    }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = (object?)null
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_object_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_add_for_object_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new
-                        {
-                        }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_missing_type_in_data()
+    [Fact]
+    public async Task Cannot_add_for_missing_type_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            id = Unknown.StringId.For<Playlist, long>(),
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        type = "playlists",
+                        id = Unknown.StringId.For<Playlist, long>(),
+                        relationship = "tracks"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                id = Unknown.StringId.For<MusicTrack, Guid>()
-                            }
+                            id = Unknown.StringId.For<MusicTrack, Guid>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_unknown_type_in_data()
+    [Fact]
+    public async Task Cannot_add_for_unknown_type_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = Unknown.ResourceType,
-                                id = Unknown.StringId.For<Performer, int>()
-                            }
+                            type = Unknown.ResourceType,
+                            id = Unknown.StringId.For<Performer, int>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_missing_ID_in_data()
+    [Fact]
+    public async Task Cannot_add_for_missing_ID_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "performers"
-                            }
+                            type = "performers"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_ID_and_local_ID_in_data()
+    [Fact]
+    public async Task Cannot_add_for_ID_and_local_ID_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "performers",
-                                id = Unknown.StringId.For<Performer, int>(),
-                                lid = "local-1"
-                            }
+                            type = "performers",
+                            id = Unknown.StringId.For<Performer, int>(),
+                            lid = "local-1"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_unknown_IDs_in_data()
-        {
-            // Arrange
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Cannot_add_for_unknown_IDs_in_data()
+    {
+        // Arrange
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            string[] trackIds =
-            {
-                Unknown.StringId.For<MusicTrack, Guid>(),
-                Unknown.StringId.AltFor<MusicTrack, Guid>()
-            };
+        string[] trackIds =
+        {
+            Unknown.StringId.For<MusicTrack, Guid>(),
+            Unknown.StringId.AltFor<MusicTrack, Guid>()
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RecordCompanies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RecordCompanies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
+                    {
+                        type = "recordCompanies",
+                        id = existingCompany.StringId,
+                        relationship = "tracks"
+                    },
+                    data = new[]
                     {
-                        op = "add",
-                        @ref = new
+                        new
                         {
-                            type = "recordCompanies",
-                            id = existingCompany.StringId,
-                            relationship = "tracks"
+                            type = "musicTracks",
+                            id = trackIds[0]
                         },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = trackIds[0]
-                            },
-                            new
-                            {
-                                type = "musicTracks",
-                                id = trackIds[1]
-                            }
+                            type = "musicTracks",
+                            id = trackIds[1]
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[0]}' in relationship 'tracks' does not exist.");
-            error1.Source.ShouldNotBeNull();
-            error1.Source.Pointer.Should().Be("/atomic:operations[0]");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[0]}' in relationship 'tracks' does not exist.");
+        error1.Source.ShouldNotBeNull();
+        error1.Source.Pointer.Should().Be("/atomic:operations[0]");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[1]}' in relationship 'tracks' does not exist.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/atomic:operations[0]");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[1]}' in relationship 'tracks' does not exist.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/atomic:operations[0]");
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_relationship_mismatch_between_ref_and_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_add_for_relationship_mismatch_between_ref_and_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "playlists",
-                                id = Unknown.StringId.For<Playlist, long>()
-                            }
+                            type = "playlists",
+                            id = Unknown.StringId.For<Playlist, long>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'playlists' is incompatible with type 'performers' of relationship 'performers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'playlists' is incompatible with type 'performers' of relationship 'performers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_add_with_empty_data_array()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Performers = _fakers.Performer.Generate(1);
+    [Fact]
+    public async Task Can_add_with_empty_data_array()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Performers = _fakers.Performer.Generate(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    @ref = new
                     {
-                        op = "add",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = Array.Empty<object>()
-                    }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = Array.Empty<object>()
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Performers.ShouldHaveCount(1);
-                trackInDatabase.Performers[0].Id.Should().Be(existingTrack.Performers[0].Id);
-            });
-        }
+            trackInDatabase.Performers.ShouldHaveCount(1);
+            trackInDatabase.Performers[0].Id.Should().Be(existingTrack.Performers[0].Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicRemoveFromToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicRemoveFromToManyRelationshipTests.cs
index d0673adab0..1e6787a0d7 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicRemoveFromToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicRemoveFromToManyRelationshipTests.cs
@@ -1,1051 +1,1045 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Relationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Relationships;
+
+public sealed class AtomicRemoveFromToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicRemoveFromToManyRelationshipTests
-        : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicRemoveFromToManyRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicRemoveFromToManyRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
+    }
 
-            testContext.UseController<OperationsController>();
-        }
+    [Fact]
+    public async Task Cannot_remove_from_ManyToOne_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
 
-        [Fact]
-        public async Task Cannot_remove_from_ManyToOne_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "ownedBy"
-                        },
-                        data = new
-                        {
-                            type = "recordCompanies",
-                            id = existingTrack.OwnedBy.StringId
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "ownedBy"
+                    },
+                    data = new
+                    {
+                        type = "recordCompanies",
+                        id = existingTrack.OwnedBy.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("Failed to deserialize request body: Only to-many relationships can be targeted through this operation.");
-            error.Detail.Should().Be("Relationship 'ownedBy' is not a to-many relationship.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/relationship");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("Failed to deserialize request body: Only to-many relationships can be targeted through this operation.");
+        error.Detail.Should().Be("Relationship 'ownedBy' is not a to-many relationship.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/relationship");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_remove_from_OneToMany_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Performers = _fakers.Performer.Generate(3);
+    [Fact]
+    public async Task Can_remove_from_OneToMany_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Performers = _fakers.Performer.Generate(3);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Performer>();
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Performer>();
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "performers",
-                                id = existingTrack.Performers[0].StringId
-                            }
+                            type = "performers",
+                            id = existingTrack.Performers[0].StringId
                         }
+                    }
+                },
+                new
+                {
+                    op = "remove",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "remove",
-                        @ref = new
+                        new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new[]
-                        {
-                            new
-                            {
-                                type = "performers",
-                                id = existingTrack.Performers[2].StringId
-                            }
+                            type = "performers",
+                            id = existingTrack.Performers[2].StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Performers.ShouldHaveCount(1);
-                trackInDatabase.Performers[0].Id.Should().Be(existingTrack.Performers[1].Id);
+            trackInDatabase.Performers.ShouldHaveCount(1);
+            trackInDatabase.Performers[0].Id.Should().Be(existingTrack.Performers[1].Id);
 
-                List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
-                performersInDatabase.ShouldHaveCount(3);
-            });
-        }
+            List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
+            performersInDatabase.ShouldHaveCount(3);
+        });
+    }
 
-        [Fact]
-        public async Task Can_remove_from_ManyToMany_relationship()
-        {
-            // Arrange
-            Playlist existingPlaylist = _fakers.Playlist.Generate();
-            existingPlaylist.Tracks = _fakers.MusicTrack.Generate(3);
+    [Fact]
+    public async Task Can_remove_from_ManyToMany_relationship()
+    {
+        // Arrange
+        Playlist existingPlaylist = _fakers.Playlist.Generate();
+        existingPlaylist.Tracks = _fakers.MusicTrack.Generate(3);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<MusicTrack>();
-                dbContext.Playlists.Add(existingPlaylist);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<MusicTrack>();
+            dbContext.Playlists.Add(existingPlaylist);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationship = "tracks"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingPlaylist.Tracks[0].StringId
-                            }
+                            type = "musicTracks",
+                            id = existingPlaylist.Tracks[0].StringId
                         }
+                    }
+                },
+                new
+                {
+                    op = "remove",
+                    @ref = new
+                    {
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationship = "tracks"
                     },
-                    new
+                    data = new[]
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingPlaylist.Tracks[2].StringId
-                            }
+                            type = "musicTracks",
+                            id = existingPlaylist.Tracks[2].StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(1);
-                playlistInDatabase.Tracks[0].Id.Should().Be(existingPlaylist.Tracks[1].Id);
+            playlistInDatabase.Tracks.ShouldHaveCount(1);
+            playlistInDatabase.Tracks[0].Id.Should().Be(existingPlaylist.Tracks[1].Id);
 
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
 
-                tracksInDatabase.ShouldHaveCount(3);
-            });
-        }
+            tracksInDatabase.ShouldHaveCount(3);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_href_element()
+    [Fact]
+    public async Task Cannot_remove_for_href_element()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
-                    {
-                        op = "remove",
-                        href = "/api/v1/musicTracks/1/relationships/performers"
-                    }
+                    op = "remove",
+                    href = "/api/v1/musicTracks/1/relationships/performers"
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_missing_type_in_ref()
+    [Fact]
+    public async Task Cannot_remove_for_missing_type_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            id = Unknown.StringId.For<Playlist, long>(),
-                            relationship = "tracks"
-                        }
+                        id = Unknown.StringId.For<Playlist, long>(),
+                        relationship = "tracks"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_unknown_type_in_ref()
+    [Fact]
+    public async Task Cannot_remove_for_unknown_type_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = Unknown.ResourceType,
-                            id = Unknown.StringId.For<Playlist, long>(),
-                            relationship = "tracks"
-                        }
+                        type = Unknown.ResourceType,
+                        id = Unknown.StringId.For<Playlist, long>(),
+                        relationship = "tracks"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_missing_ID_in_ref()
+    [Fact]
+    public async Task Cannot_remove_for_missing_ID_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            relationship = "performers"
-                        }
+                        type = "musicTracks",
+                        relationship = "performers"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_unknown_ID_in_ref()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_remove_for_unknown_ID_in_ref()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string companyId = Unknown.StringId.For<RecordCompany, short>();
+        string companyId = Unknown.StringId.For<RecordCompany, short>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "recordCompanies",
-                            id = companyId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        type = "recordCompanies",
+                        id = companyId,
+                        relationship = "tracks"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingTrack.StringId
-                            }
+                            type = "musicTracks",
+                            id = existingTrack.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'recordCompanies' with ID '{companyId}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'recordCompanies' with ID '{companyId}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_ID_and_local_ID_in_ref()
+    [Fact]
+    public async Task Cannot_remove_for_ID_and_local_ID_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            lid = "local-1",
-                            relationship = "performers"
-                        }
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        lid = "local-1",
+                        relationship = "performers"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_unknown_relationship_in_ref()
+    [Fact]
+    public async Task Cannot_remove_for_unknown_relationship_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "performers",
-                            id = Unknown.StringId.For<Performer, int>(),
-                            relationship = Unknown.Relationship
-                        }
+                        type = "performers",
+                        id = Unknown.StringId.For<Performer, int>(),
+                        relationship = Unknown.Relationship
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
-            error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'performers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/relationship");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
+        error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'performers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/relationship");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_missing_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_remove_for_missing_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_null_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_remove_for_null_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = (object?)null
-                    }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = (object?)null
                 }
-            };
+            }
+        };
+
+        const string route = "/operations";
 
-            const string route = "/operations";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_remove_for_object_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-        [Fact]
-        public async Task Cannot_remove_for_object_data()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new
-                        {
-                        }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_missing_type_in_data()
+    [Fact]
+    public async Task Cannot_remove_for_missing_type_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            id = Unknown.StringId.For<Playlist, long>(),
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        type = "playlists",
+                        id = Unknown.StringId.For<Playlist, long>(),
+                        relationship = "tracks"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                id = Unknown.StringId.For<MusicTrack, Guid>()
-                            }
+                            id = Unknown.StringId.For<MusicTrack, Guid>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_unknown_type_in_data()
+    [Fact]
+    public async Task Cannot_remove_for_unknown_type_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = Unknown.ResourceType,
-                                id = Unknown.StringId.For<Performer, int>()
-                            }
+                            type = Unknown.ResourceType,
+                            id = Unknown.StringId.For<Performer, int>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_missing_ID_in_data()
+    [Fact]
+    public async Task Cannot_remove_for_missing_ID_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "performers"
-                            }
+                            type = "performers"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_ID_and_local_ID_in_data()
+    [Fact]
+    public async Task Cannot_remove_for_ID_and_local_ID_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "performers",
-                                id = Unknown.StringId.For<Performer, int>(),
-                                lid = "local-1"
-                            }
+                            type = "performers",
+                            id = Unknown.StringId.For<Performer, int>(),
+                            lid = "local-1"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_unknown_IDs_in_data()
-        {
-            // Arrange
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Cannot_remove_for_unknown_IDs_in_data()
+    {
+        // Arrange
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            string[] trackIds =
-            {
-                Unknown.StringId.For<MusicTrack, Guid>(),
-                Unknown.StringId.AltFor<MusicTrack, Guid>()
-            };
+        string[] trackIds =
+        {
+            Unknown.StringId.For<MusicTrack, Guid>(),
+            Unknown.StringId.AltFor<MusicTrack, Guid>()
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RecordCompanies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RecordCompanies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
+                    {
+                        type = "recordCompanies",
+                        id = existingCompany.StringId,
+                        relationship = "tracks"
+                    },
+                    data = new[]
                     {
-                        op = "remove",
-                        @ref = new
+                        new
                         {
-                            type = "recordCompanies",
-                            id = existingCompany.StringId,
-                            relationship = "tracks"
+                            type = "musicTracks",
+                            id = trackIds[0]
                         },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = trackIds[0]
-                            },
-                            new
-                            {
-                                type = "musicTracks",
-                                id = trackIds[1]
-                            }
+                            type = "musicTracks",
+                            id = trackIds[1]
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[0]}' in relationship 'tracks' does not exist.");
-            error1.Source.ShouldNotBeNull();
-            error1.Source.Pointer.Should().Be("/atomic:operations[0]");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[0]}' in relationship 'tracks' does not exist.");
+        error1.Source.ShouldNotBeNull();
+        error1.Source.Pointer.Should().Be("/atomic:operations[0]");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[1]}' in relationship 'tracks' does not exist.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/atomic:operations[0]");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[1]}' in relationship 'tracks' does not exist.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/atomic:operations[0]");
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_relationship_mismatch_between_ref_and_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_remove_for_relationship_mismatch_between_ref_and_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "playlists",
-                                id = Unknown.StringId.For<Playlist, long>()
-                            }
+                            type = "playlists",
+                            id = Unknown.StringId.For<Playlist, long>()
                         }
                     }
                 }
-            };
+            }
+        };
+
+        const string route = "/operations";
 
-            const string route = "/operations";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'playlists' is incompatible with type 'performers' of relationship 'performers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'playlists' is incompatible with type 'performers' of relationship 'performers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Can_remove_with_empty_data_array()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Performers = _fakers.Performer.Generate(1);
 
-        [Fact]
-        public async Task Can_remove_with_empty_data_array()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Performers = _fakers.Performer.Generate(1);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Performer>();
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<Performer>();
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "remove",
+                    @ref = new
                     {
-                        op = "remove",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = Array.Empty<object>()
-                    }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = Array.Empty<object>()
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Performers.ShouldHaveCount(1);
-                trackInDatabase.Performers[0].Id.Should().Be(existingTrack.Performers[0].Id);
-            });
-        }
+            trackInDatabase.Performers.ShouldHaveCount(1);
+            trackInDatabase.Performers[0].Id.Should().Be(existingTrack.Performers[0].Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicReplaceToManyRelationshipTests.cs
index a77441709a..ee3ea791a5 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicReplaceToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicReplaceToManyRelationshipTests.cs
@@ -1,1148 +1,1143 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Relationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Relationships;
+
+public sealed class AtomicReplaceToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicReplaceToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicReplaceToManyRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicReplaceToManyRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
+    }
 
-            testContext.UseController<OperationsController>();
-        }
+    [Fact]
+    public async Task Can_clear_OneToMany_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Performers = _fakers.Performer.Generate(2);
 
-        [Fact]
-        public async Task Can_clear_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Performers = _fakers.Performer.Generate(2);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Performer>();
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<Performer>();
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = Array.Empty<object>()
-                    }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = Array.Empty<object>()
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Performers.Should().BeEmpty();
+            trackInDatabase.Performers.Should().BeEmpty();
 
-                List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
-                performersInDatabase.ShouldHaveCount(2);
-            });
-        }
+            List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
+            performersInDatabase.ShouldHaveCount(2);
+        });
+    }
 
-        [Fact]
-        public async Task Can_clear_ManyToMany_relationship()
-        {
-            // Arrange
-            Playlist existingPlaylist = _fakers.Playlist.Generate();
-            existingPlaylist.Tracks = _fakers.MusicTrack.Generate(2);
+    [Fact]
+    public async Task Can_clear_ManyToMany_relationship()
+    {
+        // Arrange
+        Playlist existingPlaylist = _fakers.Playlist.Generate();
+        existingPlaylist.Tracks = _fakers.MusicTrack.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<MusicTrack>();
-                dbContext.Playlists.Add(existingPlaylist);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<MusicTrack>();
+            dbContext.Playlists.Add(existingPlaylist);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationship = "tracks"
-                        },
-                        data = Array.Empty<object>()
-                    }
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationship = "tracks"
+                    },
+                    data = Array.Empty<object>()
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
 
-                playlistInDatabase.Tracks.Should().BeEmpty();
+            playlistInDatabase.Tracks.Should().BeEmpty();
 
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
 
-                tracksInDatabase.ShouldHaveCount(2);
-            });
-        }
+            tracksInDatabase.ShouldHaveCount(2);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_OneToMany_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Performers = _fakers.Performer.Generate(1);
+    [Fact]
+    public async Task Can_replace_OneToMany_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Performers = _fakers.Performer.Generate(1);
 
-            List<Performer> existingPerformers = _fakers.Performer.Generate(2);
+        List<Performer> existingPerformers = _fakers.Performer.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Performer>();
-                dbContext.MusicTracks.Add(existingTrack);
-                dbContext.Performers.AddRange(existingPerformers);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Performer>();
+            dbContext.MusicTracks.Add(existingTrack);
+            dbContext.Performers.AddRange(existingPerformers);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = new[]
                     {
-                        op = "update",
-                        @ref = new
+                        new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
+                            type = "performers",
+                            id = existingPerformers[0].StringId
                         },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "performers",
-                                id = existingPerformers[0].StringId
-                            },
-                            new
-                            {
-                                type = "performers",
-                                id = existingPerformers[1].StringId
-                            }
+                            type = "performers",
+                            id = existingPerformers[1].StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Performers.ShouldHaveCount(2);
-                trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[0].Id);
-                trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[1].Id);
+            trackInDatabase.Performers.ShouldHaveCount(2);
+            trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[0].Id);
+            trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[1].Id);
 
-                List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
-                performersInDatabase.ShouldHaveCount(3);
-            });
-        }
+            List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
+            performersInDatabase.ShouldHaveCount(3);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_ManyToMany_relationship()
-        {
-            // Arrange
-            Playlist existingPlaylist = _fakers.Playlist.Generate();
-            existingPlaylist.Tracks = _fakers.MusicTrack.Generate(1);
+    [Fact]
+    public async Task Can_replace_ManyToMany_relationship()
+    {
+        // Arrange
+        Playlist existingPlaylist = _fakers.Playlist.Generate();
+        existingPlaylist.Tracks = _fakers.MusicTrack.Generate(1);
 
-            List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(2);
+        List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<MusicTrack>();
-                dbContext.Playlists.Add(existingPlaylist);
-                dbContext.MusicTracks.AddRange(existingTracks);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<MusicTrack>();
+            dbContext.Playlists.Add(existingPlaylist);
+            dbContext.MusicTracks.AddRange(existingTracks);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
+                    {
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationship = "tracks"
+                    },
+                    data = new[]
                     {
-                        op = "update",
-                        @ref = new
+                        new
                         {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationship = "tracks"
+                            type = "musicTracks",
+                            id = existingTracks[0].StringId
                         },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingTracks[0].StringId
-                            },
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingTracks[1].StringId
-                            }
+                            type = "musicTracks",
+                            id = existingTracks[1].StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(2);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[0].Id);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[1].Id);
+            playlistInDatabase.Tracks.ShouldHaveCount(2);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[0].Id);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[1].Id);
 
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
 
-                tracksInDatabase.ShouldHaveCount(3);
-            });
-        }
+            tracksInDatabase.ShouldHaveCount(3);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_href_element()
+    [Fact]
+    public async Task Cannot_replace_for_href_element()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
-                    {
-                        op = "update",
-                        href = "/api/v1/musicTracks/1/relationships/performers"
-                    }
+                    op = "update",
+                    href = "/api/v1/musicTracks/1/relationships/performers"
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_type_in_ref()
+    [Fact]
+    public async Task Cannot_replace_for_missing_type_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            id = Unknown.StringId.For<Playlist, long>(),
-                            relationship = "tracks"
-                        }
+                        id = Unknown.StringId.For<Playlist, long>(),
+                        relationship = "tracks"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_unknown_type_in_ref()
+    [Fact]
+    public async Task Cannot_replace_for_unknown_type_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = Unknown.ResourceType,
-                            id = Unknown.StringId.For<Playlist, long>(),
-                            relationship = "tracks"
-                        }
+                        type = Unknown.ResourceType,
+                        id = Unknown.StringId.For<Playlist, long>(),
+                        relationship = "tracks"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_ID_in_ref()
+    [Fact]
+    public async Task Cannot_replace_for_missing_ID_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            relationship = "performers"
-                        }
+                        type = "musicTracks",
+                        relationship = "performers"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_unknown_ID_in_ref()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_unknown_ID_in_ref()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string companyId = Unknown.StringId.For<RecordCompany, short>();
+        string companyId = Unknown.StringId.For<RecordCompany, short>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "recordCompanies",
-                            id = companyId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        type = "recordCompanies",
+                        id = companyId,
+                        relationship = "tracks"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingTrack.StringId
-                            }
+                            type = "musicTracks",
+                            id = existingTrack.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'recordCompanies' with ID '{companyId}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'recordCompanies' with ID '{companyId}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_incompatible_ID_in_ref()
-        {
-            // Arrange
-            string guid = Unknown.StringId.Guid;
+    [Fact]
+    public async Task Cannot_replace_for_incompatible_ID_in_ref()
+    {
+        // Arrange
+        string guid = Unknown.StringId.Guid;
 
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "recordCompanies",
-                            id = guid,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        type = "recordCompanies",
+                        id = guid,
+                        relationship = "tracks"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = existingTrack.StringId
-                            }
+                            type = "musicTracks",
+                            id = existingTrack.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
-            error.Detail.Should().Be($"Failed to convert '{guid}' of type 'String' to type 'Int16'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
+        error.Detail.Should().Be($"Failed to convert '{guid}' of type 'String' to type 'Int16'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_ID_and_local_ID_in_ref()
+    [Fact]
+    public async Task Cannot_replace_for_ID_and_local_ID_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            lid = "local-1",
-                            relationship = "performers"
-                        }
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        lid = "local-1",
+                        relationship = "performers"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_unknown_relationship_in_ref()
+    [Fact]
+    public async Task Cannot_replace_for_unknown_relationship_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "performers",
-                            id = Unknown.StringId.For<Performer, int>(),
-                            relationship = Unknown.Relationship
-                        }
+                        type = "performers",
+                        id = Unknown.StringId.For<Performer, int>(),
+                        relationship = Unknown.Relationship
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
-            error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'performers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/relationship");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
+        error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'performers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/relationship");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_missing_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_null_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_null_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = (object?)null
-                    }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = (object?)null
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_object_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_object_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
+                    {
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new
-                        {
-                        }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_type_in_data()
+    [Fact]
+    public async Task Cannot_replace_for_missing_type_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "playlists",
-                            id = Unknown.StringId.For<Playlist, long>(),
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        type = "playlists",
+                        id = Unknown.StringId.For<Playlist, long>(),
+                        relationship = "tracks"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                id = Unknown.StringId.For<MusicTrack, Guid>()
-                            }
+                            id = Unknown.StringId.For<MusicTrack, Guid>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_unknown_type_in_data()
+    [Fact]
+    public async Task Cannot_replace_for_unknown_type_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = Unknown.ResourceType,
-                                id = Unknown.StringId.For<Performer, int>()
-                            }
+                            type = Unknown.ResourceType,
+                            id = Unknown.StringId.For<Performer, int>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_ID_in_data()
+    [Fact]
+    public async Task Cannot_replace_for_missing_ID_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "performers"
-                            }
+                            type = "performers"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_ID_and_local_ID_in_data()
+    [Fact]
+    public async Task Cannot_replace_for_ID_and_local_ID_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "performers",
-                                id = Unknown.StringId.For<Performer, int>(),
-                                lid = "local-1"
-                            }
+                            type = "performers",
+                            id = Unknown.StringId.For<Performer, int>(),
+                            lid = "local-1"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_unknown_IDs_in_data()
-        {
-            // Arrange
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_unknown_IDs_in_data()
+    {
+        // Arrange
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            string[] trackIds =
-            {
-                Unknown.StringId.For<MusicTrack, Guid>(),
-                Unknown.StringId.AltFor<MusicTrack, Guid>()
-            };
+        string[] trackIds =
+        {
+            Unknown.StringId.For<MusicTrack, Guid>(),
+            Unknown.StringId.AltFor<MusicTrack, Guid>()
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RecordCompanies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RecordCompanies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
+                    {
+                        type = "recordCompanies",
+                        id = existingCompany.StringId,
+                        relationship = "tracks"
+                    },
+                    data = new[]
                     {
-                        op = "update",
-                        @ref = new
+                        new
                         {
-                            type = "recordCompanies",
-                            id = existingCompany.StringId,
-                            relationship = "tracks"
+                            type = "musicTracks",
+                            id = trackIds[0]
                         },
-                        data = new[]
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = trackIds[0]
-                            },
-                            new
-                            {
-                                type = "musicTracks",
-                                id = trackIds[1]
-                            }
+                            type = "musicTracks",
+                            id = trackIds[1]
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[0]}' in relationship 'tracks' does not exist.");
-            error1.Source.ShouldNotBeNull();
-            error1.Source.Pointer.Should().Be("/atomic:operations[0]");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[0]}' in relationship 'tracks' does not exist.");
+        error1.Source.ShouldNotBeNull();
+        error1.Source.Pointer.Should().Be("/atomic:operations[0]");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[1]}' in relationship 'tracks' does not exist.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/atomic:operations[0]");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[1]}' in relationship 'tracks' does not exist.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/atomic:operations[0]");
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_incompatible_ID_in_data()
-        {
-            // Arrange
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_incompatible_ID_in_data()
+    {
+        // Arrange
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RecordCompanies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RecordCompanies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "recordCompanies",
-                            id = existingCompany.StringId,
-                            relationship = "tracks"
-                        },
-                        data = new[]
+                        type = "recordCompanies",
+                        id = existingCompany.StringId,
+                        relationship = "tracks"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "musicTracks",
-                                id = "invalid-guid"
-                            }
+                            type = "musicTracks",
+                            id = "invalid-guid"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
-            error.Detail.Should().Be("Failed to convert 'invalid-guid' of type 'String' to type 'Guid'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
+        error.Detail.Should().Be("Failed to convert 'invalid-guid' of type 'String' to type 'Guid'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_relationship_mismatch_between_ref_and_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_relationship_mismatch_between_ref_and_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "performers"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "performers"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "playlists",
-                                id = Unknown.StringId.For<Playlist, long>()
-                            }
+                            type = "playlists",
+                            id = Unknown.StringId.For<Playlist, long>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'playlists' is incompatible with type 'performers' of relationship 'performers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'playlists' is incompatible with type 'performers' of relationship 'performers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicUpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicUpdateToOneRelationshipTests.cs
index 6569ae5638..b66a5dfc26 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicUpdateToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Relationships/AtomicUpdateToOneRelationshipTests.cs
@@ -1,1313 +1,1308 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Relationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Relationships;
+
+public sealed class AtomicUpdateToOneRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicUpdateToOneRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicUpdateToOneRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicUpdateToOneRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
+    }
 
-            testContext.UseController<OperationsController>();
-        }
+    [Fact]
+    public async Task Can_clear_OneToOne_relationship_from_principal_side()
+    {
+        // Arrange
+        Lyric existingLyric = _fakers.Lyric.Generate();
+        existingLyric.Track = _fakers.MusicTrack.Generate();
 
-        [Fact]
-        public async Task Can_clear_OneToOne_relationship_from_principal_side()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Lyric existingLyric = _fakers.Lyric.Generate();
-            existingLyric.Track = _fakers.MusicTrack.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<MusicTrack>();
-                dbContext.Lyrics.Add(existingLyric);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<MusicTrack>();
+            dbContext.Lyrics.Add(existingLyric);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = existingLyric.StringId,
-                            relationship = "track"
-                        },
-                        data = (object?)null
-                    }
+                        type = "lyrics",
+                        id = existingLyric.StringId,
+                        relationship = "track"
+                    },
+                    data = (object?)null
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(existingLyric.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(existingLyric.Id);
 
-                lyricInDatabase.Track.Should().BeNull();
+            lyricInDatabase.Track.Should().BeNull();
 
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
-                tracksInDatabase.ShouldHaveCount(1);
-            });
-        }
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+            tracksInDatabase.ShouldHaveCount(1);
+        });
+    }
 
-        [Fact]
-        public async Task Can_clear_OneToOne_relationship_from_dependent_side()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Lyric = _fakers.Lyric.Generate();
+    [Fact]
+    public async Task Can_clear_OneToOne_relationship_from_dependent_side()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Lyric = _fakers.Lyric.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Lyric>();
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Lyric>();
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "lyric"
-                        },
-                        data = (object?)null
-                    }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "lyric"
+                    },
+                    data = (object?)null
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Lyric.Should().BeNull();
+            trackInDatabase.Lyric.Should().BeNull();
 
-                List<Lyric> lyricsInDatabase = await dbContext.Lyrics.ToListAsync();
-                lyricsInDatabase.ShouldHaveCount(1);
-            });
-        }
+            List<Lyric> lyricsInDatabase = await dbContext.Lyrics.ToListAsync();
+            lyricsInDatabase.ShouldHaveCount(1);
+        });
+    }
 
-        [Fact]
-        public async Task Can_clear_ManyToOne_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Can_clear_ManyToOne_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<RecordCompany>();
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<RecordCompany>();
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "ownedBy"
-                        },
-                        data = (object?)null
-                    }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "ownedBy"
+                    },
+                    data = (object?)null
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.OwnedBy.Should().BeNull();
+            trackInDatabase.OwnedBy.Should().BeNull();
 
-                List<RecordCompany> companiesInDatabase = await dbContext.RecordCompanies.ToListAsync();
-                companiesInDatabase.ShouldHaveCount(1);
-            });
-        }
+            List<RecordCompany> companiesInDatabase = await dbContext.RecordCompanies.ToListAsync();
+            companiesInDatabase.ShouldHaveCount(1);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_OneToOne_relationship_from_principal_side()
-        {
-            // Arrange
-            Lyric existingLyric = _fakers.Lyric.Generate();
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Can_create_OneToOne_relationship_from_principal_side()
+    {
+        // Arrange
+        Lyric existingLyric = _fakers.Lyric.Generate();
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingLyric, existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingLyric, existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = existingLyric.StringId,
-                            relationship = "track"
-                        },
-                        data = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId
-                        }
+                        type = "lyrics",
+                        id = existingLyric.StringId,
+                        relationship = "track"
+                    },
+                    data = new
+                    {
+                        type = "musicTracks",
+                        id = existingTrack.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(existingLyric.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(existingLyric.Id);
 
-                lyricInDatabase.Track.ShouldNotBeNull();
-                lyricInDatabase.Track.Id.Should().Be(existingTrack.Id);
-            });
-        }
+            lyricInDatabase.Track.ShouldNotBeNull();
+            lyricInDatabase.Track.Id.Should().Be(existingTrack.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_OneToOne_relationship_from_dependent_side()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            Lyric existingLyric = _fakers.Lyric.Generate();
+    [Fact]
+    public async Task Can_create_OneToOne_relationship_from_dependent_side()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        Lyric existingLyric = _fakers.Lyric.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingTrack, existingLyric);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingTrack, existingLyric);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "lyric"
-                        },
-                        data = new
-                        {
-                            type = "lyrics",
-                            id = existingLyric.StringId
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "lyric"
+                    },
+                    data = new
+                    {
+                        type = "lyrics",
+                        id = existingLyric.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Lyric.ShouldNotBeNull();
-                trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
-            });
-        }
+            trackInDatabase.Lyric.ShouldNotBeNull();
+            trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_ManyToOne_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Can_create_ManyToOne_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingTrack, existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingTrack, existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "ownedBy"
-                        },
-                        data = new
-                        {
-                            type = "recordCompanies",
-                            id = existingCompany.StringId
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "ownedBy"
+                    },
+                    data = new
+                    {
+                        type = "recordCompanies",
+                        id = existingCompany.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
-            });
-        }
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_OneToOne_relationship_from_principal_side()
-        {
-            // Arrange
-            Lyric existingLyric = _fakers.Lyric.Generate();
-            existingLyric.Track = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Can_replace_OneToOne_relationship_from_principal_side()
+    {
+        // Arrange
+        Lyric existingLyric = _fakers.Lyric.Generate();
+        existingLyric.Track = _fakers.MusicTrack.Generate();
 
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<MusicTrack>();
-                dbContext.AddInRange(existingLyric, existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<MusicTrack>();
+            dbContext.AddInRange(existingLyric, existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = existingLyric.StringId,
-                            relationship = "track"
-                        },
-                        data = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId
-                        }
+                        type = "lyrics",
+                        id = existingLyric.StringId,
+                        relationship = "track"
+                    },
+                    data = new
+                    {
+                        type = "musicTracks",
+                        id = existingTrack.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(existingLyric.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(existingLyric.Id);
 
-                lyricInDatabase.Track.ShouldNotBeNull();
-                lyricInDatabase.Track.Id.Should().Be(existingTrack.Id);
+            lyricInDatabase.Track.ShouldNotBeNull();
+            lyricInDatabase.Track.Id.Should().Be(existingTrack.Id);
 
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
-                tracksInDatabase.ShouldHaveCount(2);
-            });
-        }
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+            tracksInDatabase.ShouldHaveCount(2);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_OneToOne_relationship_from_dependent_side()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Lyric = _fakers.Lyric.Generate();
+    [Fact]
+    public async Task Can_replace_OneToOne_relationship_from_dependent_side()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Lyric = _fakers.Lyric.Generate();
 
-            Lyric existingLyric = _fakers.Lyric.Generate();
+        Lyric existingLyric = _fakers.Lyric.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Lyric>();
-                dbContext.AddInRange(existingTrack, existingLyric);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Lyric>();
+            dbContext.AddInRange(existingTrack, existingLyric);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "lyric"
-                        },
-                        data = new
-                        {
-                            type = "lyrics",
-                            id = existingLyric.StringId
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "lyric"
+                    },
+                    data = new
+                    {
+                        type = "lyrics",
+                        id = existingLyric.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Lyric.ShouldNotBeNull();
-                trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
+            trackInDatabase.Lyric.ShouldNotBeNull();
+            trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
 
-                List<Lyric> lyricsInDatabase = await dbContext.Lyrics.ToListAsync();
-                lyricsInDatabase.ShouldHaveCount(2);
-            });
-        }
+            List<Lyric> lyricsInDatabase = await dbContext.Lyrics.ToListAsync();
+            lyricsInDatabase.ShouldHaveCount(2);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_ManyToOne_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Can_replace_ManyToOne_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
 
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<RecordCompany>();
-                dbContext.AddInRange(existingTrack, existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<RecordCompany>();
+            dbContext.AddInRange(existingTrack, existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "ownedBy"
-                        },
-                        data = new
-                        {
-                            type = "recordCompanies",
-                            id = existingCompany.StringId
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "ownedBy"
+                    },
+                    data = new
+                    {
+                        type = "recordCompanies",
+                        id = existingCompany.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
 
-                List<RecordCompany> companiesInDatabase = await dbContext.RecordCompanies.ToListAsync();
-                companiesInDatabase.ShouldHaveCount(2);
-            });
-        }
+            List<RecordCompany> companiesInDatabase = await dbContext.RecordCompanies.ToListAsync();
+            companiesInDatabase.ShouldHaveCount(2);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_href_element()
+    [Fact]
+    public async Task Cannot_create_for_href_element()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
-                    {
-                        op = "update",
-                        href = "/api/v1/musicTracks/1/relationships/ownedBy"
-                    }
+                    op = "update",
+                    href = "/api/v1/musicTracks/1/relationships/ownedBy"
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_type_in_ref()
+    [Fact]
+    public async Task Cannot_create_for_missing_type_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            id = Unknown.StringId.For<Lyric, long>(),
-                            relationship = "track"
-                        }
+                        id = Unknown.StringId.For<Lyric, long>(),
+                        relationship = "track"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_type_in_ref()
+    [Fact]
+    public async Task Cannot_create_for_unknown_type_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = Unknown.ResourceType,
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "ownedBy"
-                        }
+                        type = Unknown.ResourceType,
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "ownedBy"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_ID_in_ref()
+    [Fact]
+    public async Task Cannot_create_for_missing_ID_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            relationship = "ownedBy"
-                        }
+                        type = "musicTracks",
+                        relationship = "ownedBy"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_ID_in_ref()
-        {
-            // Arrange
-            string trackId = Unknown.StringId.For<MusicTrack, Guid>();
+    [Fact]
+    public async Task Cannot_create_for_unknown_ID_in_ref()
+    {
+        // Arrange
+        string trackId = Unknown.StringId.For<MusicTrack, Guid>();
 
-            Lyric existingLyric = _fakers.Lyric.Generate();
+        Lyric existingLyric = _fakers.Lyric.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Lyrics.Add(existingLyric);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Lyrics.Add(existingLyric);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = trackId,
-                            relationship = "lyric"
-                        },
-                        data = new
-                        {
-                            type = "lyrics",
-                            id = existingLyric.StringId
-                        }
+                        type = "musicTracks",
+                        id = trackId,
+                        relationship = "lyric"
+                    },
+                    data = new
+                    {
+                        type = "lyrics",
+                        id = existingLyric.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'musicTracks' with ID '{trackId}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'musicTracks' with ID '{trackId}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_incompatible_ID_in_ref()
-        {
-            // Arrange
-            Lyric existingLyric = _fakers.Lyric.Generate();
+    [Fact]
+    public async Task Cannot_create_for_incompatible_ID_in_ref()
+    {
+        // Arrange
+        Lyric existingLyric = _fakers.Lyric.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Lyrics.Add(existingLyric);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Lyrics.Add(existingLyric);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = "invalid-guid",
-                            relationship = "lyric"
-                        },
-                        data = new
-                        {
-                            type = "lyrics",
-                            id = existingLyric.StringId
-                        }
+                        type = "musicTracks",
+                        id = "invalid-guid",
+                        relationship = "lyric"
+                    },
+                    data = new
+                    {
+                        type = "lyrics",
+                        id = existingLyric.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
-            error.Detail.Should().Be("Failed to convert 'invalid-guid' of type 'String' to type 'Guid'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
+        error.Detail.Should().Be("Failed to convert 'invalid-guid' of type 'String' to type 'Guid'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_ID_and_local_ID_in_ref()
+    [Fact]
+    public async Task Cannot_create_for_ID_and_local_ID_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            lid = "local-1",
-                            relationship = "ownedBy"
-                        }
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        lid = "local-1",
+                        relationship = "ownedBy"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_relationship_in_ref()
+    [Fact]
+    public async Task Cannot_create_for_unknown_relationship_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "performers",
-                            id = Unknown.StringId.For<Performer, int>(),
-                            relationship = Unknown.Relationship
-                        }
+                        type = "performers",
+                        id = Unknown.StringId.For<Performer, int>(),
+                        relationship = Unknown.Relationship
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
-            error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'performers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/relationship");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
+        error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'performers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/relationship");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_create_for_missing_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "lyric"
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "lyric"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_array_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_create_for_array_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "lyric"
-                        },
-                        data = new[]
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "lyric"
+                    },
+                    data = new[]
+                    {
+                        new
                         {
-                            new
-                            {
-                                type = "lyrics",
-                                id = Unknown.StringId.For<Lyric, long>()
-                            }
+                            type = "lyrics",
+                            id = Unknown.StringId.For<Lyric, long>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object or 'null', instead of an array.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object or 'null', instead of an array.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_type_in_data()
+    [Fact]
+    public async Task Cannot_create_for_missing_type_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>(),
-                            relationship = "track"
-                        },
-                        data = new
-                        {
-                            id = Unknown.StringId.For<MusicTrack, Guid>()
-                        }
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>(),
+                        relationship = "track"
+                    },
+                    data = new
+                    {
+                        id = Unknown.StringId.For<MusicTrack, Guid>()
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_type_in_data()
+    [Fact]
+    public async Task Cannot_create_for_unknown_type_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "lyric"
-                        },
-                        data = new
-                        {
-                            type = Unknown.ResourceType,
-                            id = Unknown.StringId.For<Lyric, long>()
-                        }
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "lyric"
+                    },
+                    data = new
+                    {
+                        type = Unknown.ResourceType,
+                        id = Unknown.StringId.For<Lyric, long>()
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_ID_in_data()
+    [Fact]
+    public async Task Cannot_create_for_missing_ID_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "lyric"
-                        },
-                        data = new
-                        {
-                            type = "lyrics"
-                        }
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "lyric"
+                    },
+                    data = new
+                    {
+                        type = "lyrics"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_ID_and_local_ID_in_data()
+    [Fact]
+    public async Task Cannot_create_for_ID_and_local_ID_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationship = "lyric"
-                        },
-                        data = new
-                        {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>(),
-                            lid = "local-1"
-                        }
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationship = "lyric"
+                    },
+                    data = new
+                    {
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>(),
+                        lid = "local-1"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_ID_in_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_create_for_unknown_ID_in_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string lyricId = Unknown.StringId.For<Lyric, long>();
+        string lyricId = Unknown.StringId.For<Lyric, long>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "lyric"
-                        },
-                        data = new
-                        {
-                            type = "lyrics",
-                            id = lyricId
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "lyric"
+                    },
+                    data = new
+                    {
+                        type = "lyrics",
+                        id = lyricId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'lyrics' with ID '{lyricId}' in relationship 'lyric' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'lyrics' with ID '{lyricId}' in relationship 'lyric' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_incompatible_ID_in_data()
-        {
-            // Arrange
-            Lyric existingLyric = _fakers.Lyric.Generate();
+    [Fact]
+    public async Task Cannot_create_for_incompatible_ID_in_data()
+    {
+        // Arrange
+        Lyric existingLyric = _fakers.Lyric.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Lyrics.Add(existingLyric);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Lyrics.Add(existingLyric);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "lyrics",
-                            id = existingLyric.StringId,
-                            relationship = "track"
-                        },
-                        data = new
-                        {
-                            type = "musicTracks",
-                            id = "invalid-guid"
-                        }
+                        type = "lyrics",
+                        id = existingLyric.StringId,
+                        relationship = "track"
+                    },
+                    data = new
+                    {
+                        type = "musicTracks",
+                        id = "invalid-guid"
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
-            error.Detail.Should().Be("Failed to convert 'invalid-guid' of type 'String' to type 'Guid'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
+        error.Detail.Should().Be("Failed to convert 'invalid-guid' of type 'String' to type 'Guid'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_relationship_mismatch_between_ref_and_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_create_for_relationship_mismatch_between_ref_and_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationship = "lyric"
-                        },
-                        data = new
-                        {
-                            type = "playlists",
-                            id = Unknown.StringId.For<Playlist, long>()
-                        }
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationship = "lyric"
+                    },
+                    data = new
+                    {
+                        type = "playlists",
+                        id = Unknown.StringId.For<Playlist, long>()
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'playlists' is incompatible with type 'lyrics' of relationship 'lyric'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'playlists' is incompatible with type 'lyrics' of relationship 'lyric'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicReplaceToManyRelationshipTests.cs
index e942553a6d..98b8892800 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicReplaceToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicReplaceToManyRelationshipTests.cs
@@ -1,807 +1,802 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Resources
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Resources;
+
+public sealed class AtomicReplaceToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicReplaceToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicReplaceToManyRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicReplaceToManyRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
+    }
 
-            testContext.UseController<OperationsController>();
-        }
+    [Fact]
+    public async Task Can_clear_OneToMany_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Performers = _fakers.Performer.Generate(2);
 
-        [Fact]
-        public async Task Can_clear_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Performers = _fakers.Performer.Generate(2);
+            await dbContext.ClearTableAsync<Performer>();
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Performer>();
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
-                                {
-                                    data = Array.Empty<object>()
-                                }
+                                data = Array.Empty<object>()
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Performers.Should().BeEmpty();
+            trackInDatabase.Performers.Should().BeEmpty();
 
-                List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
-                performersInDatabase.ShouldHaveCount(2);
-            });
-        }
+            List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
+            performersInDatabase.ShouldHaveCount(2);
+        });
+    }
 
-        [Fact]
-        public async Task Can_clear_ManyToMany_relationship()
-        {
-            // Arrange
-            Playlist existingPlaylist = _fakers.Playlist.Generate();
-            existingPlaylist.Tracks = _fakers.MusicTrack.Generate(2);
+    [Fact]
+    public async Task Can_clear_ManyToMany_relationship()
+    {
+        // Arrange
+        Playlist existingPlaylist = _fakers.Playlist.Generate();
+        existingPlaylist.Tracks = _fakers.MusicTrack.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<MusicTrack>();
-                dbContext.Playlists.Add(existingPlaylist);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<MusicTrack>();
+            dbContext.Playlists.Add(existingPlaylist);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationships = new
                         {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationships = new
+                            tracks = new
                             {
-                                tracks = new
-                                {
-                                    data = Array.Empty<object>()
-                                }
+                                data = Array.Empty<object>()
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
 
-                playlistInDatabase.Tracks.Should().BeEmpty();
+            playlistInDatabase.Tracks.Should().BeEmpty();
 
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
 
-                tracksInDatabase.ShouldHaveCount(2);
-            });
-        }
+            tracksInDatabase.ShouldHaveCount(2);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_OneToMany_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Performers = _fakers.Performer.Generate(1);
+    [Fact]
+    public async Task Can_replace_OneToMany_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Performers = _fakers.Performer.Generate(1);
 
-            List<Performer> existingPerformers = _fakers.Performer.Generate(2);
+        List<Performer> existingPerformers = _fakers.Performer.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Performer>();
-                dbContext.MusicTracks.Add(existingTrack);
-                dbContext.Performers.AddRange(existingPerformers);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Performer>();
+            dbContext.MusicTracks.Add(existingTrack);
+            dbContext.Performers.AddRange(existingPerformers);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = existingPerformers[0].StringId
-                                        },
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = existingPerformers[1].StringId
-                                        }
+                                        type = "performers",
+                                        id = existingPerformers[0].StringId
+                                    },
+                                    new
+                                    {
+                                        type = "performers",
+                                        id = existingPerformers[1].StringId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Performers).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Performers.ShouldHaveCount(2);
-                trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[0].Id);
-                trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[1].Id);
+            trackInDatabase.Performers.ShouldHaveCount(2);
+            trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[0].Id);
+            trackInDatabase.Performers.Should().ContainSingle(performer => performer.Id == existingPerformers[1].Id);
 
-                List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
-                performersInDatabase.ShouldHaveCount(3);
-            });
-        }
+            List<Performer> performersInDatabase = await dbContext.Performers.ToListAsync();
+            performersInDatabase.ShouldHaveCount(3);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_ManyToMany_relationship()
-        {
-            // Arrange
-            Playlist existingPlaylist = _fakers.Playlist.Generate();
-            existingPlaylist.Tracks = _fakers.MusicTrack.Generate(1);
+    [Fact]
+    public async Task Can_replace_ManyToMany_relationship()
+    {
+        // Arrange
+        Playlist existingPlaylist = _fakers.Playlist.Generate();
+        existingPlaylist.Tracks = _fakers.MusicTrack.Generate(1);
 
-            List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(2);
+        List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<MusicTrack>();
-                dbContext.Playlists.Add(existingPlaylist);
-                dbContext.MusicTracks.AddRange(existingTracks);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<MusicTrack>();
+            dbContext.Playlists.Add(existingPlaylist);
+            dbContext.MusicTracks.AddRange(existingTracks);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        relationships = new
                         {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            relationships = new
+                            tracks = new
                             {
-                                tracks = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
+                                    {
+                                        type = "musicTracks",
+                                        id = existingTracks[0].StringId
+                                    },
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            id = existingTracks[0].StringId
-                                        },
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            id = existingTracks[1].StringId
-                                        }
+                                        type = "musicTracks",
+                                        id = existingTracks[1].StringId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Playlist playlistInDatabase = await dbContext.Playlists.Include(playlist => playlist.Tracks).FirstWithIdAsync(existingPlaylist.Id);
 
-                playlistInDatabase.Tracks.ShouldHaveCount(2);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[0].Id);
-                playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[1].Id);
+            playlistInDatabase.Tracks.ShouldHaveCount(2);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[0].Id);
+            playlistInDatabase.Tracks.Should().ContainSingle(musicTrack => musicTrack.Id == existingTracks[1].Id);
 
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
 
-                tracksInDatabase.ShouldHaveCount(3);
-            });
-        }
+            tracksInDatabase.ShouldHaveCount(3);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_data_in_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_missing_data_in_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
-                                {
-                                }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_null_data_in_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_null_data_in_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
-                                {
-                                    data = (object?)null
-                                }
+                                data = (object?)null
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_object_data_in_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_object_data_in_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                    }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_type_in_relationship_data()
+    [Fact]
+    public async Task Cannot_replace_for_missing_type_in_relationship_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "playlists",
+                        id = Unknown.StringId.For<Playlist, long>(),
+                        relationships = new
                         {
-                            type = "playlists",
-                            id = Unknown.StringId.For<Playlist, long>(),
-                            relationships = new
+                            tracks = new
                             {
-                                tracks = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            id = Unknown.StringId.For<MusicTrack, Guid>()
-                                        }
+                                        id = Unknown.StringId.For<MusicTrack, Guid>()
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/tracks/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/tracks/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_unknown_type_in_relationship_data()
+    [Fact]
+    public async Task Cannot_replace_for_unknown_type_in_relationship_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = Unknown.ResourceType,
-                                            id = Unknown.StringId.For<Performer, int>()
-                                        }
+                                        type = Unknown.ResourceType,
+                                        id = Unknown.StringId.For<Performer, int>()
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_ID_in_relationship_data()
+    [Fact]
+    public async Task Cannot_replace_for_missing_ID_in_relationship_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers"
-                                        }
+                                        type = "performers"
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_ID_and_local_ID_relationship_in_data()
+    [Fact]
+    public async Task Cannot_replace_for_ID_and_local_ID_relationship_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = Unknown.StringId.For<Performer, int>(),
-                                            lid = "local-1"
-                                        }
+                                        type = "performers",
+                                        id = Unknown.StringId.For<Performer, int>(),
+                                        lid = "local-1"
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_unknown_IDs_in_relationship_data()
-        {
-            // Arrange
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_unknown_IDs_in_relationship_data()
+    {
+        // Arrange
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            string[] trackIds =
-            {
-                Unknown.StringId.For<MusicTrack, Guid>(),
-                Unknown.StringId.AltFor<MusicTrack, Guid>()
-            };
+        string[] trackIds =
+        {
+            Unknown.StringId.For<MusicTrack, Guid>(),
+            Unknown.StringId.AltFor<MusicTrack, Guid>()
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RecordCompanies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RecordCompanies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "recordCompanies",
+                        id = existingCompany.StringId,
+                        relationships = new
                         {
-                            type = "recordCompanies",
-                            id = existingCompany.StringId,
-                            relationships = new
+                            tracks = new
                             {
-                                tracks = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            id = trackIds[0]
-                                        },
-                                        new
-                                        {
-                                            type = "musicTracks",
-                                            id = trackIds[1]
-                                        }
+                                        type = "musicTracks",
+                                        id = trackIds[0]
+                                    },
+                                    new
+                                    {
+                                        type = "musicTracks",
+                                        id = trackIds[1]
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
+
+        const string route = "/operations";
 
-            const string route = "/operations";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[0]}' in relationship 'tracks' does not exist.");
+        error1.Source.ShouldNotBeNull();
+        error1.Source.Pointer.Should().Be("/atomic:operations[0]");
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[0]}' in relationship 'tracks' does not exist.");
-            error1.Source.ShouldNotBeNull();
-            error1.Source.Pointer.Should().Be("/atomic:operations[0]");
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[1]}' in relationship 'tracks' does not exist.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/atomic:operations[0]");
+    }
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'musicTracks' with ID '{trackIds[1]}' in relationship 'tracks' does not exist.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/atomic:operations[0]");
-        }
+    [Fact]
+    public async Task Cannot_create_for_relationship_mismatch()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-        [Fact]
-        public async Task Cannot_create_for_relationship_mismatch()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            performers = new
                             {
-                                performers = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "playlists",
-                                            id = Unknown.StringId.For<Playlist, long>()
-                                        }
+                                        type = "playlists",
+                                        id = Unknown.StringId.For<Playlist, long>()
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'playlists' is incompatible with type 'performers' of relationship 'performers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'playlists' is incompatible with type 'performers' of relationship 'performers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/performers/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs
index 783bacf575..f8051e369c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateResourceTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Extensions;
 using JsonApiDotNetCore.Configuration;
@@ -13,1812 +8,1811 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Resources
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Resources;
+
+public sealed class AtomicUpdateResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicUpdateResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
 
-        public AtomicUpdateResourceTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+    public AtomicUpdateResourceTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<OperationsController>();
+        testContext.UseController<OperationsController>();
 
-            // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
-            testContext.UseController<TextLanguagesController>();
+        // These routes need to be registered in ASP.NET for rendering links to resource/relationship endpoints.
+        testContext.UseController<TextLanguagesController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<ImplicitlyChangingTextLanguageDefinition>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<ImplicitlyChangingTextLanguageDefinition>();
 
-                services.AddSingleton<ResourceDefinitionHitCounter>();
-            });
+            services.AddSingleton<ResourceDefinitionHitCounter>();
+        });
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownFieldsInRequestBody = false;
-        }
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownFieldsInRequestBody = false;
+    }
 
-        [Fact]
-        public async Task Can_update_resources()
-        {
-            // Arrange
-            const int elementCount = 5;
+    [Fact]
+    public async Task Can_update_resources()
+    {
+        // Arrange
+        const int elementCount = 5;
 
-            List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(elementCount);
-            string[] newTrackTitles = _fakers.MusicTrack.Generate(elementCount).Select(musicTrack => musicTrack.Title).ToArray();
+        List<MusicTrack> existingTracks = _fakers.MusicTrack.Generate(elementCount);
+        string[] newTrackTitles = _fakers.MusicTrack.Generate(elementCount).Select(musicTrack => musicTrack.Title).ToArray();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<MusicTrack>();
-                dbContext.MusicTracks.AddRange(existingTracks);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<MusicTrack>();
+            dbContext.MusicTracks.AddRange(existingTracks);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var operationElements = new List<object>(elementCount);
+        var operationElements = new List<object>(elementCount);
 
-            for (int index = 0; index < elementCount; index++)
+        for (int index = 0; index < elementCount; index++)
+        {
+            operationElements.Add(new
             {
-                operationElements.Add(new
+                op = "update",
+                data = new
                 {
-                    op = "update",
-                    data = new
+                    type = "musicTracks",
+                    id = existingTracks[index].StringId,
+                    attributes = new
                     {
-                        type = "musicTracks",
-                        id = existingTracks[index].StringId,
-                        attributes = new
-                        {
-                            title = newTrackTitles[index]
-                        }
+                        title = newTrackTitles[index]
                     }
-                });
-            }
+                }
+            });
+        }
 
-            var requestBody = new
-            {
-                atomic__operations = operationElements
-            };
+        var requestBody = new
+        {
+            atomic__operations = operationElements
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
 
-                tracksInDatabase.ShouldHaveCount(elementCount);
+            tracksInDatabase.ShouldHaveCount(elementCount);
 
-                for (int index = 0; index < elementCount; index++)
-                {
-                    MusicTrack trackInDatabase = tracksInDatabase.Single(musicTrack => musicTrack.Id == existingTracks[index].Id);
+            for (int index = 0; index < elementCount; index++)
+            {
+                MusicTrack trackInDatabase = tracksInDatabase.Single(musicTrack => musicTrack.Id == existingTracks[index].Id);
 
-                    trackInDatabase.Title.Should().Be(newTrackTitles[index]);
-                    trackInDatabase.Genre.Should().Be(existingTracks[index].Genre);
-                }
-            });
-        }
+                trackInDatabase.Title.Should().Be(newTrackTitles[index]);
+                trackInDatabase.Genre.Should().Be(existingTracks[index].Genre);
+            }
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource_without_attributes_or_relationships()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Can_update_resource_without_attributes_or_relationships()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        attributes = new
+                        {
+                        },
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Title.Should().Be(existingTrack.Title);
-                trackInDatabase.Genre.Should().Be(existingTrack.Genre);
+            trackInDatabase.Title.Should().Be(existingTrack.Title);
+            trackInDatabase.Genre.Should().Be(existingTrack.Genre);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(existingTrack.OwnedBy.Id);
-            });
-        }
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(existingTrack.OwnedBy.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_unknown_attribute()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            string newTitle = _fakers.MusicTrack.Generate().Title;
+    [Fact]
+    public async Task Cannot_update_resource_with_unknown_attribute()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        string newTitle = _fakers.MusicTrack.Generate().Title;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            attributes = new
-                            {
-                                title = newTitle,
-                                doesNotExist = "Ignored"
-                            }
+                            title = newTitle,
+                            doesNotExist = "Ignored"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown attribute found.");
-            error.Detail.Should().Be("Attribute 'doesNotExist' does not exist on resource type 'musicTracks'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/doesNotExist");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown attribute found.");
+        error.Detail.Should().Be("Attribute 'doesNotExist' does not exist on resource type 'musicTracks'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/doesNotExist");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_unknown_attribute()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownFieldsInRequestBody = true;
+    [Fact]
+    public async Task Can_update_resource_with_unknown_attribute()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownFieldsInRequestBody = true;
 
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            string newTitle = _fakers.MusicTrack.Generate().Title;
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        string newTitle = _fakers.MusicTrack.Generate().Title;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            attributes = new
-                            {
-                                title = newTitle,
-                                doesNotExist = "Ignored"
-                            }
+                            title = newTitle,
+                            doesNotExist = "Ignored"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Title.Should().Be(newTitle);
-            });
-        }
+            trackInDatabase.Title.Should().Be(newTitle);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_unknown_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_with_unknown_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            doesNotExist = new
                             {
-                                doesNotExist = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = Unknown.ResourceType,
-                                        id = Unknown.StringId.Int32
-                                    }
+                                    type = Unknown.ResourceType,
+                                    id = Unknown.StringId.Int32
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
-            error.Detail.Should().Be("Relationship 'doesNotExist' does not exist on resource type 'musicTracks'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/doesNotExist");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
+        error.Detail.Should().Be("Relationship 'doesNotExist' does not exist on resource type 'musicTracks'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/doesNotExist");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_unknown_relationship()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownFieldsInRequestBody = true;
+    [Fact]
+    public async Task Can_update_resource_with_unknown_relationship()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownFieldsInRequestBody = true;
 
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            doesNotExist = new
                             {
-                                doesNotExist = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = Unknown.ResourceType,
-                                        id = Unknown.StringId.Int32
-                                    }
+                                    type = Unknown.ResourceType,
+                                    id = Unknown.StringId.Int32
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Can_partially_update_resource_without_side_effects()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Can_partially_update_resource_without_side_effects()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
 
-            string newGenre = _fakers.MusicTrack.Generate().Genre!;
+        string newGenre = _fakers.MusicTrack.Generate().Genre!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            attributes = new
-                            {
-                                genre = newGenre
-                            }
+                            genre = newGenre
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Title.Should().Be(existingTrack.Title);
-                trackInDatabase.LengthInSeconds.Should().BeApproximately(existingTrack.LengthInSeconds);
-                trackInDatabase.Genre.Should().Be(newGenre);
-                trackInDatabase.ReleasedAt.Should().BeCloseTo(existingTrack.ReleasedAt);
+            trackInDatabase.Title.Should().Be(existingTrack.Title);
+            trackInDatabase.LengthInSeconds.Should().BeApproximately(existingTrack.LengthInSeconds);
+            trackInDatabase.Genre.Should().Be(newGenre);
+            trackInDatabase.ReleasedAt.Should().Be(existingTrack.ReleasedAt);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(existingTrack.OwnedBy.Id);
-            });
-        }
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(existingTrack.OwnedBy.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_completely_update_resource_without_side_effects()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Can_completely_update_resource_without_side_effects()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
 
-            string newTitle = _fakers.MusicTrack.Generate().Title;
-            decimal? newLengthInSeconds = _fakers.MusicTrack.Generate().LengthInSeconds;
-            string newGenre = _fakers.MusicTrack.Generate().Genre!;
-            DateTimeOffset newReleasedAt = _fakers.MusicTrack.Generate().ReleasedAt;
+        string newTitle = _fakers.MusicTrack.Generate().Title;
+        decimal? newLengthInSeconds = _fakers.MusicTrack.Generate().LengthInSeconds;
+        string newGenre = _fakers.MusicTrack.Generate().Genre!;
+        DateTimeOffset newReleasedAt = _fakers.MusicTrack.Generate().ReleasedAt;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            attributes = new
-                            {
-                                title = newTitle,
-                                lengthInSeconds = newLengthInSeconds,
-                                genre = newGenre,
-                                releasedAt = newReleasedAt
-                            }
+                            title = newTitle,
+                            lengthInSeconds = newLengthInSeconds,
+                            genre = newGenre,
+                            releasedAt = newReleasedAt
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Title.Should().Be(newTitle);
-                trackInDatabase.LengthInSeconds.Should().BeApproximately(newLengthInSeconds);
-                trackInDatabase.Genre.Should().Be(newGenre);
-                trackInDatabase.ReleasedAt.Should().BeCloseTo(newReleasedAt);
+            trackInDatabase.Title.Should().Be(newTitle);
+            trackInDatabase.LengthInSeconds.Should().BeApproximately(newLengthInSeconds);
+            trackInDatabase.Genre.Should().Be(newGenre);
+            trackInDatabase.ReleasedAt.Should().Be(newReleasedAt);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(existingTrack.OwnedBy.Id);
-            });
-        }
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(existingTrack.OwnedBy.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_side_effects()
-        {
-            // Arrange
-            TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
-            string newIsoCode = _fakers.TextLanguage.Generate().IsoCode!;
+    [Fact]
+    public async Task Can_update_resource_with_side_effects()
+    {
+        // Arrange
+        TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
+        string newIsoCode = _fakers.TextLanguage.Generate().IsoCode!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.TextLanguages.Add(existingLanguage);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.TextLanguages.Add(existingLanguage);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "textLanguages",
+                        id = existingLanguage.StringId,
+                        attributes = new
                         {
-                            type = "textLanguages",
-                            id = existingLanguage.StringId,
-                            attributes = new
-                            {
-                                isoCode = newIsoCode
-                            }
+                            isoCode = newIsoCode
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            string isoCode = $"{newIsoCode}{ImplicitlyChangingTextLanguageDefinition.Suffix}";
+        string isoCode = $"{newIsoCode}{ImplicitlyChangingTextLanguageDefinition.Suffix}";
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Type.Should().Be("textLanguages");
-                resource.Attributes.ShouldContainKey("isoCode").With(value => value.Should().Be(isoCode));
-                resource.Attributes.Should().NotContainKey("isRightToLeft");
-                resource.Relationships.ShouldNotBeEmpty();
-            });
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                TextLanguage languageInDatabase = await dbContext.TextLanguages.FirstWithIdAsync(existingLanguage.Id);
-                languageInDatabase.IsoCode.Should().Be(isoCode);
-            });
-        }
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Type.Should().Be("textLanguages");
+            resource.Attributes.ShouldContainKey("isoCode").With(value => value.Should().Be(isoCode));
+            resource.Attributes.Should().NotContainKey("isRightToLeft");
+            resource.Relationships.ShouldNotBeEmpty();
+        });
 
-        [Fact]
-        public async Task Update_resource_with_side_effects_hides_relationship_data_in_response()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
-            existingLanguage.Lyrics = _fakers.Lyric.Generate(1);
+            TextLanguage languageInDatabase = await dbContext.TextLanguages.FirstWithIdAsync(existingLanguage.Id);
+            languageInDatabase.IsoCode.Should().Be(isoCode);
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.TextLanguages.Add(existingLanguage);
-                await dbContext.SaveChangesAsync();
-            });
+    [Fact]
+    public async Task Update_resource_with_side_effects_hides_relationship_data_in_response()
+    {
+        // Arrange
+        TextLanguage existingLanguage = _fakers.TextLanguage.Generate();
+        existingLanguage.Lyrics = _fakers.Lyric.Generate(1);
 
-            var requestBody = new
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.TextLanguages.Add(existingLanguage);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
-                        {
-                            type = "textLanguages",
-                            id = existingLanguage.StringId
-                        }
+                        type = "textLanguages",
+                        id = existingLanguage.StringId
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Results.ShouldHaveCount(1);
+        responseDocument.Results.ShouldHaveCount(1);
 
-            responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
-            {
-                resource.Relationships.ShouldNotBeEmpty();
-                resource.Relationships.Values.Should().OnlyContain(value => value != null && value.Data.Value == null);
-            });
-        }
+        responseDocument.Results[0].Data.SingleValue.ShouldNotBeNull().With(resource =>
+        {
+            resource.Relationships.ShouldNotBeEmpty();
+            resource.Relationships.Values.Should().OnlyContain(value => value != null && value.Data.Value == null);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_href_element()
+    [Fact]
+    public async Task Cannot_update_resource_for_href_element()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
-                    {
-                        op = "update",
-                        href = "/api/v1/musicTracks/1"
-                    }
+                    op = "update",
+                    href = "/api/v1/musicTracks/1"
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'href' element is not supported.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/href");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_update_resource_for_ref_element()
-        {
-            // Arrange
-            Performer existingPerformer = _fakers.Performer.Generate();
-            string newArtistName = _fakers.Performer.Generate().ArtistName!;
+    [Fact]
+    public async Task Can_update_resource_for_ref_element()
+    {
+        // Arrange
+        Performer existingPerformer = _fakers.Performer.Generate();
+        string newArtistName = _fakers.Performer.Generate().ArtistName!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Performers.Add(existingPerformer);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Performers.Add(existingPerformer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "performers",
-                            id = existingPerformer.StringId
-                        },
-                        data = new
+                        type = "performers",
+                        id = existingPerformer.StringId
+                    },
+                    data = new
+                    {
+                        type = "performers",
+                        id = existingPerformer.StringId,
+                        attributes = new
                         {
-                            type = "performers",
-                            id = existingPerformer.StringId,
-                            attributes = new
-                            {
-                                artistName = newArtistName
-                            }
+                            artistName = newArtistName
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Performer performerInDatabase = await dbContext.Performers.FirstWithIdAsync(existingPerformer.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Performer performerInDatabase = await dbContext.Performers.FirstWithIdAsync(existingPerformer.Id);
 
-                performerInDatabase.ArtistName.Should().Be(newArtistName);
-                performerInDatabase.BornAt.Should().BeCloseTo(existingPerformer.BornAt);
-            });
-        }
+            performerInDatabase.ArtistName.Should().Be(newArtistName);
+            performerInDatabase.BornAt.Should().Be(existingPerformer.BornAt);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_missing_type_in_ref()
+    [Fact]
+    public async Task Cannot_update_resource_for_missing_type_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
+                    {
+                        id = Unknown.StringId.For<Performer, int>()
+                    },
+                    data = new
                     {
-                        op = "update",
-                        @ref = new
+                        type = "performers",
+                        id = Unknown.StringId.For<Performer, int>(),
+                        attributes = new
                         {
-                            id = Unknown.StringId.For<Performer, int>()
                         },
-                        data = new
+                        relationships = new
                         {
-                            type = "performers",
-                            id = Unknown.StringId.For<Performer, int>(),
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_missing_ID_in_ref()
+    [Fact]
+    public async Task Cannot_update_resource_for_missing_ID_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
+                        type = "performers"
+                    },
+                    data = new
+                    {
+                        type = "performers",
+                        id = Unknown.StringId.For<Performer, int>(),
+                        attributes = new
                         {
-                            type = "performers"
                         },
-                        data = new
+                        relationships = new
                         {
-                            type = "performers",
-                            id = Unknown.StringId.For<Performer, int>(),
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_ID_and_local_ID_in_ref()
+    [Fact]
+    public async Task Cannot_update_resource_for_ID_and_local_ID_in_ref()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
+                        type = "performers",
+                        id = Unknown.StringId.For<Performer, int>(),
+                        lid = "local-1"
+                    },
+                    data = new
+                    {
+                        type = "performers",
+                        id = Unknown.StringId.AltFor<Performer, int>(),
+                        attributes = new
                         {
-                            type = "performers",
-                            id = Unknown.StringId.For<Performer, int>(),
-                            lid = "local-1"
                         },
-                        data = new
+                        relationships = new
                         {
-                            type = "performers",
-                            id = Unknown.StringId.AltFor<Performer, int>(),
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_missing_data()
+    [Fact]
+    public async Task Cannot_update_resource_for_missing_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
-                    {
-                        op = "update"
-                    }
+                    op = "update"
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_null_data()
+    [Fact]
+    public async Task Cannot_update_resource_for_null_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
-                    {
-                        op = "update",
-                        data = (object?)null
-                    }
+                    op = "update",
+                    data = (object?)null
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_array_data()
-        {
-            // Arrange
-            Performer existingPerformer = _fakers.Performer.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_for_array_data()
+    {
+        // Arrange
+        Performer existingPerformer = _fakers.Performer.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Performers.Add(existingPerformer);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Performers.Add(existingPerformer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new[]
                     {
-                        op = "update",
-                        data = new[]
+                        new
                         {
-                            new
+                            type = "performers",
+                            id = existingPerformer.StringId,
+                            attributes = new
                             {
-                                type = "performers",
-                                id = existingPerformer.StringId,
-                                attributes = new
-                                {
-                                    artistName = existingPerformer.ArtistName
-                                }
+                                artistName = existingPerformer.ArtistName
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of an array.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of an array.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_missing_type_in_data()
+    [Fact]
+    public async Task Cannot_update_resource_for_missing_type_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        id = Unknown.StringId.Int32,
+                        attributes = new
+                        {
+                        },
+                        relationships = new
                         {
-                            id = Unknown.StringId.Int32,
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_missing_ID_in_data()
+    [Fact]
+    public async Task Cannot_update_resource_for_missing_ID_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "performers",
+                        attributes = new
+                        {
+                        },
+                        relationships = new
                         {
-                            type = "performers",
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_ID_and_local_ID_in_data()
+    [Fact]
+    public async Task Cannot_update_resource_for_ID_and_local_ID_in_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "performers",
+                        id = Unknown.StringId.For<Performer, int>(),
+                        lid = "local-1",
+                        attributes = new
+                        {
+                        },
+                        relationships = new
                         {
-                            type = "performers",
-                            id = Unknown.StringId.For<Performer, int>(),
-                            lid = "local-1",
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_on_resource_type_mismatch_between_ref_and_data()
+    [Fact]
+    public async Task Cannot_update_on_resource_type_mismatch_between_ref_and_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
+                        type = "performers",
+                        id = Unknown.StringId.For<Performer, int>()
+                    },
+                    data = new
+                    {
+                        type = "playlists",
+                        id = Unknown.StringId.For<Playlist, long>(),
+                        attributes = new
                         {
-                            type = "performers",
-                            id = Unknown.StringId.For<Performer, int>()
                         },
-                        data = new
+                        relationships = new
                         {
-                            type = "playlists",
-                            id = Unknown.StringId.For<Playlist, long>(),
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'playlists' is incompatible with type 'performers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'playlists' is incompatible with type 'performers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_on_resource_ID_mismatch_between_ref_and_data()
-        {
-            // Arrange
-            string performerId1 = Unknown.StringId.For<Performer, int>();
-            string performerId2 = Unknown.StringId.AltFor<Performer, int>();
+    [Fact]
+    public async Task Cannot_update_on_resource_ID_mismatch_between_ref_and_data()
+    {
+        // Arrange
+        string performerId1 = Unknown.StringId.For<Performer, int>();
+        string performerId2 = Unknown.StringId.AltFor<Performer, int>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
+                        type = "performers",
+                        id = performerId1
+                    },
+                    data = new
+                    {
+                        type = "performers",
+                        id = performerId2,
+                        attributes = new
                         {
-                            type = "performers",
-                            id = performerId1
                         },
-                        data = new
+                        relationships = new
                         {
-                            type = "performers",
-                            id = performerId2,
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Conflicting 'id' values found.");
-            error.Detail.Should().Be($"Expected '{performerId1}' instead of '{performerId2}'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Conflicting 'id' values found.");
+        error.Detail.Should().Be($"Expected '{performerId1}' instead of '{performerId2}'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_on_resource_local_ID_mismatch_between_ref_and_data()
+    [Fact]
+    public async Task Cannot_update_on_resource_local_ID_mismatch_between_ref_and_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
+                    {
+                        type = "performers",
+                        lid = "local-1"
+                    },
+                    data = new
                     {
-                        op = "update",
-                        @ref = new
+                        type = "performers",
+                        lid = "local-2",
+                        attributes = new
                         {
-                            type = "performers",
-                            lid = "local-1"
                         },
-                        data = new
+                        relationships = new
                         {
-                            type = "performers",
-                            lid = "local-2",
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Conflicting 'lid' values found.");
-            error.Detail.Should().Be("Expected 'local-1' instead of 'local-2'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/lid");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Conflicting 'lid' values found.");
+        error.Detail.Should().Be("Expected 'local-1' instead of 'local-2'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/lid");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_on_mixture_of_ID_and_local_ID_between_ref_and_data()
-        {
-            // Arrange
-            string performerId = Unknown.StringId.For<Performer, int>();
+    [Fact]
+    public async Task Cannot_update_on_mixture_of_ID_and_local_ID_between_ref_and_data()
+    {
+        // Arrange
+        string performerId = Unknown.StringId.For<Performer, int>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
+                        type = "performers",
+                        id = performerId
+                    },
+                    data = new
+                    {
+                        type = "performers",
+                        lid = "local-1",
+                        attributes = new
                         {
-                            type = "performers",
-                            id = performerId
                         },
-                        data = new
+                        relationships = new
                         {
-                            type = "performers",
-                            lid = "local-1",
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_on_mixture_of_local_ID_and_ID_between_ref_and_data()
-        {
-            // Arrange
-            string performerId = Unknown.StringId.For<Performer, int>();
+    [Fact]
+    public async Task Cannot_update_on_mixture_of_local_ID_and_ID_between_ref_and_data()
+    {
+        // Arrange
+        string performerId = Unknown.StringId.For<Performer, int>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
+                    {
+                        type = "performers",
+                        lid = "local-1"
+                    },
+                    data = new
                     {
-                        op = "update",
-                        @ref = new
+                        type = "performers",
+                        id = performerId,
+                        attributes = new
                         {
-                            type = "performers",
-                            lid = "local-1"
                         },
-                        data = new
+                        relationships = new
                         {
-                            type = "performers",
-                            id = performerId,
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_unknown_type()
+    [Fact]
+    public async Task Cannot_update_resource_for_unknown_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = Unknown.ResourceType,
+                        id = Unknown.StringId.Int32,
+                        attributes = new
+                        {
+                        },
+                        relationships = new
                         {
-                            type = Unknown.ResourceType,
-                            id = Unknown.StringId.Int32,
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_unknown_ID()
-        {
-            // Arrange
-            string performerId = Unknown.StringId.For<Performer, int>();
+    [Fact]
+    public async Task Cannot_update_resource_for_unknown_ID()
+    {
+        // Arrange
+        string performerId = Unknown.StringId.For<Performer, int>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "performers",
+                        id = performerId,
+                        attributes = new
+                        {
+                        },
+                        relationships = new
                         {
-                            type = "performers",
-                            id = performerId,
-                            attributes = new
-                            {
-                            },
-                            relationships = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'performers' with ID '{performerId}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'performers' with ID '{performerId}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_for_incompatible_ID()
-        {
-            // Arrange
-            string guid = Unknown.StringId.Guid;
+    [Fact]
+    public async Task Cannot_update_resource_for_incompatible_ID()
+    {
+        // Arrange
+        string guid = Unknown.StringId.Guid;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    @ref = new
                     {
-                        op = "update",
-                        @ref = new
-                        {
-                            type = "performers",
-                            id = guid
-                        },
-                        data = new
+                        type = "performers",
+                        id = guid
+                    },
+                    data = new
+                    {
+                        type = "performers",
+                        id = guid,
+                        attributes = new
                         {
-                            type = "performers",
-                            id = guid,
-                            attributes = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
-            error.Detail.Should().Be($"Failed to convert '{guid}' of type 'String' to type 'Int32'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible 'id' value found.");
+        error.Detail.Should().Be($"Failed to convert '{guid}' of type 'String' to type 'Int32'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/ref/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_attribute_with_blocked_capability()
-        {
-            // Arrange
-            Lyric existingLyric = _fakers.Lyric.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_attribute_with_blocked_capability()
+    {
+        // Arrange
+        Lyric existingLyric = _fakers.Lyric.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Lyrics.Add(existingLyric);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Lyrics.Add(existingLyric);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "lyrics",
+                        id = existingLyric.StringId,
+                        attributes = new
                         {
-                            type = "lyrics",
-                            id = existingLyric.StringId,
-                            attributes = new
-                            {
-                                createdAt = 12.July(1980)
-                            }
+                            createdAt = 12.July(1980)
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Attribute value cannot be assigned when updating resource.");
-            error.Detail.Should().Be("The attribute 'createdAt' on resource type 'lyrics' cannot be assigned to.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/createdAt");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Attribute value cannot be assigned when updating resource.");
+        error.Detail.Should().Be("The attribute 'createdAt' on resource type 'lyrics' cannot be assigned to.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/createdAt");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_readonly_attribute()
-        {
-            // Arrange
-            Playlist existingPlaylist = _fakers.Playlist.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_with_readonly_attribute()
+    {
+        // Arrange
+        Playlist existingPlaylist = _fakers.Playlist.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Playlists.Add(existingPlaylist);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Playlists.Add(existingPlaylist);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "playlists",
+                        id = existingPlaylist.StringId,
+                        attributes = new
                         {
-                            type = "playlists",
-                            id = existingPlaylist.StringId,
-                            attributes = new
-                            {
-                                isArchived = true
-                            }
+                            isArchived = true
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Attribute is read-only.");
-            error.Detail.Should().Be("Attribute 'isArchived' on resource type 'playlists' is read-only.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/isArchived");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Attribute is read-only.");
+        error.Detail.Should().Be("Attribute 'isArchived' on resource type 'playlists' is read-only.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/isArchived");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_change_ID_of_existing_resource()
-        {
-            // Arrange
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Cannot_change_ID_of_existing_resource()
+    {
+        // Arrange
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RecordCompanies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RecordCompanies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "recordCompanies",
+                        id = existingCompany.StringId,
+                        attributes = new
                         {
-                            type = "recordCompanies",
-                            id = existingCompany.StringId,
-                            attributes = new
-                            {
-                                id = (existingCompany.Id + 1).ToString()
-                            }
+                            id = (existingCompany.Id + 1).ToString()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Resource ID is read-only.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Resource ID is read-only.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_incompatible_attribute_value()
-        {
-            // Arrange
-            Performer existingPerformer = _fakers.Performer.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_with_incompatible_attribute_value()
+    {
+        // Arrange
+        Performer existingPerformer = _fakers.Performer.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Performers.Add(existingPerformer);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Performers.Add(existingPerformer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "performers",
+                        id = existingPerformer.StringId,
+                        attributes = new
                         {
-                            type = "performers",
-                            id = existingPerformer.StringId,
-                            attributes = new
-                            {
-                                bornAt = 123.45
-                            }
+                            bornAt = 123.45
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible attribute value found.");
-            error.Detail.Should().Be("Failed to convert attribute 'bornAt' with value '123.45' of type 'Number' to type 'DateTimeOffset'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/bornAt");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible attribute value found.");
+        error.Detail.Should().Be("Failed to convert attribute 'bornAt' with value '123.45' of type 'Number' to type 'DateTimeOffset'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/attributes/bornAt");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_attributes_and_multiple_relationship_types()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Lyric = _fakers.Lyric.Generate();
-            existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
-            existingTrack.Performers = _fakers.Performer.Generate(1);
+    [Fact]
+    public async Task Can_update_resource_with_attributes_and_multiple_relationship_types()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Lyric = _fakers.Lyric.Generate();
+        existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
+        existingTrack.Performers = _fakers.Performer.Generate(1);
 
-            string newGenre = _fakers.MusicTrack.Generate().Genre!;
+        string newGenre = _fakers.MusicTrack.Generate().Genre!;
 
-            Lyric existingLyric = _fakers.Lyric.Generate();
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
-            Performer existingPerformer = _fakers.Performer.Generate();
+        Lyric existingLyric = _fakers.Lyric.Generate();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+        Performer existingPerformer = _fakers.Performer.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingTrack, existingLyric, existingCompany, existingPerformer);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingTrack, existingLyric, existingCompany, existingPerformer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        attributes = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            attributes = new
+                            genre = newGenre
+                        },
+                        relationships = new
+                        {
+                            lyric = new
                             {
-                                genre = newGenre
+                                data = new
+                                {
+                                    type = "lyrics",
+                                    id = existingLyric.StringId
+                                }
                             },
-                            relationships = new
+                            ownedBy = new
                             {
-                                lyric = new
-                                {
-                                    data = new
-                                    {
-                                        type = "lyrics",
-                                        id = existingLyric.StringId
-                                    }
-                                },
-                                ownedBy = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        id = existingCompany.StringId
-                                    }
-                                },
-                                performers = new
+                                    type = "recordCompanies",
+                                    id = existingCompany.StringId
+                                }
+                            },
+                            performers = new
+                            {
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "performers",
-                                            id = existingPerformer.StringId
-                                        }
+                                        type = "performers",
+                                        id = existingPerformer.StringId
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                MusicTrack trackInDatabase = await dbContext.MusicTracks
-                    .Include(musicTrack => musicTrack.Lyric)
-                    .Include(musicTrack => musicTrack.OwnedBy)
-                    .Include(musicTrack => musicTrack.Performers)
-                    .FirstWithIdAsync(existingTrack.Id);
+            MusicTrack trackInDatabase = await dbContext.MusicTracks
+                .Include(musicTrack => musicTrack.Lyric)
+                .Include(musicTrack => musicTrack.OwnedBy)
+                .Include(musicTrack => musicTrack.Performers)
+                .FirstWithIdAsync(existingTrack.Id);
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                trackInDatabase.Title.Should().Be(existingTrack.Title);
-                trackInDatabase.Genre.Should().Be(newGenre);
+            trackInDatabase.Title.Should().Be(existingTrack.Title);
+            trackInDatabase.Genre.Should().Be(newGenre);
 
-                trackInDatabase.Lyric.ShouldNotBeNull();
-                trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
+            trackInDatabase.Lyric.ShouldNotBeNull();
+            trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
 
-                trackInDatabase.Performers.ShouldHaveCount(1);
-                trackInDatabase.Performers[0].Id.Should().Be(existingPerformer.Id);
-            });
-        }
+            trackInDatabase.Performers.ShouldHaveCount(1);
+            trackInDatabase.Performers[0].Id.Should().Be(existingPerformer.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateToOneRelationshipTests.cs
index 3f7c089e44..efa3813d74 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/Updating/Resources/AtomicUpdateToOneRelationshipTests.cs
@@ -1,1054 +1,1049 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Resources
+namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations.Updating.Resources;
+
+public sealed class AtomicUpdateToOneRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
 {
-    public sealed class AtomicUpdateToOneRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
+    private readonly OperationsFakers _fakers = new();
+
+    public AtomicUpdateToOneRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> _testContext;
-        private readonly OperationsFakers _fakers = new();
+        _testContext = testContext;
 
-        public AtomicUpdateToOneRelationshipTests(IntegrationTestContext<TestableStartup<OperationsDbContext>, OperationsDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<OperationsController>();
+    }
 
-            testContext.UseController<OperationsController>();
-        }
+    [Fact]
+    public async Task Can_clear_OneToOne_relationship_from_principal_side()
+    {
+        // Arrange
+        Lyric existingLyric = _fakers.Lyric.Generate();
+        existingLyric.Track = _fakers.MusicTrack.Generate();
 
-        [Fact]
-        public async Task Can_clear_OneToOne_relationship_from_principal_side()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Lyric existingLyric = _fakers.Lyric.Generate();
-            existingLyric.Track = _fakers.MusicTrack.Generate();
+            await dbContext.ClearTableAsync<MusicTrack>();
+            dbContext.Lyrics.Add(existingLyric);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<MusicTrack>();
-                dbContext.Lyrics.Add(existingLyric);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "lyrics",
+                        id = existingLyric.StringId,
+                        relationships = new
                         {
-                            type = "lyrics",
-                            id = existingLyric.StringId,
-                            relationships = new
+                            track = new
                             {
-                                track = new
-                                {
-                                    data = (object?)null
-                                }
+                                data = (object?)null
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(existingLyric.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(existingLyric.Id);
 
-                lyricInDatabase.Track.Should().BeNull();
+            lyricInDatabase.Track.Should().BeNull();
 
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
-                tracksInDatabase.ShouldHaveCount(1);
-            });
-        }
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+            tracksInDatabase.ShouldHaveCount(1);
+        });
+    }
 
-        [Fact]
-        public async Task Can_clear_OneToOne_relationship_from_dependent_side()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Lyric = _fakers.Lyric.Generate();
+    [Fact]
+    public async Task Can_clear_OneToOne_relationship_from_dependent_side()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Lyric = _fakers.Lyric.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Lyric>();
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Lyric>();
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
-                                {
-                                    data = (object?)null
-                                }
+                                data = (object?)null
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Lyric.Should().BeNull();
+            trackInDatabase.Lyric.Should().BeNull();
 
-                List<Lyric> lyricsInDatabase = await dbContext.Lyrics.ToListAsync();
-                lyricsInDatabase.ShouldHaveCount(1);
-            });
-        }
+            List<Lyric> lyricsInDatabase = await dbContext.Lyrics.ToListAsync();
+            lyricsInDatabase.ShouldHaveCount(1);
+        });
+    }
 
-        [Fact]
-        public async Task Can_clear_ManyToOne_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Can_clear_ManyToOne_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<RecordCompany>();
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<RecordCompany>();
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            ownedBy = new
                             {
-                                ownedBy = new
-                                {
-                                    data = (object?)null
-                                }
+                                data = (object?)null
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.OwnedBy.Should().BeNull();
+            trackInDatabase.OwnedBy.Should().BeNull();
 
-                List<RecordCompany> companiesInDatabase = await dbContext.RecordCompanies.ToListAsync();
-                companiesInDatabase.ShouldHaveCount(1);
-            });
-        }
+            List<RecordCompany> companiesInDatabase = await dbContext.RecordCompanies.ToListAsync();
+            companiesInDatabase.ShouldHaveCount(1);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_OneToOne_relationship_from_principal_side()
-        {
-            // Arrange
-            Lyric existingLyric = _fakers.Lyric.Generate();
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Can_create_OneToOne_relationship_from_principal_side()
+    {
+        // Arrange
+        Lyric existingLyric = _fakers.Lyric.Generate();
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingLyric, existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingLyric, existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "lyrics",
+                        id = existingLyric.StringId,
+                        relationships = new
                         {
-                            type = "lyrics",
-                            id = existingLyric.StringId,
-                            relationships = new
+                            track = new
                             {
-                                track = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "musicTracks",
-                                        id = existingTrack.StringId
-                                    }
+                                    type = "musicTracks",
+                                    id = existingTrack.StringId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(existingLyric.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(existingLyric.Id);
 
-                lyricInDatabase.Track.ShouldNotBeNull();
-                lyricInDatabase.Track.Id.Should().Be(existingTrack.Id);
-            });
-        }
+            lyricInDatabase.Track.ShouldNotBeNull();
+            lyricInDatabase.Track.Id.Should().Be(existingTrack.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_OneToOne_relationship_from_dependent_side()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            Lyric existingLyric = _fakers.Lyric.Generate();
+    [Fact]
+    public async Task Can_create_OneToOne_relationship_from_dependent_side()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        Lyric existingLyric = _fakers.Lyric.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingTrack, existingLyric);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingTrack, existingLyric);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "lyrics",
-                                        id = existingLyric.StringId
-                                    }
+                                    type = "lyrics",
+                                    id = existingLyric.StringId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Lyric.ShouldNotBeNull();
-                trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
-            });
-        }
+            trackInDatabase.Lyric.ShouldNotBeNull();
+            trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_ManyToOne_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Can_create_ManyToOne_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingTrack, existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingTrack, existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            ownedBy = new
                             {
-                                ownedBy = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        id = existingCompany.StringId
-                                    }
+                                    type = "recordCompanies",
+                                    id = existingCompany.StringId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
-            });
-        }
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_OneToOne_relationship_from_principal_side()
-        {
-            // Arrange
-            Lyric existingLyric = _fakers.Lyric.Generate();
-            existingLyric.Track = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Can_replace_OneToOne_relationship_from_principal_side()
+    {
+        // Arrange
+        Lyric existingLyric = _fakers.Lyric.Generate();
+        existingLyric.Track = _fakers.MusicTrack.Generate();
 
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<MusicTrack>();
-                dbContext.AddInRange(existingLyric, existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<MusicTrack>();
+            dbContext.AddInRange(existingLyric, existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "lyrics",
+                        id = existingLyric.StringId,
+                        relationships = new
                         {
-                            type = "lyrics",
-                            id = existingLyric.StringId,
-                            relationships = new
+                            track = new
                             {
-                                track = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "musicTracks",
-                                        id = existingTrack.StringId
-                                    }
+                                    type = "musicTracks",
+                                    id = existingTrack.StringId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(existingLyric.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Lyric lyricInDatabase = await dbContext.Lyrics.Include(lyric => lyric.Track).FirstWithIdAsync(existingLyric.Id);
 
-                lyricInDatabase.Track.ShouldNotBeNull();
-                lyricInDatabase.Track.Id.Should().Be(existingTrack.Id);
+            lyricInDatabase.Track.ShouldNotBeNull();
+            lyricInDatabase.Track.Id.Should().Be(existingTrack.Id);
 
-                List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
-                tracksInDatabase.ShouldHaveCount(2);
-            });
-        }
+            List<MusicTrack> tracksInDatabase = await dbContext.MusicTracks.ToListAsync();
+            tracksInDatabase.ShouldHaveCount(2);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_OneToOne_relationship_from_dependent_side()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.Lyric = _fakers.Lyric.Generate();
+    [Fact]
+    public async Task Can_replace_OneToOne_relationship_from_dependent_side()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.Lyric = _fakers.Lyric.Generate();
 
-            Lyric existingLyric = _fakers.Lyric.Generate();
+        Lyric existingLyric = _fakers.Lyric.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Lyric>();
-                dbContext.AddInRange(existingTrack, existingLyric);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Lyric>();
+            dbContext.AddInRange(existingTrack, existingLyric);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "lyrics",
-                                        id = existingLyric.StringId
-                                    }
+                                    type = "lyrics",
+                                    id = existingLyric.StringId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.Lyric).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.Lyric.ShouldNotBeNull();
-                trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
+            trackInDatabase.Lyric.ShouldNotBeNull();
+            trackInDatabase.Lyric.Id.Should().Be(existingLyric.Id);
 
-                List<Lyric> lyricsInDatabase = await dbContext.Lyrics.ToListAsync();
-                lyricsInDatabase.ShouldHaveCount(2);
-            });
-        }
+            List<Lyric> lyricsInDatabase = await dbContext.Lyrics.ToListAsync();
+            lyricsInDatabase.ShouldHaveCount(2);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_ManyToOne_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
-            existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
+    [Fact]
+    public async Task Can_replace_ManyToOne_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+        existingTrack.OwnedBy = _fakers.RecordCompany.Generate();
 
-            RecordCompany existingCompany = _fakers.RecordCompany.Generate();
+        RecordCompany existingCompany = _fakers.RecordCompany.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<RecordCompany>();
-                dbContext.AddInRange(existingTrack, existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<RecordCompany>();
+            dbContext.AddInRange(existingTrack, existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            ownedBy = new
                             {
-                                ownedBy = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "recordCompanies",
-                                        id = existingCompany.StringId
-                                    }
+                                    type = "recordCompanies",
+                                    id = existingCompany.StringId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAtomicAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            MusicTrack trackInDatabase = await dbContext.MusicTracks.Include(musicTrack => musicTrack.OwnedBy).FirstWithIdAsync(existingTrack.Id);
 
-                trackInDatabase.OwnedBy.ShouldNotBeNull();
-                trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
+            trackInDatabase.OwnedBy.ShouldNotBeNull();
+            trackInDatabase.OwnedBy.Id.Should().Be(existingCompany.Id);
 
-                List<RecordCompany> companiesInDatabase = await dbContext.RecordCompanies.ToListAsync();
-                companiesInDatabase.ShouldHaveCount(2);
-            });
-        }
+            List<RecordCompany> companiesInDatabase = await dbContext.RecordCompanies.ToListAsync();
+            companiesInDatabase.ShouldHaveCount(2);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_null_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_create_for_null_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
-                            {
-                                lyric = (object?)null
-                            }
+                            lyric = (object?)null
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_data_in_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_create_for_missing_data_in_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
-                                {
-                                }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_array_data_in_relationship()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_create_for_array_data_in_relationship()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new[]
                                 {
-                                    data = new[]
+                                    new
                                     {
-                                        new
-                                        {
-                                            type = "lyrics",
-                                            id = Unknown.StringId.For<Lyric, long>()
-                                        }
+                                        type = "lyrics",
+                                        id = Unknown.StringId.For<Lyric, long>()
                                     }
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object or 'null', instead of an array.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object or 'null', instead of an array.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_type_in_relationship_data()
+    [Fact]
+    public async Task Cannot_create_for_missing_type_in_relationship_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "lyrics",
+                        id = Unknown.StringId.For<Lyric, long>(),
+                        relationships = new
                         {
-                            type = "lyrics",
-                            id = Unknown.StringId.For<Lyric, long>(),
-                            relationships = new
+                            track = new
                             {
-                                track = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        id = Unknown.StringId.For<MusicTrack, Guid>()
-                                    }
+                                    id = Unknown.StringId.For<MusicTrack, Guid>()
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/track/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/track/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_type_in_relationship_data()
+    [Fact]
+    public async Task Cannot_create_for_unknown_type_in_relationship_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = Unknown.ResourceType,
-                                        id = Unknown.StringId.For<Lyric, long>()
-                                    }
+                                    type = Unknown.ResourceType,
+                                    id = Unknown.StringId.For<Lyric, long>()
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_ID_in_relationship_data()
+    [Fact]
+    public async Task Cannot_create_for_missing_ID_in_relationship_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "lyrics"
-                                    }
+                                    type = "lyrics"
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' or 'lid' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_ID_and_local_ID_in_relationship_data()
+    [Fact]
+    public async Task Cannot_create_for_ID_and_local_ID_in_relationship_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = Unknown.StringId.For<MusicTrack, Guid>(),
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = Unknown.StringId.For<MusicTrack, Guid>(),
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "lyrics",
-                                        id = Unknown.StringId.For<Lyric, long>(),
-                                        lid = "local-1"
-                                    }
+                                    type = "lyrics",
+                                    id = Unknown.StringId.For<Lyric, long>(),
+                                    lid = "local-1"
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' and 'lid' element are mutually exclusive.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_ID_in_relationship_data()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_create_for_unknown_ID_in_relationship_data()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string lyricId = Unknown.StringId.For<Lyric, long>();
+        string lyricId = Unknown.StringId.For<Lyric, long>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "lyrics",
-                                        id = lyricId
-                                    }
+                                    type = "lyrics",
+                                    id = lyricId
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'lyrics' with ID '{lyricId}' in relationship 'lyric' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]");
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'lyrics' with ID '{lyricId}' in relationship 'lyric' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]");
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_relationship_mismatch()
-        {
-            // Arrange
-            MusicTrack existingTrack = _fakers.MusicTrack.Generate();
+    [Fact]
+    public async Task Cannot_create_for_relationship_mismatch()
+    {
+        // Arrange
+        MusicTrack existingTrack = _fakers.MusicTrack.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.MusicTracks.Add(existingTrack);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.MusicTracks.Add(existingTrack);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "update",
+                    data = new
                     {
-                        op = "update",
-                        data = new
+                        type = "musicTracks",
+                        id = existingTrack.StringId,
+                        relationships = new
                         {
-                            type = "musicTracks",
-                            id = existingTrack.StringId,
-                            relationships = new
+                            lyric = new
                             {
-                                lyric = new
+                                data = new
                                 {
-                                    data = new
-                                    {
-                                        type = "playlists",
-                                        id = Unknown.StringId.For<Playlist, long>()
-                                    }
+                                    type = "playlists",
+                                    id = Unknown.StringId.For<Playlist, long>()
                                 }
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'playlists' is incompatible with type 'lyrics' of relationship 'lyric'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'playlists' is incompatible with type 'lyrics' of relationship 'lyric'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/atomic:operations[0]/data/relationships/lyric/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobDbContext.cs
new file mode 100644
index 0000000000..cadbb08b56
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobDbContext.cs
@@ -0,0 +1,15 @@
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore;
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.Blobs;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class BlobDbContext : DbContext
+{
+    public DbSet<ImageContainer> ImageContainers => Set<ImageContainer>();
+
+    public BlobDbContext(DbContextOptions<BlobDbContext> options)
+        : base(options)
+    {
+    }
+}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobFakers.cs
new file mode 100644
index 0000000000..924b67dfa3
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobFakers.cs
@@ -0,0 +1,19 @@
+using Bogus;
+using TestBuildingBlocks;
+
+// @formatter:wrap_chained_method_calls chop_always
+// @formatter:keep_existing_linebreaks true
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.Blobs;
+
+internal sealed class BlobFakers : FakerContainer
+{
+    private readonly Lazy<Faker<ImageContainer>> _lazyImageContainerFaker = new(() =>
+        new Faker<ImageContainer>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(imageContainer => imageContainer.FileName, faker => faker.System.FileName())
+            .RuleFor(imageContainer => imageContainer.Data, faker => faker.Random.Bytes(128))
+            .RuleFor(imageContainer => imageContainer.Thumbnail, faker => faker.Random.Bytes(64)));
+
+    public Faker<ImageContainer> ImageContainer => _lazyImageContainerFaker.Value;
+}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobTests.cs
new file mode 100644
index 0000000000..67ca34d83c
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobTests.cs
@@ -0,0 +1,256 @@
+using System.Net;
+using FluentAssertions;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Serialization.Objects;
+using Microsoft.Extensions.DependencyInjection;
+using TestBuildingBlocks;
+using Xunit;
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.Blobs;
+
+public sealed class BlobTests : IClassFixture<IntegrationTestContext<TestableStartup<BlobDbContext>, BlobDbContext>>
+{
+    private readonly IntegrationTestContext<TestableStartup<BlobDbContext>, BlobDbContext> _testContext;
+    private readonly BlobFakers _fakers = new();
+
+    public BlobTests(IntegrationTestContext<TestableStartup<BlobDbContext>, BlobDbContext> testContext)
+    {
+        _testContext = testContext;
+
+        testContext.UseController<ImageContainersController>();
+
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+        });
+    }
+
+    [Fact]
+    public async Task Can_get_primary_resource_by_ID()
+    {
+        // Arrange
+        ImageContainer container = _fakers.ImageContainer.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.ImageContainers.Add(container);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/imageContainers/{container.StringId}";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("imageContainers");
+        responseDocument.Data.SingleValue.Id.Should().Be(container.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("fileName").With(value => value.Should().Be(container.FileName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("data").As<byte[]>().With(value => value.Should().Equal(container.Data));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("thumbnail").As<byte[]>().With(value => value.Should().Equal(container.Thumbnail));
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Can_create_resource()
+    {
+        // Arrange
+        ImageContainer newContainer = _fakers.ImageContainer.Generate();
+
+        var requestBody = new
+        {
+            data = new
+            {
+                type = "imageContainers",
+                attributes = new
+                {
+                    fileName = newContainer.FileName,
+                    data = Convert.ToBase64String(newContainer.Data),
+                    thumbnail = Convert.ToBase64String(newContainer.Thumbnail!)
+                }
+            }
+        };
+
+        const string route = "/imageContainers";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("imageContainers");
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("fileName").With(value => value.Should().Be(newContainer.FileName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("data").As<byte[]>().With(value => value.Should().Equal(newContainer.Data));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("thumbnail").As<byte[]>().With(value => value.Should().Equal(newContainer.Thumbnail));
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+
+        long newContainerId = long.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            ImageContainer containerInDatabase = await dbContext.ImageContainers.FirstWithIdAsync(newContainerId);
+
+            containerInDatabase.FileName.Should().Be(newContainer.FileName);
+            containerInDatabase.Data.Should().Equal(newContainer.Data);
+            containerInDatabase.Thumbnail.Should().Equal(newContainer.Thumbnail);
+        });
+    }
+
+    [Fact]
+    public async Task Can_update_resource()
+    {
+        // Arrange
+        ImageContainer existingContainer = _fakers.ImageContainer.Generate();
+
+        byte[] newData = _fakers.ImageContainer.Generate().Data;
+        byte[] newThumbnail = _fakers.ImageContainer.Generate().Thumbnail!;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.ImageContainers.Add(existingContainer);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            data = new
+            {
+                type = "imageContainers",
+                id = existingContainer.StringId,
+                attributes = new
+                {
+                    data = Convert.ToBase64String(newData),
+                    thumbnail = Convert.ToBase64String(newThumbnail)
+                }
+            }
+        };
+
+        string route = $"/imageContainers/{existingContainer.StringId}";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("imageContainers");
+        responseDocument.Data.SingleValue.Id.Should().Be(existingContainer.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("fileName").With(value => value.Should().Be(existingContainer.FileName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("data").As<byte[]>().With(value => value.Should().Equal(newData));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("thumbnail").As<byte[]>().With(value => value.Should().Equal(newThumbnail));
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            ImageContainer containerInDatabase = await dbContext.ImageContainers.FirstWithIdAsync(existingContainer.Id);
+
+            containerInDatabase.FileName.Should().Be(existingContainer.FileName);
+            containerInDatabase.Data.Should().Equal(newData);
+            containerInDatabase.Thumbnail.Should().Equal(newThumbnail);
+        });
+    }
+
+    [Fact]
+    public async Task Can_update_resource_with_empty_blob()
+    {
+        // Arrange
+        ImageContainer existingContainer = _fakers.ImageContainer.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.ImageContainers.Add(existingContainer);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            data = new
+            {
+                type = "imageContainers",
+                id = existingContainer.StringId,
+                attributes = new
+                {
+                    data = string.Empty
+                }
+            }
+        };
+
+        string route = $"/imageContainers/{existingContainer.StringId}";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("imageContainers");
+        responseDocument.Data.SingleValue.Id.Should().Be(existingContainer.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("fileName").With(value => value.Should().Be(existingContainer.FileName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("data").As<byte[]>().With(value => value.Should().BeEmpty());
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            ImageContainer containerInDatabase = await dbContext.ImageContainers.FirstWithIdAsync(existingContainer.Id);
+
+            containerInDatabase.FileName.Should().Be(existingContainer.FileName);
+            containerInDatabase.Data.Should().BeEmpty();
+        });
+    }
+
+    [Fact]
+    public async Task Can_update_resource_with_null_blob()
+    {
+        // Arrange
+        ImageContainer existingContainer = _fakers.ImageContainer.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.ImageContainers.Add(existingContainer);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            data = new
+            {
+                type = "imageContainers",
+                id = existingContainer.StringId,
+                attributes = new
+                {
+                    thumbnail = (object?)null
+                }
+            }
+        };
+
+        string route = $"/imageContainers/{existingContainer.StringId}";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("imageContainers");
+        responseDocument.Data.SingleValue.Id.Should().Be(existingContainer.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("fileName").With(value => value.Should().Be(existingContainer.FileName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("thumbnail").With(value => value.Should().BeNull());
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            ImageContainer containerInDatabase = await dbContext.ImageContainers.FirstWithIdAsync(existingContainer.Id);
+
+            containerInDatabase.FileName.Should().Be(existingContainer.FileName);
+            containerInDatabase.Thumbnail.Should().BeNull();
+        });
+    }
+}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/ImageContainer.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/ImageContainer.cs
new file mode 100644
index 0000000000..4ad0e54d5a
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/ImageContainer.cs
@@ -0,0 +1,19 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.Blobs;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Blobs")]
+public sealed class ImageContainer : Identifiable<long>
+{
+    [Attr]
+    public string FileName { get; set; } = null!;
+
+    [Attr]
+    public byte[] Data { get; set; } = Array.Empty<byte>();
+
+    [Attr]
+    public byte[]? Thumbnail { get; set; }
+}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Car.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Car.cs
index 9146bf865a..29213f5e69 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Car.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Car.cs
@@ -1,51 +1,50 @@
-using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys")]
+public sealed class Car : Identifiable<string?>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Car : Identifiable<string?>
+    [NotMapped]
+    public override string? Id
     {
-        [NotMapped]
-        public override string? Id
+        get => RegionId == default && LicensePlate == default ? null : $"{RegionId}:{LicensePlate}";
+        set
         {
-            get => RegionId == default && LicensePlate == default ? null : $"{RegionId}:{LicensePlate}";
-            set
+            if (value == null)
+            {
+                RegionId = default;
+                LicensePlate = default;
+                return;
+            }
+
+            string[] elements = value.Split(':');
+
+            if (elements.Length == 2 && long.TryParse(elements[0], out long regionId))
             {
-                if (value == null)
-                {
-                    RegionId = default;
-                    LicensePlate = default;
-                    return;
-                }
-
-                string[] elements = value.Split(':');
-
-                if (elements.Length == 2 && long.TryParse(elements[0], out long regionId))
-                {
-                    RegionId = regionId;
-                    LicensePlate = elements[1];
-                }
-                else
-                {
-                    throw new InvalidOperationException($"Failed to convert ID '{value}'.");
-                }
+                RegionId = regionId;
+                LicensePlate = elements[1];
+            }
+            else
+            {
+                throw new InvalidOperationException($"Failed to convert ID '{value}'.");
             }
         }
+    }
 
-        [Attr]
-        public string? LicensePlate { get; set; }
+    [Attr]
+    public string? LicensePlate { get; set; }
 
-        [Attr]
-        public long RegionId { get; set; }
+    [Attr]
+    public long RegionId { get; set; }
 
-        [HasOne]
-        public Engine Engine { get; set; } = null!;
+    [HasOne]
+    public Engine Engine { get; set; } = null!;
 
-        [HasOne]
-        public Dealership? Dealership { get; set; }
-    }
+    [HasOne]
+    public Dealership? Dealership { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarCompositeKeyAwareRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarCompositeKeyAwareRepository.cs
index 5f3e5e01d9..4009f1dd82 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarCompositeKeyAwareRepository.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarCompositeKeyAwareRepository.cs
@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries;
@@ -8,47 +6,46 @@
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public class CarCompositeKeyAwareRepository<TResource, TId> : EntityFrameworkCoreRepository<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public class CarCompositeKeyAwareRepository<TResource, TId> : EntityFrameworkCoreRepository<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
+    private readonly CarExpressionRewriter _writer;
+
+    public CarCompositeKeyAwareRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
+        IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
+        IResourceDefinitionAccessor resourceDefinitionAccessor)
+        : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
+    {
+        _writer = new CarExpressionRewriter(resourceGraph);
+    }
+
+    protected override IQueryable<TResource> ApplyQueryLayer(QueryLayer queryLayer)
     {
-        private readonly CarExpressionRewriter _writer;
+        RecursiveRewriteFilterInLayer(queryLayer);
+
+        return base.ApplyQueryLayer(queryLayer);
+    }
 
-        public CarCompositeKeyAwareRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
-            IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
+    private void RecursiveRewriteFilterInLayer(QueryLayer queryLayer)
+    {
+        if (queryLayer.Filter != null)
         {
-            _writer = new CarExpressionRewriter(resourceGraph);
+            queryLayer.Filter = (FilterExpression?)_writer.Visit(queryLayer.Filter, null);
         }
 
-        protected override IQueryable<TResource> ApplyQueryLayer(QueryLayer queryLayer)
+        if (queryLayer.Sort != null)
         {
-            RecursiveRewriteFilterInLayer(queryLayer);
-
-            return base.ApplyQueryLayer(queryLayer);
+            queryLayer.Sort = (SortExpression?)_writer.Visit(queryLayer.Sort, null);
         }
 
-        private void RecursiveRewriteFilterInLayer(QueryLayer queryLayer)
+        if (queryLayer.Projection != null)
         {
-            if (queryLayer.Filter != null)
-            {
-                queryLayer.Filter = (FilterExpression?)_writer.Visit(queryLayer.Filter, null);
-            }
-
-            if (queryLayer.Sort != null)
-            {
-                queryLayer.Sort = (SortExpression?)_writer.Visit(queryLayer.Sort, null);
-            }
-
-            if (queryLayer.Projection != null)
+            foreach (QueryLayer? nextLayer in queryLayer.Projection.Values.Where(layer => layer != null))
             {
-                foreach (QueryLayer? nextLayer in queryLayer.Projection.Values.Where(layer => layer != null))
-                {
-                    RecursiveRewriteFilterInLayer(nextLayer!);
-                }
+                RecursiveRewriteFilterInLayer(nextLayer!);
             }
         }
     }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarExpressionRewriter.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarExpressionRewriter.cs
index 301de2901f..d5b421850e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarExpressionRewriter.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarExpressionRewriter.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Reflection;
 using JsonApiDotNetCore;
 using JsonApiDotNetCore.Configuration;
@@ -9,154 +6,149 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys;
+
+/// <summary>
+/// Rewrites an expression tree, updating all references to <see cref="Car.Id" /> with the combination of <see cref="Car.RegionId" /> and
+/// <see cref="Car.LicensePlate" />.
+/// </summary>
+/// <remarks>
+/// This enables queries to use <see cref="Car.Id" />, which is not mapped in the database.
+/// </remarks>
+internal sealed class CarExpressionRewriter : QueryExpressionRewriter<object?>
 {
-    /// <summary>
-    /// Rewrites an expression tree, updating all references to <see cref="Car.Id" /> with the combination of <see cref="Car.RegionId" /> and
-    /// <see cref="Car.LicensePlate" />.
-    /// </summary>
-    /// <remarks>
-    /// This enables queries to use <see cref="Car.Id" />, which is not mapped in the database.
-    /// </remarks>
-    internal sealed class CarExpressionRewriter : QueryExpressionRewriter<object?>
-    {
-        private readonly AttrAttribute _regionIdAttribute;
-        private readonly AttrAttribute _licensePlateAttribute;
+    private readonly AttrAttribute _regionIdAttribute;
+    private readonly AttrAttribute _licensePlateAttribute;
 
-        public CarExpressionRewriter(IResourceGraph resourceGraph)
-        {
-            ResourceType carType = resourceGraph.GetResourceType<Car>();
+    public CarExpressionRewriter(IResourceGraph resourceGraph)
+    {
+        ResourceType carType = resourceGraph.GetResourceType<Car>();
 
-            _regionIdAttribute = carType.GetAttributeByPropertyName(nameof(Car.RegionId));
-            _licensePlateAttribute = carType.GetAttributeByPropertyName(nameof(Car.LicensePlate));
-        }
+        _regionIdAttribute = carType.GetAttributeByPropertyName(nameof(Car.RegionId));
+        _licensePlateAttribute = carType.GetAttributeByPropertyName(nameof(Car.LicensePlate));
+    }
 
-        public override QueryExpression? VisitComparison(ComparisonExpression expression, object? argument)
+    public override QueryExpression? VisitComparison(ComparisonExpression expression, object? argument)
+    {
+        if (expression.Left is ResourceFieldChainExpression leftChain && expression.Right is LiteralConstantExpression rightConstant)
         {
-            if (expression.Left is ResourceFieldChainExpression leftChain && expression.Right is LiteralConstantExpression rightConstant)
-            {
-                PropertyInfo leftProperty = leftChain.Fields[^1].Property;
+            PropertyInfo leftProperty = leftChain.Fields[^1].Property;
 
-                if (IsCarId(leftProperty))
+            if (IsCarId(leftProperty))
+            {
+                if (expression.Operator != ComparisonOperator.Equals)
                 {
-                    if (expression.Operator != ComparisonOperator.Equals)
-                    {
-                        throw new NotSupportedException("Only equality comparisons are possible on Car IDs.");
-                    }
-
-                    return RewriteFilterOnCarStringIds(leftChain, rightConstant.Value.AsEnumerable());
+                    throw new NotSupportedException("Only equality comparisons are possible on Car IDs.");
                 }
-            }
 
-            return base.VisitComparison(expression, argument);
+                return RewriteFilterOnCarStringIds(leftChain, rightConstant.Value.AsEnumerable());
+            }
         }
 
-        public override QueryExpression? VisitAny(AnyExpression expression, object? argument)
-        {
-            PropertyInfo property = expression.TargetAttribute.Fields[^1].Property;
-
-            if (IsCarId(property))
-            {
-                string[] carStringIds = expression.Constants.Select(constant => constant.Value).ToArray();
-                return RewriteFilterOnCarStringIds(expression.TargetAttribute, carStringIds);
-            }
+        return base.VisitComparison(expression, argument);
+    }
 
-            return base.VisitAny(expression, argument);
-        }
+    public override QueryExpression? VisitAny(AnyExpression expression, object? argument)
+    {
+        PropertyInfo property = expression.TargetAttribute.Fields[^1].Property;
 
-        public override QueryExpression? VisitMatchText(MatchTextExpression expression, object? argument)
+        if (IsCarId(property))
         {
-            PropertyInfo property = expression.TargetAttribute.Fields[^1].Property;
+            string[] carStringIds = expression.Constants.Select(constant => constant.Value).ToArray();
+            return RewriteFilterOnCarStringIds(expression.TargetAttribute, carStringIds);
+        }
 
-            if (IsCarId(property))
-            {
-                throw new NotSupportedException("Partial text matching on Car IDs is not possible.");
-            }
+        return base.VisitAny(expression, argument);
+    }
 
-            return base.VisitMatchText(expression, argument);
-        }
+    public override QueryExpression? VisitMatchText(MatchTextExpression expression, object? argument)
+    {
+        PropertyInfo property = expression.TargetAttribute.Fields[^1].Property;
 
-        private static bool IsCarId(PropertyInfo property)
+        if (IsCarId(property))
         {
-            return property.Name == nameof(Identifiable<object>.Id) && property.DeclaringType == typeof(Car);
+            throw new NotSupportedException("Partial text matching on Car IDs is not possible.");
         }
 
-        private QueryExpression RewriteFilterOnCarStringIds(ResourceFieldChainExpression existingCarIdChain, IEnumerable<string> carStringIds)
-        {
-            ImmutableArray<FilterExpression>.Builder outerTermsBuilder = ImmutableArray.CreateBuilder<FilterExpression>();
+        return base.VisitMatchText(expression, argument);
+    }
 
-            foreach (string carStringId in carStringIds)
-            {
-                var tempCar = new Car
-                {
-                    StringId = carStringId
-                };
+    private static bool IsCarId(PropertyInfo property)
+    {
+        return property.Name == nameof(Identifiable<object>.Id) && property.DeclaringType == typeof(Car);
+    }
 
-                FilterExpression keyComparison = CreateEqualityComparisonOnCompositeKey(existingCarIdChain, tempCar.RegionId, tempCar.LicensePlate!);
-                outerTermsBuilder.Add(keyComparison);
-            }
+    private QueryExpression RewriteFilterOnCarStringIds(ResourceFieldChainExpression existingCarIdChain, IEnumerable<string> carStringIds)
+    {
+        ImmutableArray<FilterExpression>.Builder outerTermsBuilder = ImmutableArray.CreateBuilder<FilterExpression>();
+
+        foreach (string carStringId in carStringIds)
+        {
+            var tempCar = new Car
+            {
+                StringId = carStringId
+            };
 
-            return outerTermsBuilder.Count == 1 ? outerTermsBuilder[0] : new LogicalExpression(LogicalOperator.Or, outerTermsBuilder.ToImmutable());
+            FilterExpression keyComparison = CreateEqualityComparisonOnCompositeKey(existingCarIdChain, tempCar.RegionId, tempCar.LicensePlate!);
+            outerTermsBuilder.Add(keyComparison);
         }
 
-        private FilterExpression CreateEqualityComparisonOnCompositeKey(ResourceFieldChainExpression existingCarIdChain, long regionIdValue,
-            string licensePlateValue)
-        {
-            ResourceFieldChainExpression regionIdChain = ReplaceLastAttributeInChain(existingCarIdChain, _regionIdAttribute);
+        return outerTermsBuilder.Count == 1 ? outerTermsBuilder[0] : new LogicalExpression(LogicalOperator.Or, outerTermsBuilder.ToImmutable());
+    }
 
-            var regionIdComparison = new ComparisonExpression(ComparisonOperator.Equals, regionIdChain,
-                new LiteralConstantExpression(regionIdValue.ToString()));
+    private FilterExpression CreateEqualityComparisonOnCompositeKey(ResourceFieldChainExpression existingCarIdChain, long regionIdValue,
+        string licensePlateValue)
+    {
+        ResourceFieldChainExpression regionIdChain = ReplaceLastAttributeInChain(existingCarIdChain, _regionIdAttribute);
+        var regionIdComparison = new ComparisonExpression(ComparisonOperator.Equals, regionIdChain, new LiteralConstantExpression(regionIdValue.ToString()));
 
-            ResourceFieldChainExpression licensePlateChain = ReplaceLastAttributeInChain(existingCarIdChain, _licensePlateAttribute);
+        ResourceFieldChainExpression licensePlateChain = ReplaceLastAttributeInChain(existingCarIdChain, _licensePlateAttribute);
+        var licensePlateComparison = new ComparisonExpression(ComparisonOperator.Equals, licensePlateChain, new LiteralConstantExpression(licensePlateValue));
 
-            var licensePlateComparison = new ComparisonExpression(ComparisonOperator.Equals, licensePlateChain,
-                new LiteralConstantExpression(licensePlateValue));
+        return new LogicalExpression(LogicalOperator.And, regionIdComparison, licensePlateComparison);
+    }
 
-            return new LogicalExpression(LogicalOperator.And, regionIdComparison, licensePlateComparison);
-        }
+    public override QueryExpression VisitSort(SortExpression expression, object? argument)
+    {
+        ImmutableArray<SortElementExpression>.Builder elementsBuilder = ImmutableArray.CreateBuilder<SortElementExpression>(expression.Elements.Count);
 
-        public override QueryExpression VisitSort(SortExpression expression, object? argument)
+        foreach (SortElementExpression sortElement in expression.Elements)
         {
-            ImmutableArray<SortElementExpression>.Builder elementsBuilder = ImmutableArray.CreateBuilder<SortElementExpression>(expression.Elements.Count);
-
-            foreach (SortElementExpression sortElement in expression.Elements)
+            if (IsSortOnCarId(sortElement))
             {
-                if (IsSortOnCarId(sortElement))
-                {
-                    ResourceFieldChainExpression regionIdSort = ReplaceLastAttributeInChain(sortElement.TargetAttribute!, _regionIdAttribute);
-                    elementsBuilder.Add(new SortElementExpression(regionIdSort, sortElement.IsAscending));
+                ResourceFieldChainExpression regionIdSort = ReplaceLastAttributeInChain(sortElement.TargetAttribute!, _regionIdAttribute);
+                elementsBuilder.Add(new SortElementExpression(regionIdSort, sortElement.IsAscending));
 
-                    ResourceFieldChainExpression licensePlateSort = ReplaceLastAttributeInChain(sortElement.TargetAttribute!, _licensePlateAttribute);
-                    elementsBuilder.Add(new SortElementExpression(licensePlateSort, sortElement.IsAscending));
-                }
-                else
-                {
-                    elementsBuilder.Add(sortElement);
-                }
+                ResourceFieldChainExpression licensePlateSort = ReplaceLastAttributeInChain(sortElement.TargetAttribute!, _licensePlateAttribute);
+                elementsBuilder.Add(new SortElementExpression(licensePlateSort, sortElement.IsAscending));
+            }
+            else
+            {
+                elementsBuilder.Add(sortElement);
             }
-
-            return new SortExpression(elementsBuilder.ToImmutable());
         }
 
-        private static bool IsSortOnCarId(SortElementExpression sortElement)
+        return new SortExpression(elementsBuilder.ToImmutable());
+    }
+
+    private static bool IsSortOnCarId(SortElementExpression sortElement)
+    {
+        if (sortElement.TargetAttribute != null)
         {
-            if (sortElement.TargetAttribute != null)
-            {
-                PropertyInfo property = sortElement.TargetAttribute.Fields[^1].Property;
+            PropertyInfo property = sortElement.TargetAttribute.Fields[^1].Property;
 
-                if (IsCarId(property))
-                {
-                    return true;
-                }
+            if (IsCarId(property))
+            {
+                return true;
             }
-
-            return false;
         }
 
-        private static ResourceFieldChainExpression ReplaceLastAttributeInChain(ResourceFieldChainExpression resourceFieldChain, AttrAttribute attribute)
-        {
-            IImmutableList<ResourceFieldAttribute> fields = resourceFieldChain.Fields.SetItem(resourceFieldChain.Fields.Count - 1, attribute);
-            return new ResourceFieldChainExpression(fields);
-        }
+        return false;
+    }
+
+    private static ResourceFieldChainExpression ReplaceLastAttributeInChain(ResourceFieldChainExpression resourceFieldChain, AttrAttribute attribute)
+    {
+        IImmutableList<ResourceFieldAttribute> fields = resourceFieldChain.Fields.SetItem(resourceFieldChain.Fields.Count - 1, attribute);
+        return new ResourceFieldChainExpression(fields);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarsController.cs
deleted file mode 100644
index aa0a2099be..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CarsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
-{
-    public sealed class CarsController : JsonApiController<Car, string?>
-    {
-        public CarsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Car, string?> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeDbContext.cs
index 25a8a04201..67213057b7 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeDbContext.cs
@@ -3,37 +3,36 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class CompositeDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class CompositeDbContext : DbContext
-    {
-        public DbSet<Car> Cars => Set<Car>();
-        public DbSet<Engine> Engines => Set<Engine>();
-        public DbSet<Dealership> Dealerships => Set<Dealership>();
+    public DbSet<Car> Cars => Set<Car>();
+    public DbSet<Engine> Engines => Set<Engine>();
+    public DbSet<Dealership> Dealerships => Set<Dealership>();
 
-        public CompositeDbContext(DbContextOptions<CompositeDbContext> options)
-            : base(options)
-        {
-        }
+    public CompositeDbContext(DbContextOptions<CompositeDbContext> options)
+        : base(options)
+    {
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<Car>()
-                .HasKey(car => new
-                {
-                    car.RegionId,
-                    car.LicensePlate
-                });
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<Car>()
+            .HasKey(car => new
+            {
+                car.RegionId,
+                car.LicensePlate
+            });
 
-            builder.Entity<Engine>()
-                .HasOne(engine => engine.Car)
-                .WithOne(car => car!.Engine)
-                .HasForeignKey<Engine>();
+        builder.Entity<Engine>()
+            .HasOne(engine => engine.Car)
+            .WithOne(car => car.Engine)
+            .HasForeignKey<Engine>();
 
-            builder.Entity<Dealership>()
-                .HasMany(dealership => dealership.Inventory)
-                .WithOne(car => car.Dealership!);
-        }
+        builder.Entity<Dealership>()
+            .HasMany(dealership => dealership.Inventory)
+            .WithOne(car => car.Dealership!);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyFakers.cs
index a470a32b6b..ce3a4455d1 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyFakers.cs
@@ -1,32 +1,30 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys;
+
+internal sealed class CompositeKeyFakers : FakerContainer
 {
-    internal sealed class CompositeKeyFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<Car>> _lazyCarFaker = new(() =>
-            new Faker<Car>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(car => car.LicensePlate, faker => faker.Random.Replace("??-??-##"))
-                .RuleFor(car => car.RegionId, faker => faker.Random.Long(100, 999)));
+    private readonly Lazy<Faker<Car>> _lazyCarFaker = new(() =>
+        new Faker<Car>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(car => car.LicensePlate, faker => faker.Random.Replace("??-??-##"))
+            .RuleFor(car => car.RegionId, faker => faker.Random.Long(100, 999)));
 
-        private readonly Lazy<Faker<Engine>> _lazyEngineFaker = new(() =>
-            new Faker<Engine>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(engine => engine.SerialCode, faker => faker.Random.Replace("????-????")));
+    private readonly Lazy<Faker<Engine>> _lazyEngineFaker = new(() =>
+        new Faker<Engine>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(engine => engine.SerialCode, faker => faker.Random.Replace("????-????")));
 
-        private readonly Lazy<Faker<Dealership>> _lazyDealershipFaker = new(() =>
-            new Faker<Dealership>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(dealership => dealership.Address, faker => faker.Address.FullAddress()));
+    private readonly Lazy<Faker<Dealership>> _lazyDealershipFaker = new(() =>
+        new Faker<Dealership>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(dealership => dealership.Address, faker => faker.Address.FullAddress()));
 
-        public Faker<Car> Car => _lazyCarFaker.Value;
-        public Faker<Engine> Engine => _lazyEngineFaker.Value;
-        public Faker<Dealership> Dealership => _lazyDealershipFaker.Value;
-    }
+    public Faker<Car> Car => _lazyCarFaker.Value;
+    public Faker<Engine> Engine => _lazyEngineFaker.Value;
+    public Faker<Dealership> Dealership => _lazyDealershipFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyTests.cs
index 7ad93bdec6..981190dc72 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyTests.cs
@@ -1,7 +1,4 @@
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -10,510 +7,505 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys;
+
+public sealed class CompositeKeyTests : IClassFixture<IntegrationTestContext<TestableStartup<CompositeDbContext>, CompositeDbContext>>
 {
-    public sealed class CompositeKeyTests : IClassFixture<IntegrationTestContext<TestableStartup<CompositeDbContext>, CompositeDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<CompositeDbContext>, CompositeDbContext> _testContext;
+    private readonly CompositeKeyFakers _fakers = new();
+
+    public CompositeKeyTests(IntegrationTestContext<TestableStartup<CompositeDbContext>, CompositeDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<CompositeDbContext>, CompositeDbContext> _testContext;
-        private readonly CompositeKeyFakers _fakers = new();
+        _testContext = testContext;
 
-        public CompositeKeyTests(IntegrationTestContext<TestableStartup<CompositeDbContext>, CompositeDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<DealershipsController>();
+        testContext.UseController<EnginesController>();
+        testContext.UseController<CarsController>();
 
-            testContext.UseController<DealershipsController>();
-            testContext.UseController<EnginesController>();
-            testContext.UseController<CarsController>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceRepository<CarCompositeKeyAwareRepository<Car, string?>>();
+            services.AddResourceRepository<CarCompositeKeyAwareRepository<Dealership, int>>();
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceRepository<CarCompositeKeyAwareRepository<Car, string?>>();
-                services.AddResourceRepository<CarCompositeKeyAwareRepository<Dealership, int>>();
-            });
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowClientGeneratedIds = true;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowClientGeneratedIds = true;
-        }
+    [Fact]
+    public async Task Can_filter_on_ID_in_primary_resources()
+    {
+        // Arrange
+        Car car = _fakers.Car.Generate();
 
-        [Fact]
-        public async Task Can_filter_on_ID_in_primary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Car car = _fakers.Car.Generate();
+            await dbContext.ClearTableAsync<Car>();
+            dbContext.Cars.Add(car);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Car>();
-                dbContext.Cars.Add(car);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/cars?filter=any(id,'{car.RegionId}:{car.LicensePlate}','999:XX-YY-22')";
 
-            string route = $"/cars?filter=any(id,'{car.RegionId}:{car.LicensePlate}','999:XX-YY-22')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(car.StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(car.StringId);
-        }
+    [Fact]
+    public async Task Can_get_primary_resource_by_ID()
+    {
+        // Arrange
+        Car car = _fakers.Car.Generate();
 
-        [Fact]
-        public async Task Can_get_primary_resource_by_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Car car = _fakers.Car.Generate();
+            await dbContext.ClearTableAsync<Car>();
+            dbContext.Cars.Add(car);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Car>();
-                dbContext.Cars.Add(car);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/cars/{car.StringId}";
 
-            string route = $"/cars/{car.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(car.StringId);
+    }
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(car.StringId);
-        }
+    [Fact]
+    public async Task Can_sort_on_ID()
+    {
+        // Arrange
+        Car car = _fakers.Car.Generate();
 
-        [Fact]
-        public async Task Can_sort_on_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Car car = _fakers.Car.Generate();
+            await dbContext.ClearTableAsync<Car>();
+            dbContext.Cars.Add(car);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Car>();
-                dbContext.Cars.Add(car);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/cars?sort=id";
 
-            const string route = "/cars?sort=id";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(car.StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(car.StringId);
-        }
+    [Fact]
+    public async Task Can_select_ID()
+    {
+        // Arrange
+        Car car = _fakers.Car.Generate();
 
-        [Fact]
-        public async Task Can_select_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Car car = _fakers.Car.Generate();
+            await dbContext.ClearTableAsync<Car>();
+            dbContext.Cars.Add(car);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Car>();
-                dbContext.Cars.Add(car);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/cars?fields[cars]=id";
+        const string route = "/cars?fields[cars]=id";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(car.StringId);
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(car.StringId);
+    }
 
-        [Fact]
-        public async Task Can_create_resource()
-        {
-            // Arrange
-            Engine existingEngine = _fakers.Engine.Generate();
+    [Fact]
+    public async Task Can_create_resource()
+    {
+        // Arrange
+        Engine existingEngine = _fakers.Engine.Generate();
 
-            Car newCar = _fakers.Car.Generate();
+        Car newCar = _fakers.Car.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Car>();
-                dbContext.Engines.Add(existingEngine);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Car>();
+            dbContext.Engines.Add(existingEngine);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "cars",
+                attributes = new
                 {
-                    type = "cars",
-                    attributes = new
-                    {
-                        regionId = newCar.RegionId,
-                        licensePlate = newCar.LicensePlate
-                    },
-                    relationships = new
+                    regionId = newCar.RegionId,
+                    licensePlate = newCar.LicensePlate
+                },
+                relationships = new
+                {
+                    engine = new
                     {
-                        engine = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "engines",
-                                id = existingEngine.StringId
-                            }
+                            type = "engines",
+                            id = existingEngine.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/cars";
+        const string route = "/cars";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Car? carInDatabase =
-                    await dbContext.Cars.FirstOrDefaultAsync(car => car.RegionId == newCar.RegionId && car.LicensePlate == newCar.LicensePlate);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Car? carInDatabase = await dbContext.Cars.FirstOrDefaultAsync(car => car.RegionId == newCar.RegionId && car.LicensePlate == newCar.LicensePlate);
 
-                carInDatabase.ShouldNotBeNull();
-                carInDatabase.Id.Should().Be($"{newCar.RegionId}:{newCar.LicensePlate}");
-            });
-        }
+            carInDatabase.ShouldNotBeNull();
+            carInDatabase.Id.Should().Be($"{newCar.RegionId}:{newCar.LicensePlate}");
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_OneToOne_relationship()
-        {
-            // Arrange
-            Car existingCar = _fakers.Car.Generate();
-            Engine existingEngine = _fakers.Engine.Generate();
+    [Fact]
+    public async Task Can_create_OneToOne_relationship()
+    {
+        // Arrange
+        Car existingCar = _fakers.Car.Generate();
+        Engine existingEngine = _fakers.Engine.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Car>();
-                dbContext.AddInRange(existingCar, existingEngine);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Car>();
+            dbContext.AddInRange(existingCar, existingEngine);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "engines",
+                id = existingEngine.StringId,
+                relationships = new
                 {
-                    type = "engines",
-                    id = existingEngine.StringId,
-                    relationships = new
+                    car = new
                     {
-                        car = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "cars",
-                                id = existingCar.StringId
-                            }
+                            type = "cars",
+                            id = existingCar.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/engines/{existingEngine.StringId}";
+        string route = $"/engines/{existingEngine.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Engine engineInDatabase = await dbContext.Engines.Include(engine => engine.Car).FirstWithIdAsync(existingEngine.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Engine engineInDatabase = await dbContext.Engines.Include(engine => engine.Car).FirstWithIdAsync(existingEngine.Id);
 
-                engineInDatabase.Car.ShouldNotBeNull();
-                engineInDatabase.Car.Id.Should().Be(existingCar.StringId);
-            });
-        }
+            engineInDatabase.Car.ShouldNotBeNull();
+            engineInDatabase.Car.Id.Should().Be(existingCar.StringId);
+        });
+    }
 
-        [Fact]
-        public async Task Can_clear_OneToOne_relationship()
-        {
-            // Arrange
-            Engine existingEngine = _fakers.Engine.Generate();
-            existingEngine.Car = _fakers.Car.Generate();
+    [Fact]
+    public async Task Can_clear_OneToOne_relationship()
+    {
+        // Arrange
+        Engine existingEngine = _fakers.Engine.Generate();
+        existingEngine.Car = _fakers.Car.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Car>();
-                dbContext.Engines.Add(existingEngine);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Car>();
+            dbContext.Engines.Add(existingEngine);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "engines",
+                id = existingEngine.StringId,
+                relationships = new
                 {
-                    type = "engines",
-                    id = existingEngine.StringId,
-                    relationships = new
+                    car = new
                     {
-                        car = new
-                        {
-                            data = (object?)null
-                        }
+                        data = (object?)null
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/engines/{existingEngine.StringId}";
+        string route = $"/engines/{existingEngine.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Engine engineInDatabase = await dbContext.Engines.Include(engine => engine.Car).FirstWithIdAsync(existingEngine.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Engine engineInDatabase = await dbContext.Engines.Include(engine => engine.Car).FirstWithIdAsync(existingEngine.Id);
 
-                engineInDatabase.Car.Should().BeNull();
-            });
-        }
+            engineInDatabase.Car.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Can_remove_from_OneToMany_relationship()
-        {
-            // Arrange
-            Dealership existingDealership = _fakers.Dealership.Generate();
-            existingDealership.Inventory = _fakers.Car.Generate(2).ToHashSet();
+    [Fact]
+    public async Task Can_remove_from_OneToMany_relationship()
+    {
+        // Arrange
+        Dealership existingDealership = _fakers.Dealership.Generate();
+        existingDealership.Inventory = _fakers.Car.Generate(2).ToHashSet();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Car>();
-                dbContext.Dealerships.Add(existingDealership);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Car>();
+            dbContext.Dealerships.Add(existingDealership);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "cars",
-                        id = existingDealership.Inventory.ElementAt(0).StringId
-                    }
+                    type = "cars",
+                    id = existingDealership.Inventory.ElementAt(0).StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/dealerships/{existingDealership.StringId}/relationships/inventory";
+        string route = $"/dealerships/{existingDealership.StringId}/relationships/inventory";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Dealership dealershipInDatabase =
-                    await dbContext.Dealerships.Include(dealership => dealership.Inventory).FirstWithIdAsync(existingDealership.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Dealership dealershipInDatabase = await dbContext.Dealerships.Include(dealership => dealership.Inventory).FirstWithIdAsync(existingDealership.Id);
 
-                dealershipInDatabase.Inventory.ShouldHaveCount(1);
-                dealershipInDatabase.Inventory.Should().ContainSingle(car => car.Id == existingDealership.Inventory.ElementAt(1).Id);
-            });
-        }
+            dealershipInDatabase.Inventory.ShouldHaveCount(1);
+            dealershipInDatabase.Inventory.Should().ContainSingle(car => car.Id == existingDealership.Inventory.ElementAt(1).Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_add_to_OneToMany_relationship()
-        {
-            // Arrange
-            Dealership existingDealership = _fakers.Dealership.Generate();
-            Car existingCar = _fakers.Car.Generate();
+    [Fact]
+    public async Task Can_add_to_OneToMany_relationship()
+    {
+        // Arrange
+        Dealership existingDealership = _fakers.Dealership.Generate();
+        Car existingCar = _fakers.Car.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Car>();
-                dbContext.AddInRange(existingDealership, existingCar);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Car>();
+            dbContext.AddInRange(existingDealership, existingCar);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "cars",
-                        id = existingCar.StringId
-                    }
+                    type = "cars",
+                    id = existingCar.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/dealerships/{existingDealership.StringId}/relationships/inventory";
+        string route = $"/dealerships/{existingDealership.StringId}/relationships/inventory";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Dealership dealershipInDatabase =
-                    await dbContext.Dealerships.Include(dealership => dealership.Inventory).FirstWithIdAsync(existingDealership.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Dealership dealershipInDatabase = await dbContext.Dealerships.Include(dealership => dealership.Inventory).FirstWithIdAsync(existingDealership.Id);
 
-                dealershipInDatabase.Inventory.ShouldHaveCount(1);
-                dealershipInDatabase.Inventory.Should().ContainSingle(car => car.Id == existingCar.Id);
-            });
-        }
+            dealershipInDatabase.Inventory.ShouldHaveCount(1);
+            dealershipInDatabase.Inventory.Should().ContainSingle(car => car.Id == existingCar.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_OneToMany_relationship()
-        {
-            // Arrange
-            Dealership existingDealership = _fakers.Dealership.Generate();
-            existingDealership.Inventory = _fakers.Car.Generate(2).ToHashSet();
+    [Fact]
+    public async Task Can_replace_OneToMany_relationship()
+    {
+        // Arrange
+        Dealership existingDealership = _fakers.Dealership.Generate();
+        existingDealership.Inventory = _fakers.Car.Generate(2).ToHashSet();
 
-            Car existingCar = _fakers.Car.Generate();
+        Car existingCar = _fakers.Car.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Car>();
-                dbContext.AddInRange(existingDealership, existingCar);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Car>();
+            dbContext.AddInRange(existingDealership, existingCar);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "cars",
-                        id = existingDealership.Inventory.ElementAt(0).StringId
-                    },
-                    new
-                    {
-                        type = "cars",
-                        id = existingCar.StringId
-                    }
+                    type = "cars",
+                    id = existingDealership.Inventory.ElementAt(0).StringId
+                },
+                new
+                {
+                    type = "cars",
+                    id = existingCar.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/dealerships/{existingDealership.StringId}/relationships/inventory";
+        string route = $"/dealerships/{existingDealership.StringId}/relationships/inventory";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Dealership dealershipInDatabase =
-                    await dbContext.Dealerships.Include(dealership => dealership.Inventory).FirstWithIdAsync(existingDealership.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Dealership dealershipInDatabase = await dbContext.Dealerships.Include(dealership => dealership.Inventory).FirstWithIdAsync(existingDealership.Id);
 
-                dealershipInDatabase.Inventory.ShouldHaveCount(2);
-                dealershipInDatabase.Inventory.Should().ContainSingle(car => car.Id == existingCar.Id);
-                dealershipInDatabase.Inventory.Should().ContainSingle(car => car.Id == existingDealership.Inventory.ElementAt(0).Id);
-            });
-        }
+            dealershipInDatabase.Inventory.ShouldHaveCount(2);
+            dealershipInDatabase.Inventory.Should().ContainSingle(car => car.Id == existingCar.Id);
+            dealershipInDatabase.Inventory.Should().ContainSingle(car => car.Id == existingDealership.Inventory.ElementAt(0).Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_remove_from_ManyToOne_relationship_for_unknown_relationship_ID()
-        {
-            // Arrange
-            Dealership existingDealership = _fakers.Dealership.Generate();
+    [Fact]
+    public async Task Cannot_remove_from_ManyToOne_relationship_for_unknown_relationship_ID()
+    {
+        // Arrange
+        Dealership existingDealership = _fakers.Dealership.Generate();
 
-            string unknownCarId = _fakers.Car.Generate().StringId!;
+        string unknownCarId = _fakers.Car.Generate().StringId!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Car>();
-                dbContext.Dealerships.Add(existingDealership);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Car>();
+            dbContext.Dealerships.Add(existingDealership);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "cars",
-                        id = unknownCarId
-                    }
+                    type = "cars",
+                    id = unknownCarId
                 }
-            };
+            }
+        };
+
+        string route = $"/dealerships/{existingDealership.StringId}/relationships/inventory";
 
-            string route = $"/dealerships/{existingDealership.StringId}/relationships/inventory";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'cars' with ID '{unknownCarId}' in relationship 'inventory' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'cars' with ID '{unknownCarId}' in relationship 'inventory' does not exist.");
-        }
+    [Fact]
+    public async Task Can_delete_resource()
+    {
+        // Arrange
+        Car existingCar = _fakers.Car.Generate();
 
-        [Fact]
-        public async Task Can_delete_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Car existingCar = _fakers.Car.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Car>();
-                dbContext.Cars.Add(existingCar);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<Car>();
+            dbContext.Cars.Add(existingCar);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/cars/{existingCar.StringId}";
+        string route = $"/cars/{existingCar.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Car? carInDatabase =
-                    await dbContext.Cars.FirstOrDefaultAsync(car => car.RegionId == existingCar.RegionId && car.LicensePlate == existingCar.LicensePlate);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Car? carInDatabase =
+                await dbContext.Cars.FirstOrDefaultAsync(car => car.RegionId == existingCar.RegionId && car.LicensePlate == existingCar.LicensePlate);
 
-                carInDatabase.Should().BeNull();
-            });
-        }
+            carInDatabase.Should().BeNull();
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Dealership.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Dealership.cs
index 42d11da754..14784cb438 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Dealership.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Dealership.cs
@@ -1,17 +1,16 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys")]
+public sealed class Dealership : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Dealership : Identifiable<int>
-    {
-        [Attr]
-        public string Address { get; set; } = null!;
+    [Attr]
+    public string Address { get; set; } = null!;
 
-        [HasMany]
-        public ISet<Car> Inventory { get; set; } = new HashSet<Car>();
-    }
+    [HasMany]
+    public ISet<Car> Inventory { get; set; } = new HashSet<Car>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/DealershipsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/DealershipsController.cs
deleted file mode 100644
index 2ec7d85cda..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/DealershipsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
-{
-    public sealed class DealershipsController : JsonApiController<Dealership, int>
-    {
-        public DealershipsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Dealership, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Engine.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Engine.cs
index 2a322e7513..56421610aa 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Engine.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/Engine.cs
@@ -2,15 +2,15 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys")]
+public sealed class Engine : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Engine : Identifiable<int>
-    {
-        [Attr]
-        public string SerialCode { get; set; } = null!;
+    [Attr]
+    public string SerialCode { get; set; } = null!;
 
-        [HasOne]
-        public Car? Car { get; set; }
-    }
+    [HasOne]
+    public Car? Car { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/EnginesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/EnginesController.cs
deleted file mode 100644
index f995a72233..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/EnginesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys
-{
-    public sealed class EnginesController : JsonApiController<Engine, int>
-    {
-        public EnginesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Engine, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/AcceptHeaderTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/AcceptHeaderTests.cs
index 35b24149f6..caa29722c5 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/AcceptHeaderTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/AcceptHeaderTests.cs
@@ -1,253 +1,249 @@
-using System;
 using System.Net;
-using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation
+namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation;
+
+public sealed class AcceptHeaderTests : IClassFixture<IntegrationTestContext<TestableStartup<PolicyDbContext>, PolicyDbContext>>
 {
-    public sealed class AcceptHeaderTests : IClassFixture<IntegrationTestContext<TestableStartup<PolicyDbContext>, PolicyDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<PolicyDbContext>, PolicyDbContext> _testContext;
+    private readonly IntegrationTestContext<TestableStartup<PolicyDbContext>, PolicyDbContext> _testContext;
 
-        public AcceptHeaderTests(IntegrationTestContext<TestableStartup<PolicyDbContext>, PolicyDbContext> testContext)
-        {
-            _testContext = testContext;
+    public AcceptHeaderTests(IntegrationTestContext<TestableStartup<PolicyDbContext>, PolicyDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<OperationsController>();
-            testContext.UseController<PoliciesController>();
-        }
+        testContext.UseController<OperationsController>();
+        testContext.UseController<PoliciesController>();
+    }
 
-        [Fact]
-        public async Task Permits_no_Accept_headers()
-        {
-            // Arrange
-            const string route = "/policies";
+    [Fact]
+    public async Task Permits_no_Accept_headers()
+    {
+        // Arrange
+        const string route = "/policies";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-        [Fact]
-        public async Task Permits_no_Accept_headers_at_operations_endpoint()
+    [Fact]
+    public async Task Permits_no_Accept_headers_at_operations_endpoint()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "policies",
+                        attributes = new
                         {
-                            type = "policies",
-                            attributes = new
-                            {
-                                name = "some"
-                            }
+                            name = "some"
                         }
                     }
                 }
-            };
+            }
+        };
+
+        const string route = "/operations";
+        const string contentType = HeaderConstants.AtomicOperationsMediaType;
 
-            const string route = "/operations";
-            const string contentType = HeaderConstants.AtomicOperationsMediaType;
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+    [Fact]
+    public async Task Permits_global_wildcard_in_Accept_headers()
+    {
+        // Arrange
+        const string route = "/policies";
 
-        [Fact]
-        public async Task Permits_global_wildcard_in_Accept_headers()
+        Action<HttpRequestHeaders> setRequestHeaders = headers =>
         {
-            // Arrange
-            const string route = "/policies";
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("text/html"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("*/*"));
+        };
 
-            Action<HttpRequestHeaders> setRequestHeaders = headers =>
-            {
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("text/html"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("*/*"));
-            };
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route, setRequestHeaders);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route, setRequestHeaders);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+    [Fact]
+    public async Task Permits_application_wildcard_in_Accept_headers()
+    {
+        // Arrange
+        const string route = "/policies";
 
-        [Fact]
-        public async Task Permits_application_wildcard_in_Accept_headers()
+        Action<HttpRequestHeaders> setRequestHeaders = headers =>
         {
-            // Arrange
-            const string route = "/policies";
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("text/html;q=0.8"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/*;q=0.2"));
+        };
 
-            Action<HttpRequestHeaders> setRequestHeaders = headers =>
-            {
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("text/html;q=0.8"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("application/*;q=0.2"));
-            };
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route, setRequestHeaders);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route, setRequestHeaders);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+    [Fact]
+    public async Task Permits_JsonApi_without_parameters_in_Accept_headers()
+    {
+        // Arrange
+        const string route = "/policies";
 
-        [Fact]
-        public async Task Permits_JsonApi_without_parameters_in_Accept_headers()
+        Action<HttpRequestHeaders> setRequestHeaders = headers =>
         {
-            // Arrange
-            const string route = "/policies";
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("text/html"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; profile=some"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; ext=other"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; unknown=unexpected"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; q=0.3"));
+        };
+
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route, setRequestHeaders);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-            Action<HttpRequestHeaders> setRequestHeaders = headers =>
-            {
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("text/html"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; profile=some"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; ext=other"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; unknown=unexpected"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; q=0.3"));
-            };
-
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route, setRequestHeaders);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
-
-        [Fact]
-        public async Task Permits_JsonApi_with_AtomicOperations_extension_in_Accept_headers_at_operations_endpoint()
+    [Fact]
+    public async Task Permits_JsonApi_with_AtomicOperations_extension_in_Accept_headers_at_operations_endpoint()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "policies",
+                        attributes = new
                         {
-                            type = "policies",
-                            attributes = new
-                            {
-                                name = "some"
-                            }
+                            name = "some"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
-            const string contentType = HeaderConstants.AtomicOperationsMediaType;
+        const string route = "/operations";
+        const string contentType = HeaderConstants.AtomicOperationsMediaType;
 
-            Action<HttpRequestHeaders> setRequestHeaders = headers =>
-            {
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("text/html"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; profile=some"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(HeaderConstants.MediaType));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; unknown=unexpected"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType};ext=\"https://jsonapi.org/ext/atomic\"; q=0.2"));
-            };
-
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType, setRequestHeaders);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
-
-        [Fact]
-        public async Task Denies_JsonApi_with_parameters_in_Accept_headers()
+        Action<HttpRequestHeaders> setRequestHeaders = headers =>
         {
-            // Arrange
-            const string route = "/policies";
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("text/html"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; profile=some"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(HeaderConstants.MediaType));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; unknown=unexpected"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType};ext=\"https://jsonapi.org/ext/atomic\"; q=0.2"));
+        };
+
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType, setRequestHeaders);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-            Action<HttpRequestHeaders> setRequestHeaders = headers =>
-            {
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("text/html"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; profile=some"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; ext=other"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; unknown=unexpected"));
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(HeaderConstants.AtomicOperationsMediaType));
-            };
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route, setRequestHeaders);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotAcceptable);
-
-            responseDocument.Errors.ShouldHaveCount(1);
-
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotAcceptable);
-            error.Title.Should().Be("The specified Accept header value does not contain any supported media types.");
-            error.Detail.Should().Be("Please include 'application/vnd.api+json' in the Accept header values.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Header.Should().Be("Accept");
-        }
-
-        [Fact]
-        public async Task Denies_JsonApi_in_Accept_headers_at_operations_endpoint()
+    [Fact]
+    public async Task Denies_JsonApi_with_parameters_in_Accept_headers()
+    {
+        // Arrange
+        const string route = "/policies";
+
+        Action<HttpRequestHeaders> setRequestHeaders = headers =>
+        {
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse("text/html"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; profile=some"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; ext=other"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse($"{HeaderConstants.MediaType}; unknown=unexpected"));
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(HeaderConstants.AtomicOperationsMediaType));
+        };
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route, setRequestHeaders);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotAcceptable);
+
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotAcceptable);
+        error.Title.Should().Be("The specified Accept header value does not contain any supported media types.");
+        error.Detail.Should().Be("Please include 'application/vnd.api+json' in the Accept header values.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Header.Should().Be("Accept");
+    }
+
+    [Fact]
+    public async Task Denies_JsonApi_in_Accept_headers_at_operations_endpoint()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "policies",
+                        attributes = new
                         {
-                            type = "policies",
-                            attributes = new
-                            {
-                                name = "some"
-                            }
+                            name = "some"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
-            const string contentType = HeaderConstants.AtomicOperationsMediaType;
+        const string route = "/operations";
+        const string contentType = HeaderConstants.AtomicOperationsMediaType;
 
-            Action<HttpRequestHeaders> setRequestHeaders = headers =>
-            {
-                headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(HeaderConstants.MediaType));
-            };
+        Action<HttpRequestHeaders> setRequestHeaders = headers =>
+        {
+            headers.Accept.Add(MediaTypeWithQualityHeaderValue.Parse(HeaderConstants.MediaType));
+        };
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) =
-                await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType, setRequestHeaders);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) =
+            await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType, setRequestHeaders);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotAcceptable);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotAcceptable);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotAcceptable);
-            error.Title.Should().Be("The specified Accept header value does not contain any supported media types.");
-            error.Detail.Should().Be("Please include 'application/vnd.api+json; ext=\"https://jsonapi.org/ext/atomic\"' in the Accept header values.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Header.Should().Be("Accept");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotAcceptable);
+        error.Title.Should().Be("The specified Accept header value does not contain any supported media types.");
+        error.Detail.Should().Be("Please include 'application/vnd.api+json; ext=\"https://jsonapi.org/ext/atomic\"' in the Accept header values.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Header.Should().Be("Accept");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/ContentTypeHeaderTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/ContentTypeHeaderTests.cs
index 9c96bf0a1d..70fd03c453 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/ContentTypeHeaderTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/ContentTypeHeaderTests.cs
@@ -1,388 +1,385 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation
+namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation;
+
+public sealed class ContentTypeHeaderTests : IClassFixture<IntegrationTestContext<TestableStartup<PolicyDbContext>, PolicyDbContext>>
 {
-    public sealed class ContentTypeHeaderTests : IClassFixture<IntegrationTestContext<TestableStartup<PolicyDbContext>, PolicyDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<PolicyDbContext>, PolicyDbContext> _testContext;
+    private readonly IntegrationTestContext<TestableStartup<PolicyDbContext>, PolicyDbContext> _testContext;
 
-        public ContentTypeHeaderTests(IntegrationTestContext<TestableStartup<PolicyDbContext>, PolicyDbContext> testContext)
-        {
-            _testContext = testContext;
+    public ContentTypeHeaderTests(IntegrationTestContext<TestableStartup<PolicyDbContext>, PolicyDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<PoliciesController>();
-            testContext.UseController<OperationsController>();
-        }
+        testContext.UseController<PoliciesController>();
+        testContext.UseController<OperationsController>();
+    }
 
-        [Fact]
-        public async Task Returns_JsonApi_ContentType_header()
-        {
-            // Arrange
-            const string route = "/policies";
+    [Fact]
+    public async Task Returns_JsonApi_ContentType_header()
+    {
+        // Arrange
+        const string route = "/policies";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be(HeaderConstants.MediaType);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
+        httpResponse.Content.Headers.ContentType.ToString().Should().Be(HeaderConstants.MediaType);
+    }
 
-        [Fact]
-        public async Task Returns_JsonApi_ContentType_header_with_AtomicOperations_extension()
+    [Fact]
+    public async Task Returns_JsonApi_ContentType_header_with_AtomicOperations_extension()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "policies",
+                        attributes = new
                         {
-                            type = "policies",
-                            attributes = new
-                            {
-                                name = "some"
-                            }
+                            name = "some"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
+        const string route = "/operations";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAtomicAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be(HeaderConstants.AtomicOperationsMediaType);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
+        httpResponse.Content.Headers.ContentType.ToString().Should().Be(HeaderConstants.AtomicOperationsMediaType);
+    }
 
-        [Fact]
-        public async Task Denies_unknown_ContentType_header()
+    [Fact]
+    public async Task Denies_unknown_ContentType_header()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "policies",
+                attributes = new
                 {
-                    type = "policies",
-                    attributes = new
-                    {
-                        name = "some"
-                    }
+                    name = "some"
                 }
-            };
+            }
+        };
 
-            const string route = "/policies";
-            const string contentType = "text/html";
+        const string route = "/policies";
+        const string contentType = "text/html";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
-            error.Title.Should().Be("The specified Content-Type header value is not supported.");
-            error.Detail.Should().Be("Please specify 'application/vnd.api+json' instead of 'text/html' for the Content-Type header value.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Header.Should().Be("Content-Type");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
+        error.Title.Should().Be("The specified Content-Type header value is not supported.");
+        error.Detail.Should().Be("Please specify 'application/vnd.api+json' instead of 'text/html' for the Content-Type header value.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Header.Should().Be("Content-Type");
+    }
 
-        [Fact]
-        public async Task Permits_JsonApi_ContentType_header()
+    [Fact]
+    public async Task Permits_JsonApi_ContentType_header()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "policies",
+                attributes = new
                 {
-                    type = "policies",
-                    attributes = new
-                    {
-                        name = "some"
-                    }
+                    name = "some"
                 }
-            };
+            }
+        };
 
-            const string route = "/policies";
-            const string contentType = HeaderConstants.MediaType;
+        const string route = "/policies";
+        const string contentType = HeaderConstants.MediaType;
 
-            // Act
-            // ReSharper disable once RedundantArgumentDefaultValue
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
+        // Act
+        // ReSharper disable once RedundantArgumentDefaultValue
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+    }
 
-        [Fact]
-        public async Task Permits_JsonApi_ContentType_header_with_AtomicOperations_extension_at_operations_endpoint()
+    [Fact]
+    public async Task Permits_JsonApi_ContentType_header_with_AtomicOperations_extension_at_operations_endpoint()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "policies",
+                        attributes = new
                         {
-                            type = "policies",
-                            attributes = new
-                            {
-                                name = "some"
-                            }
+                            name = "some"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
-            const string contentType = HeaderConstants.AtomicOperationsMediaType;
+        const string route = "/operations";
+        const string contentType = HeaderConstants.AtomicOperationsMediaType;
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-        [Fact]
-        public async Task Denies_JsonApi_ContentType_header_with_profile()
+    [Fact]
+    public async Task Denies_JsonApi_ContentType_header_with_profile()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "policies",
+                attributes = new
                 {
-                    type = "policies",
-                    attributes = new
-                    {
-                        name = "some"
-                    }
+                    name = "some"
                 }
-            };
+            }
+        };
 
-            const string route = "/policies";
-            string contentType = $"{HeaderConstants.MediaType}; profile=something";
+        const string route = "/policies";
+        const string contentType = $"{HeaderConstants.MediaType}; profile=something";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
-            error.Title.Should().Be("The specified Content-Type header value is not supported.");
-            error.Detail.Should().Be($"Please specify 'application/vnd.api+json' instead of '{contentType}' for the Content-Type header value.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Header.Should().Be("Content-Type");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
+        error.Title.Should().Be("The specified Content-Type header value is not supported.");
+        error.Detail.Should().Be($"Please specify 'application/vnd.api+json' instead of '{contentType}' for the Content-Type header value.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Header.Should().Be("Content-Type");
+    }
 
-        [Fact]
-        public async Task Denies_JsonApi_ContentType_header_with_extension()
+    [Fact]
+    public async Task Denies_JsonApi_ContentType_header_with_extension()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "policies",
+                attributes = new
                 {
-                    type = "policies",
-                    attributes = new
-                    {
-                        name = "some"
-                    }
+                    name = "some"
                 }
-            };
+            }
+        };
 
-            const string route = "/policies";
-            string contentType = $"{HeaderConstants.MediaType}; ext=something";
+        const string route = "/policies";
+        const string contentType = $"{HeaderConstants.MediaType}; ext=something";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
-            error.Title.Should().Be("The specified Content-Type header value is not supported.");
-            error.Detail.Should().Be($"Please specify 'application/vnd.api+json' instead of '{contentType}' for the Content-Type header value.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Header.Should().Be("Content-Type");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
+        error.Title.Should().Be("The specified Content-Type header value is not supported.");
+        error.Detail.Should().Be($"Please specify 'application/vnd.api+json' instead of '{contentType}' for the Content-Type header value.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Header.Should().Be("Content-Type");
+    }
 
-        [Fact]
-        public async Task Denies_JsonApi_ContentType_header_with_AtomicOperations_extension_at_resource_endpoint()
+    [Fact]
+    public async Task Denies_JsonApi_ContentType_header_with_AtomicOperations_extension_at_resource_endpoint()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "policies",
+                attributes = new
                 {
-                    type = "policies",
-                    attributes = new
-                    {
-                        name = "some"
-                    }
+                    name = "some"
                 }
-            };
+            }
+        };
 
-            const string route = "/policies";
-            const string contentType = HeaderConstants.AtomicOperationsMediaType;
+        const string route = "/policies";
+        const string contentType = HeaderConstants.AtomicOperationsMediaType;
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
-            error.Title.Should().Be("The specified Content-Type header value is not supported.");
-            error.Detail.Should().Be($"Please specify 'application/vnd.api+json' instead of '{contentType}' for the Content-Type header value.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Header.Should().Be("Content-Type");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
+        error.Title.Should().Be("The specified Content-Type header value is not supported.");
+        error.Detail.Should().Be($"Please specify 'application/vnd.api+json' instead of '{contentType}' for the Content-Type header value.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Header.Should().Be("Content-Type");
+    }
 
-        [Fact]
-        public async Task Denies_JsonApi_ContentType_header_with_CharSet()
+    [Fact]
+    public async Task Denies_JsonApi_ContentType_header_with_CharSet()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "policies",
+                attributes = new
                 {
-                    type = "policies",
-                    attributes = new
-                    {
-                        name = "some"
-                    }
+                    name = "some"
                 }
-            };
+            }
+        };
 
-            const string route = "/policies";
-            string contentType = $"{HeaderConstants.MediaType}; charset=ISO-8859-4";
+        const string route = "/policies";
+        const string contentType = $"{HeaderConstants.MediaType}; charset=ISO-8859-4";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
-            error.Title.Should().Be("The specified Content-Type header value is not supported.");
-            error.Detail.Should().Be($"Please specify 'application/vnd.api+json' instead of '{contentType}' for the Content-Type header value.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Header.Should().Be("Content-Type");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
+        error.Title.Should().Be("The specified Content-Type header value is not supported.");
+        error.Detail.Should().Be($"Please specify 'application/vnd.api+json' instead of '{contentType}' for the Content-Type header value.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Header.Should().Be("Content-Type");
+    }
 
-        [Fact]
-        public async Task Denies_JsonApi_ContentType_header_with_unknown_parameter()
+    [Fact]
+    public async Task Denies_JsonApi_ContentType_header_with_unknown_parameter()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "policies",
+                attributes = new
                 {
-                    type = "policies",
-                    attributes = new
-                    {
-                        name = "some"
-                    }
+                    name = "some"
                 }
-            };
+            }
+        };
 
-            const string route = "/policies";
-            string contentType = $"{HeaderConstants.MediaType}; unknown=unexpected";
+        const string route = "/policies";
+        const string contentType = $"{HeaderConstants.MediaType}; unknown=unexpected";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
-            error.Title.Should().Be("The specified Content-Type header value is not supported.");
-            error.Detail.Should().Be($"Please specify 'application/vnd.api+json' instead of '{contentType}' for the Content-Type header value.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Header.Should().Be("Content-Type");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
+        error.Title.Should().Be("The specified Content-Type header value is not supported.");
+        error.Detail.Should().Be($"Please specify 'application/vnd.api+json' instead of '{contentType}' for the Content-Type header value.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Header.Should().Be("Content-Type");
+    }
 
-        [Fact]
-        public async Task Denies_JsonApi_ContentType_header_at_operations_endpoint()
+    [Fact]
+    public async Task Denies_JsonApi_ContentType_header_at_operations_endpoint()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            atomic__operations = new[]
             {
-                atomic__operations = new[]
+                new
                 {
-                    new
+                    op = "add",
+                    data = new
                     {
-                        op = "add",
-                        data = new
+                        type = "policies",
+                        attributes = new
                         {
-                            type = "policies",
-                            attributes = new
-                            {
-                                name = "some"
-                            }
+                            name = "some"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/operations";
-            const string contentType = HeaderConstants.MediaType;
+        const string route = "/operations";
+        const string contentType = HeaderConstants.MediaType;
 
-            // Act
-            // ReSharper disable once RedundantArgumentDefaultValue
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
+        // Act
+        // ReSharper disable once RedundantArgumentDefaultValue
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody, contentType);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnsupportedMediaType);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            string detail = $"Please specify '{HeaderConstants.AtomicOperationsMediaType}' instead of '{contentType}' for the Content-Type header value.";
+        const string detail = $"Please specify '{HeaderConstants.AtomicOperationsMediaType}' instead of '{contentType}' for the Content-Type header value.";
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
-            error.Title.Should().Be("The specified Content-Type header value is not supported.");
-            error.Detail.Should().Be(detail);
-            error.Source.ShouldNotBeNull();
-            error.Source.Header.Should().Be("Content-Type");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnsupportedMediaType);
+        error.Title.Should().Be("The specified Content-Type header value is not supported.");
+        error.Detail.Should().Be(detail);
+        error.Source.ShouldNotBeNull();
+        error.Source.Header.Should().Be("Content-Type");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/OperationsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/OperationsController.cs
index 06cf328d23..d24a0f29d1 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/OperationsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/OperationsController.cs
@@ -5,14 +5,13 @@
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation
+namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation;
+
+public sealed class OperationsController : JsonApiOperationsController
 {
-    public sealed class OperationsController : JsonApiOperationsController
+    public OperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor,
+        IJsonApiRequest request, ITargetedFields targetedFields)
+        : base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
     {
-        public OperationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IOperationsProcessor processor,
-            IJsonApiRequest request, ITargetedFields targetedFields)
-            : base(options, resourceGraph, loggerFactory, processor, request, targetedFields)
-        {
-        }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PoliciesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PoliciesController.cs
deleted file mode 100644
index 4edb2dfdec..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PoliciesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation
-{
-    public sealed class PoliciesController : JsonApiController<Policy, int>
-    {
-        public PoliciesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Policy, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/Policy.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/Policy.cs
index 27d850107c..ab2339e9fd 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/Policy.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/Policy.cs
@@ -2,12 +2,12 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation
+namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation")]
+public sealed class Policy : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Policy : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
-    }
+    [Attr]
+    public string Name { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PolicyDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PolicyDbContext.cs
index 3e952ff6ba..61063269ce 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PolicyDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ContentNegotiation/PolicyDbContext.cs
@@ -1,16 +1,15 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation
+namespace JsonApiDotNetCoreTests.IntegrationTests.ContentNegotiation;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class PolicyDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class PolicyDbContext : DbContext
-    {
-        public DbSet<Policy> Policies => Set<Policy>();
+    public DbSet<Policy> Policies => Set<Policy>();
 
-        public PolicyDbContext(DbContextOptions<PolicyDbContext> options)
-            : base(options)
-        {
-        }
+    public PolicyDbContext(DbContextOptions<PolicyDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultDbContext.cs
index c8219d8dd6..63b748ffab 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultDbContext.cs
@@ -1,16 +1,15 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults
+namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class ActionResultDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ActionResultDbContext : DbContext
-    {
-        public DbSet<Toothbrush> Toothbrushes => Set<Toothbrush>();
+    public DbSet<Toothbrush> Toothbrushes => Set<Toothbrush>();
 
-        public ActionResultDbContext(DbContextOptions<ActionResultDbContext> options)
-            : base(options)
-        {
-        }
+    public ActionResultDbContext(DbContextOptions<ActionResultDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultTests.cs
index 915b2020fc..94e9a12b85 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ActionResultTests.cs
@@ -1,156 +1,153 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults
+namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults;
+
+public sealed class ActionResultTests : IClassFixture<IntegrationTestContext<TestableStartup<ActionResultDbContext>, ActionResultDbContext>>
 {
-    public sealed class ActionResultTests : IClassFixture<IntegrationTestContext<TestableStartup<ActionResultDbContext>, ActionResultDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ActionResultDbContext>, ActionResultDbContext> _testContext;
+
+    public ActionResultTests(IntegrationTestContext<TestableStartup<ActionResultDbContext>, ActionResultDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ActionResultDbContext>, ActionResultDbContext> _testContext;
+        _testContext = testContext;
 
-        public ActionResultTests(IntegrationTestContext<TestableStartup<ActionResultDbContext>, ActionResultDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<ToothbrushesController>();
+    }
 
-            testContext.UseController<ToothbrushesController>();
-        }
+    [Fact]
+    public async Task Can_get_resource_by_ID()
+    {
+        // Arrange
+        var toothbrush = new Toothbrush();
 
-        [Fact]
-        public async Task Can_get_resource_by_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var toothbrush = new Toothbrush();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Toothbrushes.Add(toothbrush);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Toothbrushes.Add(toothbrush);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/toothbrushes/{toothbrush.StringId}";
+        string route = $"/toothbrushes/{toothbrush.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(toothbrush.StringId);
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(toothbrush.StringId);
+    }
 
-        [Fact]
-        public async Task Converts_empty_ActionResult_to_error_collection()
-        {
-            // Arrange
-            string route = $"/toothbrushes/{ToothbrushesController.EmptyActionResultId}";
+    [Fact]
+    public async Task Converts_empty_ActionResult_to_error_collection()
+    {
+        // Arrange
+        string route = $"/toothbrushes/{ToothbrushesController.EmptyActionResultId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("NotFound");
-            error.Detail.Should().BeNull();
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("NotFound");
+        error.Detail.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Converts_ActionResult_with_error_object_to_error_collection()
-        {
-            // Arrange
-            string route = $"/toothbrushes/{ToothbrushesController.ActionResultWithErrorObjectId}";
+    [Fact]
+    public async Task Converts_ActionResult_with_error_object_to_error_collection()
+    {
+        // Arrange
+        string route = $"/toothbrushes/{ToothbrushesController.ActionResultWithErrorObjectId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("No toothbrush with that ID exists.");
-            error.Detail.Should().BeNull();
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("No toothbrush with that ID exists.");
+        error.Detail.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Cannot_convert_ActionResult_with_string_parameter_to_error_collection()
-        {
-            // Arrange
-            string route = $"/toothbrushes/{ToothbrushesController.ActionResultWithStringParameter}";
+    [Fact]
+    public async Task Cannot_convert_ActionResult_with_string_parameter_to_error_collection()
+    {
+        // Arrange
+        string route = $"/toothbrushes/{ToothbrushesController.ActionResultWithStringParameter}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.InternalServerError);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.InternalServerError);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
-            error.Title.Should().Be("An unhandled error occurred while processing this request.");
-            error.Detail.Should().Be("Data being returned must be resources, operations, errors or null.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
+        error.Title.Should().Be("An unhandled error occurred while processing this request.");
+        error.Detail.Should().Be("Data being returned must be resources, operations, errors or null.");
+    }
 
-        [Fact]
-        public async Task Converts_ObjectResult_with_error_object_to_error_collection()
-        {
-            // Arrange
-            string route = $"/toothbrushes/{ToothbrushesController.ObjectResultWithErrorObjectId}";
+    [Fact]
+    public async Task Converts_ObjectResult_with_error_object_to_error_collection()
+    {
+        // Arrange
+        string route = $"/toothbrushes/{ToothbrushesController.ObjectResultWithErrorObjectId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadGateway);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadGateway);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadGateway);
-            error.Title.Should().BeNull();
-            error.Detail.Should().BeNull();
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadGateway);
+        error.Title.Should().BeNull();
+        error.Detail.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Converts_ObjectResult_with_error_objects_to_error_collection()
-        {
-            // Arrange
-            string route = $"/toothbrushes/{ToothbrushesController.ObjectResultWithErrorCollectionId}";
+    [Fact]
+    public async Task Converts_ObjectResult_with_error_objects_to_error_collection()
+    {
+        // Arrange
+        string route = $"/toothbrushes/{ToothbrushesController.ObjectResultWithErrorCollectionId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(3);
+        responseDocument.Errors.ShouldHaveCount(3);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.PreconditionFailed);
-            error1.Title.Should().BeNull();
-            error1.Detail.Should().BeNull();
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.PreconditionFailed);
+        error1.Title.Should().BeNull();
+        error1.Detail.Should().BeNull();
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.Unauthorized);
-            error2.Title.Should().BeNull();
-            error2.Detail.Should().BeNull();
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.Unauthorized);
+        error2.Title.Should().BeNull();
+        error2.Detail.Should().BeNull();
 
-            ErrorObject error3 = responseDocument.Errors[2];
-            error3.StatusCode.Should().Be(HttpStatusCode.ExpectationFailed);
-            error3.Title.Should().Be("This is not a very great request.");
-            error3.Detail.Should().BeNull();
-        }
+        ErrorObject error3 = responseDocument.Errors[2];
+        error3.StatusCode.Should().Be(HttpStatusCode.ExpectationFailed);
+        error3.Title.Should().Be("This is not a very great request.");
+        error3.Detail.Should().BeNull();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/Toothbrush.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/Toothbrush.cs
index 674513f910..4e6769756a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/Toothbrush.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/Toothbrush.cs
@@ -2,12 +2,12 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults
+namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults")]
+public sealed class Toothbrush : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Toothbrush : Identifiable<int>
-    {
-        [Attr]
-        public bool IsElectric { get; set; }
-    }
+    [Attr]
+    public bool IsElectric { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs
index 92bdf57157..2170d113ce 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ControllerActionResults/ToothbrushesController.cs
@@ -1,71 +1,63 @@
 using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Serialization.Objects;
-using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults
+namespace JsonApiDotNetCoreTests.IntegrationTests.ControllerActionResults;
+
+// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
+public partial class ToothbrushesController
 {
-    public sealed class ToothbrushesController : BaseJsonApiController<Toothbrush, int>
-    {
-        internal const int EmptyActionResultId = 11111111;
-        internal const int ActionResultWithErrorObjectId = 22222222;
-        internal const int ActionResultWithStringParameter = 33333333;
-        internal const int ObjectResultWithErrorObjectId = 44444444;
-        internal const int ObjectResultWithErrorCollectionId = 55555555;
+}
 
-        public ToothbrushesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Toothbrush, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
+partial class ToothbrushesController
+{
+    internal const int EmptyActionResultId = 11111111;
+    internal const int ActionResultWithErrorObjectId = 22222222;
+    internal const int ActionResultWithStringParameter = 33333333;
+    internal const int ObjectResultWithErrorObjectId = 44444444;
+    internal const int ObjectResultWithErrorCollectionId = 55555555;
+
+    [HttpGet("{id}")]
+    public override async Task<IActionResult> GetAsync(int id, CancellationToken cancellationToken)
+    {
+        if (id == EmptyActionResultId)
         {
+            return NotFound();
         }
 
-        [HttpGet("{id}")]
-        public override async Task<IActionResult> GetAsync(int id, CancellationToken cancellationToken)
+        if (id == ActionResultWithErrorObjectId)
         {
-            if (id == EmptyActionResultId)
+            return NotFound(new ErrorObject(HttpStatusCode.NotFound)
             {
-                return NotFound();
-            }
-
-            if (id == ActionResultWithErrorObjectId)
-            {
-                return NotFound(new ErrorObject(HttpStatusCode.NotFound)
-                {
-                    Title = "No toothbrush with that ID exists."
-                });
-            }
+                Title = "No toothbrush with that ID exists."
+            });
+        }
 
-            if (id == ActionResultWithStringParameter)
-            {
-                return Conflict("Something went wrong.");
-            }
+        if (id == ActionResultWithStringParameter)
+        {
+            return Conflict("Something went wrong.");
+        }
 
-            if (id == ObjectResultWithErrorObjectId)
-            {
-                return Error(new ErrorObject(HttpStatusCode.BadGateway));
-            }
+        if (id == ObjectResultWithErrorObjectId)
+        {
+            return Error(new ErrorObject(HttpStatusCode.BadGateway));
+        }
 
-            if (id == ObjectResultWithErrorCollectionId)
+        if (id == ObjectResultWithErrorCollectionId)
+        {
+            var errors = new[]
             {
-                var errors = new[]
+                new ErrorObject(HttpStatusCode.PreconditionFailed),
+                new ErrorObject(HttpStatusCode.Unauthorized),
+                new ErrorObject(HttpStatusCode.ExpectationFailed)
                 {
-                    new ErrorObject(HttpStatusCode.PreconditionFailed),
-                    new ErrorObject(HttpStatusCode.Unauthorized),
-                    new ErrorObject(HttpStatusCode.ExpectationFailed)
-                    {
-                        Title = "This is not a very great request."
-                    }
-                };
+                    Title = "This is not a very great request."
+                }
+            };
 
-                return Error(errors);
-            }
-
-            return await base.GetAsync(id, cancellationToken);
+            return Error(errors);
         }
+
+        return await base.GetAsync(id, cancellationToken);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeTests.cs
index 2d6fcca6fb..ee5c6c2da7 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/ApiControllerAttributeTests.cs
@@ -1,41 +1,38 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes
+namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
+
+public sealed class ApiControllerAttributeTests : IClassFixture<IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext>>
 {
-    public sealed class ApiControllerAttributeTests : IClassFixture<IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext> _testContext;
+    private readonly IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext> _testContext;
 
-        public ApiControllerAttributeTests(IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext> testContext)
-        {
-            _testContext = testContext;
+    public ApiControllerAttributeTests(IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<CiviliansController>();
-        }
+        testContext.UseController<CiviliansController>();
+    }
 
-        [Fact]
-        public async Task ApiController_attribute_transforms_NotFound_action_result_without_arguments_into_ProblemDetails()
-        {
-            // Arrange
-            const string route = "/world-civilians/missing";
+    [Fact]
+    public async Task ApiController_attribute_transforms_NotFound_action_result_without_arguments_into_ProblemDetails()
+    {
+        // Arrange
+        const string route = "/world-civilians/missing";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.Links.ShouldNotBeNull();
-            error.Links.About.Should().Be("https://tools.ietf.org/html/rfc7231#section-6.5.4");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.Links.ShouldNotBeNull();
+        error.Links.About.Should().Be("https://tools.ietf.org/html/rfc7231#section-6.5.4");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Civilian.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Civilian.cs
index 13141feca6..09fceeca60 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Civilian.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Civilian.cs
@@ -2,12 +2,12 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes
+namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes")]
+public sealed class Civilian : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Civilian : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
-    }
+    [Attr]
+    public string Name { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs
index aad9ccb421..313a8e8849 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CiviliansController.cs
@@ -1,29 +1,22 @@
-using System.Threading.Tasks;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Controllers.Annotations;
-using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes
+namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
+
+// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
+public partial class CiviliansController
 {
-    [ApiController]
-    [DisableRoutingConvention]
-    [Route("world-civilians")]
-    public sealed class CiviliansController : JsonApiController<Civilian, int>
-    {
-        public CiviliansController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Civilian, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
+}
 
-        [HttpGet("missing")]
-        public async Task<IActionResult> GetMissingAsync()
-        {
-            await Task.Yield();
-            return NotFound();
-        }
+[ApiController]
+[DisableRoutingConvention]
+[Route("world-civilians")]
+partial class CiviliansController
+{
+    [HttpGet("missing")]
+    public async Task<IActionResult> GetMissingAsync()
+    {
+        await Task.Yield();
+        return NotFound();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteDbContext.cs
index fc24c83f45..784e07bb4b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteDbContext.cs
@@ -1,17 +1,16 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes
+namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class CustomRouteDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class CustomRouteDbContext : DbContext
-    {
-        public DbSet<Town> Towns => Set<Town>();
-        public DbSet<Civilian> Civilians => Set<Civilian>();
+    public DbSet<Town> Towns => Set<Town>();
+    public DbSet<Civilian> Civilians => Set<Civilian>();
 
-        public CustomRouteDbContext(DbContextOptions<CustomRouteDbContext> options)
-            : base(options)
-        {
-        }
+    public CustomRouteDbContext(DbContextOptions<CustomRouteDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteFakers.cs
index 6d32e44da8..d9416d99ab 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteFakers.cs
@@ -1,27 +1,25 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes
+namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
+
+internal sealed class CustomRouteFakers : FakerContainer
 {
-    internal sealed class CustomRouteFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<Town>> _lazyTownFaker = new(() =>
-            new Faker<Town>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(town => town.Name, faker => faker.Address.City())
-                .RuleFor(town => town.Latitude, faker => faker.Address.Latitude())
-                .RuleFor(town => town.Longitude, faker => faker.Address.Longitude()));
+    private readonly Lazy<Faker<Town>> _lazyTownFaker = new(() =>
+        new Faker<Town>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(town => town.Name, faker => faker.Address.City())
+            .RuleFor(town => town.Latitude, faker => faker.Address.Latitude())
+            .RuleFor(town => town.Longitude, faker => faker.Address.Longitude()));
 
-        private readonly Lazy<Faker<Civilian>> _lazyCivilianFaker = new(() =>
-            new Faker<Civilian>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(civilian => civilian.Name, faker => faker.Person.FullName));
+    private readonly Lazy<Faker<Civilian>> _lazyCivilianFaker = new(() =>
+        new Faker<Civilian>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(civilian => civilian.Name, faker => faker.Person.FullName));
 
-        public Faker<Town> Town => _lazyTownFaker.Value;
-        public Faker<Civilian> Civilian => _lazyCivilianFaker.Value;
-    }
+    public Faker<Town> Town => _lazyTownFaker.Value;
+    public Faker<Civilian> Civilian => _lazyCivilianFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteTests.cs
index 4c313aa2c3..a4a98592d9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteTests.cs
@@ -1,97 +1,92 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes
+namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
+
+public sealed class CustomRouteTests : IClassFixture<IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext>>
 {
-    public sealed class CustomRouteTests : IClassFixture<IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext>>
+    private const string HostPrefix = "http://localhost";
+
+    private readonly IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext> _testContext;
+    private readonly CustomRouteFakers _fakers = new();
+
+    public CustomRouteTests(IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext> testContext)
     {
-        private const string HostPrefix = "http://localhost";
+        _testContext = testContext;
 
-        private readonly IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext> _testContext;
-        private readonly CustomRouteFakers _fakers = new();
+        testContext.UseController<CiviliansController>();
+        testContext.UseController<TownsController>();
+    }
 
-        public CustomRouteTests(IntegrationTestContext<TestableStartup<CustomRouteDbContext>, CustomRouteDbContext> testContext)
+    [Fact]
+    public async Task Can_get_resource_at_custom_route()
+    {
+        // Arrange
+        Town town = _fakers.Town.Generate();
+        town.Civilians = _fakers.Civilian.Generate(1).ToHashSet();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            _testContext = testContext;
+            dbContext.Towns.Add(town);
+            await dbContext.SaveChangesAsync();
+        });
 
-            testContext.UseController<CiviliansController>();
-            testContext.UseController<TownsController>();
-        }
+        string route = $"/world-api/civilization/popular/towns/{town.StringId}";
 
-        [Fact]
-        public async Task Can_get_resource_at_custom_route()
-        {
-            // Arrange
-            Town town = _fakers.Town.Generate();
-            town.Civilians = _fakers.Civilian.Generate(1).ToHashSet();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Towns.Add(town);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/world-api/civilization/popular/towns/{town.StringId}";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("towns");
-            responseDocument.Data.SingleValue.Id.Should().Be(town.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(town.Name));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("latitude").With(value => value.Should().Be(town.Latitude));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("longitude").With(value => value.Should().Be(town.Longitude));
-
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("civilians").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{HostPrefix}{route}/relationships/civilians");
-                value.Links.Related.Should().Be($"{HostPrefix}{route}/civilians");
-            });
-
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-        }
-
-        [Fact]
-        public async Task Can_get_resources_at_custom_action_method()
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("towns");
+        responseDocument.Data.SingleValue.Id.Should().Be(town.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(town.Name));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("latitude").With(value => value.Should().Be(town.Latitude));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("longitude").With(value => value.Should().Be(town.Longitude));
+
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("civilians").With(value =>
         {
-            // Arrange
-            List<Town> town = _fakers.Town.Generate(7);
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{HostPrefix}{route}/relationships/civilians");
+            value.Links.Related.Should().Be($"{HostPrefix}{route}/civilians");
+        });
+
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Town>();
-                dbContext.Towns.AddRange(town);
-                await dbContext.SaveChangesAsync();
-            });
+    [Fact]
+    public async Task Can_get_resources_at_custom_action_method()
+    {
+        // Arrange
+        List<Town> town = _fakers.Town.Generate(7);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Town>();
+            dbContext.Towns.AddRange(town);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/world-api/civilization/popular/towns/largest-5";
+        const string route = "/world-api/civilization/popular/towns/largest-5";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(5);
-            responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Type == "towns");
-            responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Attributes.ShouldNotBeNull().Any());
-            responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Relationships.ShouldNotBeNull().Any());
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(5);
+        responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Type == "towns");
+        responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Attributes.ShouldNotBeNull().Any());
+        responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Relationships.ShouldNotBeNull().Any());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Town.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Town.cs
index ca893947a6..bbb7e6909a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Town.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/Town.cs
@@ -1,23 +1,22 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes
+namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes")]
+public sealed class Town : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Town : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [Attr]
-        public double Latitude { get; set; }
+    [Attr]
+    public double Latitude { get; set; }
 
-        [Attr]
-        public double Longitude { get; set; }
+    [Attr]
+    public double Longitude { get; set; }
 
-        [HasMany]
-        public ISet<Civilian> Civilians { get; set; } = new HashSet<Civilian>();
-    }
+    [HasMany]
+    public ISet<Civilian> Civilians { get; set; } = new HashSet<Civilian>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs
index 79b9cbc63b..e3fab1ff3c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/TownsController.cs
@@ -1,37 +1,38 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Controllers.Annotations;
 using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes
+namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
+
+// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
+public partial class TownsController
 {
-    [DisableRoutingConvention]
-    [Route("world-api/civilization/popular/towns")]
-    public sealed class TownsController : JsonApiController<Town, int>
-    {
-        private readonly CustomRouteDbContext _dbContext;
+}
+
+[DisableRoutingConvention]
+[Route("world-api/civilization/popular/towns")]
+partial class TownsController
+{
+    private readonly CustomRouteDbContext _dbContext;
 
-        public TownsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<Town, int> resourceService,
-            CustomRouteDbContext dbContext)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-            _dbContext = dbContext;
-        }
+    [ActivatorUtilitiesConstructor]
+    public TownsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<Town, int> resourceService,
+        CustomRouteDbContext dbContext)
+        : base(options, resourceGraph, loggerFactory, resourceService)
+    {
+        _dbContext = dbContext;
+    }
 
-        [HttpGet("largest-{count}")]
-        public async Task<IActionResult> GetLargestTownsAsync(int count, CancellationToken cancellationToken)
-        {
-            IQueryable<Town> query = _dbContext.Towns.OrderByDescending(town => town.Civilians.Count).Take(count);
+    [HttpGet("largest-{count}")]
+    public async Task<IActionResult> GetLargestTownsAsync(int count, CancellationToken cancellationToken)
+    {
+        IQueryable<Town> query = _dbContext.Towns.OrderByDescending(town => town.Civilians.Count).Take(count);
 
-            List<Town> results = await query.ToListAsync(cancellationToken);
-            return Ok(results);
-        }
+        List<Town> results = await query.ToListAsync(cancellationToken);
+        return Ok(results);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Building.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Building.cs
index eb4a3d2fc7..ea3805cb22 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Building.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Building.cs
@@ -1,66 +1,65 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
+namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.EagerLoading")]
+public sealed class Building : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Building : Identifiable<int>
-    {
-        private string? _tempPrimaryDoorColor;
+    private string? _tempPrimaryDoorColor;
 
-        [Attr]
-        public string Number { get; set; } = null!;
+    [Attr]
+    public string Number { get; set; } = null!;
 
-        [NotMapped]
-        [Attr]
-        public int WindowCount => Windows.Count;
+    [NotMapped]
+    [Attr]
+    public int WindowCount => Windows.Count;
 
-        [NotMapped]
-        [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
-        public string PrimaryDoorColor
+    [NotMapped]
+    [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
+    public string PrimaryDoorColor
+    {
+        get
         {
-            get
+            if (_tempPrimaryDoorColor == null && PrimaryDoor == null)
             {
-                if (_tempPrimaryDoorColor == null && PrimaryDoor == null)
-                {
-                    // The ASP.NET model validator reads the value of this required property, to ensure it is not null.
-                    // When creating a resource, BuildingDefinition ensures a value is assigned. But when updating a resource
-                    // and PrimaryDoorColor is explicitly set to null in the request body and ModelState validation is enabled,
-                    // we want it to produce a validation error, so return null here.
-                    return null!;
-                }
+                // The ASP.NET model validator reads the value of this required property, to ensure it is not null.
+                // When creating a resource, BuildingDefinition ensures a value is assigned. But when updating a resource
+                // and PrimaryDoorColor is explicitly set to null in the request body and ModelState validation is enabled,
+                // we want it to produce a validation error, so return null here.
+                return null!;
+            }
 
-                return _tempPrimaryDoorColor ?? PrimaryDoor!.Color;
+            return _tempPrimaryDoorColor ?? PrimaryDoor!.Color;
+        }
+        set
+        {
+            if (PrimaryDoor == null)
+            {
+                // A request body is being deserialized. At this time, related entities have not been loaded yet.
+                // We cache the assigned value in a private field, so it can be used later.
+                _tempPrimaryDoorColor = value;
             }
-            set
+            else
             {
-                if (PrimaryDoor == null)
-                {
-                    // A request body is being deserialized. At this time, related entities have not been loaded yet.
-                    // We cache the assigned value in a private field, so it can be used later.
-                    _tempPrimaryDoorColor = value;
-                }
-                else
-                {
-                    PrimaryDoor.Color = value;
-                }
+                PrimaryDoor.Color = value;
             }
         }
+    }
 
-        [NotMapped]
-        [Attr(Capabilities = AttrCapabilities.AllowView)]
-        public string? SecondaryDoorColor => SecondaryDoor?.Color;
+    [NotMapped]
+    [Attr(Capabilities = AttrCapabilities.AllowView)]
+    public string? SecondaryDoorColor => SecondaryDoor?.Color;
 
-        [EagerLoad]
-        public IList<Window> Windows { get; set; } = new List<Window>();
+    [EagerLoad]
+    public IList<Window> Windows { get; set; } = new List<Window>();
 
-        [EagerLoad]
-        public Door? PrimaryDoor { get; set; }
+    [EagerLoad]
+    public Door? PrimaryDoor { get; set; }
 
-        [EagerLoad]
-        public Door? SecondaryDoor { get; set; }
-    }
+    [EagerLoad]
+    public Door? SecondaryDoor { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingDefinition.cs
index a6fc726a19..a1ebb2c87f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingDefinition.cs
@@ -4,32 +4,31 @@
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
+namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class BuildingDefinition : JsonApiResourceDefinition<Building, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class BuildingDefinition : JsonApiResourceDefinition<Building, int>
-    {
-        private readonly IJsonApiRequest _request;
+    private readonly IJsonApiRequest _request;
 
-        public BuildingDefinition(IResourceGraph resourceGraph, IJsonApiRequest request)
-            : base(resourceGraph)
-        {
-            ArgumentGuard.NotNull(request, nameof(request));
+    public BuildingDefinition(IResourceGraph resourceGraph, IJsonApiRequest request)
+        : base(resourceGraph)
+    {
+        ArgumentGuard.NotNull(request, nameof(request));
 
-            _request = request;
-        }
+        _request = request;
+    }
 
-        public override void OnDeserialize(Building resource)
+    public override void OnDeserialize(Building resource)
+    {
+        if (_request.WriteOperation == WriteOperationKind.CreateResource)
         {
-            if (_request.WriteOperation == WriteOperationKind.CreateResource)
+            // Must ensure that an instance exists for this required relationship,
+            // so that ASP.NET ModelState validation does not produce a validation error.
+            resource.PrimaryDoor = new Door
             {
-                // Must ensure that an instance exists for this required relationship,
-                // so that ASP.NET ModelState validation does not produce a validation error.
-                resource.PrimaryDoor = new Door
-                {
-                    Color = "(unspecified)"
-                };
-            }
+                Color = "(unspecified)"
+            };
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingRepository.cs
index 88a4f6d714..572a7bd3e6 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingRepository.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingRepository.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries;
@@ -8,29 +5,28 @@
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
+namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class BuildingRepository : EntityFrameworkCoreRepository<Building, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class BuildingRepository : EntityFrameworkCoreRepository<Building, int>
+    public BuildingRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
+        IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
+        IResourceDefinitionAccessor resourceDefinitionAccessor)
+        : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
     {
-        public BuildingRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
-            IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
-        {
-        }
+    }
 
-        public override async Task<Building> GetForCreateAsync(int id, CancellationToken cancellationToken)
-        {
-            Building building = await base.GetForCreateAsync(id, cancellationToken);
+    public override async Task<Building> GetForCreateAsync(int id, CancellationToken cancellationToken)
+    {
+        Building building = await base.GetForCreateAsync(id, cancellationToken);
 
-            // Must ensure that an instance exists for this required relationship, so that POST Resource succeeds.
-            building.PrimaryDoor = new Door
-            {
-                Color = "(unspecified)"
-            };
+        // Must ensure that an instance exists for this required relationship, so that POST Resource succeeds.
+        building.PrimaryDoor = new Door
+        {
+            Color = "(unspecified)"
+        };
 
-            return building;
-        }
+        return building;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingsController.cs
deleted file mode 100644
index f26107ba89..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/BuildingsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
-{
-    public sealed class BuildingsController : JsonApiController<Building, int>
-    {
-        public BuildingsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Building, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs
index ce9788abb7..fea280724b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/City.cs
@@ -1,17 +1,15 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
+namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class City : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class City : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [HasMany]
-        public IList<Street> Streets { get; set; } = new List<Street>();
-    }
+    [HasMany]
+    public IList<Street> Streets { get; set; } = new List<Street>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Door.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Door.cs
index c42235ea23..1e60b1bd71 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Door.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Door.cs
@@ -1,11 +1,12 @@
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
+namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[NoResource]
+public sealed class Door
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Door
-    {
-        public int Id { get; set; }
-        public string Color { get; set; } = null!;
-    }
+    public int Id { get; set; }
+    public string Color { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingDbContext.cs
index aec0207c25..01f81cd319 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingDbContext.cs
@@ -3,36 +3,35 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
+namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class EagerLoadingDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class EagerLoadingDbContext : DbContext
-    {
-        public DbSet<State> States => Set<State>();
-        public DbSet<Street> Streets => Set<Street>();
-        public DbSet<Building> Buildings => Set<Building>();
-        public DbSet<Door> Doors => Set<Door>();
+    public DbSet<State> States => Set<State>();
+    public DbSet<Street> Streets => Set<Street>();
+    public DbSet<Building> Buildings => Set<Building>();
+    public DbSet<Door> Doors => Set<Door>();
 
-        public EagerLoadingDbContext(DbContextOptions<EagerLoadingDbContext> options)
-            : base(options)
-        {
-        }
+    public EagerLoadingDbContext(DbContextOptions<EagerLoadingDbContext> options)
+        : base(options)
+    {
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<Building>()
-                .HasOne(building => building.PrimaryDoor)
-                .WithOne()
-                .HasForeignKey<Building>("PrimaryDoorId")
-                // The PrimaryDoor relationship property is declared as nullable, because the Door type is not publicly exposed,
-                // so we don't want ModelState validation to fail when it isn't provided by the client. But because
-                // BuildingRepository ensures a value is assigned on Create, we can make it a required relationship in the database.
-                .IsRequired();
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<Building>()
+            .HasOne(building => building.PrimaryDoor)
+            .WithOne()
+            .HasForeignKey<Building>("PrimaryDoorId")
+            // The PrimaryDoor relationship property is declared as nullable, because the Door type is not publicly exposed,
+            // so we don't want ModelState validation to fail when it isn't provided by the client. But because
+            // BuildingRepository ensures a value is assigned on Create, we can make it a required relationship in the database.
+            .IsRequired();
 
-            builder.Entity<Building>()
-                .HasOne(building => building.SecondaryDoor)
-                .WithOne()
-                .HasForeignKey<Building>("SecondaryDoorId");
-        }
+        builder.Entity<Building>()
+            .HasOne(building => building.SecondaryDoor)
+            .WithOne()
+            .HasForeignKey<Building>("SecondaryDoorId");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingFakers.cs
index 608ae1c034..0ac7eb6804 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingFakers.cs
@@ -1,50 +1,48 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
+namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
+
+internal sealed class EagerLoadingFakers : FakerContainer
 {
-    internal sealed class EagerLoadingFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<State>> _lazyStateFaker = new(() =>
-            new Faker<State>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(state => state.Name, faker => faker.Address.City()));
-
-        private readonly Lazy<Faker<City>> _lazyCityFaker = new(() =>
-            new Faker<City>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(city => city.Name, faker => faker.Address.City()));
-
-        private readonly Lazy<Faker<Street>> _lazyStreetFaker = new(() =>
-            new Faker<Street>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(street => street.Name, faker => faker.Address.StreetName()));
-
-        private readonly Lazy<Faker<Building>> _lazyBuildingFaker = new(() =>
-            new Faker<Building>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(building => building.Number, faker => faker.Address.BuildingNumber()));
-
-        private readonly Lazy<Faker<Window>> _lazyWindowFaker = new(() =>
-            new Faker<Window>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(window => window.HeightInCentimeters, faker => faker.Random.Number(30, 199))
-                .RuleFor(window => window.WidthInCentimeters, faker => faker.Random.Number(30, 199)));
-
-        private readonly Lazy<Faker<Door>> _lazyDoorFaker = new(() =>
-            new Faker<Door>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(door => door.Color, faker => faker.Commerce.Color()));
-
-        public Faker<State> State => _lazyStateFaker.Value;
-        public Faker<City> City => _lazyCityFaker.Value;
-        public Faker<Street> Street => _lazyStreetFaker.Value;
-        public Faker<Building> Building => _lazyBuildingFaker.Value;
-        public Faker<Window> Window => _lazyWindowFaker.Value;
-        public Faker<Door> Door => _lazyDoorFaker.Value;
-    }
+    private readonly Lazy<Faker<State>> _lazyStateFaker = new(() =>
+        new Faker<State>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(state => state.Name, faker => faker.Address.City()));
+
+    private readonly Lazy<Faker<City>> _lazyCityFaker = new(() =>
+        new Faker<City>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(city => city.Name, faker => faker.Address.City()));
+
+    private readonly Lazy<Faker<Street>> _lazyStreetFaker = new(() =>
+        new Faker<Street>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(street => street.Name, faker => faker.Address.StreetName()));
+
+    private readonly Lazy<Faker<Building>> _lazyBuildingFaker = new(() =>
+        new Faker<Building>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(building => building.Number, faker => faker.Address.BuildingNumber()));
+
+    private readonly Lazy<Faker<Window>> _lazyWindowFaker = new(() =>
+        new Faker<Window>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(window => window.HeightInCentimeters, faker => faker.Random.Number(30, 199))
+            .RuleFor(window => window.WidthInCentimeters, faker => faker.Random.Number(30, 199)));
+
+    private readonly Lazy<Faker<Door>> _lazyDoorFaker = new(() =>
+        new Faker<Door>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(door => door.Color, faker => faker.Commerce.Color()));
+
+    public Faker<State> State => _lazyStateFaker.Value;
+    public Faker<City> City => _lazyCityFaker.Value;
+    public Faker<Street> Street => _lazyStreetFaker.Value;
+    public Faker<Building> Building => _lazyBuildingFaker.Value;
+    public Faker<Window> Window => _lazyWindowFaker.Value;
+    public Faker<Door> Door => _lazyDoorFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingTests.cs
index b0c22d0bff..e12167ad3a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingTests.cs
@@ -1,6 +1,4 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -8,403 +6,402 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
+namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
+
+public sealed class EagerLoadingTests : IClassFixture<IntegrationTestContext<TestableStartup<EagerLoadingDbContext>, EagerLoadingDbContext>>
 {
-    public sealed class EagerLoadingTests : IClassFixture<IntegrationTestContext<TestableStartup<EagerLoadingDbContext>, EagerLoadingDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<EagerLoadingDbContext>, EagerLoadingDbContext> _testContext;
+    private readonly EagerLoadingFakers _fakers = new();
+
+    public EagerLoadingTests(IntegrationTestContext<TestableStartup<EagerLoadingDbContext>, EagerLoadingDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<EagerLoadingDbContext>, EagerLoadingDbContext> _testContext;
-        private readonly EagerLoadingFakers _fakers = new();
+        _testContext = testContext;
 
-        public EagerLoadingTests(IntegrationTestContext<TestableStartup<EagerLoadingDbContext>, EagerLoadingDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<StreetsController>();
+        testContext.UseController<StatesController>();
+        testContext.UseController<BuildingsController>();
 
-            testContext.UseController<StreetsController>();
-            testContext.UseController<StatesController>();
-            testContext.UseController<BuildingsController>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<BuildingDefinition>();
+            services.AddResourceRepository<BuildingRepository>();
+        });
+    }
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<BuildingDefinition>();
-                services.AddResourceRepository<BuildingRepository>();
-            });
-        }
+    [Fact]
+    public async Task Can_get_primary_resource_with_eager_loads()
+    {
+        // Arrange
+        Building building = _fakers.Building.Generate();
+        building.Windows = _fakers.Window.Generate(4);
+        building.PrimaryDoor = _fakers.Door.Generate();
+        building.SecondaryDoor = _fakers.Door.Generate();
 
-        [Fact]
-        public async Task Can_get_primary_resource_with_eager_loads()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Building building = _fakers.Building.Generate();
-            building.Windows = _fakers.Window.Generate(4);
-            building.PrimaryDoor = _fakers.Door.Generate();
-            building.SecondaryDoor = _fakers.Door.Generate();
+            dbContext.Buildings.Add(building);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Buildings.Add(building);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/buildings/{building.StringId}";
 
-            string route = $"/buildings/{building.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(building.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("number").With(value => value.Should().Be(building.Number));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("windowCount").With(value => value.Should().Be(4));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("primaryDoorColor").With(value => value.Should().Be(building.PrimaryDoor.Color));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("secondaryDoorColor").With(value => value.Should().Be(building.SecondaryDoor.Color));
+    }
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(building.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("number").With(value => value.Should().Be(building.Number));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("windowCount").With(value => value.Should().Be(4));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("primaryDoorColor").With(value => value.Should().Be(building.PrimaryDoor.Color));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("secondaryDoorColor").With(value => value.Should().Be(building.SecondaryDoor.Color));
-        }
+    [Fact]
+    public async Task Can_get_primary_resource_with_nested_eager_loads()
+    {
+        // Arrange
+        Street street = _fakers.Street.Generate();
+        street.Buildings = _fakers.Building.Generate(2);
 
-        [Fact]
-        public async Task Can_get_primary_resource_with_nested_eager_loads()
-        {
-            // Arrange
-            Street street = _fakers.Street.Generate();
-            street.Buildings = _fakers.Building.Generate(2);
+        street.Buildings[0].Windows = _fakers.Window.Generate(2);
+        street.Buildings[0].PrimaryDoor = _fakers.Door.Generate();
 
-            street.Buildings[0].Windows = _fakers.Window.Generate(2);
-            street.Buildings[0].PrimaryDoor = _fakers.Door.Generate();
+        street.Buildings[1].Windows = _fakers.Window.Generate(3);
+        street.Buildings[1].PrimaryDoor = _fakers.Door.Generate();
+        street.Buildings[1].SecondaryDoor = _fakers.Door.Generate();
 
-            street.Buildings[1].Windows = _fakers.Window.Generate(3);
-            street.Buildings[1].PrimaryDoor = _fakers.Door.Generate();
-            street.Buildings[1].SecondaryDoor = _fakers.Door.Generate();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Streets.Add(street);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Streets.Add(street);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/streets/{street.StringId}";
 
-            string route = $"/streets/{street.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(street.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(street.Name));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("buildingCount").With(value => value.Should().Be(2));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("doorTotalCount").With(value => value.Should().Be(3));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("windowTotalCount").With(value => value.Should().Be(5));
+    }
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(street.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(street.Name));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("buildingCount").With(value => value.Should().Be(2));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("doorTotalCount").With(value => value.Should().Be(3));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("windowTotalCount").With(value => value.Should().Be(5));
-        }
+    [Fact]
+    public async Task Can_get_primary_resource_with_fieldset()
+    {
+        // Arrange
+        Street street = _fakers.Street.Generate();
+        street.Buildings = _fakers.Building.Generate(1);
+        street.Buildings[0].Windows = _fakers.Window.Generate(3);
+        street.Buildings[0].PrimaryDoor = _fakers.Door.Generate();
 
-        [Fact]
-        public async Task Can_get_primary_resource_with_fieldset()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Street street = _fakers.Street.Generate();
-            street.Buildings = _fakers.Building.Generate(1);
-            street.Buildings[0].Windows = _fakers.Window.Generate(3);
-            street.Buildings[0].PrimaryDoor = _fakers.Door.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Streets.Add(street);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Streets.Add(street);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/streets/{street.StringId}?fields[streets]=windowTotalCount";
+        string route = $"/streets/{street.StringId}?fields[streets]=windowTotalCount";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(street.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("windowTotalCount").With(value => value.Should().Be(3));
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(street.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("windowTotalCount").With(value => value.Should().Be(3));
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Can_get_primary_resource_with_includes()
+    [Fact]
+    public async Task Can_get_primary_resource_with_includes()
+    {
+        // Arrange
+        State state = _fakers.State.Generate();
+        state.Cities = _fakers.City.Generate(1);
+        state.Cities[0].Streets = _fakers.Street.Generate(1);
+        state.Cities[0].Streets[0].Buildings = _fakers.Building.Generate(1);
+        state.Cities[0].Streets[0].Buildings[0].PrimaryDoor = _fakers.Door.Generate();
+        state.Cities[0].Streets[0].Buildings[0].Windows = _fakers.Window.Generate(3);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            State state = _fakers.State.Generate();
-            state.Cities = _fakers.City.Generate(1);
-            state.Cities[0].Streets = _fakers.Street.Generate(1);
-            state.Cities[0].Streets[0].Buildings = _fakers.Building.Generate(1);
-            state.Cities[0].Streets[0].Buildings[0].PrimaryDoor = _fakers.Door.Generate();
-            state.Cities[0].Streets[0].Buildings[0].Windows = _fakers.Window.Generate(3);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.States.Add(state);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.States.Add(state);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/states/{state.StringId}?include=cities.streets";
+        string route = $"/states/{state.StringId}?include=cities.streets";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(state.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(state.Name));
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(state.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(state.Name));
 
-            responseDocument.Included.ShouldHaveCount(2);
+        responseDocument.Included.ShouldHaveCount(2);
 
-            responseDocument.Included[0].Type.Should().Be("cities");
-            responseDocument.Included[0].Id.Should().Be(state.Cities[0].StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("name").With(value => value.Should().Be(state.Cities[0].Name));
+        responseDocument.Included[0].Type.Should().Be("cities");
+        responseDocument.Included[0].Id.Should().Be(state.Cities[0].StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("name").With(value => value.Should().Be(state.Cities[0].Name));
 
-            responseDocument.Included[1].Type.Should().Be("streets");
-            responseDocument.Included[1].Id.Should().Be(state.Cities[0].Streets[0].StringId);
-            responseDocument.Included[1].Attributes.ShouldContainKey("buildingCount").With(value => value.Should().Be(1));
-            responseDocument.Included[1].Attributes.ShouldContainKey("doorTotalCount").With(value => value.Should().Be(1));
-            responseDocument.Included[1].Attributes.ShouldContainKey("windowTotalCount").With(value => value.Should().Be(3));
-        }
+        responseDocument.Included[1].Type.Should().Be("streets");
+        responseDocument.Included[1].Id.Should().Be(state.Cities[0].Streets[0].StringId);
+        responseDocument.Included[1].Attributes.ShouldContainKey("buildingCount").With(value => value.Should().Be(1));
+        responseDocument.Included[1].Attributes.ShouldContainKey("doorTotalCount").With(value => value.Should().Be(1));
+        responseDocument.Included[1].Attributes.ShouldContainKey("windowTotalCount").With(value => value.Should().Be(3));
+    }
 
-        [Fact]
-        public async Task Can_get_secondary_resources_with_include_and_fieldsets()
-        {
-            // Arrange
-            State state = _fakers.State.Generate();
-            state.Cities = _fakers.City.Generate(1);
-            state.Cities[0].Streets = _fakers.Street.Generate(1);
-            state.Cities[0].Streets[0].Buildings = _fakers.Building.Generate(1);
-            state.Cities[0].Streets[0].Buildings[0].PrimaryDoor = _fakers.Door.Generate();
-            state.Cities[0].Streets[0].Buildings[0].SecondaryDoor = _fakers.Door.Generate();
-            state.Cities[0].Streets[0].Buildings[0].Windows = _fakers.Window.Generate(1);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.States.Add(state);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/states/{state.StringId}/cities?include=streets&fields[cities]=name&fields[streets]=doorTotalCount,windowTotalCount";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(state.Cities[0].StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("name").With(value => value.Should().Be(state.Cities[0].Name));
-            responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
-
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("streets");
-            responseDocument.Included[0].Id.Should().Be(state.Cities[0].Streets[0].StringId);
-            responseDocument.Included[0].Attributes.ShouldHaveCount(2);
-            responseDocument.Included[0].Attributes.ShouldContainKey("doorTotalCount").With(value => value.Should().Be(2));
-            responseDocument.Included[0].Attributes.ShouldContainKey("windowTotalCount").With(value => value.Should().Be(1));
-            responseDocument.Included[0].Relationships.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Can_create_resource()
+    [Fact]
+    public async Task Can_get_secondary_resources_with_include_and_fieldsets()
+    {
+        // Arrange
+        State state = _fakers.State.Generate();
+        state.Cities = _fakers.City.Generate(1);
+        state.Cities[0].Streets = _fakers.Street.Generate(1);
+        state.Cities[0].Streets[0].Buildings = _fakers.Building.Generate(1);
+        state.Cities[0].Streets[0].Buildings[0].PrimaryDoor = _fakers.Door.Generate();
+        state.Cities[0].Streets[0].Buildings[0].SecondaryDoor = _fakers.Door.Generate();
+        state.Cities[0].Streets[0].Buildings[0].Windows = _fakers.Window.Generate(1);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Building newBuilding = _fakers.Building.Generate();
+            dbContext.States.Add(state);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/states/{state.StringId}/cities?include=streets&fields[cities]=name&fields[streets]=doorTotalCount,windowTotalCount";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(state.Cities[0].StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("name").With(value => value.Should().Be(state.Cities[0].Name));
+        responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("streets");
+        responseDocument.Included[0].Id.Should().Be(state.Cities[0].Streets[0].StringId);
+        responseDocument.Included[0].Attributes.ShouldHaveCount(2);
+        responseDocument.Included[0].Attributes.ShouldContainKey("doorTotalCount").With(value => value.Should().Be(2));
+        responseDocument.Included[0].Attributes.ShouldContainKey("windowTotalCount").With(value => value.Should().Be(1));
+        responseDocument.Included[0].Relationships.Should().BeNull();
+    }
 
-            var requestBody = new
+    [Fact]
+    public async Task Can_create_resource()
+    {
+        // Arrange
+        Building newBuilding = _fakers.Building.Generate();
+
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "buildings",
+                attributes = new
                 {
-                    type = "buildings",
-                    attributes = new
-                    {
-                        number = newBuilding.Number
-                    }
+                    number = newBuilding.Number
                 }
-            };
+            }
+        };
 
-            const string route = "/buildings";
+        const string route = "/buildings";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("number").With(value => value.Should().Be(newBuilding.Number));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("windowCount").With(value => value.Should().Be(0));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("primaryDoorColor").With(value => value.Should().Be("(unspecified)"));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("secondaryDoorColor").With(value => value.Should().BeNull());
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("number").With(value => value.Should().Be(newBuilding.Number));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("windowCount").With(value => value.Should().Be(0));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("primaryDoorColor").With(value => value.Should().Be("(unspecified)"));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("secondaryDoorColor").With(value => value.Should().BeNull());
 
-            int newBuildingId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newBuildingId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
-
-                Building? buildingInDatabase = await dbContext.Buildings
-                    .Include(building => building.PrimaryDoor)
-                    .Include(building => building.SecondaryDoor)
-                    .Include(building => building.Windows)
-                    .FirstWithIdOrDefaultAsync(newBuildingId);
-
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
-
-                buildingInDatabase.ShouldNotBeNull();
-                buildingInDatabase.Number.Should().Be(newBuilding.Number);
-                buildingInDatabase.PrimaryDoor.ShouldNotBeNull();
-                buildingInDatabase.PrimaryDoor.Color.Should().Be("(unspecified)");
-                buildingInDatabase.SecondaryDoor.Should().BeNull();
-                buildingInDatabase.Windows.Should().BeEmpty();
-            });
-        }
-
-        [Fact]
-        public async Task Can_update_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Building existingBuilding = _fakers.Building.Generate();
-            existingBuilding.PrimaryDoor = _fakers.Door.Generate();
-            existingBuilding.SecondaryDoor = _fakers.Door.Generate();
-            existingBuilding.Windows = _fakers.Window.Generate(2);
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
+
+            Building? buildingInDatabase = await dbContext.Buildings
+                .Include(building => building.PrimaryDoor)
+                .Include(building => building.SecondaryDoor)
+                .Include(building => building.Windows)
+                .FirstWithIdOrDefaultAsync(newBuildingId);
+
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
+
+            buildingInDatabase.ShouldNotBeNull();
+            buildingInDatabase.Number.Should().Be(newBuilding.Number);
+            buildingInDatabase.PrimaryDoor.ShouldNotBeNull();
+            buildingInDatabase.PrimaryDoor.Color.Should().Be("(unspecified)");
+            buildingInDatabase.SecondaryDoor.Should().BeNull();
+            buildingInDatabase.Windows.Should().BeEmpty();
+        });
+    }
+
+    [Fact]
+    public async Task Can_update_resource()
+    {
+        // Arrange
+        Building existingBuilding = _fakers.Building.Generate();
+        existingBuilding.PrimaryDoor = _fakers.Door.Generate();
+        existingBuilding.SecondaryDoor = _fakers.Door.Generate();
+        existingBuilding.Windows = _fakers.Window.Generate(2);
 
-            string newBuildingNumber = _fakers.Building.Generate().Number;
-            string newPrimaryDoorColor = _fakers.Door.Generate().Color;
+        string newBuildingNumber = _fakers.Building.Generate().Number;
+        string newPrimaryDoorColor = _fakers.Door.Generate().Color;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Buildings.Add(existingBuilding);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Buildings.Add(existingBuilding);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "buildings",
+                id = existingBuilding.StringId,
+                attributes = new
                 {
-                    type = "buildings",
-                    id = existingBuilding.StringId,
-                    attributes = new
-                    {
-                        number = newBuildingNumber,
-                        primaryDoorColor = newPrimaryDoorColor
-                    }
+                    number = newBuildingNumber,
+                    primaryDoorColor = newPrimaryDoorColor
                 }
-            };
+            }
+        };
 
-            string route = $"/buildings/{existingBuilding.StringId}";
+        string route = $"/buildings/{existingBuilding.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
-
-                Building? buildingInDatabase = await dbContext.Buildings
-                    .Include(building => building.PrimaryDoor)
-                    .Include(building => building.SecondaryDoor)
-                    .Include(building => building.Windows)
-                    .FirstWithIdOrDefaultAsync(existingBuilding.Id);
-
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
-
-                buildingInDatabase.ShouldNotBeNull();
-                buildingInDatabase.Number.Should().Be(newBuildingNumber);
-                buildingInDatabase.PrimaryDoor.ShouldNotBeNull();
-                buildingInDatabase.PrimaryDoor.Color.Should().Be(newPrimaryDoorColor);
-                buildingInDatabase.SecondaryDoor.ShouldNotBeNull();
-                buildingInDatabase.Windows.ShouldHaveCount(2);
-            });
-        }
-
-        [Fact]
-        public async Task Cannot_update_resource_when_primaryDoorColor_is_set_to_null()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Building existingBuilding = _fakers.Building.Generate();
-            existingBuilding.PrimaryDoor = _fakers.Door.Generate();
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
+
+            Building? buildingInDatabase = await dbContext.Buildings
+                .Include(building => building.PrimaryDoor)
+                .Include(building => building.SecondaryDoor)
+                .Include(building => building.Windows)
+                .FirstWithIdOrDefaultAsync(existingBuilding.Id);
+
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
+
+            buildingInDatabase.ShouldNotBeNull();
+            buildingInDatabase.Number.Should().Be(newBuildingNumber);
+            buildingInDatabase.PrimaryDoor.ShouldNotBeNull();
+            buildingInDatabase.PrimaryDoor.Color.Should().Be(newPrimaryDoorColor);
+            buildingInDatabase.SecondaryDoor.ShouldNotBeNull();
+            buildingInDatabase.Windows.ShouldHaveCount(2);
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Buildings.Add(existingBuilding);
-                await dbContext.SaveChangesAsync();
-            });
+    [Fact]
+    public async Task Cannot_update_resource_when_primaryDoorColor_is_set_to_null()
+    {
+        // Arrange
+        Building existingBuilding = _fakers.Building.Generate();
+        existingBuilding.PrimaryDoor = _fakers.Door.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Buildings.Add(existingBuilding);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "buildings",
+                id = existingBuilding.StringId,
+                attributes = new
                 {
-                    type = "buildings",
-                    id = existingBuilding.StringId,
-                    attributes = new
-                    {
-                        primaryDoorColor = (string?)null
-                    }
+                    primaryDoorColor = (string?)null
                 }
-            };
+            }
+        };
+
+        string route = $"/buildings/{existingBuilding.StringId}";
 
-            string route = $"/buildings/{existingBuilding.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Input validation failed.");
+        error.Detail.Should().Be("The PrimaryDoorColor field is required.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/primaryDoorColor");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Input validation failed.");
-            error.Detail.Should().Be("The PrimaryDoorColor field is required.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/primaryDoorColor");
-        }
+    [Fact]
+    public async Task Can_delete_resource()
+    {
+        // Arrange
+        Building existingBuilding = _fakers.Building.Generate();
+        existingBuilding.PrimaryDoor = _fakers.Door.Generate();
 
-        [Fact]
-        public async Task Can_delete_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Building existingBuilding = _fakers.Building.Generate();
-            existingBuilding.PrimaryDoor = _fakers.Door.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Buildings.Add(existingBuilding);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Buildings.Add(existingBuilding);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/buildings/{existingBuilding.StringId}";
+        string route = $"/buildings/{existingBuilding.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Building? buildingInDatabase = await dbContext.Buildings.FirstWithIdOrDefaultAsync(existingBuilding.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Building? buildingInDatabase = await dbContext.Buildings.FirstWithIdOrDefaultAsync(existingBuilding.Id);
 
-                buildingInDatabase.Should().BeNull();
-            });
-        }
+            buildingInDatabase.Should().BeNull();
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/State.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/State.cs
index e15f5e2ee2..6f41815618 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/State.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/State.cs
@@ -1,17 +1,16 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
+namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.EagerLoading")]
+public sealed class State : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class State : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [HasMany]
-        public IList<City> Cities { get; set; } = new List<City>();
-    }
+    [HasMany]
+    public IList<City> Cities { get; set; } = new List<City>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StatesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StatesController.cs
deleted file mode 100644
index 5e792adefd..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StatesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
-{
-    public sealed class StatesController : JsonApiController<State, int>
-    {
-        public StatesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<State, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Street.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Street.cs
index d6aa1a97e3..db440ad85d 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Street.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Street.cs
@@ -1,31 +1,29 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
+namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.EagerLoading")]
+public sealed class Street : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Street : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [NotMapped]
-        [Attr(Capabilities = AttrCapabilities.AllowView)]
-        public int BuildingCount => Buildings.Count;
+    [NotMapped]
+    [Attr(Capabilities = AttrCapabilities.AllowView)]
+    public int BuildingCount => Buildings.Count;
 
-        [NotMapped]
-        [Attr(Capabilities = AttrCapabilities.AllowView)]
-        public int DoorTotalCount => Buildings.Sum(building => building.SecondaryDoor == null ? 1 : 2);
+    [NotMapped]
+    [Attr(Capabilities = AttrCapabilities.AllowView)]
+    public int DoorTotalCount => Buildings.Sum(building => building.SecondaryDoor == null ? 1 : 2);
 
-        [NotMapped]
-        [Attr(Capabilities = AttrCapabilities.AllowView)]
-        public int WindowTotalCount => Buildings.Sum(building => building.WindowCount);
+    [NotMapped]
+    [Attr(Capabilities = AttrCapabilities.AllowView)]
+    public int WindowTotalCount => Buildings.Sum(building => building.WindowCount);
 
-        [EagerLoad]
-        public IList<Building> Buildings { get; set; } = new List<Building>();
-    }
+    [EagerLoad]
+    public IList<Building> Buildings { get; set; } = new List<Building>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StreetsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StreetsController.cs
deleted file mode 100644
index 19aab24dda..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/StreetsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
-{
-    public sealed class StreetsController : JsonApiController<Street, int>
-    {
-        public StreetsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Street, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Window.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Window.cs
index 2e447e5d59..9727327216 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Window.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/Window.cs
@@ -1,12 +1,13 @@
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading
+namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[NoResource]
+public sealed class Window
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Window
-    {
-        public int Id { get; set; }
-        public int HeightInCentimeters { get; set; }
-        public int WidthInCentimeters { get; set; }
-    }
+    public int Id { get; set; }
+    public int HeightInCentimeters { get; set; }
+    public int WidthInCentimeters { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/AlternateExceptionHandler.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/AlternateExceptionHandler.cs
index 46f81275f9..4af459fb71 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/AlternateExceptionHandler.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/AlternateExceptionHandler.cs
@@ -1,40 +1,37 @@
-using System;
-using System.Collections.Generic;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling
+namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling;
+
+public sealed class AlternateExceptionHandler : ExceptionHandler
 {
-    public sealed class AlternateExceptionHandler : ExceptionHandler
+    public AlternateExceptionHandler(ILoggerFactory loggerFactory, IJsonApiOptions options)
+        : base(loggerFactory, options)
     {
-        public AlternateExceptionHandler(ILoggerFactory loggerFactory, IJsonApiOptions options)
-            : base(loggerFactory, options)
-        {
-        }
+    }
 
-        protected override LogLevel GetLogLevel(Exception exception)
+    protected override LogLevel GetLogLevel(Exception exception)
+    {
+        if (exception is ConsumerArticleIsNoLongerAvailableException)
         {
-            if (exception is ConsumerArticleIsNoLongerAvailableException)
-            {
-                return LogLevel.Warning;
-            }
-
-            return base.GetLogLevel(exception);
+            return LogLevel.Warning;
         }
 
-        protected override IReadOnlyList<ErrorObject> CreateErrorResponse(Exception exception)
+        return base.GetLogLevel(exception);
+    }
+
+    protected override IReadOnlyList<ErrorObject> CreateErrorResponse(Exception exception)
+    {
+        if (exception is ConsumerArticleIsNoLongerAvailableException articleException)
         {
-            if (exception is ConsumerArticleIsNoLongerAvailableException articleException)
+            articleException.Errors[0].Meta = new Dictionary<string, object?>
             {
-                articleException.Errors[0].Meta = new Dictionary<string, object?>
-                {
-                    ["Support"] = $"Please contact us for info about similar articles at {articleException.SupportEmailAddress}."
-                };
-            }
-
-            return base.CreateErrorResponse(exception);
+                ["Support"] = $"Please contact us for info about similar articles at {articleException.SupportEmailAddress}."
+            };
         }
+
+        return base.CreateErrorResponse(exception);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticle.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticle.cs
index 4c914b05b5..c508e7aa17 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticle.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticle.cs
@@ -2,12 +2,12 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling
+namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling")]
+public sealed class ConsumerArticle : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ConsumerArticle : Identifiable<int>
-    {
-        [Attr]
-        public string Code { get; set; } = null!;
-    }
+    [Attr]
+    public string Code { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleIsNoLongerAvailableException.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleIsNoLongerAvailableException.cs
index 78260204d7..6c913ac04b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleIsNoLongerAvailableException.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleIsNoLongerAvailableException.cs
@@ -2,20 +2,19 @@
 using JsonApiDotNetCore.Errors;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling
+namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling;
+
+internal sealed class ConsumerArticleIsNoLongerAvailableException : JsonApiException
 {
-    internal sealed class ConsumerArticleIsNoLongerAvailableException : JsonApiException
-    {
-        public string SupportEmailAddress { get; }
+    public string SupportEmailAddress { get; }
 
-        public ConsumerArticleIsNoLongerAvailableException(string articleCode, string supportEmailAddress)
-            : base(new ErrorObject(HttpStatusCode.Gone)
-            {
-                Title = "The requested article is no longer available.",
-                Detail = $"Article with code '{articleCode}' is no longer available."
-            })
+    public ConsumerArticleIsNoLongerAvailableException(string articleCode, string supportEmailAddress)
+        : base(new ErrorObject(HttpStatusCode.Gone)
         {
-            SupportEmailAddress = supportEmailAddress;
-        }
+            Title = "The requested article is no longer available.",
+            Detail = $"Article with code '{articleCode}' is no longer available."
+        })
+    {
+        SupportEmailAddress = supportEmailAddress;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleService.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleService.cs
index ce66e0575f..335bf7e9fb 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleService.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticleService.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -10,32 +7,30 @@
 using JsonApiDotNetCore.Services;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling
+namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class ConsumerArticleService : JsonApiResourceService<ConsumerArticle, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class ConsumerArticleService : JsonApiResourceService<ConsumerArticle, int>
+    private const string SupportEmailAddress = "company@email.com";
+    internal const string UnavailableArticlePrefix = "X";
+
+    public ConsumerArticleService(IResourceRepositoryAccessor repositoryAccessor, IQueryLayerComposer queryLayerComposer, IPaginationContext paginationContext,
+        IJsonApiOptions options, ILoggerFactory loggerFactory, IJsonApiRequest request, IResourceChangeTracker<ConsumerArticle> resourceChangeTracker,
+        IResourceDefinitionAccessor resourceDefinitionAccessor)
+        : base(repositoryAccessor, queryLayerComposer, paginationContext, options, loggerFactory, request, resourceChangeTracker, resourceDefinitionAccessor)
     {
-        private const string SupportEmailAddress = "company@email.com";
-        internal const string UnavailableArticlePrefix = "X";
+    }
 
-        public ConsumerArticleService(IResourceRepositoryAccessor repositoryAccessor, IQueryLayerComposer queryLayerComposer,
-            IPaginationContext paginationContext, IJsonApiOptions options, ILoggerFactory loggerFactory, IJsonApiRequest request,
-            IResourceChangeTracker<ConsumerArticle> resourceChangeTracker, IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(repositoryAccessor, queryLayerComposer, paginationContext, options, loggerFactory, request, resourceChangeTracker,
-                resourceDefinitionAccessor)
-        {
-        }
+    public override async Task<ConsumerArticle> GetAsync(int id, CancellationToken cancellationToken)
+    {
+        ConsumerArticle consumerArticle = await base.GetAsync(id, cancellationToken);
 
-        public override async Task<ConsumerArticle> GetAsync(int id, CancellationToken cancellationToken)
+        if (consumerArticle.Code.StartsWith(UnavailableArticlePrefix, StringComparison.Ordinal))
         {
-            ConsumerArticle consumerArticle = await base.GetAsync(id, cancellationToken);
-
-            if (consumerArticle.Code.StartsWith(UnavailableArticlePrefix, StringComparison.Ordinal))
-            {
-                throw new ConsumerArticleIsNoLongerAvailableException(consumerArticle.Code, SupportEmailAddress);
-            }
-
-            return consumerArticle;
+            throw new ConsumerArticleIsNoLongerAvailableException(consumerArticle.Code, SupportEmailAddress);
         }
+
+        return consumerArticle;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticlesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticlesController.cs
deleted file mode 100644
index c7e13af033..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ConsumerArticlesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling
-{
-    public sealed class ConsumerArticlesController : JsonApiController<ConsumerArticle, int>
-    {
-        public ConsumerArticlesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<ConsumerArticle, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ErrorDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ErrorDbContext.cs
index 70141a7998..141dfc4f71 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ErrorDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ErrorDbContext.cs
@@ -1,17 +1,16 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling
+namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class ErrorDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ErrorDbContext : DbContext
-    {
-        public DbSet<ConsumerArticle> ConsumerArticles => Set<ConsumerArticle>();
-        public DbSet<ThrowingArticle> ThrowingArticles => Set<ThrowingArticle>();
+    public DbSet<ConsumerArticle> ConsumerArticles => Set<ConsumerArticle>();
+    public DbSet<ThrowingArticle> ThrowingArticles => Set<ThrowingArticle>();
 
-        public ErrorDbContext(DbContextOptions<ErrorDbContext> options)
-            : base(options)
-        {
-        }
+    public ErrorDbContext(DbContextOptions<ErrorDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ExceptionHandlerTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ExceptionHandlerTests.cs
index 5622f87280..13f69d94b4 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ExceptionHandlerTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ExceptionHandlerTests.cs
@@ -1,9 +1,5 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -13,169 +9,168 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling
+namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling;
+
+public sealed class ExceptionHandlerTests : IClassFixture<IntegrationTestContext<TestableStartup<ErrorDbContext>, ErrorDbContext>>
 {
-    public sealed class ExceptionHandlerTests : IClassFixture<IntegrationTestContext<TestableStartup<ErrorDbContext>, ErrorDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ErrorDbContext>, ErrorDbContext> _testContext;
+
+    public ExceptionHandlerTests(IntegrationTestContext<TestableStartup<ErrorDbContext>, ErrorDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ErrorDbContext>, ErrorDbContext> _testContext;
+        _testContext = testContext;
 
-        public ExceptionHandlerTests(IntegrationTestContext<TestableStartup<ErrorDbContext>, ErrorDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<ThrowingArticlesController>();
+        testContext.UseController<ConsumerArticlesController>();
 
-            testContext.UseController<ThrowingArticlesController>();
-            testContext.UseController<ConsumerArticlesController>();
+        var loggerFactory = new FakeLoggerFactory(LogLevel.Warning);
 
-            var loggerFactory = new FakeLoggerFactory(LogLevel.Warning);
+        testContext.ConfigureLogging(options =>
+        {
+            options.ClearProviders();
+            options.AddProvider(loggerFactory);
+        });
 
-            testContext.ConfigureLogging(options =>
-            {
-                options.ClearProviders();
-                options.AddProvider(loggerFactory);
-            });
+        testContext.ConfigureServicesBeforeStartup(services =>
+        {
+            services.AddSingleton(loggerFactory);
+        });
 
-            testContext.ConfigureServicesBeforeStartup(services =>
-            {
-                services.AddSingleton(loggerFactory);
-            });
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceService<ConsumerArticleService>();
+            services.AddScoped<IExceptionHandler, AlternateExceptionHandler>();
+        });
+    }
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceService<ConsumerArticleService>();
-                services.AddScoped<IExceptionHandler, AlternateExceptionHandler>();
-            });
-        }
+    [Fact]
+    public async Task Logs_and_produces_error_response_for_custom_exception()
+    {
+        // Arrange
+        var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
+        loggerFactory.Logger.Clear();
 
-        [Fact]
-        public async Task Logs_and_produces_error_response_for_custom_exception()
+        var consumerArticle = new ConsumerArticle
         {
-            // Arrange
-            var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
-            loggerFactory.Logger.Clear();
-
-            var consumerArticle = new ConsumerArticle
-            {
-                Code = $"{ConsumerArticleService.UnavailableArticlePrefix}123"
-            };
+            Code = $"{ConsumerArticleService.UnavailableArticlePrefix}123"
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.ConsumerArticles.Add(consumerArticle);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.ConsumerArticles.Add(consumerArticle);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/consumerArticles/{consumerArticle.StringId}";
+        string route = $"/consumerArticles/{consumerArticle.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Gone);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Gone);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Gone);
-            error.Title.Should().Be("The requested article is no longer available.");
-            error.Detail.Should().Be("Article with code 'X123' is no longer available.");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Gone);
+        error.Title.Should().Be("The requested article is no longer available.");
+        error.Detail.Should().Be("Article with code 'X123' is no longer available.");
 
-            error.Meta.ShouldContainKey("support").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetString().Should().Be("Please contact us for info about similar articles at company@email.com.");
-            });
+        error.Meta.ShouldContainKey("support").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetString().Should().Be("Please contact us for info about similar articles at company@email.com.");
+        });
 
-            responseDocument.Meta.Should().BeNull();
+        responseDocument.Meta.Should().BeNull();
 
-            loggerFactory.Logger.Messages.ShouldHaveCount(1);
-            loggerFactory.Logger.Messages.Single().LogLevel.Should().Be(LogLevel.Warning);
-            loggerFactory.Logger.Messages.Single().Text.Should().Contain("Article with code 'X123' is no longer available.");
-        }
+        loggerFactory.Logger.Messages.ShouldHaveCount(1);
+        loggerFactory.Logger.Messages.Single().LogLevel.Should().Be(LogLevel.Warning);
+        loggerFactory.Logger.Messages.Single().Text.Should().Contain("Article with code 'X123' is no longer available.");
+    }
 
-        [Fact]
-        public async Task Logs_and_produces_error_response_on_deserialization_failure()
-        {
-            // Arrange
-            var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
-            loggerFactory.Logger.Clear();
+    [Fact]
+    public async Task Logs_and_produces_error_response_on_deserialization_failure()
+    {
+        // Arrange
+        var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
+        loggerFactory.Logger.Clear();
 
-            const string requestBody = @"{ ""data"": { ""type"": """" } }";
+        const string requestBody = @"{ ""data"": { ""type"": """" } }";
 
-            const string route = "/consumerArticles";
+        const string route = "/consumerArticles";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be("Resource type '' does not exist.");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be("Resource type '' does not exist.");
 
-            error.Meta.ShouldContainKey("requestBody").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetString().Should().Be(requestBody);
-            });
+        error.Meta.ShouldContainKey("requestBody").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetString().Should().Be(requestBody);
+        });
 
-            error.Meta.ShouldContainKey("stackTrace").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                IEnumerable<string?> stackTraceLines = element.EnumerateArray().Select(token => token.GetString());
+        error.Meta.ShouldContainKey("stackTrace").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            IEnumerable<string?> stackTraceLines = element.EnumerateArray().Select(token => token.GetString());
 
-                stackTraceLines.ShouldNotBeEmpty();
-            });
+            stackTraceLines.ShouldNotBeEmpty();
+        });
 
-            loggerFactory.Logger.Messages.Should().BeEmpty();
-        }
+        loggerFactory.Logger.Messages.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Logs_and_produces_error_response_on_serialization_failure()
-        {
-            // Arrange
-            var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
-            loggerFactory.Logger.Clear();
+    [Fact]
+    public async Task Logs_and_produces_error_response_on_serialization_failure()
+    {
+        // Arrange
+        var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
+        loggerFactory.Logger.Clear();
 
-            var throwingArticle = new ThrowingArticle();
+        var throwingArticle = new ThrowingArticle();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.ThrowingArticles.Add(throwingArticle);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.ThrowingArticles.Add(throwingArticle);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/throwingArticles/{throwingArticle.StringId}";
+        string route = $"/throwingArticles/{throwingArticle.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.InternalServerError);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.InternalServerError);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
-            error.Title.Should().Be("An unhandled error occurred while processing this request.");
-            error.Detail.Should().Be("Exception has been thrown by the target of an invocation.");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
+        error.Title.Should().Be("An unhandled error occurred while processing this request.");
+        error.Detail.Should().Be("Exception has been thrown by the target of an invocation.");
 
-            error.Meta.ShouldContainKey("stackTrace").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                IEnumerable<string?> stackTraceLines = element.EnumerateArray().Select(token => token.GetString());
+        error.Meta.ShouldContainKey("stackTrace").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            IEnumerable<string?> stackTraceLines = element.EnumerateArray().Select(token => token.GetString());
 
-                stackTraceLines.Should().ContainMatch("*ThrowingArticle*");
-            });
+            stackTraceLines.Should().ContainMatch("*ThrowingArticle*");
+        });
 
-            responseDocument.Meta.Should().BeNull();
+        responseDocument.Meta.Should().BeNull();
 
-            loggerFactory.Logger.Messages.ShouldHaveCount(1);
-            loggerFactory.Logger.Messages.Single().LogLevel.Should().Be(LogLevel.Error);
-            loggerFactory.Logger.Messages.Single().Text.Should().Contain("Exception has been thrown by the target of an invocation.");
-        }
+        loggerFactory.Logger.Messages.ShouldHaveCount(1);
+        loggerFactory.Logger.Messages.Single().LogLevel.Should().Be(LogLevel.Error);
+        loggerFactory.Logger.Messages.Single().Text.Should().Contain("Exception has been thrown by the target of an invocation.");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticle.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticle.cs
index d0a3ce819a..ae63c0f158 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticle.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticle.cs
@@ -1,16 +1,15 @@
-using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling
+namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling")]
+public sealed class ThrowingArticle : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ThrowingArticle : Identifiable<int>
-    {
-        [Attr]
-        [NotMapped]
-        public string Status => throw new InvalidOperationException("Article status could not be determined.");
-    }
+    [Attr]
+    [NotMapped]
+    public string Status => throw new InvalidOperationException("Article status could not be determined.");
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticlesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticlesController.cs
deleted file mode 100644
index d518902f47..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ExceptionHandling/ThrowingArticlesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ExceptionHandling
-{
-    public sealed class ThrowingArticlesController : JsonApiController<ThrowingArticle, int>
-    {
-        public ThrowingArticlesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<ThrowingArticle, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HitCountingResourceDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HitCountingResourceDefinition.cs
index 58cb641e49..57098822a1 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/HitCountingResourceDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HitCountingResourceDefinition.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -9,189 +6,188 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests
+namespace JsonApiDotNetCoreTests.IntegrationTests;
+
+/// <summary>
+/// Tracks invocations on <see cref="IResourceDefinition{TResource,TId}" /> callback methods. This is used solely in our tests, so we can assert which
+/// calls were made, and in which order.
+/// </summary>
+public abstract class HitCountingResourceDefinition<TResource, TId> : JsonApiResourceDefinition<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Tracks invocations on <see cref="IResourceDefinition{TResource,TId}" /> callback methods. This is used solely in our tests, so we can assert which
-    /// calls were made, and in which order.
-    /// </summary>
-    public abstract class HitCountingResourceDefinition<TResource, TId> : JsonApiResourceDefinition<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        private readonly ResourceDefinitionHitCounter _hitCounter;
+    private readonly ResourceDefinitionHitCounter _hitCounter;
 
-        protected virtual ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.All;
+    protected virtual ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.All;
 
-        protected HitCountingResourceDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph)
-        {
-            ArgumentGuard.NotNull(hitCounter, nameof(hitCounter));
+    protected HitCountingResourceDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph)
+    {
+        ArgumentGuard.NotNull(hitCounter, nameof(hitCounter));
 
-            _hitCounter = hitCounter;
-        }
+        _hitCounter = hitCounter;
+    }
 
-        public override IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes)
+    public override IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnApplyIncludes))
         {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnApplyIncludes))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnApplyIncludes);
-            }
-
-            return base.OnApplyIncludes(existingIncludes);
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnApplyIncludes);
         }
 
-        public override FilterExpression? OnApplyFilter(FilterExpression? existingFilter)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnApplyFilter))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnApplyFilter);
-            }
+        return base.OnApplyIncludes(existingIncludes);
+    }
 
-            return base.OnApplyFilter(existingFilter);
+    public override FilterExpression? OnApplyFilter(FilterExpression? existingFilter)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnApplyFilter))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnApplyFilter);
         }
 
-        public override SortExpression? OnApplySort(SortExpression? existingSort)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnApplySort))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnApplySort);
-            }
+        return base.OnApplyFilter(existingFilter);
+    }
 
-            return base.OnApplySort(existingSort);
+    public override SortExpression? OnApplySort(SortExpression? existingSort)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnApplySort))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnApplySort);
         }
 
-        public override PaginationExpression? OnApplyPagination(PaginationExpression? existingPagination)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnApplyPagination))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnApplyPagination);
-            }
+        return base.OnApplySort(existingSort);
+    }
 
-            return base.OnApplyPagination(existingPagination);
+    public override PaginationExpression? OnApplyPagination(PaginationExpression? existingPagination)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnApplyPagination))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnApplyPagination);
         }
 
-        public override SparseFieldSetExpression? OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet);
-            }
+        return base.OnApplyPagination(existingPagination);
+    }
 
-            return base.OnApplySparseFieldSet(existingSparseFieldSet);
+    public override SparseFieldSetExpression? OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet);
         }
 
-        public override QueryStringParameterHandlers<TResource>? OnRegisterQueryableHandlersForQueryStringParameters()
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters);
-            }
+        return base.OnApplySparseFieldSet(existingSparseFieldSet);
+    }
 
-            return base.OnRegisterQueryableHandlersForQueryStringParameters();
+    public override QueryStringParameterHandlers<TResource>? OnRegisterQueryableHandlersForQueryStringParameters()
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters);
         }
 
-        public override IDictionary<string, object?>? GetMeta(TResource resource)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.GetMeta))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.GetMeta);
-            }
+        return base.OnRegisterQueryableHandlersForQueryStringParameters();
+    }
 
-            return base.GetMeta(resource);
+    public override IDictionary<string, object?>? GetMeta(TResource resource)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.GetMeta))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.GetMeta);
         }
 
-        public override Task OnPrepareWriteAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync);
-            }
+        return base.GetMeta(resource);
+    }
 
-            return base.OnPrepareWriteAsync(resource, writeOperation, cancellationToken);
+    public override Task OnPrepareWriteAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync);
         }
 
-        public override Task<IIdentifiable?> OnSetToOneRelationshipAsync(TResource leftResource, HasOneAttribute hasOneRelationship,
-            IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync);
-            }
+        return base.OnPrepareWriteAsync(resource, writeOperation, cancellationToken);
+    }
 
-            return base.OnSetToOneRelationshipAsync(leftResource, hasOneRelationship, rightResourceId, writeOperation, cancellationToken);
+    public override Task<IIdentifiable?> OnSetToOneRelationshipAsync(TResource leftResource, HasOneAttribute hasOneRelationship, IIdentifiable? rightResourceId,
+        WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync);
         }
 
-        public override Task OnSetToManyRelationshipAsync(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync);
-            }
+        return base.OnSetToOneRelationshipAsync(leftResource, hasOneRelationship, rightResourceId, writeOperation, cancellationToken);
+    }
 
-            return base.OnSetToManyRelationshipAsync(leftResource, hasManyRelationship, rightResourceIds, writeOperation, cancellationToken);
+    public override Task OnSetToManyRelationshipAsync(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync);
         }
 
-        public override Task OnAddToRelationshipAsync(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnAddToRelationshipAsync))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnAddToRelationshipAsync);
-            }
+        return base.OnSetToManyRelationshipAsync(leftResource, hasManyRelationship, rightResourceIds, writeOperation, cancellationToken);
+    }
 
-            return base.OnAddToRelationshipAsync(leftResourceId, hasManyRelationship, rightResourceIds, cancellationToken);
+    public override Task OnAddToRelationshipAsync(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnAddToRelationshipAsync))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnAddToRelationshipAsync);
         }
 
-        public override Task OnRemoveFromRelationshipAsync(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnRemoveFromRelationshipAsync))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnRemoveFromRelationshipAsync);
-            }
+        return base.OnAddToRelationshipAsync(leftResourceId, hasManyRelationship, rightResourceIds, cancellationToken);
+    }
 
-            return base.OnRemoveFromRelationshipAsync(leftResource, hasManyRelationship, rightResourceIds, cancellationToken);
+    public override Task OnRemoveFromRelationshipAsync(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnRemoveFromRelationshipAsync))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnRemoveFromRelationshipAsync);
         }
 
-        public override Task OnWritingAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnWritingAsync))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnWritingAsync);
-            }
+        return base.OnRemoveFromRelationshipAsync(leftResource, hasManyRelationship, rightResourceIds, cancellationToken);
+    }
 
-            return base.OnWritingAsync(resource, writeOperation, cancellationToken);
+    public override Task OnWritingAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnWritingAsync))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnWritingAsync);
         }
 
-        public override Task OnWriteSucceededAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync);
-            }
+        return base.OnWritingAsync(resource, writeOperation, cancellationToken);
+    }
 
-            return base.OnWriteSucceededAsync(resource, writeOperation, cancellationToken);
+    public override Task OnWriteSucceededAsync(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync);
         }
 
-        public override void OnDeserialize(TResource resource)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnDeserialize))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnDeserialize);
-            }
+        return base.OnWriteSucceededAsync(resource, writeOperation, cancellationToken);
+    }
 
-            base.OnDeserialize(resource);
+    public override void OnDeserialize(TResource resource)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnDeserialize))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnDeserialize);
         }
 
-        public override void OnSerialize(TResource resource)
-        {
-            if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnSerialize))
-            {
-                _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnSerialize);
-            }
+        base.OnDeserialize(resource);
+    }
 
-            base.OnSerialize(resource);
+    public override void OnSerialize(TResource resource)
+    {
+        if (ExtensibilityPointsToTrack.HasFlag(ResourceDefinitionExtensibilityPoints.OnSerialize))
+        {
+            _hitCounter.TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints.OnSerialize);
         }
+
+        base.OnSerialize(resource);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGalleriesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGalleriesController.cs
deleted file mode 100644
index adec47514b..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGalleriesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS
-{
-    public sealed class ArtGalleriesController : JsonApiController<ArtGallery, int>
-    {
-        public ArtGalleriesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<ArtGallery, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGallery.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGallery.cs
index 34bec33ba3..f73865f589 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGallery.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/ArtGallery.cs
@@ -1,17 +1,16 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS
+namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS")]
+public sealed class ArtGallery : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ArtGallery : Identifiable<int>
-    {
-        [Attr]
-        public string Theme { get; set; } = null!;
+    [Attr]
+    public string Theme { get; set; } = null!;
 
-        [HasMany]
-        public ISet<Painting> Paintings { get; set; } = new HashSet<Painting>();
-    }
+    [HasMany]
+    public ISet<Painting> Paintings { get; set; } = new HashSet<Painting>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingDbContext.cs
index 81e9ab0a1a..e92dae1318 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingDbContext.cs
@@ -1,17 +1,16 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS
+namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class HostingDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class HostingDbContext : DbContext
-    {
-        public DbSet<ArtGallery> ArtGalleries => Set<ArtGallery>();
-        public DbSet<Painting> Paintings => Set<Painting>();
+    public DbSet<ArtGallery> ArtGalleries => Set<ArtGallery>();
+    public DbSet<Painting> Paintings => Set<Painting>();
 
-        public HostingDbContext(DbContextOptions<HostingDbContext> options)
-            : base(options)
-        {
-        }
+    public HostingDbContext(DbContextOptions<HostingDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingFakers.cs
index 027ba2d61e..93734a6f08 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingFakers.cs
@@ -1,25 +1,23 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS
+namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS;
+
+internal sealed class HostingFakers : FakerContainer
 {
-    internal sealed class HostingFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<ArtGallery>> _lazyArtGalleryFaker = new(() =>
-            new Faker<ArtGallery>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(artGallery => artGallery.Theme, faker => faker.Lorem.Word()));
+    private readonly Lazy<Faker<ArtGallery>> _lazyArtGalleryFaker = new(() =>
+        new Faker<ArtGallery>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(artGallery => artGallery.Theme, faker => faker.Lorem.Word()));
 
-        private readonly Lazy<Faker<Painting>> _lazyPaintingFaker = new(() =>
-            new Faker<Painting>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(painting => painting.Title, faker => faker.Lorem.Sentence()));
+    private readonly Lazy<Faker<Painting>> _lazyPaintingFaker = new(() =>
+        new Faker<Painting>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(painting => painting.Title, faker => faker.Lorem.Sentence()));
 
-        public Faker<ArtGallery> ArtGallery => _lazyArtGalleryFaker.Value;
-        public Faker<Painting> Painting => _lazyPaintingFaker.Value;
-    }
+    public Faker<ArtGallery> ArtGallery => _lazyArtGalleryFaker.Value;
+    public Faker<Painting> Painting => _lazyPaintingFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingStartup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingStartup.cs
index 07ff57f515..24546c2062 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingStartup.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingStartup.cs
@@ -6,25 +6,24 @@
 using Microsoft.Extensions.Logging;
 using TestBuildingBlocks;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS
+namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class HostingStartup<TDbContext> : TestableStartup<TDbContext>
+    where TDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class HostingStartup<TDbContext> : TestableStartup<TDbContext>
-        where TDbContext : DbContext
+    protected override void SetJsonApiOptions(JsonApiOptions options)
     {
-        protected override void SetJsonApiOptions(JsonApiOptions options)
-        {
-            base.SetJsonApiOptions(options);
+        base.SetJsonApiOptions(options);
 
-            options.Namespace = "public-api";
-            options.IncludeTotalResourceCount = true;
-        }
+        options.Namespace = "public-api";
+        options.IncludeTotalResourceCount = true;
+    }
 
-        public override void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)
-        {
-            app.UsePathBase("/iis-application-virtual-directory");
+    public override void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)
+    {
+        app.UsePathBase("/iis-application-virtual-directory");
 
-            base.Configure(app, environment, loggerFactory);
-        }
+        base.Configure(app, environment, loggerFactory);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingTests.cs
index 009cb406ee..c6e4ea363b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingTests.cs
@@ -1,162 +1,157 @@
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS
+namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS;
+
+public sealed class HostingTests : IClassFixture<IntegrationTestContext<HostingStartup<HostingDbContext>, HostingDbContext>>
 {
-    public sealed class HostingTests : IClassFixture<IntegrationTestContext<HostingStartup<HostingDbContext>, HostingDbContext>>
-    {
-        private const string HostPrefix = "http://localhost";
+    private const string HostPrefix = "http://localhost";
 
-        private readonly IntegrationTestContext<HostingStartup<HostingDbContext>, HostingDbContext> _testContext;
-        private readonly HostingFakers _fakers = new();
+    private readonly IntegrationTestContext<HostingStartup<HostingDbContext>, HostingDbContext> _testContext;
+    private readonly HostingFakers _fakers = new();
 
-        public HostingTests(IntegrationTestContext<HostingStartup<HostingDbContext>, HostingDbContext> testContext)
-        {
-            _testContext = testContext;
+    public HostingTests(IntegrationTestContext<HostingStartup<HostingDbContext>, HostingDbContext> testContext)
+    {
+        _testContext = testContext;
+
+        testContext.UseController<PaintingsController>();
+        testContext.UseController<ArtGalleriesController>();
+    }
 
-            testContext.UseController<PaintingsController>();
-            testContext.UseController<ArtGalleriesController>();
-        }
+    [Fact]
+    public async Task Get_primary_resources_with_include_returns_links()
+    {
+        // Arrange
+        ArtGallery gallery = _fakers.ArtGallery.Generate();
+        gallery.Paintings = _fakers.Painting.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_primary_resources_with_include_returns_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            ArtGallery gallery = _fakers.ArtGallery.Generate();
-            gallery.Paintings = _fakers.Painting.Generate(1).ToHashSet();
+            await dbContext.ClearTableAsync<ArtGallery>();
+            dbContext.ArtGalleries.Add(gallery);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<ArtGallery>();
-                dbContext.ArtGalleries.Add(gallery);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/iis-application-virtual-directory/public-api/artGalleries?include=paintings";
 
-            const string route = "/iis-application-virtual-directory/public-api/artGalleries?include=paintings";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            string galleryLink = $"{HostPrefix}/iis-application-virtual-directory/public-api/artGalleries/{gallery.StringId}";
+
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(galleryLink);
 
-            responseDocument.Data.ManyValue[0].With(resource =>
+            resource.Relationships.ShouldContainKey("paintings").With(value =>
             {
-                string galleryLink = $"{HostPrefix}/iis-application-virtual-directory/public-api/artGalleries/{gallery.StringId}";
-
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(galleryLink);
-
-                resource.Relationships.ShouldContainKey("paintings").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{galleryLink}/relationships/paintings");
-                    value.Links.Related.Should().Be($"{galleryLink}/paintings");
-                });
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{galleryLink}/relationships/paintings");
+                value.Links.Related.Should().Be($"{galleryLink}/paintings");
             });
+        });
 
-            string paintingLink =
-                $"{HostPrefix}/iis-application-virtual-directory/custom/path/to/paintings-of-the-world/{gallery.Paintings.ElementAt(0).StringId}";
+        string paintingLink = $"{HostPrefix}/iis-application-virtual-directory/custom/path/to/paintings-of-the-world/{gallery.Paintings.ElementAt(0).StringId}";
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
+        responseDocument.Included[0].With(resource =>
+        {
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(paintingLink);
+
+            resource.Relationships.ShouldContainKey("exposedAt").With(value =>
             {
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(paintingLink);
-
-                resource.Relationships.ShouldContainKey("exposedAt").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{paintingLink}/relationships/exposedAt");
-                    value.Links.Related.Should().Be($"{paintingLink}/exposedAt");
-                });
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{paintingLink}/relationships/exposedAt");
+                value.Links.Related.Should().Be($"{paintingLink}/exposedAt");
             });
-        }
+        });
+    }
+
+    [Fact]
+    public async Task Get_primary_resources_with_include_on_custom_route_returns_links()
+    {
+        // Arrange
+        Painting painting = _fakers.Painting.Generate();
+        painting.ExposedAt = _fakers.ArtGallery.Generate();
 
-        [Fact]
-        public async Task Get_primary_resources_with_include_on_custom_route_returns_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Painting painting = _fakers.Painting.Generate();
-            painting.ExposedAt = _fakers.ArtGallery.Generate();
+            await dbContext.ClearTableAsync<Painting>();
+            dbContext.Paintings.Add(painting);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Painting>();
-                dbContext.Paintings.Add(painting);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/iis-application-virtual-directory/custom/path/to/paintings-of-the-world?include=exposedAt";
 
-            const string route = "/iis-application-virtual-directory/custom/path/to/paintings-of-the-world?include=exposedAt";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            string paintingLink = $"{HostPrefix}/iis-application-virtual-directory/custom/path/to/paintings-of-the-world/{painting.StringId}";
+
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(paintingLink);
 
-            responseDocument.Data.ManyValue[0].With(resource =>
+            resource.Relationships.ShouldContainKey("exposedAt").With(value =>
             {
-                string paintingLink = $"{HostPrefix}/iis-application-virtual-directory/custom/path/to/paintings-of-the-world/{painting.StringId}";
-
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(paintingLink);
-
-                resource.Relationships.ShouldContainKey("exposedAt").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{paintingLink}/relationships/exposedAt");
-                    value.Links.Related.Should().Be($"{paintingLink}/exposedAt");
-                });
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{paintingLink}/relationships/exposedAt");
+                value.Links.Related.Should().Be($"{paintingLink}/exposedAt");
             });
+        });
+
+        responseDocument.Included.ShouldHaveCount(1);
+
+        responseDocument.Included[0].With(resource =>
+        {
+            string galleryLink = $"{HostPrefix}/iis-application-virtual-directory/public-api/artGalleries/{painting.ExposedAt.StringId}";
 
-            responseDocument.Included.ShouldHaveCount(1);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(galleryLink);
 
-            responseDocument.Included[0].With(resource =>
+            resource.Relationships.ShouldContainKey("paintings").With(value =>
             {
-                string galleryLink = $"{HostPrefix}/iis-application-virtual-directory/public-api/artGalleries/{painting.ExposedAt.StringId}";
-
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(galleryLink);
-
-                resource.Relationships.ShouldContainKey("paintings").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{galleryLink}/relationships/paintings");
-                    value.Links.Related.Should().Be($"{galleryLink}/paintings");
-                });
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{galleryLink}/relationships/paintings");
+                value.Links.Related.Should().Be($"{galleryLink}/paintings");
             });
-        }
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/Painting.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/Painting.cs
index f2dd3082a4..97c04ac55e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/Painting.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/Painting.cs
@@ -2,15 +2,15 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS
+namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS")]
+public sealed class Painting : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Painting : Identifiable<int>
-    {
-        [Attr]
-        public string Title { get; set; } = null!;
+    [Attr]
+    public string Title { get; set; } = null!;
 
-        [HasOne]
-        public ArtGallery? ExposedAt { get; set; }
-    }
+    [HasOne]
+    public ArtGallery? ExposedAt { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs
index 6dcc0d930b..bf7b915f03 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/PaintingsController.cs
@@ -1,20 +1,15 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Controllers.Annotations;
-using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS
+namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS;
+
+// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
+public partial class PaintingsController
+{
+}
+
+[DisableRoutingConvention]
+[Route("custom/path/to/paintings-of-the-world")]
+partial class PaintingsController
 {
-    [DisableRoutingConvention]
-    [Route("custom/path/to/paintings-of-the-world")]
-    public sealed class PaintingsController : JsonApiController<Painting, int>
-    {
-        public PaintingsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Painting, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs
index 197cee35c6..911054f291 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccount.cs
@@ -1,16 +1,14 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation
+namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class BankAccount : ObfuscatedIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class BankAccount : ObfuscatedIdentifiable
-    {
-        [Attr]
-        public string Iban { get; set; } = null!;
+    [Attr]
+    public string Iban { get; set; } = null!;
 
-        [HasMany]
-        public IList<DebitCard> Cards { get; set; } = new List<DebitCard>();
-    }
+    [HasMany]
+    public IList<DebitCard> Cards { get; set; } = new List<DebitCard>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccountsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccountsController.cs
index d064824979..eedc36ff87 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccountsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/BankAccountsController.cs
@@ -2,14 +2,13 @@
 using JsonApiDotNetCore.Services;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation
+namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
+
+public sealed class BankAccountsController : ObfuscatedIdentifiableController<BankAccount>
 {
-    public sealed class BankAccountsController : ObfuscatedIdentifiableController<BankAccount>
+    public BankAccountsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<BankAccount, int> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
     {
-        public BankAccountsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<BankAccount, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs
index 13e8cb583f..323d1bd1e3 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCard.cs
@@ -1,18 +1,17 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation
+namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class DebitCard : ObfuscatedIdentifiable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class DebitCard : ObfuscatedIdentifiable
-    {
-        [Attr]
-        public string OwnerName { get; set; } = null!;
+    [Attr]
+    public string OwnerName { get; set; } = null!;
 
-        [Attr]
-        public short PinCode { get; set; }
+    [Attr]
+    public short PinCode { get; set; }
 
-        [HasOne]
-        public BankAccount Account { get; set; } = null!;
-    }
+    [HasOne]
+    public BankAccount Account { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCardsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCardsController.cs
index 2d733f0a34..e8c426572a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCardsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/DebitCardsController.cs
@@ -2,14 +2,13 @@
 using JsonApiDotNetCore.Services;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation
+namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
+
+public sealed class DebitCardsController : ObfuscatedIdentifiableController<DebitCard>
 {
-    public sealed class DebitCardsController : ObfuscatedIdentifiableController<DebitCard>
+    public DebitCardsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<DebitCard, int> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
     {
-        public DebitCardsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<DebitCard, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/HexadecimalCodec.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/HexadecimalCodec.cs
index 7796ec4ed5..1e95efa717 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/HexadecimalCodec.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/HexadecimalCodec.cs
@@ -1,71 +1,68 @@
-using System;
-using System.Collections.Generic;
 using System.Globalization;
 using System.Net;
 using System.Text;
 using JsonApiDotNetCore.Errors;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation
+namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
+
+internal sealed class HexadecimalCodec
 {
-    internal sealed class HexadecimalCodec
+    public int Decode(string? value)
     {
-        public int Decode(string? value)
+        if (value == null)
         {
-            if (value == null)
-            {
-                return 0;
-            }
+            return 0;
+        }
 
-            if (!value.StartsWith("x", StringComparison.Ordinal))
+        if (!value.StartsWith("x", StringComparison.Ordinal))
+        {
+            throw new JsonApiException(new ErrorObject(HttpStatusCode.BadRequest)
             {
-                throw new JsonApiException(new ErrorObject(HttpStatusCode.BadRequest)
-                {
-                    Title = "Invalid ID value.",
-                    Detail = $"The value '{value}' is not a valid hexadecimal value."
-                });
-            }
-
-            string stringValue = FromHexString(value[1..]);
-            return int.Parse(stringValue);
+                Title = "Invalid ID value.",
+                Detail = $"The value '{value}' is not a valid hexadecimal value."
+            });
         }
 
-        private static string FromHexString(string hexString)
-        {
-            var bytes = new List<byte>(hexString.Length / 2);
+        string stringValue = FromHexString(value[1..]);
+        return int.Parse(stringValue);
+    }
 
-            for (int index = 0; index < hexString.Length; index += 2)
-            {
-                string hexChar = hexString.Substring(index, 2);
-                byte bt = byte.Parse(hexChar, NumberStyles.HexNumber);
-                bytes.Add(bt);
-            }
+    private static string FromHexString(string hexString)
+    {
+        var bytes = new List<byte>(hexString.Length / 2);
 
-            char[] chars = Encoding.ASCII.GetChars(bytes.ToArray());
-            return new string(chars);
+        for (int index = 0; index < hexString.Length; index += 2)
+        {
+            string hexChar = hexString.Substring(index, 2);
+            byte bt = byte.Parse(hexChar, NumberStyles.HexNumber);
+            bytes.Add(bt);
         }
 
-        public string? Encode(int value)
-        {
-            if (value == 0)
-            {
-                return null;
-            }
+        char[] chars = Encoding.ASCII.GetChars(bytes.ToArray());
+        return new string(chars);
+    }
 
-            string stringValue = value.ToString();
-            return $"x{ToHexString(stringValue)}";
+    public string? Encode(int value)
+    {
+        if (value == 0)
+        {
+            return null;
         }
 
-        private static string ToHexString(string value)
-        {
-            var builder = new StringBuilder();
+        string stringValue = value.ToString();
+        return $"x{ToHexString(stringValue)}";
+    }
 
-            foreach (byte bt in Encoding.ASCII.GetBytes(value))
-            {
-                builder.Append(bt.ToString("X2"));
-            }
+    private static string ToHexString(string value)
+    {
+        var builder = new StringBuilder();
 
-            return builder.ToString();
+        foreach (byte bt in Encoding.ASCII.GetBytes(value))
+        {
+            builder.Append(bt.ToString("X2"));
         }
+
+        return builder.ToString();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/IdObfuscationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/IdObfuscationTests.cs
index bbe61c5059..e14f5c616e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/IdObfuscationTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/IdObfuscationTests.cs
@@ -1,478 +1,474 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation
+namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
+
+public sealed class IdObfuscationTests : IClassFixture<IntegrationTestContext<TestableStartup<ObfuscationDbContext>, ObfuscationDbContext>>
 {
-    public sealed class IdObfuscationTests : IClassFixture<IntegrationTestContext<TestableStartup<ObfuscationDbContext>, ObfuscationDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ObfuscationDbContext>, ObfuscationDbContext> _testContext;
+    private readonly ObfuscationFakers _fakers = new();
+
+    public IdObfuscationTests(IntegrationTestContext<TestableStartup<ObfuscationDbContext>, ObfuscationDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ObfuscationDbContext>, ObfuscationDbContext> _testContext;
-        private readonly ObfuscationFakers _fakers = new();
+        _testContext = testContext;
 
-        public IdObfuscationTests(IntegrationTestContext<TestableStartup<ObfuscationDbContext>, ObfuscationDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<BankAccountsController>();
+        testContext.UseController<DebitCardsController>();
+    }
 
-            testContext.UseController<BankAccountsController>();
-            testContext.UseController<DebitCardsController>();
-        }
+    [Fact]
+    public async Task Can_filter_equality_in_primary_resources()
+    {
+        // Arrange
+        List<BankAccount> accounts = _fakers.BankAccount.Generate(2);
 
-        [Fact]
-        public async Task Can_filter_equality_in_primary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<BankAccount> accounts = _fakers.BankAccount.Generate(2);
+            await dbContext.ClearTableAsync<BankAccount>();
+            dbContext.BankAccounts.AddRange(accounts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BankAccount>();
-                dbContext.BankAccounts.AddRange(accounts);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/bankAccounts?filter=equals(id,'{accounts[1].StringId}')";
 
-            string route = $"/bankAccounts?filter=equals(id,'{accounts[1].StringId}')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(accounts[1].StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(accounts[1].StringId);
-        }
+    [Fact]
+    public async Task Can_filter_any_in_primary_resources()
+    {
+        // Arrange
+        List<BankAccount> accounts = _fakers.BankAccount.Generate(2);
 
-        [Fact]
-        public async Task Can_filter_any_in_primary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<BankAccount> accounts = _fakers.BankAccount.Generate(2);
+            await dbContext.ClearTableAsync<BankAccount>();
+            dbContext.BankAccounts.AddRange(accounts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BankAccount>();
-                dbContext.BankAccounts.AddRange(accounts);
-                await dbContext.SaveChangesAsync();
-            });
+        var codec = new HexadecimalCodec();
+        string route = $"/bankAccounts?filter=any(id,'{accounts[1].StringId}','{codec.Encode(Unknown.TypedId.Int32)}')";
 
-            var codec = new HexadecimalCodec();
-            string route = $"/bankAccounts?filter=any(id,'{accounts[1].StringId}','{codec.Encode(Unknown.TypedId.Int32)}')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(accounts[1].StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(accounts[1].StringId);
-        }
+    [Fact]
+    public async Task Cannot_get_primary_resource_for_invalid_ID()
+    {
+        // Arrange
+        const string route = "/bankAccounts/not-a-hex-value";
 
-        [Fact]
-        public async Task Cannot_get_primary_resource_for_invalid_ID()
-        {
-            // Arrange
-            const string route = "/bankAccounts/not-a-hex-value";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Invalid ID value.");
+        error.Detail.Should().Be("The value 'not-a-hex-value' is not a valid hexadecimal value.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Invalid ID value.");
-            error.Detail.Should().Be("The value 'not-a-hex-value' is not a valid hexadecimal value.");
-        }
+    [Fact]
+    public async Task Can_get_primary_resource_by_ID()
+    {
+        // Arrange
+        DebitCard card = _fakers.DebitCard.Generate();
+        card.Account = _fakers.BankAccount.Generate();
 
-        [Fact]
-        public async Task Can_get_primary_resource_by_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            DebitCard card = _fakers.DebitCard.Generate();
-            card.Account = _fakers.BankAccount.Generate();
+            dbContext.DebitCards.Add(card);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.DebitCards.Add(card);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/debitCards/{card.StringId}";
 
-            string route = $"/debitCards/{card.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(card.StringId);
+    }
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(card.StringId);
-        }
+    [Fact]
+    public async Task Can_get_secondary_resources()
+    {
+        // Arrange
+        BankAccount account = _fakers.BankAccount.Generate();
+        account.Cards = _fakers.DebitCard.Generate(2);
 
-        [Fact]
-        public async Task Can_get_secondary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BankAccount account = _fakers.BankAccount.Generate();
-            account.Cards = _fakers.DebitCard.Generate(2);
+            dbContext.BankAccounts.Add(account);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.BankAccounts.Add(account);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/bankAccounts/{account.StringId}/cards";
 
-            string route = $"/bankAccounts/{account.StringId}/cards";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(account.Cards[0].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(account.Cards[1].StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(account.Cards[0].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(account.Cards[1].StringId);
-        }
+    [Fact]
+    public async Task Can_include_resource_with_sparse_fieldset()
+    {
+        // Arrange
+        BankAccount account = _fakers.BankAccount.Generate();
+        account.Cards = _fakers.DebitCard.Generate(1);
 
-        [Fact]
-        public async Task Can_include_resource_with_sparse_fieldset()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BankAccount account = _fakers.BankAccount.Generate();
-            account.Cards = _fakers.DebitCard.Generate(1);
+            dbContext.BankAccounts.Add(account);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.BankAccounts.Add(account);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/bankAccounts/{account.StringId}?include=cards&fields[debitCards]=ownerName";
 
-            string route = $"/bankAccounts/{account.StringId}?include=cards&fields[debitCards]=ownerName";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(account.StringId);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(account.StringId);
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Id.Should().Be(account.Cards[0].StringId);
+        responseDocument.Included[0].Attributes.ShouldHaveCount(1);
+        responseDocument.Included[0].Relationships.Should().BeNull();
+    }
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Id.Should().Be(account.Cards[0].StringId);
-            responseDocument.Included[0].Attributes.ShouldHaveCount(1);
-            responseDocument.Included[0].Relationships.Should().BeNull();
-        }
+    [Fact]
+    public async Task Can_get_relationship()
+    {
+        // Arrange
+        BankAccount account = _fakers.BankAccount.Generate();
+        account.Cards = _fakers.DebitCard.Generate(1);
 
-        [Fact]
-        public async Task Can_get_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BankAccount account = _fakers.BankAccount.Generate();
-            account.Cards = _fakers.DebitCard.Generate(1);
+            dbContext.BankAccounts.Add(account);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.BankAccounts.Add(account);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/bankAccounts/{account.StringId}/relationships/cards";
 
-            string route = $"/bankAccounts/{account.StringId}/relationships/cards";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(account.Cards[0].StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(account.Cards[0].StringId);
-        }
+    [Fact]
+    public async Task Can_create_resource_with_relationship()
+    {
+        // Arrange
+        BankAccount existingAccount = _fakers.BankAccount.Generate();
+        DebitCard newCard = _fakers.DebitCard.Generate();
 
-        [Fact]
-        public async Task Can_create_resource_with_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BankAccount existingAccount = _fakers.BankAccount.Generate();
-            DebitCard newCard = _fakers.DebitCard.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.BankAccounts.Add(existingAccount);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.BankAccounts.Add(existingAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "debitCards",
+                attributes = new
                 {
-                    type = "debitCards",
-                    attributes = new
-                    {
-                        ownerName = newCard.OwnerName,
-                        pinCode = newCard.PinCode
-                    },
-                    relationships = new
+                    ownerName = newCard.OwnerName,
+                    pinCode = newCard.PinCode
+                },
+                relationships = new
+                {
+                    account = new
                     {
-                        account = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "bankAccounts",
-                                id = existingAccount.StringId
-                            }
+                            type = "bankAccounts",
+                            id = existingAccount.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/debitCards";
+        const string route = "/debitCards";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("ownerName").With(value => value.Should().Be(newCard.OwnerName));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("pinCode").With(value => value.Should().Be(newCard.PinCode));
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("ownerName").With(value => value.Should().Be(newCard.OwnerName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("pinCode").With(value => value.Should().Be(newCard.PinCode));
 
-            var codec = new HexadecimalCodec();
-            int newCardId = codec.Decode(responseDocument.Data.SingleValue.Id);
+        var codec = new HexadecimalCodec();
+        int newCardId = codec.Decode(responseDocument.Data.SingleValue.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                DebitCard cardInDatabase = await dbContext.DebitCards.Include(card => card.Account).FirstWithIdAsync(newCardId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            DebitCard cardInDatabase = await dbContext.DebitCards.Include(card => card.Account).FirstWithIdAsync(newCardId);
 
-                cardInDatabase.OwnerName.Should().Be(newCard.OwnerName);
-                cardInDatabase.PinCode.Should().Be(newCard.PinCode);
+            cardInDatabase.OwnerName.Should().Be(newCard.OwnerName);
+            cardInDatabase.PinCode.Should().Be(newCard.PinCode);
 
-                cardInDatabase.Account.ShouldNotBeNull();
-                cardInDatabase.Account.Id.Should().Be(existingAccount.Id);
-                cardInDatabase.Account.StringId.Should().Be(existingAccount.StringId);
-            });
-        }
+            cardInDatabase.Account.ShouldNotBeNull();
+            cardInDatabase.Account.Id.Should().Be(existingAccount.Id);
+            cardInDatabase.Account.StringId.Should().Be(existingAccount.StringId);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_relationship()
-        {
-            // Arrange
-            BankAccount existingAccount = _fakers.BankAccount.Generate();
-            existingAccount.Cards = _fakers.DebitCard.Generate(1);
+    [Fact]
+    public async Task Can_update_resource_with_relationship()
+    {
+        // Arrange
+        BankAccount existingAccount = _fakers.BankAccount.Generate();
+        existingAccount.Cards = _fakers.DebitCard.Generate(1);
 
-            DebitCard existingCard = _fakers.DebitCard.Generate();
-            existingCard.Account = _fakers.BankAccount.Generate();
+        DebitCard existingCard = _fakers.DebitCard.Generate();
+        existingCard.Account = _fakers.BankAccount.Generate();
 
-            string newIban = _fakers.BankAccount.Generate().Iban;
+        string newIban = _fakers.BankAccount.Generate().Iban;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingAccount, existingCard);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingAccount, existingCard);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "bankAccounts",
+                id = existingAccount.StringId,
+                attributes = new
                 {
-                    type = "bankAccounts",
-                    id = existingAccount.StringId,
-                    attributes = new
-                    {
-                        iban = newIban
-                    },
-                    relationships = new
+                    iban = newIban
+                },
+                relationships = new
+                {
+                    cards = new
                     {
-                        cards = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "debitCards",
-                                    id = existingCard.StringId
-                                }
+                                type = "debitCards",
+                                id = existingCard.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/bankAccounts/{existingAccount.StringId}";
+        string route = $"/bankAccounts/{existingAccount.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                BankAccount accountInDatabase = await dbContext.BankAccounts.Include(account => account.Cards).FirstWithIdAsync(existingAccount.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            BankAccount accountInDatabase = await dbContext.BankAccounts.Include(account => account.Cards).FirstWithIdAsync(existingAccount.Id);
 
-                accountInDatabase.Iban.Should().Be(newIban);
+            accountInDatabase.Iban.Should().Be(newIban);
 
-                accountInDatabase.Cards.ShouldHaveCount(1);
-                accountInDatabase.Cards[0].Id.Should().Be(existingCard.Id);
-                accountInDatabase.Cards[0].StringId.Should().Be(existingCard.StringId);
-            });
-        }
+            accountInDatabase.Cards.ShouldHaveCount(1);
+            accountInDatabase.Cards[0].Id.Should().Be(existingCard.Id);
+            accountInDatabase.Cards[0].StringId.Should().Be(existingCard.StringId);
+        });
+    }
 
-        [Fact]
-        public async Task Can_add_to_ToMany_relationship()
-        {
-            // Arrange
-            BankAccount existingAccount = _fakers.BankAccount.Generate();
-            existingAccount.Cards = _fakers.DebitCard.Generate(1);
+    [Fact]
+    public async Task Can_add_to_ToMany_relationship()
+    {
+        // Arrange
+        BankAccount existingAccount = _fakers.BankAccount.Generate();
+        existingAccount.Cards = _fakers.DebitCard.Generate(1);
 
-            DebitCard existingDebitCard = _fakers.DebitCard.Generate();
-            existingDebitCard.Account = _fakers.BankAccount.Generate();
+        DebitCard existingDebitCard = _fakers.DebitCard.Generate();
+        existingDebitCard.Account = _fakers.BankAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingAccount, existingDebitCard);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingAccount, existingDebitCard);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "debitCards",
-                        id = existingDebitCard.StringId
-                    }
+                    type = "debitCards",
+                    id = existingDebitCard.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/bankAccounts/{existingAccount.StringId}/relationships/cards";
+        string route = $"/bankAccounts/{existingAccount.StringId}/relationships/cards";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                BankAccount accountInDatabase = await dbContext.BankAccounts.Include(account => account.Cards).FirstWithIdAsync(existingAccount.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            BankAccount accountInDatabase = await dbContext.BankAccounts.Include(account => account.Cards).FirstWithIdAsync(existingAccount.Id);
 
-                accountInDatabase.Cards.ShouldHaveCount(2);
-            });
-        }
+            accountInDatabase.Cards.ShouldHaveCount(2);
+        });
+    }
 
-        [Fact]
-        public async Task Can_remove_from_ToMany_relationship()
-        {
-            // Arrange
-            BankAccount existingAccount = _fakers.BankAccount.Generate();
-            existingAccount.Cards = _fakers.DebitCard.Generate(2);
+    [Fact]
+    public async Task Can_remove_from_ToMany_relationship()
+    {
+        // Arrange
+        BankAccount existingAccount = _fakers.BankAccount.Generate();
+        existingAccount.Cards = _fakers.DebitCard.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.BankAccounts.Add(existingAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.BankAccounts.Add(existingAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "debitCards",
-                        id = existingAccount.Cards[0].StringId
-                    }
+                    type = "debitCards",
+                    id = existingAccount.Cards[0].StringId
                 }
-            };
-
-            string route = $"/bankAccounts/{existingAccount.StringId}/relationships/cards";
+            }
+        };
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        string route = $"/bankAccounts/{existingAccount.StringId}/relationships/cards";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            responseDocument.Should().BeEmpty();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                BankAccount accountInDatabase = await dbContext.BankAccounts.Include(account => account.Cards).FirstWithIdAsync(existingAccount.Id);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                accountInDatabase.Cards.ShouldHaveCount(1);
-            });
-        }
+        responseDocument.Should().BeEmpty();
 
-        [Fact]
-        public async Task Can_delete_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BankAccount existingAccount = _fakers.BankAccount.Generate();
-            existingAccount.Cards = _fakers.DebitCard.Generate(1);
+            BankAccount accountInDatabase = await dbContext.BankAccounts.Include(account => account.Cards).FirstWithIdAsync(existingAccount.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.BankAccounts.Add(existingAccount);
-                await dbContext.SaveChangesAsync();
-            });
+            accountInDatabase.Cards.ShouldHaveCount(1);
+        });
+    }
 
-            string route = $"/bankAccounts/{existingAccount.StringId}";
+    [Fact]
+    public async Task Can_delete_resource()
+    {
+        // Arrange
+        BankAccount existingAccount = _fakers.BankAccount.Generate();
+        existingAccount.Cards = _fakers.DebitCard.Generate(1);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.BankAccounts.Add(existingAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        string route = $"/bankAccounts/{existingAccount.StringId}";
 
-            responseDocument.Should().BeEmpty();
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                BankAccount? accountInDatabase = await dbContext.BankAccounts.Include(account => account.Cards).FirstWithIdOrDefaultAsync(existingAccount.Id);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                accountInDatabase.Should().BeNull();
-            });
-        }
+        responseDocument.Should().BeEmpty();
 
-        [Fact]
-        public async Task Cannot_delete_unknown_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var codec = new HexadecimalCodec();
-            string? stringId = codec.Encode(Unknown.TypedId.Int32);
+            BankAccount? accountInDatabase = await dbContext.BankAccounts.Include(account => account.Cards).FirstWithIdOrDefaultAsync(existingAccount.Id);
+
+            accountInDatabase.Should().BeNull();
+        });
+    }
+
+    [Fact]
+    public async Task Cannot_delete_unknown_resource()
+    {
+        // Arrange
+        var codec = new HexadecimalCodec();
+        string? stringId = codec.Encode(Unknown.TypedId.Int32);
 
-            string route = $"/bankAccounts/{stringId}";
+        string route = $"/bankAccounts/{stringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'bankAccounts' with ID '{stringId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'bankAccounts' with ID '{stringId}' does not exist.");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiable.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiable.cs
index 223a29229f..0aa2203d8a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiable.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiable.cs
@@ -1,19 +1,18 @@
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation
+namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
+
+public abstract class ObfuscatedIdentifiable : Identifiable<int>
 {
-    public abstract class ObfuscatedIdentifiable : Identifiable<int>
-    {
-        private static readonly HexadecimalCodec Codec = new();
+    private static readonly HexadecimalCodec Codec = new();
 
-        protected override string? GetStringId(int value)
-        {
-            return value == default ? null : Codec.Encode(value);
-        }
+    protected override string? GetStringId(int value)
+    {
+        return value == default ? null : Codec.Encode(value);
+    }
 
-        protected override int GetTypedId(string? value)
-        {
-            return value == null ? default : Codec.Decode(value);
-        }
+    protected override int GetTypedId(string? value)
+    {
+        return value == null ? default : Codec.Decode(value);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiableController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiableController.cs
index 0eb276db99..cded455259 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiableController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscatedIdentifiableController.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Resources;
@@ -8,87 +5,86 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation
+namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
+
+public abstract class ObfuscatedIdentifiableController<TResource> : BaseJsonApiController<TResource, int>
+    where TResource : class, IIdentifiable<int>
 {
-    public abstract class ObfuscatedIdentifiableController<TResource> : BaseJsonApiController<TResource, int>
-        where TResource : class, IIdentifiable<int>
-    {
-        private readonly HexadecimalCodec _codec = new();
+    private readonly HexadecimalCodec _codec = new();
 
-        protected ObfuscatedIdentifiableController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<TResource, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
+    protected ObfuscatedIdentifiableController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<TResource, int> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
+    {
+    }
 
-        [HttpGet]
-        public override Task<IActionResult> GetAsync(CancellationToken cancellationToken)
-        {
-            return base.GetAsync(cancellationToken);
-        }
+    [HttpGet]
+    public override Task<IActionResult> GetAsync(CancellationToken cancellationToken)
+    {
+        return base.GetAsync(cancellationToken);
+    }
 
-        [HttpGet("{id}")]
-        public Task<IActionResult> GetAsync(string id, CancellationToken cancellationToken)
-        {
-            int idValue = _codec.Decode(id);
-            return base.GetAsync(idValue, cancellationToken);
-        }
+    [HttpGet("{id}")]
+    public Task<IActionResult> GetAsync(string id, CancellationToken cancellationToken)
+    {
+        int idValue = _codec.Decode(id);
+        return base.GetAsync(idValue, cancellationToken);
+    }
 
-        [HttpGet("{id}/{relationshipName}")]
-        public Task<IActionResult> GetSecondaryAsync(string id, string relationshipName, CancellationToken cancellationToken)
-        {
-            int idValue = _codec.Decode(id);
-            return base.GetSecondaryAsync(idValue, relationshipName, cancellationToken);
-        }
+    [HttpGet("{id}/{relationshipName}")]
+    public Task<IActionResult> GetSecondaryAsync(string id, string relationshipName, CancellationToken cancellationToken)
+    {
+        int idValue = _codec.Decode(id);
+        return base.GetSecondaryAsync(idValue, relationshipName, cancellationToken);
+    }
 
-        [HttpGet("{id}/relationships/{relationshipName}")]
-        public Task<IActionResult> GetRelationshipAsync(string id, string relationshipName, CancellationToken cancellationToken)
-        {
-            int idValue = _codec.Decode(id);
-            return base.GetRelationshipAsync(idValue, relationshipName, cancellationToken);
-        }
+    [HttpGet("{id}/relationships/{relationshipName}")]
+    public Task<IActionResult> GetRelationshipAsync(string id, string relationshipName, CancellationToken cancellationToken)
+    {
+        int idValue = _codec.Decode(id);
+        return base.GetRelationshipAsync(idValue, relationshipName, cancellationToken);
+    }
 
-        [HttpPost]
-        public override Task<IActionResult> PostAsync([FromBody] TResource resource, CancellationToken cancellationToken)
-        {
-            return base.PostAsync(resource, cancellationToken);
-        }
+    [HttpPost]
+    public override Task<IActionResult> PostAsync([FromBody] TResource resource, CancellationToken cancellationToken)
+    {
+        return base.PostAsync(resource, cancellationToken);
+    }
 
-        [HttpPost("{id}/relationships/{relationshipName}")]
-        public Task<IActionResult> PostRelationshipAsync(string id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-        {
-            int idValue = _codec.Decode(id);
-            return base.PostRelationshipAsync(idValue, relationshipName, rightResourceIds, cancellationToken);
-        }
+    [HttpPost("{id}/relationships/{relationshipName}")]
+    public Task<IActionResult> PostRelationshipAsync(string id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        int idValue = _codec.Decode(id);
+        return base.PostRelationshipAsync(idValue, relationshipName, rightResourceIds, cancellationToken);
+    }
 
-        [HttpPatch("{id}")]
-        public Task<IActionResult> PatchAsync(string id, [FromBody] TResource resource, CancellationToken cancellationToken)
-        {
-            int idValue = _codec.Decode(id);
-            return base.PatchAsync(idValue, resource, cancellationToken);
-        }
+    [HttpPatch("{id}")]
+    public Task<IActionResult> PatchAsync(string id, [FromBody] TResource resource, CancellationToken cancellationToken)
+    {
+        int idValue = _codec.Decode(id);
+        return base.PatchAsync(idValue, resource, cancellationToken);
+    }
 
-        [HttpPatch("{id}/relationships/{relationshipName}")]
-        public Task<IActionResult> PatchRelationshipAsync(string id, string relationshipName, [FromBody] object rightValue, CancellationToken cancellationToken)
-        {
-            int idValue = _codec.Decode(id);
-            return base.PatchRelationshipAsync(idValue, relationshipName, rightValue, cancellationToken);
-        }
+    [HttpPatch("{id}/relationships/{relationshipName}")]
+    public Task<IActionResult> PatchRelationshipAsync(string id, string relationshipName, [FromBody] object rightValue, CancellationToken cancellationToken)
+    {
+        int idValue = _codec.Decode(id);
+        return base.PatchRelationshipAsync(idValue, relationshipName, rightValue, cancellationToken);
+    }
 
-        [HttpDelete("{id}")]
-        public Task<IActionResult> DeleteAsync(string id, CancellationToken cancellationToken)
-        {
-            int idValue = _codec.Decode(id);
-            return base.DeleteAsync(idValue, cancellationToken);
-        }
+    [HttpDelete("{id}")]
+    public Task<IActionResult> DeleteAsync(string id, CancellationToken cancellationToken)
+    {
+        int idValue = _codec.Decode(id);
+        return base.DeleteAsync(idValue, cancellationToken);
+    }
 
-        [HttpDelete("{id}/relationships/{relationshipName}")]
-        public Task<IActionResult> DeleteRelationshipAsync(string id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-        {
-            int idValue = _codec.Decode(id);
-            return base.DeleteRelationshipAsync(idValue, relationshipName, rightResourceIds, cancellationToken);
-        }
+    [HttpDelete("{id}/relationships/{relationshipName}")]
+    public Task<IActionResult> DeleteRelationshipAsync(string id, string relationshipName, [FromBody] ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        int idValue = _codec.Decode(id);
+        return base.DeleteRelationshipAsync(idValue, relationshipName, rightResourceIds, cancellationToken);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationDbContext.cs
index 4cf9791745..94921ea800 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationDbContext.cs
@@ -1,17 +1,16 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation
+namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class ObfuscationDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ObfuscationDbContext : DbContext
-    {
-        public DbSet<BankAccount> BankAccounts => Set<BankAccount>();
-        public DbSet<DebitCard> DebitCards => Set<DebitCard>();
+    public DbSet<BankAccount> BankAccounts => Set<BankAccount>();
+    public DbSet<DebitCard> DebitCards => Set<DebitCard>();
 
-        public ObfuscationDbContext(DbContextOptions<ObfuscationDbContext> options)
-            : base(options)
-        {
-        }
+    public ObfuscationDbContext(DbContextOptions<ObfuscationDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationFakers.cs
index 3b82da0e5d..201089d15b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationFakers.cs
@@ -1,26 +1,24 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation
+namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
+
+internal sealed class ObfuscationFakers : FakerContainer
 {
-    internal sealed class ObfuscationFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<BankAccount>> _lazyBankAccountFaker = new(() =>
-            new Faker<BankAccount>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(bankAccount => bankAccount.Iban, faker => faker.Finance.Iban()));
+    private readonly Lazy<Faker<BankAccount>> _lazyBankAccountFaker = new(() =>
+        new Faker<BankAccount>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(bankAccount => bankAccount.Iban, faker => faker.Finance.Iban()));
 
-        private readonly Lazy<Faker<DebitCard>> _lazyDebitCardFaker = new(() =>
-            new Faker<DebitCard>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(debitCard => debitCard.OwnerName, faker => faker.Name.FullName())
-                .RuleFor(debitCard => debitCard.PinCode, faker => (short)faker.Random.Number(1000, 9999)));
+    private readonly Lazy<Faker<DebitCard>> _lazyDebitCardFaker = new(() =>
+        new Faker<DebitCard>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(debitCard => debitCard.OwnerName, faker => faker.Name.FullName())
+            .RuleFor(debitCard => debitCard.PinCode, faker => (short)faker.Random.Number(1000, 9999)));
 
-        public Faker<BankAccount> BankAccount => _lazyBankAccountFaker.Value;
-        public Faker<DebitCard> DebitCard => _lazyDebitCardFaker.Value;
-    }
+    public Faker<BankAccount> BankAccount => _lazyBankAccountFaker.Value;
+    public Faker<DebitCard> DebitCard => _lazyDebitCardFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateDbContext.cs
index a67e9f2647..2f1b56cf6f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateDbContext.cs
@@ -3,39 +3,38 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState
+namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class ModelStateDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ModelStateDbContext : DbContext
+    public DbSet<SystemVolume> Volumes => Set<SystemVolume>();
+    public DbSet<SystemDirectory> Directories => Set<SystemDirectory>();
+    public DbSet<SystemFile> Files => Set<SystemFile>();
+
+    public ModelStateDbContext(DbContextOptions<ModelStateDbContext> options)
+        : base(options)
+    {
+    }
+
+    protected override void OnModelCreating(ModelBuilder builder)
     {
-        public DbSet<SystemVolume> Volumes => Set<SystemVolume>();
-        public DbSet<SystemDirectory> Directories => Set<SystemDirectory>();
-        public DbSet<SystemFile> Files => Set<SystemFile>();
-
-        public ModelStateDbContext(DbContextOptions<ModelStateDbContext> options)
-            : base(options)
-        {
-        }
-
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<SystemVolume>()
-                .HasOne(systemVolume => systemVolume.RootDirectory)
-                .WithOne()
-                .HasForeignKey<SystemVolume>("RootDirectoryId")
-                .IsRequired();
-
-            builder.Entity<SystemDirectory>()
-                .HasMany(systemDirectory => systemDirectory.Subdirectories)
-                .WithOne(systemDirectory => systemDirectory.Parent!);
-
-            builder.Entity<SystemDirectory>()
-                .HasOne(systemDirectory => systemDirectory.Self)
-                .WithOne();
-
-            builder.Entity<SystemDirectory>()
-                .HasOne(systemDirectory => systemDirectory.AlsoSelf)
-                .WithOne();
-        }
+        builder.Entity<SystemVolume>()
+            .HasOne(systemVolume => systemVolume.RootDirectory)
+            .WithOne()
+            .HasForeignKey<SystemVolume>("RootDirectoryId")
+            .IsRequired();
+
+        builder.Entity<SystemDirectory>()
+            .HasMany(systemDirectory => systemDirectory.Subdirectories)
+            .WithOne(systemDirectory => systemDirectory.Parent!);
+
+        builder.Entity<SystemDirectory>()
+            .HasOne(systemDirectory => systemDirectory.Self)
+            .WithOne();
+
+        builder.Entity<SystemDirectory>()
+            .HasOne(systemDirectory => systemDirectory.AlsoSelf)
+            .WithOne();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateFakers.cs
index 06b8829ebe..75183eaf9f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateFakers.cs
@@ -1,34 +1,32 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState
+namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState;
+
+internal sealed class ModelStateFakers : FakerContainer
 {
-    internal sealed class ModelStateFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<SystemVolume>> _lazySystemVolumeFaker = new(() =>
-            new Faker<SystemVolume>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(systemVolume => systemVolume.Name, faker => faker.Lorem.Word()));
+    private readonly Lazy<Faker<SystemVolume>> _lazySystemVolumeFaker = new(() =>
+        new Faker<SystemVolume>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(systemVolume => systemVolume.Name, faker => faker.Lorem.Word()));
 
-        private readonly Lazy<Faker<SystemFile>> _lazySystemFileFaker = new(() =>
-            new Faker<SystemFile>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(systemFile => systemFile.FileName, faker => faker.System.FileName())
-                .RuleFor(systemFile => systemFile.SizeInBytes, faker => faker.Random.Long(0, 1_000_000)));
+    private readonly Lazy<Faker<SystemFile>> _lazySystemFileFaker = new(() =>
+        new Faker<SystemFile>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(systemFile => systemFile.FileName, faker => faker.System.FileName())
+            .RuleFor(systemFile => systemFile.SizeInBytes, faker => faker.Random.Long(0, 1_000_000)));
 
-        private readonly Lazy<Faker<SystemDirectory>> _lazySystemDirectoryFaker = new(() =>
-            new Faker<SystemDirectory>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(systemDirectory => systemDirectory.Name, faker => faker.Address.City())
-                .RuleFor(systemDirectory => systemDirectory.IsCaseSensitive, faker => faker.Random.Bool())
-                .RuleFor(systemDirectory => systemDirectory.SizeInBytes, faker => faker.Random.Long(0, 1_000_000)));
+    private readonly Lazy<Faker<SystemDirectory>> _lazySystemDirectoryFaker = new(() =>
+        new Faker<SystemDirectory>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(systemDirectory => systemDirectory.Name, faker => faker.Address.City())
+            .RuleFor(systemDirectory => systemDirectory.IsCaseSensitive, faker => faker.Random.Bool())
+            .RuleFor(systemDirectory => systemDirectory.SizeInBytes, faker => faker.Random.Long(0, 1_000_000)));
 
-        public Faker<SystemVolume> SystemVolume => _lazySystemVolumeFaker.Value;
-        public Faker<SystemFile> SystemFile => _lazySystemFileFaker.Value;
-        public Faker<SystemDirectory> SystemDirectory => _lazySystemDirectoryFaker.Value;
-    }
+    public Faker<SystemVolume> SystemVolume => _lazySystemVolumeFaker.Value;
+    public Faker<SystemFile> SystemFile => _lazySystemFileFaker.Value;
+    public Faker<SystemDirectory> SystemDirectory => _lazySystemDirectoryFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs
index e314bf5461..5a07c9ec99 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateValidationTests.cs
@@ -1,869 +1,865 @@
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState
+namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState;
+
+public sealed class ModelStateValidationTests : IClassFixture<IntegrationTestContext<TestableStartup<ModelStateDbContext>, ModelStateDbContext>>
 {
-    public sealed class ModelStateValidationTests : IClassFixture<IntegrationTestContext<TestableStartup<ModelStateDbContext>, ModelStateDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<ModelStateDbContext>, ModelStateDbContext> _testContext;
-        private readonly ModelStateFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<ModelStateDbContext>, ModelStateDbContext> _testContext;
+    private readonly ModelStateFakers _fakers = new();
 
-        public ModelStateValidationTests(IntegrationTestContext<TestableStartup<ModelStateDbContext>, ModelStateDbContext> testContext)
-        {
-            _testContext = testContext;
+    public ModelStateValidationTests(IntegrationTestContext<TestableStartup<ModelStateDbContext>, ModelStateDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<SystemDirectoriesController>();
-            testContext.UseController<SystemFilesController>();
-        }
+        testContext.UseController<SystemDirectoriesController>();
+        testContext.UseController<SystemFilesController>();
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_omitted_required_attribute()
+    [Fact]
+    public async Task Cannot_create_resource_with_omitted_required_attribute()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    attributes = new
-                    {
-                        isCaseSensitive = true
-                    }
+                    isCaseSensitive = true
                 }
-            };
+            }
+        };
 
-            const string route = "/systemDirectories";
+        const string route = "/systemDirectories";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Input validation failed.");
-            error.Detail.Should().Be("The Name field is required.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/directoryName");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Input validation failed.");
+        error.Detail.Should().Be("The Name field is required.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/directoryName");
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_null_for_required_attribute_value()
+    [Fact]
+    public async Task Cannot_create_resource_with_null_for_required_attribute_value()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    attributes = new
-                    {
-                        directoryName = (string?)null,
-                        isCaseSensitive = true
-                    }
+                    directoryName = (string?)null,
+                    isCaseSensitive = true
                 }
-            };
+            }
+        };
 
-            const string route = "/systemDirectories";
+        const string route = "/systemDirectories";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Input validation failed.");
-            error.Detail.Should().Be("The Name field is required.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/directoryName");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Input validation failed.");
+        error.Detail.Should().Be("The Name field is required.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/directoryName");
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_invalid_attribute_value()
+    [Fact]
+    public async Task Cannot_create_resource_with_invalid_attribute_value()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    attributes = new
-                    {
-                        directoryName = "!@#$%^&*().-",
-                        isCaseSensitive = true
-                    }
+                    directoryName = "!@#$%^&*().-",
+                    isCaseSensitive = true
                 }
-            };
+            }
+        };
 
-            const string route = "/systemDirectories";
+        const string route = "/systemDirectories";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Input validation failed.");
-            error.Detail.Should().Be("The field Name must match the regular expression '^[\\w\\s]+$'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/directoryName");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Input validation failed.");
+        error.Detail.Should().Be("The field Name must match the regular expression '^[\\w\\s]+$'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/directoryName");
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_valid_attribute_value()
-        {
-            // Arrange
-            SystemDirectory newDirectory = _fakers.SystemDirectory.Generate();
+    [Fact]
+    public async Task Can_create_resource_with_valid_attribute_value()
+    {
+        // Arrange
+        SystemDirectory newDirectory = _fakers.SystemDirectory.Generate();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    attributes = new
-                    {
-                        directoryName = newDirectory.Name,
-                        isCaseSensitive = newDirectory.IsCaseSensitive
-                    }
+                    directoryName = newDirectory.Name,
+                    isCaseSensitive = newDirectory.IsCaseSensitive
                 }
-            };
+            }
+        };
 
-            const string route = "/systemDirectories";
+        const string route = "/systemDirectories";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("directoryName").With(value => value.Should().Be(newDirectory.Name));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isCaseSensitive").With(value => value.Should().Be(newDirectory.IsCaseSensitive));
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("directoryName").With(value => value.Should().Be(newDirectory.Name));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isCaseSensitive").With(value => value.Should().Be(newDirectory.IsCaseSensitive));
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_multiple_violations()
+    [Fact]
+    public async Task Cannot_create_resource_with_multiple_violations()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    attributes = new
-                    {
-                        isCaseSensitive = false,
-                        sizeInBytes = -1
-                    }
+                    isCaseSensitive = false,
+                    sizeInBytes = -1
                 }
-            };
+            }
+        };
 
-            const string route = "/systemDirectories";
+        const string route = "/systemDirectories";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error1.Title.Should().Be("Input validation failed.");
-            error1.Detail.Should().Be("The Name field is required.");
-            error1.Source.ShouldNotBeNull();
-            error1.Source.Pointer.Should().Be("/data/attributes/directoryName");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error1.Title.Should().Be("Input validation failed.");
+        error1.Detail.Should().Be("The Name field is required.");
+        error1.Source.ShouldNotBeNull();
+        error1.Source.Pointer.Should().Be("/data/attributes/directoryName");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error2.Title.Should().Be("Input validation failed.");
-            error2.Detail.Should().Be("The field SizeInBytes must be between 0 and 9223372036854775807.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/data/attributes/sizeInBytes");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error2.Title.Should().Be("Input validation failed.");
+        error2.Detail.Should().Be("The field SizeInBytes must be between 0 and 9223372036854775807.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/data/attributes/sizeInBytes");
+    }
 
-        [Fact]
-        public async Task Does_not_exceed_MaxModelValidationErrors()
+    [Fact]
+    public async Task Does_not_exceed_MaxModelValidationErrors()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    attributes = new
-                    {
-                        sizeInBytes = -1
-                    }
+                    sizeInBytes = -1
                 }
-            };
-
-            const string route = "/systemDirectories";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
-
-            responseDocument.Errors.ShouldHaveCount(3);
-
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error1.Title.Should().Be("Input validation failed.");
-            error1.Detail.Should().Be("The maximum number of allowed model errors has been reached.");
-            error1.Source.Should().BeNull();
+            }
+        };
+
+        const string route = "/systemDirectories";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+
+        responseDocument.Errors.ShouldHaveCount(3);
+
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error1.Title.Should().Be("Input validation failed.");
+        error1.Detail.Should().Be("The maximum number of allowed model errors has been reached.");
+        error1.Source.Should().BeNull();
+
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error2.Title.Should().Be("Input validation failed.");
+        error2.Detail.Should().Be("The Name field is required.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/data/attributes/directoryName");
+
+        ErrorObject error3 = responseDocument.Errors[2];
+        error3.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error3.Title.Should().Be("Input validation failed.");
+        error3.Detail.Should().Be("The IsCaseSensitive field is required.");
+        error3.Source.ShouldNotBeNull();
+        error3.Source.Pointer.Should().Be("/data/attributes/isCaseSensitive");
+    }
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error2.Title.Should().Be("Input validation failed.");
-            error2.Detail.Should().Be("The Name field is required.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/data/attributes/directoryName");
+    [Fact]
+    public async Task Can_create_resource_with_annotated_relationships()
+    {
+        // Arrange
+        SystemDirectory existingParentDirectory = _fakers.SystemDirectory.Generate();
+        SystemDirectory existingSubdirectory = _fakers.SystemDirectory.Generate();
+        SystemFile existingFile = _fakers.SystemFile.Generate();
 
-            ErrorObject error3 = responseDocument.Errors[2];
-            error3.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error3.Title.Should().Be("Input validation failed.");
-            error3.Detail.Should().Be("The IsCaseSensitive field is required.");
-            error3.Source.ShouldNotBeNull();
-            error3.Source.Pointer.Should().Be("/data/attributes/isCaseSensitive");
-        }
+        SystemDirectory newDirectory = _fakers.SystemDirectory.Generate();
 
-        [Fact]
-        public async Task Can_create_resource_with_annotated_relationships()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            SystemDirectory existingParentDirectory = _fakers.SystemDirectory.Generate();
-            SystemDirectory existingSubdirectory = _fakers.SystemDirectory.Generate();
-            SystemFile existingFile = _fakers.SystemFile.Generate();
+            dbContext.Directories.AddRange(existingParentDirectory, existingSubdirectory);
+            dbContext.Files.Add(existingFile);
+            await dbContext.SaveChangesAsync();
+        });
 
-            SystemDirectory newDirectory = _fakers.SystemDirectory.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Directories.AddRange(existingParentDirectory, existingSubdirectory);
-                dbContext.Files.Add(existingFile);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    attributes = new
-                    {
-                        directoryName = newDirectory.Name,
-                        isCaseSensitive = newDirectory.IsCaseSensitive
-                    },
-                    relationships = new
+                    directoryName = newDirectory.Name,
+                    isCaseSensitive = newDirectory.IsCaseSensitive
+                },
+                relationships = new
+                {
+                    subdirectories = new
                     {
-                        subdirectories = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "systemDirectories",
-                                    id = existingSubdirectory.StringId
-                                }
+                                type = "systemDirectories",
+                                id = existingSubdirectory.StringId
                             }
-                        },
-                        files = new
+                        }
+                    },
+                    files = new
+                    {
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "systemFiles",
-                                    id = existingFile.StringId
-                                }
+                                type = "systemFiles",
+                                id = existingFile.StringId
                             }
-                        },
-                        parent = new
+                        }
+                    },
+                    parent = new
+                    {
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "systemDirectories",
-                                id = existingParentDirectory.StringId
-                            }
+                            type = "systemDirectories",
+                            id = existingParentDirectory.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/systemDirectories";
+        const string route = "/systemDirectories";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("directoryName").With(value => value.Should().Be(newDirectory.Name));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isCaseSensitive").With(value => value.Should().Be(newDirectory.IsCaseSensitive));
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("directoryName").With(value => value.Should().Be(newDirectory.Name));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isCaseSensitive").With(value => value.Should().Be(newDirectory.IsCaseSensitive));
+    }
 
-        [Fact]
-        public async Task Can_add_to_annotated_ToMany_relationship()
-        {
-            // Arrange
-            SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
-            SystemFile existingFile = _fakers.SystemFile.Generate();
+    [Fact]
+    public async Task Can_add_to_annotated_ToMany_relationship()
+    {
+        // Arrange
+        SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
+        SystemFile existingFile = _fakers.SystemFile.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingDirectory, existingFile);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingDirectory, existingFile);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "systemFiles",
-                        id = existingFile.StringId
-                    }
+                    type = "systemFiles",
+                    id = existingFile.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/systemDirectories/{existingDirectory.StringId}/relationships/files";
+        string route = $"/systemDirectories/{existingDirectory.StringId}/relationships/files";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_omitted_required_attribute_value()
-        {
-            // Arrange
-            SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
+    [Fact]
+    public async Task Can_update_resource_with_omitted_required_attribute_value()
+    {
+        // Arrange
+        SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
 
-            long newSizeInBytes = _fakers.SystemDirectory.Generate().SizeInBytes;
+        long newSizeInBytes = _fakers.SystemDirectory.Generate().SizeInBytes;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Directories.Add(existingDirectory);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Directories.Add(existingDirectory);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                id = existingDirectory.StringId,
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    id = existingDirectory.StringId,
-                    attributes = new
-                    {
-                        sizeInBytes = newSizeInBytes
-                    }
+                    sizeInBytes = newSizeInBytes
                 }
-            };
+            }
+        };
 
-            string route = $"/systemDirectories/{existingDirectory.StringId}";
+        string route = $"/systemDirectories/{existingDirectory.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_null_for_required_attribute_values()
-        {
-            // Arrange
-            SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_with_null_for_required_attribute_values()
+    {
+        // Arrange
+        SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Directories.Add(existingDirectory);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Directories.Add(existingDirectory);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                id = existingDirectory.StringId,
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    id = existingDirectory.StringId,
-                    attributes = new
-                    {
-                        directoryName = (string?)null,
-                        isCaseSensitive = (bool?)null
-                    }
+                    directoryName = (string?)null,
+                    isCaseSensitive = (bool?)null
                 }
-            };
+            }
+        };
 
-            string route = $"/systemDirectories/{existingDirectory.StringId}";
+        string route = $"/systemDirectories/{existingDirectory.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error1.Title.Should().Be("Input validation failed.");
-            error1.Detail.Should().Be("The Name field is required.");
-            error1.Source.ShouldNotBeNull();
-            error1.Source.Pointer.Should().Be("/data/attributes/directoryName");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error1.Title.Should().Be("Input validation failed.");
+        error1.Detail.Should().Be("The Name field is required.");
+        error1.Source.ShouldNotBeNull();
+        error1.Source.Pointer.Should().Be("/data/attributes/directoryName");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error2.Title.Should().Be("Input validation failed.");
-            error2.Detail.Should().Be("The IsCaseSensitive field is required.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/data/attributes/isCaseSensitive");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error2.Title.Should().Be("Input validation failed.");
+        error2.Detail.Should().Be("The IsCaseSensitive field is required.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/data/attributes/isCaseSensitive");
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_invalid_attribute_value()
-        {
-            // Arrange
-            SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_with_invalid_attribute_value()
+    {
+        // Arrange
+        SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Directories.Add(existingDirectory);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Directories.Add(existingDirectory);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                id = existingDirectory.StringId,
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    id = existingDirectory.StringId,
-                    attributes = new
-                    {
-                        directoryName = "!@#$%^&*().-"
-                    }
+                    directoryName = "!@#$%^&*().-"
                 }
-            };
+            }
+        };
 
-            string route = $"/systemDirectories/{existingDirectory.StringId}";
+        string route = $"/systemDirectories/{existingDirectory.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Input validation failed.");
-            error.Detail.Should().Be("The field Name must match the regular expression '^[\\w\\s]+$'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/directoryName");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Input validation failed.");
+        error.Detail.Should().Be("The field Name must match the regular expression '^[\\w\\s]+$'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/directoryName");
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_invalid_ID()
+    [Fact]
+    public async Task Cannot_update_resource_with_invalid_ID()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                id = "-1",
+                relationships = new
                 {
-                    type = "systemDirectories",
-                    id = "-1",
-                    relationships = new
+                    subdirectories = new
                     {
-                        subdirectories = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "systemDirectories",
-                                    id = "-1"
-                                }
+                                type = "systemDirectories",
+                                id = "-1"
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/systemDirectories/-1";
+        const string route = "/systemDirectories/-1";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error1.Title.Should().Be("Input validation failed.");
-            error1.Detail.Should().Be("The field Id must match the regular expression '^[0-9]+$'.");
-            error1.Source.ShouldNotBeNull();
-            error1.Source.Pointer.Should().Be("/data/id");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error1.Title.Should().Be("Input validation failed.");
+        error1.Detail.Should().Be("The field Id must match the regular expression '^[0-9]+$'.");
+        error1.Source.ShouldNotBeNull();
+        error1.Source.Pointer.Should().Be("/data/id");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error2.Title.Should().Be("Input validation failed.");
-            error2.Detail.Should().Be("The field Id must match the regular expression '^[0-9]+$'.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/data/relationships/subdirectories/data[0]/id");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error2.Title.Should().Be("Input validation failed.");
+        error2.Detail.Should().Be("The field Id must match the regular expression '^[0-9]+$'.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/data/relationships/subdirectories/data[0]/id");
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_valid_attribute_value()
-        {
-            // Arrange
-            SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
+    [Fact]
+    public async Task Can_update_resource_with_valid_attribute_value()
+    {
+        // Arrange
+        SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
 
-            string newDirectoryName = _fakers.SystemDirectory.Generate().Name;
+        string newDirectoryName = _fakers.SystemDirectory.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Directories.Add(existingDirectory);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Directories.Add(existingDirectory);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                id = existingDirectory.StringId,
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    id = existingDirectory.StringId,
-                    attributes = new
-                    {
-                        directoryName = newDirectoryName
-                    }
+                    directoryName = newDirectoryName
                 }
-            };
+            }
+        };
 
-            string route = $"/systemDirectories/{existingDirectory.StringId}";
+        string route = $"/systemDirectories/{existingDirectory.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_annotated_relationships()
-        {
-            // Arrange
-            SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
-            existingDirectory.Subdirectories = _fakers.SystemDirectory.Generate(1);
-            existingDirectory.Files = _fakers.SystemFile.Generate(1);
-            existingDirectory.Parent = _fakers.SystemDirectory.Generate();
+    [Fact]
+    public async Task Can_update_resource_with_annotated_relationships()
+    {
+        // Arrange
+        SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
+        existingDirectory.Subdirectories = _fakers.SystemDirectory.Generate(1);
+        existingDirectory.Files = _fakers.SystemFile.Generate(1);
+        existingDirectory.Parent = _fakers.SystemDirectory.Generate();
 
-            SystemDirectory existingParent = _fakers.SystemDirectory.Generate();
-            SystemDirectory existingSubdirectory = _fakers.SystemDirectory.Generate();
-            SystemFile existingFile = _fakers.SystemFile.Generate();
+        SystemDirectory existingParent = _fakers.SystemDirectory.Generate();
+        SystemDirectory existingSubdirectory = _fakers.SystemDirectory.Generate();
+        SystemFile existingFile = _fakers.SystemFile.Generate();
 
-            string newDirectoryName = _fakers.SystemDirectory.Generate().Name;
+        string newDirectoryName = _fakers.SystemDirectory.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Directories.AddRange(existingDirectory, existingParent, existingSubdirectory);
-                dbContext.Files.Add(existingFile);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Directories.AddRange(existingDirectory, existingParent, existingSubdirectory);
+            dbContext.Files.Add(existingFile);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                id = existingDirectory.StringId,
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    id = existingDirectory.StringId,
-                    attributes = new
-                    {
-                        directoryName = newDirectoryName
-                    },
-                    relationships = new
+                    directoryName = newDirectoryName
+                },
+                relationships = new
+                {
+                    subdirectories = new
                     {
-                        subdirectories = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "systemDirectories",
-                                    id = existingSubdirectory.StringId
-                                }
+                                type = "systemDirectories",
+                                id = existingSubdirectory.StringId
                             }
-                        },
-                        files = new
+                        }
+                    },
+                    files = new
+                    {
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "systemFiles",
-                                    id = existingFile.StringId
-                                }
+                                type = "systemFiles",
+                                id = existingFile.StringId
                             }
-                        },
-                        parent = new
+                        }
+                    },
+                    parent = new
+                    {
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "systemDirectories",
-                                id = existingParent.StringId
-                            }
+                            type = "systemDirectories",
+                            id = existingParent.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/systemDirectories/{existingDirectory.StringId}";
+        string route = $"/systemDirectories/{existingDirectory.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_multiple_self_references()
-        {
-            // Arrange
-            SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
+    [Fact]
+    public async Task Can_update_resource_with_multiple_self_references()
+    {
+        // Arrange
+        SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Directories.Add(existingDirectory);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Directories.Add(existingDirectory);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                id = existingDirectory.StringId,
+                relationships = new
                 {
-                    type = "systemDirectories",
-                    id = existingDirectory.StringId,
-                    relationships = new
+                    self = new
                     {
-                        self = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "systemDirectories",
-                                id = existingDirectory.StringId
-                            }
-                        },
-                        alsoSelf = new
+                            type = "systemDirectories",
+                            id = existingDirectory.StringId
+                        }
+                    },
+                    alsoSelf = new
+                    {
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "systemDirectories",
-                                id = existingDirectory.StringId
-                            }
+                            type = "systemDirectories",
+                            id = existingDirectory.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/systemDirectories/{existingDirectory.StringId}";
+        string route = $"/systemDirectories/{existingDirectory.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_collection_of_self_references()
-        {
-            // Arrange
-            SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
+    [Fact]
+    public async Task Can_update_resource_with_collection_of_self_references()
+    {
+        // Arrange
+        SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Directories.Add(existingDirectory);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Directories.Add(existingDirectory);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                id = existingDirectory.StringId,
+                relationships = new
                 {
-                    type = "systemDirectories",
-                    id = existingDirectory.StringId,
-                    relationships = new
+                    subdirectories = new
                     {
-                        subdirectories = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "systemDirectories",
-                                    id = existingDirectory.StringId
-                                }
+                                type = "systemDirectories",
+                                id = existingDirectory.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/systemDirectories/{existingDirectory.StringId}";
+        string route = $"/systemDirectories/{existingDirectory.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Can_replace_annotated_ToOne_relationship()
-        {
-            // Arrange
-            SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
-            existingDirectory.Parent = _fakers.SystemDirectory.Generate();
+    [Fact]
+    public async Task Can_replace_annotated_ToOne_relationship()
+    {
+        // Arrange
+        SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
+        existingDirectory.Parent = _fakers.SystemDirectory.Generate();
 
-            SystemDirectory otherExistingDirectory = _fakers.SystemDirectory.Generate();
+        SystemDirectory otherExistingDirectory = _fakers.SystemDirectory.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Directories.AddRange(existingDirectory, otherExistingDirectory);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Directories.AddRange(existingDirectory, otherExistingDirectory);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
-                {
-                    type = "systemDirectories",
-                    id = otherExistingDirectory.StringId
-                }
-            };
+                type = "systemDirectories",
+                id = otherExistingDirectory.StringId
+            }
+        };
 
-            string route = $"/systemDirectories/{existingDirectory.StringId}/relationships/parent";
+        string route = $"/systemDirectories/{existingDirectory.StringId}/relationships/parent";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Can_replace_annotated_ToMany_relationship()
-        {
-            // Arrange
-            SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
-            existingDirectory.Files = _fakers.SystemFile.Generate(2);
+    [Fact]
+    public async Task Can_replace_annotated_ToMany_relationship()
+    {
+        // Arrange
+        SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
+        existingDirectory.Files = _fakers.SystemFile.Generate(2);
 
-            SystemFile existingFile = _fakers.SystemFile.Generate();
+        SystemFile existingFile = _fakers.SystemFile.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingDirectory, existingFile);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingDirectory, existingFile);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "systemFiles",
-                        id = existingFile.StringId
-                    }
+                    type = "systemFiles",
+                    id = existingFile.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/systemDirectories/{existingDirectory.StringId}/relationships/files";
+        string route = $"/systemDirectories/{existingDirectory.StringId}/relationships/files";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Can_remove_from_annotated_ToMany_relationship()
-        {
-            // Arrange
-            SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
-            existingDirectory.Files = _fakers.SystemFile.Generate(1);
+    [Fact]
+    public async Task Can_remove_from_annotated_ToMany_relationship()
+    {
+        // Arrange
+        SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
+        existingDirectory.Files = _fakers.SystemFile.Generate(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Directories.Add(existingDirectory);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Directories.Add(existingDirectory);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "systemFiles",
-                        id = existingDirectory.Files.ElementAt(0).StringId
-                    }
+                    type = "systemFiles",
+                    id = existingDirectory.Files.ElementAt(0).StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/systemDirectories/{existingDirectory.StringId}/relationships/files";
+        string route = $"/systemDirectories/{existingDirectory.StringId}/relationships/files";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/NoModelStateValidationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/NoModelStateValidationTests.cs
index 4a7968e68c..bef4748d69 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/NoModelStateValidationTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/NoModelStateValidationTests.cs
@@ -1,139 +1,135 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using JsonApiDotNetCoreTests.Startups;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState
+namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState;
+
+public sealed class NoModelStateValidationTests : IClassFixture<IntegrationTestContext<NoModelStateValidationStartup<ModelStateDbContext>, ModelStateDbContext>>
 {
-    public sealed class NoModelStateValidationTests
-        : IClassFixture<IntegrationTestContext<NoModelStateValidationStartup<ModelStateDbContext>, ModelStateDbContext>>
-    {
-        private readonly IntegrationTestContext<NoModelStateValidationStartup<ModelStateDbContext>, ModelStateDbContext> _testContext;
-        private readonly ModelStateFakers _fakers = new();
+    private readonly IntegrationTestContext<NoModelStateValidationStartup<ModelStateDbContext>, ModelStateDbContext> _testContext;
+    private readonly ModelStateFakers _fakers = new();
 
-        public NoModelStateValidationTests(IntegrationTestContext<NoModelStateValidationStartup<ModelStateDbContext>, ModelStateDbContext> testContext)
-        {
-            _testContext = testContext;
+    public NoModelStateValidationTests(IntegrationTestContext<NoModelStateValidationStartup<ModelStateDbContext>, ModelStateDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<SystemVolumesController>();
-            testContext.UseController<SystemDirectoriesController>();
-            testContext.UseController<SystemFilesController>();
-        }
+        testContext.UseController<SystemVolumesController>();
+        testContext.UseController<SystemDirectoriesController>();
+        testContext.UseController<SystemFilesController>();
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_invalid_attribute_value()
+    [Fact]
+    public async Task Can_create_resource_with_invalid_attribute_value()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    attributes = new
-                    {
-                        directoryName = "!@#$%^&*().-",
-                        isCaseSensitive = false
-                    }
+                    directoryName = "!@#$%^&*().-",
+                    isCaseSensitive = false
                 }
-            };
+            }
+        };
 
-            const string route = "/systemDirectories";
+        const string route = "/systemDirectories";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("directoryName").With(value => value.Should().Be("!@#$%^&*().-"));
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("directoryName").With(value => value.Should().Be("!@#$%^&*().-"));
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_invalid_attribute_value()
-        {
-            // Arrange
-            SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
+    [Fact]
+    public async Task Can_update_resource_with_invalid_attribute_value()
+    {
+        // Arrange
+        SystemDirectory existingDirectory = _fakers.SystemDirectory.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Directories.Add(existingDirectory);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Directories.Add(existingDirectory);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "systemDirectories",
+                id = existingDirectory.StringId,
+                attributes = new
                 {
-                    type = "systemDirectories",
-                    id = existingDirectory.StringId,
-                    attributes = new
-                    {
-                        directoryName = "!@#$%^&*().-"
-                    }
+                    directoryName = "!@#$%^&*().-"
                 }
-            };
+            }
+        };
 
-            string route = $"/systemDirectories/{existingDirectory.StringId}";
+        string route = $"/systemDirectories/{existingDirectory.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Cannot_clear_required_OneToOne_relationship_through_primary_endpoint()
-        {
-            // Arrange
-            SystemVolume existingVolume = _fakers.SystemVolume.Generate();
-            existingVolume.RootDirectory = _fakers.SystemDirectory.Generate();
+    [Fact]
+    public async Task Cannot_clear_required_OneToOne_relationship_through_primary_endpoint()
+    {
+        // Arrange
+        SystemVolume existingVolume = _fakers.SystemVolume.Generate();
+        existingVolume.RootDirectory = _fakers.SystemDirectory.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Volumes.Add(existingVolume);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Volumes.Add(existingVolume);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "systemVolumes",
+                id = existingVolume.StringId,
+                relationships = new
                 {
-                    type = "systemVolumes",
-                    id = existingVolume.StringId,
-                    relationships = new
+                    rootDirectory = new
                     {
-                        rootDirectory = new
-                        {
-                            data = (object?)null
-                        }
+                        data = (object?)null
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/systemVolumes/{existingVolume.StringId}";
+        string route = $"/systemVolumes/{existingVolume.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Failed to clear a required relationship.");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Failed to clear a required relationship.");
 
-            error.Detail.Should().Be($"The relationship 'rootDirectory' on resource type 'systemVolumes' with ID '{existingVolume.StringId}' " +
-                "cannot be cleared because it is a required relationship.");
-        }
+        error.Detail.Should().Be($"The relationship 'rootDirectory' on resource type 'systemVolumes' with ID '{existingVolume.StringId}' " +
+            "cannot be cleared because it is a required relationship.");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectoriesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectoriesController.cs
deleted file mode 100644
index 0c4af4fa1a..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectoriesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState
-{
-    public sealed class SystemDirectoriesController : JsonApiController<SystemDirectory, int>
-    {
-        public SystemDirectoriesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<SystemDirectory, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectory.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectory.cs
index 549356dbca..1712ad103e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectory.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemDirectory.cs
@@ -1,42 +1,41 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState
+namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState")]
+public sealed class SystemDirectory : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class SystemDirectory : Identifiable<int>
-    {
-        [RegularExpression("^[0-9]+$")]
-        public override int Id { get; set; }
+    [RegularExpression("^[0-9]+$")]
+    public override int Id { get; set; }
 
-        [Attr(PublicName = "directoryName")]
-        [RegularExpression(@"^[\w\s]+$")]
-        public string Name { get; set; } = null!;
+    [Attr(PublicName = "directoryName")]
+    [RegularExpression(@"^[\w\s]+$")]
+    public string Name { get; set; } = null!;
 
-        [Attr]
-        [Required]
-        public bool? IsCaseSensitive { get; set; }
+    [Attr]
+    [Required]
+    public bool? IsCaseSensitive { get; set; }
 
-        [Attr]
-        [Range(typeof(long), "0", "9223372036854775807")]
-        public long SizeInBytes { get; set; }
+    [Attr]
+    [Range(typeof(long), "0", "9223372036854775807")]
+    public long SizeInBytes { get; set; }
 
-        [HasMany]
-        public ICollection<SystemDirectory> Subdirectories { get; set; } = new List<SystemDirectory>();
+    [HasMany]
+    public ICollection<SystemDirectory> Subdirectories { get; set; } = new List<SystemDirectory>();
 
-        [HasMany]
-        public ICollection<SystemFile> Files { get; set; } = new List<SystemFile>();
+    [HasMany]
+    public ICollection<SystemFile> Files { get; set; } = new List<SystemFile>();
 
-        [HasOne]
-        public SystemDirectory? Self { get; set; }
+    [HasOne]
+    public SystemDirectory? Self { get; set; }
 
-        [HasOne]
-        public SystemDirectory? AlsoSelf { get; set; }
+    [HasOne]
+    public SystemDirectory? AlsoSelf { get; set; }
 
-        [HasOne]
-        public SystemDirectory? Parent { get; set; }
-    }
+    [HasOne]
+    public SystemDirectory? Parent { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFile.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFile.cs
index 7a8d796a58..56bd50d1e7 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFile.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFile.cs
@@ -3,18 +3,18 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState
+namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState")]
+public sealed class SystemFile : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class SystemFile : Identifiable<int>
-    {
-        [Attr]
-        [MinLength(1)]
-        public string FileName { get; set; } = null!;
+    [Attr]
+    [MinLength(1)]
+    public string FileName { get; set; } = null!;
 
-        [Attr]
-        [Required]
-        [Range(typeof(long), "0", "9223372036854775807")]
-        public long? SizeInBytes { get; set; }
-    }
+    [Attr]
+    [Required]
+    [Range(typeof(long), "0", "9223372036854775807")]
+    public long? SizeInBytes { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFilesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFilesController.cs
deleted file mode 100644
index 90fb26d246..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemFilesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState
-{
-    public sealed class SystemFilesController : JsonApiController<SystemFile, int>
-    {
-        public SystemFilesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<SystemFile, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemVolume.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemVolume.cs
index b2c4ede226..08e4e58937 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemVolume.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemVolume.cs
@@ -2,15 +2,15 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState
+namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState")]
+public sealed class SystemVolume : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class SystemVolume : Identifiable<int>
-    {
-        [Attr]
-        public string? Name { get; set; }
+    [Attr]
+    public string? Name { get; set; }
 
-        [HasOne]
-        public SystemDirectory RootDirectory { get; set; } = null!;
-    }
+    [HasOne]
+    public SystemDirectory RootDirectory { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemVolumesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemVolumesController.cs
deleted file mode 100644
index a649619ec1..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/SystemVolumesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState
-{
-    public sealed class SystemVolumesController : JsonApiController<SystemVolume, int>
-    {
-        public SystemVolumesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<SystemVolume, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/Workflow.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/Workflow.cs
index 127d66355a..486d4f96b3 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/Workflow.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/Workflow.cs
@@ -1,14 +1,13 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody
+namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody")]
+public sealed class Workflow : Identifiable<Guid>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Workflow : Identifiable<Guid>
-    {
-        [Attr]
-        public WorkflowStage Stage { get; set; }
-    }
+    [Attr]
+    public WorkflowStage Stage { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDbContext.cs
index ab1442ea05..decc09bdc6 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDbContext.cs
@@ -3,16 +3,15 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody
+namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class WorkflowDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class WorkflowDbContext : DbContext
-    {
-        public DbSet<Workflow> Workflows => Set<Workflow>();
+    public DbSet<Workflow> Workflows => Set<Workflow>();
 
-        public WorkflowDbContext(DbContextOptions<WorkflowDbContext> options)
-            : base(options)
-        {
-        }
+    public WorkflowDbContext(DbContextOptions<WorkflowDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDefinition.cs
index cebebb9fda..f63b793e5b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowDefinition.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Errors;
@@ -10,104 +6,103 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody
+namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class WorkflowDefinition : JsonApiResourceDefinition<Workflow, Guid>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class WorkflowDefinition : JsonApiResourceDefinition<Workflow, Guid>
+    private static readonly Dictionary<WorkflowStage, ICollection<WorkflowStage>> StageTransitionTable = new()
     {
-        private static readonly Dictionary<WorkflowStage, ICollection<WorkflowStage>> StageTransitionTable = new()
+        [WorkflowStage.Created] = new[]
         {
-            [WorkflowStage.Created] = new[]
-            {
-                WorkflowStage.InProgress
-            },
-            [WorkflowStage.InProgress] = new[]
-            {
-                WorkflowStage.OnHold,
-                WorkflowStage.Succeeded,
-                WorkflowStage.Failed,
-                WorkflowStage.Canceled
-            },
-            [WorkflowStage.OnHold] = new[]
-            {
-                WorkflowStage.InProgress,
-                WorkflowStage.Canceled
-            }
-        };
+            WorkflowStage.InProgress
+        },
+        [WorkflowStage.InProgress] = new[]
+        {
+            WorkflowStage.OnHold,
+            WorkflowStage.Succeeded,
+            WorkflowStage.Failed,
+            WorkflowStage.Canceled
+        },
+        [WorkflowStage.OnHold] = new[]
+        {
+            WorkflowStage.InProgress,
+            WorkflowStage.Canceled
+        }
+    };
 
-        private WorkflowStage _previousStage;
+    private WorkflowStage _previousStage;
 
-        public WorkflowDefinition(IResourceGraph resourceGraph)
-            : base(resourceGraph)
+    public WorkflowDefinition(IResourceGraph resourceGraph)
+        : base(resourceGraph)
+    {
+    }
+
+    public override Task OnPrepareWriteAsync(Workflow resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (writeOperation == WriteOperationKind.UpdateResource)
         {
+            _previousStage = resource.Stage;
         }
 
-        public override Task OnPrepareWriteAsync(Workflow resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            if (writeOperation == WriteOperationKind.UpdateResource)
-            {
-                _previousStage = resource.Stage;
-            }
+        return Task.CompletedTask;
+    }
 
-            return Task.CompletedTask;
+    public override Task OnWritingAsync(Workflow resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (writeOperation == WriteOperationKind.CreateResource)
+        {
+            AssertHasValidInitialStage(resource);
         }
-
-        public override Task OnWritingAsync(Workflow resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        else if (writeOperation == WriteOperationKind.UpdateResource && resource.Stage != _previousStage)
         {
-            if (writeOperation == WriteOperationKind.CreateResource)
-            {
-                AssertHasValidInitialStage(resource);
-            }
-            else if (writeOperation == WriteOperationKind.UpdateResource && resource.Stage != _previousStage)
-            {
-                AssertCanTransitionToStage(_previousStage, resource.Stage);
-            }
-
-            return Task.CompletedTask;
+            AssertCanTransitionToStage(_previousStage, resource.Stage);
         }
 
-        [AssertionMethod]
-        private static void AssertHasValidInitialStage(Workflow resource)
+        return Task.CompletedTask;
+    }
+
+    [AssertionMethod]
+    private static void AssertHasValidInitialStage(Workflow resource)
+    {
+        if (resource.Stage != WorkflowStage.Created)
         {
-            if (resource.Stage != WorkflowStage.Created)
+            throw new JsonApiException(new ErrorObject(HttpStatusCode.UnprocessableEntity)
             {
-                throw new JsonApiException(new ErrorObject(HttpStatusCode.UnprocessableEntity)
+                Title = "Invalid workflow stage.",
+                Detail = $"Initial stage of workflow must be '{WorkflowStage.Created}'.",
+                Source = new ErrorSource
                 {
-                    Title = "Invalid workflow stage.",
-                    Detail = $"Initial stage of workflow must be '{WorkflowStage.Created}'.",
-                    Source = new ErrorSource
-                    {
-                        Pointer = "/data/attributes/stage"
-                    }
-                });
-            }
+                    Pointer = "/data/attributes/stage"
+                }
+            });
         }
+    }
 
-        [AssertionMethod]
-        private static void AssertCanTransitionToStage(WorkflowStage fromStage, WorkflowStage toStage)
+    [AssertionMethod]
+    private static void AssertCanTransitionToStage(WorkflowStage fromStage, WorkflowStage toStage)
+    {
+        if (!CanTransitionToStage(fromStage, toStage))
         {
-            if (!CanTransitionToStage(fromStage, toStage))
+            throw new JsonApiException(new ErrorObject(HttpStatusCode.UnprocessableEntity)
             {
-                throw new JsonApiException(new ErrorObject(HttpStatusCode.UnprocessableEntity)
+                Title = "Invalid workflow stage.",
+                Detail = $"Cannot transition from '{fromStage}' to '{toStage}'.",
+                Source = new ErrorSource
                 {
-                    Title = "Invalid workflow stage.",
-                    Detail = $"Cannot transition from '{fromStage}' to '{toStage}'.",
-                    Source = new ErrorSource
-                    {
-                        Pointer = "/data/attributes/stage"
-                    }
-                });
-            }
+                    Pointer = "/data/attributes/stage"
+                }
+            });
         }
+    }
 
-        private static bool CanTransitionToStage(WorkflowStage fromStage, WorkflowStage toStage)
+    private static bool CanTransitionToStage(WorkflowStage fromStage, WorkflowStage toStage)
+    {
+        if (StageTransitionTable.TryGetValue(fromStage, out ICollection<WorkflowStage>? possibleNextStages))
         {
-            if (StageTransitionTable.TryGetValue(fromStage, out ICollection<WorkflowStage>? possibleNextStages))
-            {
-                return possibleNextStages.Contains(toStage);
-            }
-
-            return false;
+            return possibleNextStages.Contains(toStage);
         }
+
+        return false;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowStage.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowStage.cs
index 07c9dbe4ca..60baadeadd 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowStage.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowStage.cs
@@ -1,12 +1,11 @@
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody
+namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody;
+
+public enum WorkflowStage
 {
-    public enum WorkflowStage
-    {
-        Created,
-        InProgress,
-        OnHold,
-        Succeeded,
-        Failed,
-        Canceled
-    }
+    Created,
+    InProgress,
+    OnHold,
+    Succeeded,
+    Failed,
+    Canceled
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowTests.cs
index 3b7d0f9f16..002d598003 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowTests.cs
@@ -1,174 +1,171 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody
+namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody;
+
+public sealed class WorkflowTests : IClassFixture<IntegrationTestContext<TestableStartup<WorkflowDbContext>, WorkflowDbContext>>
 {
-    public sealed class WorkflowTests : IClassFixture<IntegrationTestContext<TestableStartup<WorkflowDbContext>, WorkflowDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<WorkflowDbContext>, WorkflowDbContext> _testContext;
+    private readonly IntegrationTestContext<TestableStartup<WorkflowDbContext>, WorkflowDbContext> _testContext;
 
-        public WorkflowTests(IntegrationTestContext<TestableStartup<WorkflowDbContext>, WorkflowDbContext> testContext)
-        {
-            _testContext = testContext;
+    public WorkflowTests(IntegrationTestContext<TestableStartup<WorkflowDbContext>, WorkflowDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<WorkflowsController>();
+        testContext.UseController<WorkflowsController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<WorkflowDefinition>();
-            });
-        }
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<WorkflowDefinition>();
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_in_valid_stage()
+    [Fact]
+    public async Task Can_create_in_valid_stage()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workflows",
+                attributes = new
                 {
-                    type = "workflows",
-                    attributes = new
-                    {
-                        stage = WorkflowStage.Created
-                    }
+                    stage = WorkflowStage.Created
                 }
-            };
+            }
+        };
 
-            const string route = "/workflows";
+        const string route = "/workflows";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+    }
 
-        [Fact]
-        public async Task Cannot_create_in_invalid_stage()
+    [Fact]
+    public async Task Cannot_create_in_invalid_stage()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workflows",
+                attributes = new
                 {
-                    type = "workflows",
-                    attributes = new
-                    {
-                        stage = WorkflowStage.Canceled
-                    }
+                    stage = WorkflowStage.Canceled
                 }
-            };
+            }
+        };
 
-            const string route = "/workflows";
+        const string route = "/workflows";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Invalid workflow stage.");
-            error.Detail.Should().Be("Initial stage of workflow must be 'Created'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/stage");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Invalid workflow stage.");
+        error.Detail.Should().Be("Initial stage of workflow must be 'Created'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/stage");
+    }
 
-        [Fact]
-        public async Task Cannot_transition_to_invalid_stage()
+    [Fact]
+    public async Task Cannot_transition_to_invalid_stage()
+    {
+        // Arrange
+        var existingWorkflow = new Workflow
         {
-            // Arrange
-            var existingWorkflow = new Workflow
-            {
-                Stage = WorkflowStage.OnHold
-            };
+            Stage = WorkflowStage.OnHold
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Workflows.Add(existingWorkflow);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Workflows.Add(existingWorkflow);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workflows",
+                id = existingWorkflow.StringId,
+                attributes = new
                 {
-                    type = "workflows",
-                    id = existingWorkflow.StringId,
-                    attributes = new
-                    {
-                        stage = WorkflowStage.Succeeded
-                    }
+                    stage = WorkflowStage.Succeeded
                 }
-            };
+            }
+        };
 
-            string route = $"/workflows/{existingWorkflow.StringId}";
+        string route = $"/workflows/{existingWorkflow.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Invalid workflow stage.");
-            error.Detail.Should().Be("Cannot transition from 'OnHold' to 'Succeeded'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/stage");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Invalid workflow stage.");
+        error.Detail.Should().Be("Cannot transition from 'OnHold' to 'Succeeded'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/stage");
+    }
 
-        [Fact]
-        public async Task Can_transition_to_valid_stage()
+    [Fact]
+    public async Task Can_transition_to_valid_stage()
+    {
+        // Arrange
+        var existingWorkflow = new Workflow
         {
-            // Arrange
-            var existingWorkflow = new Workflow
-            {
-                Stage = WorkflowStage.InProgress
-            };
+            Stage = WorkflowStage.InProgress
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Workflows.Add(existingWorkflow);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Workflows.Add(existingWorkflow);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workflows",
+                id = existingWorkflow.StringId,
+                attributes = new
                 {
-                    type = "workflows",
-                    id = existingWorkflow.StringId,
-                    attributes = new
-                    {
-                        stage = WorkflowStage.Failed
-                    }
+                    stage = WorkflowStage.Failed
                 }
-            };
+            }
+        };
 
-            string route = $"/workflows/{existingWorkflow.StringId}";
+        string route = $"/workflows/{existingWorkflow.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowsController.cs
deleted file mode 100644
index b31523b7e1..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/RequestBody/WorkflowsController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.RequestBody
-{
-    public sealed class WorkflowsController : JsonApiController<Workflow, Guid>
-    {
-        public WorkflowsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Workflow, Guid> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithNamespaceTests.cs
index d9a628af06..799942bea9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithNamespaceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithNamespaceTests.cs
@@ -1,7 +1,4 @@
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
@@ -11,471 +8,469 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
+namespace JsonApiDotNetCoreTests.IntegrationTests.Links;
+
+public sealed class AbsoluteLinksWithNamespaceTests : IClassFixture<IntegrationTestContext<AbsoluteLinksInApiNamespaceStartup<LinksDbContext>, LinksDbContext>>
 {
-    public sealed class AbsoluteLinksWithNamespaceTests
-        : IClassFixture<IntegrationTestContext<AbsoluteLinksInApiNamespaceStartup<LinksDbContext>, LinksDbContext>>
+    private const string HostPrefix = "http://localhost";
+    private const string PathPrefix = "/api";
+
+    private readonly IntegrationTestContext<AbsoluteLinksInApiNamespaceStartup<LinksDbContext>, LinksDbContext> _testContext;
+    private readonly LinksFakers _fakers = new();
+
+    public AbsoluteLinksWithNamespaceTests(IntegrationTestContext<AbsoluteLinksInApiNamespaceStartup<LinksDbContext>, LinksDbContext> testContext)
     {
-        private const string HostPrefix = "http://localhost";
-        private const string PathPrefix = "/api";
+        _testContext = testContext;
 
-        private readonly IntegrationTestContext<AbsoluteLinksInApiNamespaceStartup<LinksDbContext>, LinksDbContext> _testContext;
-        private readonly LinksFakers _fakers = new();
+        testContext.UseController<PhotoAlbumsController>();
+        testContext.UseController<PhotosController>();
 
-        public AbsoluteLinksWithNamespaceTests(IntegrationTestContext<AbsoluteLinksInApiNamespaceStartup<LinksDbContext>, LinksDbContext> testContext)
+        testContext.ConfigureServicesAfterStartup(services =>
         {
-            _testContext = testContext;
-
-            testContext.UseController<PhotoAlbumsController>();
-            testContext.UseController<PhotosController>();
+            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-            });
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeTotalResourceCount = true;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeTotalResourceCount = true;
-        }
+    [Fact]
+    public async Task Get_primary_resource_by_ID_returns_absolute_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_primary_resource_by_ID_returns_absolute_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photoAlbums/{album.StringId}";
 
-            string route = $"{PathPrefix}/photoAlbums/{album.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be($"{HostPrefix}{route}");
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{HostPrefix}{route}/relationships/photos");
+            value.Links.Related.Should().Be($"{HostPrefix}{route}/photos");
+        });
+    }
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{HostPrefix}{route}/relationships/photos");
-                value.Links.Related.Should().Be($"{HostPrefix}{route}/photos");
-            });
-        }
+    [Fact]
+    public async Task Get_primary_resources_with_include_returns_absolute_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+        album.Photos = _fakers.Photo.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_primary_resources_with_include_returns_absolute_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
-            album.Photos = _fakers.Photo.Generate(1).ToHashSet();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<PhotoAlbum>();
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<PhotoAlbum>();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"{PathPrefix}/photoAlbums?include=photos";
+        const string route = $"{PathPrefix}/photoAlbums?include=photos";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue[0].With(resource =>
-            {
-                string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}";
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(albumLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(albumLink);
 
-                resource.Relationships.ShouldContainKey("photos").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                    value.Links.Related.Should().Be($"{albumLink}/photos");
-                });
+            resource.Relationships.ShouldContainKey("photos").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+                value.Links.Related.Should().Be($"{albumLink}/photos");
             });
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(photoLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(photoLink);
 
-                resource.Relationships.ShouldContainKey("album").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                    value.Links.Related.Should().Be($"{photoLink}/album");
-                });
+            resource.Relationships.ShouldContainKey("album").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+                value.Links.Related.Should().Be($"{photoLink}/album");
             });
-        }
+        });
+    }
+
+    [Fact]
+    public async Task Get_secondary_resource_returns_absolute_links()
+    {
+        // Arrange
+        Photo photo = _fakers.Photo.Generate();
+        photo.Album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_secondary_resource_returns_absolute_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Photo photo = _fakers.Photo.Generate();
-            photo.Album = _fakers.PhotoAlbum.Generate();
+            dbContext.Photos.Add(photo);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(photo);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photos/{photo.StringId}/album";
 
-            string route = $"{PathPrefix}/photos/{photo.StringId}/album";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{photo.Album.StringId}";
 
-            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{photo.Album.StringId}";
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+            value.Links.Related.Should().Be($"{albumLink}/photos");
+        });
+    }
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                value.Links.Related.Should().Be($"{albumLink}/photos");
-            });
-        }
+    [Fact]
+    public async Task Get_secondary_resources_returns_absolute_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+        album.Photos = _fakers.Photo.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_secondary_resources_returns_absolute_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
-            album.Photos = _fakers.Photo.Generate(1).ToHashSet();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photoAlbums/{album.StringId}/photos";
 
-            string route = $"{PathPrefix}/photoAlbums/{album.StringId}/photos";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-
-            responseDocument.Data.ManyValue[0].With(resource =>
-            {
-                string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(photoLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(photoLink);
 
-                resource.Relationships.ShouldContainKey("album").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                    value.Links.Related.Should().Be($"{photoLink}/album");
-                });
+            resource.Relationships.ShouldContainKey("album").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+                value.Links.Related.Should().Be($"{photoLink}/album");
             });
-        }
+        });
+    }
+
+    [Fact]
+    public async Task Get_ToOne_relationship_returns_absolute_links()
+    {
+        // Arrange
+        Photo photo = _fakers.Photo.Generate();
+        photo.Album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_ToOne_relationship_returns_absolute_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Photo photo = _fakers.Photo.Generate();
-            photo.Album = _fakers.PhotoAlbum.Generate();
+            dbContext.Photos.Add(photo);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(photo);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photos/{photo.StringId}/relationships/album";
 
-            string route = $"{PathPrefix}/photos/{photo.StringId}/relationships/album";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photos/{photo.StringId}/album");
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photos/{photo.StringId}/album");
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Should().BeNull();
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+    }
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Should().BeNull();
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
-        }
+    [Fact]
+    public async Task Get_ToMany_relationship_returns_absolute_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+        album.Photos = _fakers.Photo.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_ToMany_relationship_returns_absolute_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
-            album.Photos = _fakers.Photo.Generate(1).ToHashSet();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"{PathPrefix}/photoAlbums/{album.StringId}/relationships/photos";
+        string route = $"{PathPrefix}/photoAlbums/{album.StringId}/relationships/photos";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}/photos");
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}/photos");
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Links.Should().BeNull();
-            responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Links.Should().BeNull();
+        responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Create_resource_with_side_effects_and_include_returns_absolute_links()
-        {
-            // Arrange
-            Photo existingPhoto = _fakers.Photo.Generate();
+    [Fact]
+    public async Task Create_resource_with_side_effects_and_include_returns_absolute_links()
+    {
+        // Arrange
+        Photo existingPhoto = _fakers.Photo.Generate();
 
-            string newAlbumName = _fakers.PhotoAlbum.Generate().Name;
+        string newAlbumName = _fakers.PhotoAlbum.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(existingPhoto);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Photos.Add(existingPhoto);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "photoAlbums",
+                attributes = new
                 {
-                    type = "photoAlbums",
-                    attributes = new
-                    {
-                        name = newAlbumName
-                    },
-                    relationships = new
+                    name = newAlbumName
+                },
+                relationships = new
+                {
+                    photos = new
                     {
-                        photos = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "photos",
-                                    id = existingPhoto.StringId
-                                }
+                                type = "photos",
+                                id = existingPhoto.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"{PathPrefix}/photoAlbums?include=photos";
+        const string route = $"{PathPrefix}/photoAlbums?include=photos";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
 
-            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{responseDocument.Data.SingleValue.Id}";
+        string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{responseDocument.Data.SingleValue.Id}";
 
-            responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
+        responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                value.Links.Related.Should().Be($"{albumLink}/photos");
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+            value.Links.Related.Should().Be($"{albumLink}/photos");
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(photoLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(photoLink);
 
-                resource.Relationships.ShouldContainKey("album").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                    value.Links.Related.Should().Be($"{photoLink}/album");
-                });
+            resource.Relationships.ShouldContainKey("album").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+                value.Links.Related.Should().Be($"{photoLink}/album");
             });
-        }
+        });
+    }
 
-        [Fact]
-        public async Task Update_resource_with_side_effects_and_include_returns_absolute_links()
-        {
-            // Arrange
-            Photo existingPhoto = _fakers.Photo.Generate();
-            PhotoAlbum existingAlbum = _fakers.PhotoAlbum.Generate();
+    [Fact]
+    public async Task Update_resource_with_side_effects_and_include_returns_absolute_links()
+    {
+        // Arrange
+        Photo existingPhoto = _fakers.Photo.Generate();
+        PhotoAlbum existingAlbum = _fakers.PhotoAlbum.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingPhoto, existingAlbum);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingPhoto, existingAlbum);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "photos",
+                id = existingPhoto.StringId,
+                relationships = new
                 {
-                    type = "photos",
-                    id = existingPhoto.StringId,
-                    relationships = new
+                    album = new
                     {
-                        album = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "photoAlbums",
-                                id = existingAlbum.StringId
-                            }
+                            type = "photoAlbums",
+                            id = existingAlbum.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"{PathPrefix}/photos/{existingPhoto.StringId}?include=album";
+        string route = $"{PathPrefix}/photos/{existingPhoto.StringId}?include=album";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
+        string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be(photoLink);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be(photoLink);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("album").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                value.Links.Related.Should().Be($"{photoLink}/album");
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("album").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+            value.Links.Related.Should().Be($"{photoLink}/album");
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{existingAlbum.StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{existingAlbum.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(albumLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(albumLink);
 
-                resource.Relationships.ShouldContainKey("photos").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                    value.Links.Related.Should().Be($"{albumLink}/photos");
-                });
+            resource.Relationships.ShouldContainKey("photos").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+                value.Links.Related.Should().Be($"{albumLink}/photos");
             });
-        }
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithoutNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithoutNamespaceTests.cs
index 2bf54c153c..6fa391fd22 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithoutNamespaceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/AbsoluteLinksWithoutNamespaceTests.cs
@@ -1,7 +1,4 @@
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
@@ -11,471 +8,469 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
+namespace JsonApiDotNetCoreTests.IntegrationTests.Links;
+
+public sealed class AbsoluteLinksWithoutNamespaceTests : IClassFixture<IntegrationTestContext<AbsoluteLinksNoNamespaceStartup<LinksDbContext>, LinksDbContext>>
 {
-    public sealed class AbsoluteLinksWithoutNamespaceTests
-        : IClassFixture<IntegrationTestContext<AbsoluteLinksNoNamespaceStartup<LinksDbContext>, LinksDbContext>>
+    private const string HostPrefix = "http://localhost";
+    private const string PathPrefix = "";
+
+    private readonly IntegrationTestContext<AbsoluteLinksNoNamespaceStartup<LinksDbContext>, LinksDbContext> _testContext;
+    private readonly LinksFakers _fakers = new();
+
+    public AbsoluteLinksWithoutNamespaceTests(IntegrationTestContext<AbsoluteLinksNoNamespaceStartup<LinksDbContext>, LinksDbContext> testContext)
     {
-        private const string HostPrefix = "http://localhost";
-        private const string PathPrefix = "";
+        _testContext = testContext;
 
-        private readonly IntegrationTestContext<AbsoluteLinksNoNamespaceStartup<LinksDbContext>, LinksDbContext> _testContext;
-        private readonly LinksFakers _fakers = new();
+        testContext.UseController<PhotoAlbumsController>();
+        testContext.UseController<PhotosController>();
 
-        public AbsoluteLinksWithoutNamespaceTests(IntegrationTestContext<AbsoluteLinksNoNamespaceStartup<LinksDbContext>, LinksDbContext> testContext)
+        testContext.ConfigureServicesAfterStartup(services =>
         {
-            _testContext = testContext;
-
-            testContext.UseController<PhotoAlbumsController>();
-            testContext.UseController<PhotosController>();
+            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-            });
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeTotalResourceCount = true;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeTotalResourceCount = true;
-        }
+    [Fact]
+    public async Task Get_primary_resource_by_ID_returns_absolute_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_primary_resource_by_ID_returns_absolute_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photoAlbums/{album.StringId}";
 
-            string route = $"{PathPrefix}/photoAlbums/{album.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be($"{HostPrefix}{route}");
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{HostPrefix}{route}/relationships/photos");
+            value.Links.Related.Should().Be($"{HostPrefix}{route}/photos");
+        });
+    }
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{HostPrefix}{route}/relationships/photos");
-                value.Links.Related.Should().Be($"{HostPrefix}{route}/photos");
-            });
-        }
+    [Fact]
+    public async Task Get_primary_resources_with_include_returns_absolute_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+        album.Photos = _fakers.Photo.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_primary_resources_with_include_returns_absolute_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
-            album.Photos = _fakers.Photo.Generate(1).ToHashSet();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<PhotoAlbum>();
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<PhotoAlbum>();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"{PathPrefix}/photoAlbums?include=photos";
+        const string route = $"{PathPrefix}/photoAlbums?include=photos";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue[0].With(resource =>
-            {
-                string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}";
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(albumLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(albumLink);
 
-                resource.Relationships.ShouldContainKey("photos").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                    value.Links.Related.Should().Be($"{albumLink}/photos");
-                });
+            resource.Relationships.ShouldContainKey("photos").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+                value.Links.Related.Should().Be($"{albumLink}/photos");
             });
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(photoLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(photoLink);
 
-                resource.Relationships.ShouldContainKey("album").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                    value.Links.Related.Should().Be($"{photoLink}/album");
-                });
+            resource.Relationships.ShouldContainKey("album").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+                value.Links.Related.Should().Be($"{photoLink}/album");
             });
-        }
+        });
+    }
+
+    [Fact]
+    public async Task Get_secondary_resource_returns_absolute_links()
+    {
+        // Arrange
+        Photo photo = _fakers.Photo.Generate();
+        photo.Album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_secondary_resource_returns_absolute_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Photo photo = _fakers.Photo.Generate();
-            photo.Album = _fakers.PhotoAlbum.Generate();
+            dbContext.Photos.Add(photo);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(photo);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photos/{photo.StringId}/album";
 
-            string route = $"{PathPrefix}/photos/{photo.StringId}/album";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{photo.Album.StringId}";
 
-            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{photo.Album.StringId}";
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+            value.Links.Related.Should().Be($"{albumLink}/photos");
+        });
+    }
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                value.Links.Related.Should().Be($"{albumLink}/photos");
-            });
-        }
+    [Fact]
+    public async Task Get_secondary_resources_returns_absolute_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+        album.Photos = _fakers.Photo.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_secondary_resources_returns_absolute_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
-            album.Photos = _fakers.Photo.Generate(1).ToHashSet();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photoAlbums/{album.StringId}/photos";
 
-            string route = $"{PathPrefix}/photoAlbums/{album.StringId}/photos";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-
-            responseDocument.Data.ManyValue[0].With(resource =>
-            {
-                string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(photoLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(photoLink);
 
-                resource.Relationships.ShouldContainKey("album").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                    value.Links.Related.Should().Be($"{photoLink}/album");
-                });
+            resource.Relationships.ShouldContainKey("album").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+                value.Links.Related.Should().Be($"{photoLink}/album");
             });
-        }
+        });
+    }
+
+    [Fact]
+    public async Task Get_ToOne_relationship_returns_absolute_links()
+    {
+        // Arrange
+        Photo photo = _fakers.Photo.Generate();
+        photo.Album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_ToOne_relationship_returns_absolute_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Photo photo = _fakers.Photo.Generate();
-            photo.Album = _fakers.PhotoAlbum.Generate();
+            dbContext.Photos.Add(photo);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(photo);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photos/{photo.StringId}/relationships/album";
 
-            string route = $"{PathPrefix}/photos/{photo.StringId}/relationships/album";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photos/{photo.StringId}/album");
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photos/{photo.StringId}/album");
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Should().BeNull();
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+    }
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Should().BeNull();
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
-        }
+    [Fact]
+    public async Task Get_ToMany_relationship_returns_absolute_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+        album.Photos = _fakers.Photo.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_ToMany_relationship_returns_absolute_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
-            album.Photos = _fakers.Photo.Generate(1).ToHashSet();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"{PathPrefix}/photoAlbums/{album.StringId}/relationships/photos";
+        string route = $"{PathPrefix}/photoAlbums/{album.StringId}/relationships/photos";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}/photos");
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}/photos");
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Links.Should().BeNull();
-            responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Links.Should().BeNull();
+        responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Create_resource_with_side_effects_and_include_returns_absolute_links()
-        {
-            // Arrange
-            Photo existingPhoto = _fakers.Photo.Generate();
+    [Fact]
+    public async Task Create_resource_with_side_effects_and_include_returns_absolute_links()
+    {
+        // Arrange
+        Photo existingPhoto = _fakers.Photo.Generate();
 
-            string newAlbumName = _fakers.PhotoAlbum.Generate().Name;
+        string newAlbumName = _fakers.PhotoAlbum.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(existingPhoto);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Photos.Add(existingPhoto);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "photoAlbums",
+                attributes = new
                 {
-                    type = "photoAlbums",
-                    attributes = new
-                    {
-                        name = newAlbumName
-                    },
-                    relationships = new
+                    name = newAlbumName
+                },
+                relationships = new
+                {
+                    photos = new
                     {
-                        photos = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "photos",
-                                    id = existingPhoto.StringId
-                                }
+                                type = "photos",
+                                id = existingPhoto.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"{PathPrefix}/photoAlbums?include=photos";
+        const string route = $"{PathPrefix}/photoAlbums?include=photos";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
 
-            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{responseDocument.Data.SingleValue.Id}";
+        string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{responseDocument.Data.SingleValue.Id}";
 
-            responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
+        responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                value.Links.Related.Should().Be($"{albumLink}/photos");
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+            value.Links.Related.Should().Be($"{albumLink}/photos");
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(photoLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(photoLink);
 
-                resource.Relationships.ShouldContainKey("album").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                    value.Links.Related.Should().Be($"{photoLink}/album");
-                });
+            resource.Relationships.ShouldContainKey("album").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+                value.Links.Related.Should().Be($"{photoLink}/album");
             });
-        }
+        });
+    }
 
-        [Fact]
-        public async Task Update_resource_with_side_effects_and_include_returns_absolute_links()
-        {
-            // Arrange
-            Photo existingPhoto = _fakers.Photo.Generate();
-            PhotoAlbum existingAlbum = _fakers.PhotoAlbum.Generate();
+    [Fact]
+    public async Task Update_resource_with_side_effects_and_include_returns_absolute_links()
+    {
+        // Arrange
+        Photo existingPhoto = _fakers.Photo.Generate();
+        PhotoAlbum existingAlbum = _fakers.PhotoAlbum.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingPhoto, existingAlbum);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingPhoto, existingAlbum);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "photos",
+                id = existingPhoto.StringId,
+                relationships = new
                 {
-                    type = "photos",
-                    id = existingPhoto.StringId,
-                    relationships = new
+                    album = new
                     {
-                        album = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "photoAlbums",
-                                id = existingAlbum.StringId
-                            }
+                            type = "photoAlbums",
+                            id = existingAlbum.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"{PathPrefix}/photos/{existingPhoto.StringId}?include=album";
+        string route = $"{PathPrefix}/photos/{existingPhoto.StringId}?include=album";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
+        string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be(photoLink);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be(photoLink);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("album").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                value.Links.Related.Should().Be($"{photoLink}/album");
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("album").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+            value.Links.Related.Should().Be($"{photoLink}/album");
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{existingAlbum.StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{existingAlbum.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(albumLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(albumLink);
 
-                resource.Relationships.ShouldContainKey("photos").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                    value.Links.Related.Should().Be($"{albumLink}/photos");
-                });
+            resource.Relationships.ShouldContainKey("photos").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+                value.Links.Related.Should().Be($"{albumLink}/photos");
             });
-        }
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinkInclusionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinkInclusionTests.cs
index 77eaaf376f..128a19efb9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinkInclusionTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinkInclusionTests.cs
@@ -1,133 +1,130 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
+namespace JsonApiDotNetCoreTests.IntegrationTests.Links;
+
+public sealed class LinkInclusionTests : IClassFixture<IntegrationTestContext<TestableStartup<LinksDbContext>, LinksDbContext>>
 {
-    public sealed class LinkInclusionTests : IClassFixture<IntegrationTestContext<TestableStartup<LinksDbContext>, LinksDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<LinksDbContext>, LinksDbContext> _testContext;
+    private readonly LinksFakers _fakers = new();
+
+    public LinkInclusionTests(IntegrationTestContext<TestableStartup<LinksDbContext>, LinksDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<LinksDbContext>, LinksDbContext> _testContext;
-        private readonly LinksFakers _fakers = new();
+        _testContext = testContext;
 
-        public LinkInclusionTests(IntegrationTestContext<TestableStartup<LinksDbContext>, LinksDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<PhotosController>();
+        testContext.UseController<PhotoLocationsController>();
+    }
 
-            testContext.UseController<PhotosController>();
-            testContext.UseController<PhotoLocationsController>();
-        }
+    [Fact]
+    public async Task Get_primary_resource_with_include_applies_links_visibility_from_ResourceLinksAttribute()
+    {
+        // Arrange
+        PhotoLocation location = _fakers.PhotoLocation.Generate();
+        location.Photo = _fakers.Photo.Generate();
+        location.Album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_primary_resource_with_include_applies_links_visibility_from_ResourceLinksAttribute()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoLocation location = _fakers.PhotoLocation.Generate();
-            location.Photo = _fakers.Photo.Generate();
-            location.Album = _fakers.PhotoAlbum.Generate();
+            dbContext.PhotoLocations.Add(location);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoLocations.Add(location);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/photoLocations/{location.StringId}?include=photo,album";
 
-            string route = $"/photoLocations/{location.StringId}?include=photo,album";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.Should().BeNull();
 
-            responseDocument.Links.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Should().BeNull();
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Should().BeNull();
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photo").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().BeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photo").With(value =>
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("album").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.Should().BeNull();
+        });
+
+        responseDocument.Included.ShouldHaveCount(2);
+
+        responseDocument.Included[0].With(resource =>
+        {
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.ShouldNotBeNull();
+
+            resource.Relationships.ShouldContainKey("location").With(value =>
             {
                 value.ShouldNotBeNull();
                 value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().BeNull();
+                value.Links.Self.ShouldNotBeNull();
                 value.Links.Related.ShouldNotBeNull();
             });
+        });
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("album").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.Should().BeNull();
-            });
-
-            responseDocument.Included.ShouldHaveCount(2);
+        responseDocument.Included[1].With(resource =>
+        {
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.ShouldNotBeNull();
 
-            responseDocument.Included[0].With(resource =>
+            resource.Relationships.ShouldContainKey("photos").With(value =>
             {
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.ShouldNotBeNull();
-
-                resource.Relationships.ShouldContainKey("location").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.ShouldNotBeNull();
-                    value.Links.Related.ShouldNotBeNull();
-                });
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.ShouldNotBeNull();
+                value.Links.Related.ShouldNotBeNull();
             });
+        });
+    }
 
-            responseDocument.Included[1].With(resource =>
-            {
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.ShouldNotBeNull();
-
-                resource.Relationships.ShouldContainKey("photos").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.ShouldNotBeNull();
-                    value.Links.Related.ShouldNotBeNull();
-                });
-            });
-        }
+    [Fact]
+    public async Task Get_secondary_resource_applies_links_visibility_from_ResourceLinksAttribute()
+    {
+        // Arrange
+        Photo photo = _fakers.Photo.Generate();
+        photo.Location = _fakers.PhotoLocation.Generate();
 
-        [Fact]
-        public async Task Get_secondary_resource_applies_links_visibility_from_ResourceLinksAttribute()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Photo photo = _fakers.Photo.Generate();
-            photo.Location = _fakers.PhotoLocation.Generate();
+            dbContext.Photos.Add(photo);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(photo);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/photos/{photo.StringId}/location";
+        string route = $"/photos/{photo.StringId}/location";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.Should().BeNull();
+        responseDocument.Links.Should().BeNull();
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Should().BeNull();
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photo").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().BeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photo").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().BeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
 
-            responseDocument.Data.SingleValue.Relationships.Should().NotContainKey("album");
-        }
+        responseDocument.Data.SingleValue.Relationships.Should().NotContainKey("album");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksDbContext.cs
index 935c4b6718..390f8ec5e2 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksDbContext.cs
@@ -3,26 +3,25 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
+namespace JsonApiDotNetCoreTests.IntegrationTests.Links;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class LinksDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class LinksDbContext : DbContext
-    {
-        public DbSet<PhotoAlbum> PhotoAlbums => Set<PhotoAlbum>();
-        public DbSet<Photo> Photos => Set<Photo>();
-        public DbSet<PhotoLocation> PhotoLocations => Set<PhotoLocation>();
+    public DbSet<PhotoAlbum> PhotoAlbums => Set<PhotoAlbum>();
+    public DbSet<Photo> Photos => Set<Photo>();
+    public DbSet<PhotoLocation> PhotoLocations => Set<PhotoLocation>();
 
-        public LinksDbContext(DbContextOptions<LinksDbContext> options)
-            : base(options)
-        {
-        }
+    public LinksDbContext(DbContextOptions<LinksDbContext> options)
+        : base(options)
+    {
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<Photo>()
-                .HasOne(photo => photo.Location)
-                .WithOne(location => location!.Photo)
-                .HasForeignKey<Photo>("LocationId");
-        }
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<Photo>()
+            .HasOne(photo => photo.Location)
+            .WithOne(location => location.Photo)
+            .HasForeignKey<Photo>("LocationId");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksFakers.cs
index dfe263c43b..bd34d85cf5 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksFakers.cs
@@ -1,33 +1,31 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
+namespace JsonApiDotNetCoreTests.IntegrationTests.Links;
+
+internal sealed class LinksFakers : FakerContainer
 {
-    internal sealed class LinksFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<PhotoAlbum>> _lazyPhotoAlbumFaker = new(() =>
-            new Faker<PhotoAlbum>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(photoAlbum => photoAlbum.Name, faker => faker.Lorem.Sentence()));
+    private readonly Lazy<Faker<PhotoAlbum>> _lazyPhotoAlbumFaker = new(() =>
+        new Faker<PhotoAlbum>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(photoAlbum => photoAlbum.Name, faker => faker.Lorem.Sentence()));
 
-        private readonly Lazy<Faker<Photo>> _lazyPhotoFaker = new(() =>
-            new Faker<Photo>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(photo => photo.Url, faker => faker.Image.PlaceImgUrl()));
+    private readonly Lazy<Faker<Photo>> _lazyPhotoFaker = new(() =>
+        new Faker<Photo>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(photo => photo.Url, faker => faker.Image.PlaceImgUrl()));
 
-        private readonly Lazy<Faker<PhotoLocation>> _lazyPhotoLocationFaker = new(() =>
-            new Faker<PhotoLocation>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(photoLocation => photoLocation.PlaceName, faker => faker.Address.FullAddress())
-                .RuleFor(photoLocation => photoLocation.Latitude, faker => faker.Address.Latitude())
-                .RuleFor(photoLocation => photoLocation.Longitude, faker => faker.Address.Longitude()));
+    private readonly Lazy<Faker<PhotoLocation>> _lazyPhotoLocationFaker = new(() =>
+        new Faker<PhotoLocation>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(photoLocation => photoLocation.PlaceName, faker => faker.Address.FullAddress())
+            .RuleFor(photoLocation => photoLocation.Latitude, faker => faker.Address.Latitude())
+            .RuleFor(photoLocation => photoLocation.Longitude, faker => faker.Address.Longitude()));
 
-        public Faker<PhotoAlbum> PhotoAlbum => _lazyPhotoAlbumFaker.Value;
-        public Faker<Photo> Photo => _lazyPhotoFaker.Value;
-        public Faker<PhotoLocation> PhotoLocation => _lazyPhotoLocationFaker.Value;
-    }
+    public Faker<PhotoAlbum> PhotoAlbum => _lazyPhotoAlbumFaker.Value;
+    public Faker<Photo> Photo => _lazyPhotoFaker.Value;
+    public Faker<PhotoLocation> PhotoLocation => _lazyPhotoLocationFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/Photo.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/Photo.cs
index 1ee92f0d58..a4766b38ab 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/Photo.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/Photo.cs
@@ -1,20 +1,19 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
+namespace JsonApiDotNetCoreTests.IntegrationTests.Links;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Links")]
+public sealed class Photo : Identifiable<Guid>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Photo : Identifiable<Guid>
-    {
-        [Attr]
-        public string? Url { get; set; }
+    [Attr]
+    public string? Url { get; set; }
 
-        [HasOne]
-        public PhotoLocation? Location { get; set; }
+    [HasOne]
+    public PhotoLocation? Location { get; set; }
 
-        [HasOne]
-        public PhotoAlbum? Album { get; set; }
-    }
+    [HasOne]
+    public PhotoAlbum? Album { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbum.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbum.cs
index 9f6df3c0d5..32bdf79a40 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbum.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbum.cs
@@ -1,18 +1,16 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
+namespace JsonApiDotNetCoreTests.IntegrationTests.Links;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Links")]
+public sealed class PhotoAlbum : Identifiable<Guid>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class PhotoAlbum : Identifiable<Guid>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [HasMany]
-        public ISet<Photo> Photos { get; set; } = new HashSet<Photo>();
-    }
+    [HasMany]
+    public ISet<Photo> Photos { get; set; } = new HashSet<Photo>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbumsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbumsController.cs
deleted file mode 100644
index 29f80bc733..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoAlbumsController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
-{
-    public sealed class PhotoAlbumsController : JsonApiController<PhotoAlbum, Guid>
-    {
-        public PhotoAlbumsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<PhotoAlbum, Guid> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocation.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocation.cs
index 5985719055..ddd1489cbe 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocation.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocation.cs
@@ -2,25 +2,25 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
+namespace JsonApiDotNetCoreTests.IntegrationTests.Links;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[ResourceLinks(TopLevelLinks = LinkTypes.None, ResourceLinks = LinkTypes.None, RelationshipLinks = LinkTypes.Related)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Links")]
+public sealed class PhotoLocation : Identifiable<int>
 {
-    [ResourceLinks(TopLevelLinks = LinkTypes.None, ResourceLinks = LinkTypes.None, RelationshipLinks = LinkTypes.Related)]
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class PhotoLocation : Identifiable<int>
-    {
-        [Attr]
-        public string? PlaceName { get; set; }
+    [Attr]
+    public string? PlaceName { get; set; }
 
-        [Attr]
-        public double Latitude { get; set; }
+    [Attr]
+    public double Latitude { get; set; }
 
-        [Attr]
-        public double Longitude { get; set; }
+    [Attr]
+    public double Longitude { get; set; }
 
-        [HasOne]
-        public Photo Photo { get; set; } = null!;
+    [HasOne]
+    public Photo Photo { get; set; } = null!;
 
-        [HasOne(Links = LinkTypes.None)]
-        public PhotoAlbum? Album { get; set; }
-    }
+    [HasOne(Links = LinkTypes.None)]
+    public PhotoAlbum? Album { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocationsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocationsController.cs
deleted file mode 100644
index c77e97d5e4..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotoLocationsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
-{
-    public sealed class PhotoLocationsController : JsonApiController<PhotoLocation, int>
-    {
-        public PhotoLocationsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<PhotoLocation, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotosController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotosController.cs
deleted file mode 100644
index 0a3c83b911..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/PhotosController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
-{
-    public sealed class PhotosController : JsonApiController<Photo, Guid>
-    {
-        public PhotosController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Photo, Guid> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithNamespaceTests.cs
index 5213db54dd..be55eec1d1 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithNamespaceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithNamespaceTests.cs
@@ -1,7 +1,4 @@
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
@@ -11,471 +8,469 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
+namespace JsonApiDotNetCoreTests.IntegrationTests.Links;
+
+public sealed class RelativeLinksWithNamespaceTests : IClassFixture<IntegrationTestContext<RelativeLinksInApiNamespaceStartup<LinksDbContext>, LinksDbContext>>
 {
-    public sealed class RelativeLinksWithNamespaceTests
-        : IClassFixture<IntegrationTestContext<RelativeLinksInApiNamespaceStartup<LinksDbContext>, LinksDbContext>>
+    private const string HostPrefix = "";
+    private const string PathPrefix = "/api";
+
+    private readonly IntegrationTestContext<RelativeLinksInApiNamespaceStartup<LinksDbContext>, LinksDbContext> _testContext;
+    private readonly LinksFakers _fakers = new();
+
+    public RelativeLinksWithNamespaceTests(IntegrationTestContext<RelativeLinksInApiNamespaceStartup<LinksDbContext>, LinksDbContext> testContext)
     {
-        private const string HostPrefix = "";
-        private const string PathPrefix = "/api";
+        _testContext = testContext;
 
-        private readonly IntegrationTestContext<RelativeLinksInApiNamespaceStartup<LinksDbContext>, LinksDbContext> _testContext;
-        private readonly LinksFakers _fakers = new();
+        testContext.UseController<PhotoAlbumsController>();
+        testContext.UseController<PhotosController>();
 
-        public RelativeLinksWithNamespaceTests(IntegrationTestContext<RelativeLinksInApiNamespaceStartup<LinksDbContext>, LinksDbContext> testContext)
+        testContext.ConfigureServicesAfterStartup(services =>
         {
-            _testContext = testContext;
-
-            testContext.UseController<PhotoAlbumsController>();
-            testContext.UseController<PhotosController>();
+            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-            });
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeTotalResourceCount = true;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeTotalResourceCount = true;
-        }
+    [Fact]
+    public async Task Get_primary_resource_by_ID_returns_relative_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_primary_resource_by_ID_returns_relative_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photoAlbums/{album.StringId}";
 
-            string route = $"{PathPrefix}/photoAlbums/{album.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be($"{HostPrefix}{route}");
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{HostPrefix}{route}/relationships/photos");
+            value.Links.Related.Should().Be($"{HostPrefix}{route}/photos");
+        });
+    }
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{HostPrefix}{route}/relationships/photos");
-                value.Links.Related.Should().Be($"{HostPrefix}{route}/photos");
-            });
-        }
+    [Fact]
+    public async Task Get_primary_resources_with_include_returns_relative_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+        album.Photos = _fakers.Photo.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_primary_resources_with_include_returns_relative_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
-            album.Photos = _fakers.Photo.Generate(1).ToHashSet();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<PhotoAlbum>();
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<PhotoAlbum>();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"{PathPrefix}/photoAlbums?include=photos";
+        const string route = $"{PathPrefix}/photoAlbums?include=photos";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue[0].With(resource =>
-            {
-                string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}";
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(albumLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(albumLink);
 
-                resource.Relationships.ShouldContainKey("photos").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                    value.Links.Related.Should().Be($"{albumLink}/photos");
-                });
+            resource.Relationships.ShouldContainKey("photos").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+                value.Links.Related.Should().Be($"{albumLink}/photos");
             });
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(photoLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(photoLink);
 
-                resource.Relationships.ShouldContainKey("album").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                    value.Links.Related.Should().Be($"{photoLink}/album");
-                });
+            resource.Relationships.ShouldContainKey("album").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+                value.Links.Related.Should().Be($"{photoLink}/album");
             });
-        }
+        });
+    }
+
+    [Fact]
+    public async Task Get_secondary_resource_returns_relative_links()
+    {
+        // Arrange
+        Photo photo = _fakers.Photo.Generate();
+        photo.Album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_secondary_resource_returns_relative_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Photo photo = _fakers.Photo.Generate();
-            photo.Album = _fakers.PhotoAlbum.Generate();
+            dbContext.Photos.Add(photo);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(photo);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photos/{photo.StringId}/album";
 
-            string route = $"{PathPrefix}/photos/{photo.StringId}/album";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{photo.Album.StringId}";
 
-            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{photo.Album.StringId}";
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+            value.Links.Related.Should().Be($"{albumLink}/photos");
+        });
+    }
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                value.Links.Related.Should().Be($"{albumLink}/photos");
-            });
-        }
+    [Fact]
+    public async Task Get_secondary_resources_returns_relative_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+        album.Photos = _fakers.Photo.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_secondary_resources_returns_relative_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
-            album.Photos = _fakers.Photo.Generate(1).ToHashSet();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photoAlbums/{album.StringId}/photos";
 
-            string route = $"{PathPrefix}/photoAlbums/{album.StringId}/photos";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-
-            responseDocument.Data.ManyValue[0].With(resource =>
-            {
-                string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(photoLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(photoLink);
 
-                resource.Relationships.ShouldContainKey("album").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                    value.Links.Related.Should().Be($"{photoLink}/album");
-                });
+            resource.Relationships.ShouldContainKey("album").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+                value.Links.Related.Should().Be($"{photoLink}/album");
             });
-        }
+        });
+    }
+
+    [Fact]
+    public async Task Get_ToOne_relationship_returns_relative_links()
+    {
+        // Arrange
+        Photo photo = _fakers.Photo.Generate();
+        photo.Album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_ToOne_relationship_returns_relative_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Photo photo = _fakers.Photo.Generate();
-            photo.Album = _fakers.PhotoAlbum.Generate();
+            dbContext.Photos.Add(photo);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(photo);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photos/{photo.StringId}/relationships/album";
 
-            string route = $"{PathPrefix}/photos/{photo.StringId}/relationships/album";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photos/{photo.StringId}/album");
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photos/{photo.StringId}/album");
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Should().BeNull();
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+    }
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Should().BeNull();
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
-        }
+    [Fact]
+    public async Task Get_ToMany_relationship_returns_relative_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+        album.Photos = _fakers.Photo.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_ToMany_relationship_returns_relative_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
-            album.Photos = _fakers.Photo.Generate(1).ToHashSet();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"{PathPrefix}/photoAlbums/{album.StringId}/relationships/photos";
+        string route = $"{PathPrefix}/photoAlbums/{album.StringId}/relationships/photos";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}/photos");
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}/photos");
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Links.Should().BeNull();
-            responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Links.Should().BeNull();
+        responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Create_resource_with_side_effects_and_include_returns_relative_links()
-        {
-            // Arrange
-            Photo existingPhoto = _fakers.Photo.Generate();
+    [Fact]
+    public async Task Create_resource_with_side_effects_and_include_returns_relative_links()
+    {
+        // Arrange
+        Photo existingPhoto = _fakers.Photo.Generate();
 
-            string newAlbumName = _fakers.PhotoAlbum.Generate().Name;
+        string newAlbumName = _fakers.PhotoAlbum.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(existingPhoto);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Photos.Add(existingPhoto);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "photoAlbums",
+                attributes = new
                 {
-                    type = "photoAlbums",
-                    attributes = new
-                    {
-                        name = newAlbumName
-                    },
-                    relationships = new
+                    name = newAlbumName
+                },
+                relationships = new
+                {
+                    photos = new
                     {
-                        photos = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "photos",
-                                    id = existingPhoto.StringId
-                                }
+                                type = "photos",
+                                id = existingPhoto.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"{PathPrefix}/photoAlbums?include=photos";
+        const string route = $"{PathPrefix}/photoAlbums?include=photos";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
 
-            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{responseDocument.Data.SingleValue.Id}";
+        string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{responseDocument.Data.SingleValue.Id}";
 
-            responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
+        responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                value.Links.Related.Should().Be($"{albumLink}/photos");
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+            value.Links.Related.Should().Be($"{albumLink}/photos");
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(photoLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(photoLink);
 
-                resource.Relationships.ShouldContainKey("album").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                    value.Links.Related.Should().Be($"{photoLink}/album");
-                });
+            resource.Relationships.ShouldContainKey("album").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+                value.Links.Related.Should().Be($"{photoLink}/album");
             });
-        }
+        });
+    }
 
-        [Fact]
-        public async Task Update_resource_with_side_effects_and_include_returns_relative_links()
-        {
-            // Arrange
-            Photo existingPhoto = _fakers.Photo.Generate();
-            PhotoAlbum existingAlbum = _fakers.PhotoAlbum.Generate();
+    [Fact]
+    public async Task Update_resource_with_side_effects_and_include_returns_relative_links()
+    {
+        // Arrange
+        Photo existingPhoto = _fakers.Photo.Generate();
+        PhotoAlbum existingAlbum = _fakers.PhotoAlbum.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingPhoto, existingAlbum);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingPhoto, existingAlbum);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "photos",
+                id = existingPhoto.StringId,
+                relationships = new
                 {
-                    type = "photos",
-                    id = existingPhoto.StringId,
-                    relationships = new
+                    album = new
                     {
-                        album = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "photoAlbums",
-                                id = existingAlbum.StringId
-                            }
+                            type = "photoAlbums",
+                            id = existingAlbum.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"{PathPrefix}/photos/{existingPhoto.StringId}?include=album";
+        string route = $"{PathPrefix}/photos/{existingPhoto.StringId}?include=album";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
+        string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be(photoLink);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be(photoLink);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("album").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                value.Links.Related.Should().Be($"{photoLink}/album");
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("album").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+            value.Links.Related.Should().Be($"{photoLink}/album");
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{existingAlbum.StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{existingAlbum.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(albumLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(albumLink);
 
-                resource.Relationships.ShouldContainKey("photos").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                    value.Links.Related.Should().Be($"{albumLink}/photos");
-                });
+            resource.Relationships.ShouldContainKey("photos").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+                value.Links.Related.Should().Be($"{albumLink}/photos");
             });
-        }
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithoutNamespaceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithoutNamespaceTests.cs
index 7fb86278c8..93e85cd0e1 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithoutNamespaceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/RelativeLinksWithoutNamespaceTests.cs
@@ -1,7 +1,4 @@
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
@@ -11,471 +8,469 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Links
+namespace JsonApiDotNetCoreTests.IntegrationTests.Links;
+
+public sealed class RelativeLinksWithoutNamespaceTests : IClassFixture<IntegrationTestContext<RelativeLinksNoNamespaceStartup<LinksDbContext>, LinksDbContext>>
 {
-    public sealed class RelativeLinksWithoutNamespaceTests
-        : IClassFixture<IntegrationTestContext<RelativeLinksNoNamespaceStartup<LinksDbContext>, LinksDbContext>>
+    private const string HostPrefix = "";
+    private const string PathPrefix = "";
+
+    private readonly IntegrationTestContext<RelativeLinksNoNamespaceStartup<LinksDbContext>, LinksDbContext> _testContext;
+    private readonly LinksFakers _fakers = new();
+
+    public RelativeLinksWithoutNamespaceTests(IntegrationTestContext<RelativeLinksNoNamespaceStartup<LinksDbContext>, LinksDbContext> testContext)
     {
-        private const string HostPrefix = "";
-        private const string PathPrefix = "";
+        _testContext = testContext;
 
-        private readonly IntegrationTestContext<RelativeLinksNoNamespaceStartup<LinksDbContext>, LinksDbContext> _testContext;
-        private readonly LinksFakers _fakers = new();
+        testContext.UseController<PhotoAlbumsController>();
+        testContext.UseController<PhotosController>();
 
-        public RelativeLinksWithoutNamespaceTests(IntegrationTestContext<RelativeLinksNoNamespaceStartup<LinksDbContext>, LinksDbContext> testContext)
+        testContext.ConfigureServicesAfterStartup(services =>
         {
-            _testContext = testContext;
-
-            testContext.UseController<PhotoAlbumsController>();
-            testContext.UseController<PhotosController>();
+            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-            });
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeTotalResourceCount = true;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeTotalResourceCount = true;
-        }
+    [Fact]
+    public async Task Get_primary_resource_by_ID_returns_relative_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_primary_resource_by_ID_returns_relative_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photoAlbums/{album.StringId}";
 
-            string route = $"{PathPrefix}/photoAlbums/{album.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be($"{HostPrefix}{route}");
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{HostPrefix}{route}/relationships/photos");
+            value.Links.Related.Should().Be($"{HostPrefix}{route}/photos");
+        });
+    }
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{HostPrefix}{route}/relationships/photos");
-                value.Links.Related.Should().Be($"{HostPrefix}{route}/photos");
-            });
-        }
+    [Fact]
+    public async Task Get_primary_resources_with_include_returns_relative_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+        album.Photos = _fakers.Photo.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_primary_resources_with_include_returns_relative_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
-            album.Photos = _fakers.Photo.Generate(1).ToHashSet();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<PhotoAlbum>();
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<PhotoAlbum>();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"{PathPrefix}/photoAlbums?include=photos";
+        const string route = $"{PathPrefix}/photoAlbums?include=photos";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue[0].With(resource =>
-            {
-                string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}";
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(albumLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(albumLink);
 
-                resource.Relationships.ShouldContainKey("photos").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                    value.Links.Related.Should().Be($"{albumLink}/photos");
-                });
+            resource.Relationships.ShouldContainKey("photos").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+                value.Links.Related.Should().Be($"{albumLink}/photos");
             });
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(photoLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(photoLink);
 
-                resource.Relationships.ShouldContainKey("album").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                    value.Links.Related.Should().Be($"{photoLink}/album");
-                });
+            resource.Relationships.ShouldContainKey("album").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+                value.Links.Related.Should().Be($"{photoLink}/album");
             });
-        }
+        });
+    }
+
+    [Fact]
+    public async Task Get_secondary_resource_returns_relative_links()
+    {
+        // Arrange
+        Photo photo = _fakers.Photo.Generate();
+        photo.Album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_secondary_resource_returns_relative_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Photo photo = _fakers.Photo.Generate();
-            photo.Album = _fakers.PhotoAlbum.Generate();
+            dbContext.Photos.Add(photo);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(photo);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photos/{photo.StringId}/album";
 
-            string route = $"{PathPrefix}/photos/{photo.StringId}/album";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{photo.Album.StringId}";
 
-            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{photo.Album.StringId}";
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+            value.Links.Related.Should().Be($"{albumLink}/photos");
+        });
+    }
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                value.Links.Related.Should().Be($"{albumLink}/photos");
-            });
-        }
+    [Fact]
+    public async Task Get_secondary_resources_returns_relative_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+        album.Photos = _fakers.Photo.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_secondary_resources_returns_relative_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
-            album.Photos = _fakers.Photo.Generate(1).ToHashSet();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photoAlbums/{album.StringId}/photos";
 
-            string route = $"{PathPrefix}/photoAlbums/{album.StringId}/photos";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-
-            responseDocument.Data.ManyValue[0].With(resource =>
-            {
-                string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{album.Photos.ElementAt(0).StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(photoLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(photoLink);
 
-                resource.Relationships.ShouldContainKey("album").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                    value.Links.Related.Should().Be($"{photoLink}/album");
-                });
+            resource.Relationships.ShouldContainKey("album").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+                value.Links.Related.Should().Be($"{photoLink}/album");
             });
-        }
+        });
+    }
+
+    [Fact]
+    public async Task Get_ToOne_relationship_returns_relative_links()
+    {
+        // Arrange
+        Photo photo = _fakers.Photo.Generate();
+        photo.Album = _fakers.PhotoAlbum.Generate();
 
-        [Fact]
-        public async Task Get_ToOne_relationship_returns_relative_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Photo photo = _fakers.Photo.Generate();
-            photo.Album = _fakers.PhotoAlbum.Generate();
+            dbContext.Photos.Add(photo);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(photo);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"{PathPrefix}/photos/{photo.StringId}/relationships/album";
 
-            string route = $"{PathPrefix}/photos/{photo.StringId}/relationships/album";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photos/{photo.StringId}/album");
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photos/{photo.StringId}/album");
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Should().BeNull();
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+    }
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Should().BeNull();
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
-        }
+    [Fact]
+    public async Task Get_ToMany_relationship_returns_relative_links()
+    {
+        // Arrange
+        PhotoAlbum album = _fakers.PhotoAlbum.Generate();
+        album.Photos = _fakers.Photo.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Get_ToMany_relationship_returns_relative_links()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PhotoAlbum album = _fakers.PhotoAlbum.Generate();
-            album.Photos = _fakers.Photo.Generate(1).ToHashSet();
+            dbContext.PhotoAlbums.Add(album);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PhotoAlbums.Add(album);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"{PathPrefix}/photoAlbums/{album.StringId}/relationships/photos";
+        string route = $"{PathPrefix}/photoAlbums/{album.StringId}/relationships/photos";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}/photos");
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().Be($"{HostPrefix}{PathPrefix}/photoAlbums/{album.StringId}/photos");
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Links.Should().BeNull();
-            responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Links.Should().BeNull();
+        responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Create_resource_with_side_effects_and_include_returns_relative_links()
-        {
-            // Arrange
-            Photo existingPhoto = _fakers.Photo.Generate();
+    [Fact]
+    public async Task Create_resource_with_side_effects_and_include_returns_relative_links()
+    {
+        // Arrange
+        Photo existingPhoto = _fakers.Photo.Generate();
 
-            string newAlbumName = _fakers.PhotoAlbum.Generate().Name;
+        string newAlbumName = _fakers.PhotoAlbum.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Photos.Add(existingPhoto);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Photos.Add(existingPhoto);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "photoAlbums",
+                attributes = new
                 {
-                    type = "photoAlbums",
-                    attributes = new
-                    {
-                        name = newAlbumName
-                    },
-                    relationships = new
+                    name = newAlbumName
+                },
+                relationships = new
+                {
+                    photos = new
                     {
-                        photos = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "photos",
-                                    id = existingPhoto.StringId
-                                }
+                                type = "photos",
+                                id = existingPhoto.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"{PathPrefix}/photoAlbums?include=photos";
+        const string route = $"{PathPrefix}/photoAlbums?include=photos";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
 
-            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{responseDocument.Data.SingleValue.Id}";
+        string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{responseDocument.Data.SingleValue.Id}";
 
-            responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
+        responseDocument.Data.SingleValue.Links.Self.Should().Be(albumLink);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                value.Links.Related.Should().Be($"{albumLink}/photos");
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("photos").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+            value.Links.Related.Should().Be($"{albumLink}/photos");
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(photoLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(photoLink);
 
-                resource.Relationships.ShouldContainKey("album").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                    value.Links.Related.Should().Be($"{photoLink}/album");
-                });
+            resource.Relationships.ShouldContainKey("album").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+                value.Links.Related.Should().Be($"{photoLink}/album");
             });
-        }
+        });
+    }
 
-        [Fact]
-        public async Task Update_resource_with_side_effects_and_include_returns_relative_links()
-        {
-            // Arrange
-            Photo existingPhoto = _fakers.Photo.Generate();
-            PhotoAlbum existingAlbum = _fakers.PhotoAlbum.Generate();
+    [Fact]
+    public async Task Update_resource_with_side_effects_and_include_returns_relative_links()
+    {
+        // Arrange
+        Photo existingPhoto = _fakers.Photo.Generate();
+        PhotoAlbum existingAlbum = _fakers.PhotoAlbum.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingPhoto, existingAlbum);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingPhoto, existingAlbum);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "photos",
+                id = existingPhoto.StringId,
+                relationships = new
                 {
-                    type = "photos",
-                    id = existingPhoto.StringId,
-                    relationships = new
+                    album = new
                     {
-                        album = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "photoAlbums",
-                                id = existingAlbum.StringId
-                            }
+                            type = "photoAlbums",
+                            id = existingAlbum.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"{PathPrefix}/photos/{existingPhoto.StringId}?include=album";
+        string route = $"{PathPrefix}/photos/{existingPhoto.StringId}?include=album";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
+        string photoLink = $"{HostPrefix}{PathPrefix}/photos/{existingPhoto.StringId}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be(photoLink);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be(photoLink);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("album").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{photoLink}/relationships/album");
-                value.Links.Related.Should().Be($"{photoLink}/album");
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("album").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{photoLink}/relationships/album");
+            value.Links.Related.Should().Be($"{photoLink}/album");
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{existingAlbum.StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string albumLink = $"{HostPrefix}{PathPrefix}/photoAlbums/{existingAlbum.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(albumLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(albumLink);
 
-                resource.Relationships.ShouldContainKey("photos").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
-                    value.Links.Related.Should().Be($"{albumLink}/photos");
-                });
+            resource.Relationships.ShouldContainKey("photos").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{albumLink}/relationships/photos");
+                value.Links.Related.Should().Be($"{albumLink}/photos");
             });
-        }
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntriesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntriesController.cs
deleted file mode 100644
index d3104eb45b..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntriesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Logging
-{
-    public sealed class AuditEntriesController : JsonApiController<AuditEntry, int>
-    {
-        public AuditEntriesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<AuditEntry, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntry.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntry.cs
index 00aaa5c6b7..cbd1dd0989 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntry.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/AuditEntry.cs
@@ -1,17 +1,16 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Logging
+namespace JsonApiDotNetCoreTests.IntegrationTests.Logging;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Logging")]
+public sealed class AuditEntry : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class AuditEntry : Identifiable<int>
-    {
-        [Attr]
-        public string UserName { get; set; } = null!;
+    [Attr]
+    public string UserName { get; set; } = null!;
 
-        [Attr]
-        public DateTimeOffset CreatedAt { get; set; }
-    }
+    [Attr]
+    public DateTimeOffset CreatedAt { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingDbContext.cs
index d99bf62f8a..39c497616c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingDbContext.cs
@@ -1,16 +1,15 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Logging
+namespace JsonApiDotNetCoreTests.IntegrationTests.Logging;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class LoggingDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class LoggingDbContext : DbContext
-    {
-        public DbSet<AuditEntry> AuditEntries => Set<AuditEntry>();
+    public DbSet<AuditEntry> AuditEntries => Set<AuditEntry>();
 
-        public LoggingDbContext(DbContextOptions<LoggingDbContext> options)
-            : base(options)
-        {
-        }
+    public LoggingDbContext(DbContextOptions<LoggingDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingFakers.cs
index f2e17e5494..1c467dc782 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingFakers.cs
@@ -1,21 +1,19 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Logging
+namespace JsonApiDotNetCoreTests.IntegrationTests.Logging;
+
+internal sealed class LoggingFakers : FakerContainer
 {
-    internal sealed class LoggingFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<AuditEntry>> _lazyAuditEntryFaker = new(() =>
-            new Faker<AuditEntry>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(auditEntry => auditEntry.UserName, faker => faker.Internet.UserName())
-                .RuleFor(auditEntry => auditEntry.CreatedAt, faker => faker.Date.PastOffset()
-                    .TruncateToWholeMilliseconds()));
+    private readonly Lazy<Faker<AuditEntry>> _lazyAuditEntryFaker = new(() =>
+        new Faker<AuditEntry>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(auditEntry => auditEntry.UserName, faker => faker.Internet.UserName())
+            .RuleFor(auditEntry => auditEntry.CreatedAt, faker => faker.Date.PastOffset()
+                .TruncateToWholeMilliseconds()));
 
-        public Faker<AuditEntry> AuditEntry => _lazyAuditEntryFaker.Value;
-    }
+    public Faker<AuditEntry> AuditEntry => _lazyAuditEntryFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs
index 0ac74170db..f7d800a2af 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingTests.cs
@@ -1,122 +1,118 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Logging
+namespace JsonApiDotNetCoreTests.IntegrationTests.Logging;
+
+public sealed class LoggingTests : IClassFixture<IntegrationTestContext<TestableStartup<LoggingDbContext>, LoggingDbContext>>
 {
-    public sealed class LoggingTests : IClassFixture<IntegrationTestContext<TestableStartup<LoggingDbContext>, LoggingDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<LoggingDbContext>, LoggingDbContext> _testContext;
-        private readonly LoggingFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<LoggingDbContext>, LoggingDbContext> _testContext;
+    private readonly LoggingFakers _fakers = new();
 
-        public LoggingTests(IntegrationTestContext<TestableStartup<LoggingDbContext>, LoggingDbContext> testContext)
-        {
-            _testContext = testContext;
+    public LoggingTests(IntegrationTestContext<TestableStartup<LoggingDbContext>, LoggingDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<AuditEntriesController>();
+        testContext.UseController<AuditEntriesController>();
 
-            var loggerFactory = new FakeLoggerFactory(LogLevel.Trace);
+        var loggerFactory = new FakeLoggerFactory(LogLevel.Trace);
 
-            testContext.ConfigureLogging(options =>
-            {
-                options.ClearProviders();
-                options.AddProvider(loggerFactory);
-                options.SetMinimumLevel(LogLevel.Trace);
-            });
-
-            testContext.ConfigureServicesBeforeStartup(services =>
-            {
-                services.AddSingleton(loggerFactory);
-            });
-        }
+        testContext.ConfigureLogging(options =>
+        {
+            options.ClearProviders();
+            options.AddProvider(loggerFactory);
+            options.SetMinimumLevel(LogLevel.Trace);
+        });
 
-        [Fact]
-        public async Task Logs_request_body_at_Trace_level()
+        testContext.ConfigureServicesBeforeStartup(services =>
         {
-            // Arrange
-            var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
-            loggerFactory.Logger.Clear();
+            services.AddSingleton(loggerFactory);
+        });
+    }
 
-            AuditEntry newEntry = _fakers.AuditEntry.Generate();
+    [Fact]
+    public async Task Logs_request_body_at_Trace_level()
+    {
+        // Arrange
+        var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
+        loggerFactory.Logger.Clear();
+
+        AuditEntry newEntry = _fakers.AuditEntry.Generate();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "auditEntries",
+                attributes = new
                 {
-                    type = "auditEntries",
-                    attributes = new
-                    {
-                        userName = newEntry.UserName,
-                        createdAt = newEntry.CreatedAt
-                    }
+                    userName = newEntry.UserName,
+                    createdAt = newEntry.CreatedAt
                 }
-            };
+            }
+        };
 
-            // Arrange
-            const string route = "/auditEntries";
+        // Arrange
+        const string route = "/auditEntries";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            loggerFactory.Logger.Messages.ShouldNotBeEmpty();
+        loggerFactory.Logger.Messages.ShouldNotBeEmpty();
 
-            loggerFactory.Logger.Messages.Should().ContainSingle(message => message.LogLevel == LogLevel.Trace &&
-                message.Text.StartsWith("Received POST request at 'http://localhost/auditEntries' with body: <<", StringComparison.Ordinal));
-        }
+        loggerFactory.Logger.Messages.Should().ContainSingle(message => message.LogLevel == LogLevel.Trace &&
+            message.Text.StartsWith("Received POST request at 'http://localhost/auditEntries' with body: <<", StringComparison.Ordinal));
+    }
 
-        [Fact]
-        public async Task Logs_response_body_at_Trace_level()
-        {
-            // Arrange
-            var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
-            loggerFactory.Logger.Clear();
+    [Fact]
+    public async Task Logs_response_body_at_Trace_level()
+    {
+        // Arrange
+        var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
+        loggerFactory.Logger.Clear();
 
-            // Arrange
-            const string route = "/auditEntries";
+        // Arrange
+        const string route = "/auditEntries";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            loggerFactory.Logger.Messages.ShouldNotBeEmpty();
+        loggerFactory.Logger.Messages.ShouldNotBeEmpty();
 
-            loggerFactory.Logger.Messages.Should().ContainSingle(message => message.LogLevel == LogLevel.Trace &&
-                message.Text.StartsWith("Sending 200 response for GET request at 'http://localhost/auditEntries' with body: <<", StringComparison.Ordinal));
-        }
+        loggerFactory.Logger.Messages.Should().ContainSingle(message => message.LogLevel == LogLevel.Trace &&
+            message.Text.StartsWith("Sending 200 response for GET request at 'http://localhost/auditEntries' with body: <<", StringComparison.Ordinal));
+    }
 
-        [Fact]
-        public async Task Logs_invalid_request_body_error_at_Information_level()
-        {
-            // Arrange
-            var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
-            loggerFactory.Logger.Clear();
+    [Fact]
+    public async Task Logs_invalid_request_body_error_at_Information_level()
+    {
+        // Arrange
+        var loggerFactory = _testContext.Factory.Services.GetRequiredService<FakeLoggerFactory>();
+        loggerFactory.Logger.Clear();
 
-            // Arrange
-            const string requestBody = "{ \"data\" {";
+        // Arrange
+        const string requestBody = "{ \"data\" {";
 
-            const string route = "/auditEntries";
+        const string route = "/auditEntries";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            loggerFactory.Logger.Messages.ShouldNotBeEmpty();
+        loggerFactory.Logger.Messages.ShouldNotBeEmpty();
 
-            loggerFactory.Logger.Messages.Should().ContainSingle(message => message.LogLevel == LogLevel.Information &&
-                message.Text.Contains("Failed to deserialize request body."));
-        }
+        loggerFactory.Logger.Messages.Should().ContainSingle(message => message.LogLevel == LogLevel.Information &&
+            message.Text.Contains("Failed to deserialize request body."));
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/MetaDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/MetaDbContext.cs
index 9c46c51709..25f6f10810 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/MetaDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/MetaDbContext.cs
@@ -1,17 +1,16 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.Meta;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class MetaDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class MetaDbContext : DbContext
-    {
-        public DbSet<ProductFamily> ProductFamilies => Set<ProductFamily>();
-        public DbSet<SupportTicket> SupportTickets => Set<SupportTicket>();
+    public DbSet<ProductFamily> ProductFamilies => Set<ProductFamily>();
+    public DbSet<SupportTicket> SupportTickets => Set<SupportTicket>();
 
-        public MetaDbContext(DbContextOptions<MetaDbContext> options)
-            : base(options)
-        {
-        }
+    public MetaDbContext(DbContextOptions<MetaDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/MetaFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/MetaFakers.cs
index 3deae16930..726dd82923 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/MetaFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/MetaFakers.cs
@@ -1,25 +1,23 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.Meta;
+
+internal sealed class MetaFakers : FakerContainer
 {
-    internal sealed class MetaFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<ProductFamily>> _lazyProductFamilyFaker = new(() =>
-            new Faker<ProductFamily>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(productFamily => productFamily.Name, faker => faker.Commerce.ProductName()));
+    private readonly Lazy<Faker<ProductFamily>> _lazyProductFamilyFaker = new(() =>
+        new Faker<ProductFamily>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(productFamily => productFamily.Name, faker => faker.Commerce.ProductName()));
 
-        private readonly Lazy<Faker<SupportTicket>> _lazySupportTicketFaker = new(() =>
-            new Faker<SupportTicket>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(supportTicket => supportTicket.Description, faker => faker.Lorem.Paragraph()));
+    private readonly Lazy<Faker<SupportTicket>> _lazySupportTicketFaker = new(() =>
+        new Faker<SupportTicket>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(supportTicket => supportTicket.Description, faker => faker.Lorem.Paragraph()));
 
-        public Faker<ProductFamily> ProductFamily => _lazyProductFamilyFaker.Value;
-        public Faker<SupportTicket> SupportTicket => _lazySupportTicketFaker.Value;
-    }
+    public Faker<ProductFamily> ProductFamily => _lazyProductFamilyFaker.Value;
+    public Faker<SupportTicket> SupportTicket => _lazySupportTicketFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamiliesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamiliesController.cs
deleted file mode 100644
index 408d6a3414..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamiliesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Meta
-{
-    public sealed class ProductFamiliesController : JsonApiController<ProductFamily, int>
-    {
-        public ProductFamiliesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<ProductFamily, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamily.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamily.cs
index feb2d9358a..f860972abe 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamily.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ProductFamily.cs
@@ -1,17 +1,16 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.Meta;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Meta")]
+public sealed class ProductFamily : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ProductFamily : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [HasMany]
-        public IList<SupportTicket> Tickets { get; set; } = new List<SupportTicket>();
-    }
+    [HasMany]
+    public IList<SupportTicket> Tickets { get; set; } = new List<SupportTicket>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResourceMetaTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResourceMetaTests.cs
index dacfe150df..1ee473bffd 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResourceMetaTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResourceMetaTests.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -9,101 +6,100 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.Meta;
+
+public sealed class ResourceMetaTests : IClassFixture<IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext>>
 {
-    public sealed class ResourceMetaTests : IClassFixture<IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext> _testContext;
+    private readonly MetaFakers _fakers = new();
+
+    public ResourceMetaTests(IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext> _testContext;
-        private readonly MetaFakers _fakers = new();
+        _testContext = testContext;
 
-        public ResourceMetaTests(IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext> testContext)
+        testContext.UseController<ProductFamiliesController>();
+        testContext.UseController<SupportTicketsController>();
+
+        testContext.ConfigureServicesAfterStartup(services =>
         {
-            _testContext = testContext;
+            services.AddResourceDefinition<SupportTicketDefinition>();
+            services.AddSingleton<ResourceDefinitionHitCounter>();
+        });
 
-            testContext.UseController<ProductFamiliesController>();
-            testContext.UseController<SupportTicketsController>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        hitCounter.Reset();
+    }
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<SupportTicketDefinition>();
-                services.AddSingleton<ResourceDefinitionHitCounter>();
-            });
+    [Fact]
+    public async Task Returns_resource_meta_from_ResourceDefinition()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            hitCounter.Reset();
-        }
+        List<SupportTicket> tickets = _fakers.SupportTicket.Generate(3);
+        tickets[0].Description = $"Critical: {tickets[0].Description}";
+        tickets[2].Description = $"Critical: {tickets[2].Description}";
 
-        [Fact]
-        public async Task Returns_resource_meta_from_ResourceDefinition()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            List<SupportTicket> tickets = _fakers.SupportTicket.Generate(3);
-            tickets[0].Description = $"Critical: {tickets[0].Description}";
-            tickets[2].Description = $"Critical: {tickets[2].Description}";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<SupportTicket>();
-                dbContext.SupportTickets.AddRange(tickets);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/supportTickets";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(3);
-            responseDocument.Data.ManyValue[0].Meta.ShouldContainKey("hasHighPriority");
-            responseDocument.Data.ManyValue[1].Meta.Should().BeNull();
-            responseDocument.Data.ManyValue[2].Meta.ShouldContainKey("hasHighPriority");
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(SupportTicket), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(SupportTicket), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(SupportTicket), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Returns_resource_meta_from_ResourceDefinition_in_included_resources()
+            await dbContext.ClearTableAsync<SupportTicket>();
+            dbContext.SupportTickets.AddRange(tickets);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/supportTickets";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(3);
+        responseDocument.Data.ManyValue[0].Meta.ShouldContainKey("hasHighPriority");
+        responseDocument.Data.ManyValue[1].Meta.Should().BeNull();
+        responseDocument.Data.ManyValue[2].Meta.ShouldContainKey("hasHighPriority");
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            (typeof(SupportTicket), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(SupportTicket), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(SupportTicket), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
 
-            ProductFamily family = _fakers.ProductFamily.Generate();
-            family.Tickets = _fakers.SupportTicket.Generate(1);
-            family.Tickets[0].Description = $"Critical: {family.Tickets[0].Description}";
+    [Fact]
+    public async Task Returns_resource_meta_from_ResourceDefinition_in_included_resources()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<ProductFamily>();
-                dbContext.ProductFamilies.Add(family);
-                await dbContext.SaveChangesAsync();
-            });
+        ProductFamily family = _fakers.ProductFamily.Generate();
+        family.Tickets = _fakers.SupportTicket.Generate(1);
+        family.Tickets[0].Description = $"Critical: {family.Tickets[0].Description}";
 
-            string route = $"/productFamilies/{family.StringId}?include=tickets";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<ProductFamily>();
+            dbContext.ProductFamilies.Add(family);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/productFamilies/{family.StringId}?include=tickets";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Meta.ShouldContainKey("hasHighPriority");
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Meta.ShouldContainKey("hasHighPriority");
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(SupportTicket), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(SupportTicket), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResponseMetaTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResponseMetaTests.cs
index d416eac792..14818db0d5 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResponseMetaTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/ResponseMetaTests.cs
@@ -1,6 +1,4 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Response;
@@ -8,46 +6,46 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.Meta;
+
+public sealed class ResponseMetaTests : IClassFixture<IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext>>
 {
-    public sealed class ResponseMetaTests : IClassFixture<IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext> _testContext;
+    private readonly IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext> _testContext;
 
-        public ResponseMetaTests(IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext> testContext)
-        {
-            _testContext = testContext;
+    public ResponseMetaTests(IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<ProductFamiliesController>();
-            testContext.UseController<SupportTicketsController>();
+        testContext.UseController<ProductFamiliesController>();
+        testContext.UseController<SupportTicketsController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddSingleton<IResponseMeta, SupportResponseMeta>();
-            });
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddSingleton<IResponseMeta, SupportResponseMeta>();
+        });
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeTotalResourceCount = false;
-        }
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeTotalResourceCount = false;
+    }
 
-        [Fact]
-        public async Task Returns_top_level_meta()
+    [Fact]
+    public async Task Returns_top_level_meta()
+    {
+        // Arrange
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<SupportTicket>();
-            });
+            await dbContext.ClearTableAsync<SupportTicket>();
+        });
 
-            const string route = "/supportTickets";
+        const string route = "/supportTickets";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/supportTickets"",
     ""first"": ""http://localhost/supportTickets""
@@ -64,6 +62,5 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     ]
   }
 }");
-        }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportResponseMeta.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportResponseMeta.cs
index 7bb94a52c8..8e3b27b286 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportResponseMeta.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportResponseMeta.cs
@@ -1,24 +1,22 @@
-using System.Collections.Generic;
 using JsonApiDotNetCore.Serialization.Response;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.Meta;
+
+public sealed class SupportResponseMeta : IResponseMeta
 {
-    public sealed class SupportResponseMeta : IResponseMeta
+    public IReadOnlyDictionary<string, object?> GetMeta()
     {
-        public IReadOnlyDictionary<string, object?> GetMeta()
+        return new Dictionary<string, object?>
         {
-            return new Dictionary<string, object?>
+            ["license"] = "MIT",
+            ["projectUrl"] = "https://github.com/json-api-dotnet/JsonApiDotNetCore/",
+            ["versions"] = new[]
             {
-                ["license"] = "MIT",
-                ["projectUrl"] = "https://github.com/json-api-dotnet/JsonApiDotNetCore/",
-                ["versions"] = new[]
-                {
-                    "v4.0.0",
-                    "v3.1.0",
-                    "v2.5.2",
-                    "v1.3.1"
-                }
-            };
-        }
+                "v4.0.0",
+                "v3.1.0",
+                "v2.5.2",
+                "v1.3.1"
+            }
+        };
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicket.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicket.cs
index 603b6790fd..619542ad6d 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicket.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicket.cs
@@ -2,12 +2,12 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.Meta;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Meta")]
+public sealed class SupportTicket : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class SupportTicket : Identifiable<int>
-    {
-        [Attr]
-        public string Description { get; set; } = null!;
-    }
+    [Attr]
+    public string Description { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketDefinition.cs
index 0c355abce6..6ca207d0aa 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketDefinition.cs
@@ -1,33 +1,30 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.Meta;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class SupportTicketDefinition : HitCountingResourceDefinition<SupportTicket, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class SupportTicketDefinition : HitCountingResourceDefinition<SupportTicket, int>
+    protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.GetMeta;
+
+    public SupportTicketDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, hitCounter)
     {
-        protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.GetMeta;
+    }
 
-        public SupportTicketDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, hitCounter)
-        {
-        }
+    public override IDictionary<string, object?>? GetMeta(SupportTicket resource)
+    {
+        base.GetMeta(resource);
 
-        public override IDictionary<string, object?>? GetMeta(SupportTicket resource)
+        if (!string.IsNullOrEmpty(resource.Description) && resource.Description.StartsWith("Critical:", StringComparison.Ordinal))
         {
-            base.GetMeta(resource);
-
-            if (!string.IsNullOrEmpty(resource.Description) && resource.Description.StartsWith("Critical:", StringComparison.Ordinal))
+            return new Dictionary<string, object?>
             {
-                return new Dictionary<string, object?>
-                {
-                    ["hasHighPriority"] = true
-                };
-            }
-
-            return null;
+                ["hasHighPriority"] = true
+            };
         }
+
+        return null;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketsController.cs
deleted file mode 100644
index 9e5b6da653..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/SupportTicketsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Meta
-{
-    public sealed class SupportTicketsController : JsonApiController<SupportTicket, int>
-    {
-        public SupportTicketsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<SupportTicket, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs
index 60604b91f0..20de051454 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/TopLevelCountTests.cs
@@ -1,7 +1,5 @@
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
@@ -10,150 +8,149 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Meta
+namespace JsonApiDotNetCoreTests.IntegrationTests.Meta;
+
+public sealed class TopLevelCountTests : IClassFixture<IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext>>
 {
-    public sealed class TopLevelCountTests : IClassFixture<IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext> _testContext;
+    private readonly MetaFakers _fakers = new();
+
+    public TopLevelCountTests(IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext> _testContext;
-        private readonly MetaFakers _fakers = new();
+        _testContext = testContext;
 
-        public TopLevelCountTests(IntegrationTestContext<TestableStartup<MetaDbContext>, MetaDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<ProductFamiliesController>();
+        testContext.UseController<SupportTicketsController>();
 
-            testContext.UseController<ProductFamiliesController>();
-            testContext.UseController<SupportTicketsController>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-            });
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeTotalResourceCount = true;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeTotalResourceCount = true;
-        }
+    [Fact]
+    public async Task Renders_resource_count_for_collection()
+    {
+        // Arrange
+        SupportTicket ticket = _fakers.SupportTicket.Generate();
 
-        [Fact]
-        public async Task Renders_resource_count_for_collection()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            SupportTicket ticket = _fakers.SupportTicket.Generate();
+            await dbContext.ClearTableAsync<SupportTicket>();
+            dbContext.SupportTickets.Add(ticket);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<SupportTicket>();
-                dbContext.SupportTickets.Add(ticket);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/supportTickets";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        const string route = "/supportTickets";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Meta.ShouldNotBeNull();
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Meta.ShouldContainKey("total").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetInt32().Should().Be(1);
-            });
-        }
+        responseDocument.Meta.ShouldNotBeNull();
 
-        [Fact]
-        public async Task Renders_resource_count_for_empty_collection()
+        responseDocument.Meta.ShouldContainKey("total").With(value =>
         {
-            // Arrange
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<SupportTicket>();
-            });
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetInt32().Should().Be(1);
+        });
+    }
 
-            const string route = "/supportTickets";
+    [Fact]
+    public async Task Renders_resource_count_for_empty_collection()
+    {
+        // Arrange
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<SupportTicket>();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        const string route = "/supportTickets";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Meta.ShouldNotBeNull();
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Meta.ShouldContainKey("total").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetInt32().Should().Be(0);
-            });
-        }
+        responseDocument.Meta.ShouldNotBeNull();
 
-        [Fact]
-        public async Task Hides_resource_count_in_create_resource_response()
+        responseDocument.Meta.ShouldContainKey("total").With(value =>
         {
-            // Arrange
-            string newDescription = _fakers.SupportTicket.Generate().Description;
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetInt32().Should().Be(0);
+        });
+    }
 
-            var requestBody = new
+    [Fact]
+    public async Task Hides_resource_count_in_create_resource_response()
+    {
+        // Arrange
+        string newDescription = _fakers.SupportTicket.Generate().Description;
+
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "supportTickets",
+                attributes = new
                 {
-                    type = "supportTickets",
-                    attributes = new
-                    {
-                        description = newDescription
-                    }
+                    description = newDescription
                 }
-            };
+            }
+        };
 
-            const string route = "/supportTickets";
+        const string route = "/supportTickets";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Meta.Should().BeNull();
-        }
+        responseDocument.Meta.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Hides_resource_count_in_update_resource_response()
-        {
-            // Arrange
-            SupportTicket existingTicket = _fakers.SupportTicket.Generate();
+    [Fact]
+    public async Task Hides_resource_count_in_update_resource_response()
+    {
+        // Arrange
+        SupportTicket existingTicket = _fakers.SupportTicket.Generate();
 
-            string newDescription = _fakers.SupportTicket.Generate().Description;
+        string newDescription = _fakers.SupportTicket.Generate().Description;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.SupportTickets.Add(existingTicket);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.SupportTickets.Add(existingTicket);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "supportTickets",
+                id = existingTicket.StringId,
+                attributes = new
                 {
-                    type = "supportTickets",
-                    id = existingTicket.StringId,
-                    attributes = new
-                    {
-                        description = newDescription
-                    }
+                    description = newDescription
                 }
-            };
+            }
+        };
 
-            string route = $"/supportTickets/{existingTicket.StringId}";
+        string route = $"/supportTickets/{existingTicket.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Meta.Should().BeNull();
-        }
+        responseDocument.Meta.Should().BeNull();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainFakers.cs
index 8f8a9168db..8109dadf31 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainFakers.cs
@@ -1,26 +1,24 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices;
+
+internal sealed class DomainFakers : FakerContainer
 {
-    internal sealed class DomainFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<DomainUser>> _lazyDomainUserFaker = new(() =>
-            new Faker<DomainUser>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(domainUser => domainUser.LoginName, faker => faker.Person.UserName)
-                .RuleFor(domainUser => domainUser.DisplayName, faker => faker.Person.FullName));
+    private readonly Lazy<Faker<DomainUser>> _lazyDomainUserFaker = new(() =>
+        new Faker<DomainUser>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(domainUser => domainUser.LoginName, faker => faker.Person.UserName)
+            .RuleFor(domainUser => domainUser.DisplayName, faker => faker.Person.FullName));
 
-        private readonly Lazy<Faker<DomainGroup>> _lazyDomainGroupFaker = new(() =>
-            new Faker<DomainGroup>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(domainGroup => domainGroup.Name, faker => faker.Commerce.Department()));
+    private readonly Lazy<Faker<DomainGroup>> _lazyDomainGroupFaker = new(() =>
+        new Faker<DomainGroup>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(domainGroup => domainGroup.Name, faker => faker.Commerce.Department()));
 
-        public Faker<DomainUser> DomainUser => _lazyDomainUserFaker.Value;
-        public Faker<DomainGroup> DomainGroup => _lazyDomainGroupFaker.Value;
-    }
+    public Faker<DomainUser> DomainUser => _lazyDomainUserFaker.Value;
+    public Faker<DomainGroup> DomainGroup => _lazyDomainGroupFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroup.cs
index f8028b650e..dd87456892 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroup.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroup.cs
@@ -1,18 +1,16 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Microservices")]
+public sealed class DomainGroup : Identifiable<Guid>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class DomainGroup : Identifiable<Guid>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [HasMany]
-        public ISet<DomainUser> Users { get; set; } = new HashSet<DomainUser>();
-    }
+    [HasMany]
+    public ISet<DomainUser> Users { get; set; } = new HashSet<DomainUser>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroupsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroupsController.cs
deleted file mode 100644
index cb1bbc6a32..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainGroupsController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices
-{
-    public sealed class DomainGroupsController : JsonApiController<DomainGroup, Guid>
-    {
-        public DomainGroupsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<DomainGroup, Guid> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUser.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUser.cs
index 6bc4af7483..0efb562355 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUser.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUser.cs
@@ -1,20 +1,19 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Microservices")]
+public sealed class DomainUser : Identifiable<Guid>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class DomainUser : Identifiable<Guid>
-    {
-        [Attr]
-        public string LoginName { get; set; } = null!;
+    [Attr]
+    public string LoginName { get; set; } = null!;
 
-        [Attr]
-        public string? DisplayName { get; set; }
+    [Attr]
+    public string? DisplayName { get; set; }
 
-        [HasOne]
-        public DomainGroup? Group { get; set; }
-    }
+    [HasOne]
+    public DomainGroup? Group { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUsersController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUsersController.cs
deleted file mode 100644
index 3890ced6cb..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainUsersController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices
-{
-    public sealed class DomainUsersController : JsonApiController<DomainUser, Guid>
-    {
-        public DomainUsersController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<DomainUser, Guid> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetDbContext.cs
index c778390d39..2dd337421a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetDbContext.cs
@@ -1,17 +1,16 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class FireForgetDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class FireForgetDbContext : DbContext
-    {
-        public DbSet<DomainUser> Users => Set<DomainUser>();
-        public DbSet<DomainGroup> Groups => Set<DomainGroup>();
+    public DbSet<DomainUser> Users => Set<DomainUser>();
+    public DbSet<DomainGroup> Groups => Set<DomainGroup>();
 
-        public FireForgetDbContext(DbContextOptions<FireForgetDbContext> options)
-            : base(options)
-        {
-        }
+    public FireForgetDbContext(DbContextOptions<FireForgetDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetGroupDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetGroupDefinition.cs
index 23c17aa47f..a148a47b20 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetGroupDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetGroupDefinition.cs
@@ -1,51 +1,47 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class FireForgetGroupDefinition : MessagingGroupDefinition
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class FireForgetGroupDefinition : MessagingGroupDefinition
+    private readonly MessageBroker _messageBroker;
+    private DomainGroup? _groupToDelete;
+
+    public FireForgetGroupDefinition(IResourceGraph resourceGraph, FireForgetDbContext dbContext, MessageBroker messageBroker,
+        ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, dbContext.Users, dbContext.Groups, hitCounter)
     {
-        private readonly MessageBroker _messageBroker;
-        private DomainGroup? _groupToDelete;
+        _messageBroker = messageBroker;
+    }
 
-        public FireForgetGroupDefinition(IResourceGraph resourceGraph, FireForgetDbContext dbContext, MessageBroker messageBroker,
-            ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, dbContext.Users, dbContext.Groups, hitCounter)
-        {
-            _messageBroker = messageBroker;
-        }
+    public override async Task OnWritingAsync(DomainGroup group, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        await base.OnWritingAsync(group, writeOperation, cancellationToken);
 
-        public override async Task OnWritingAsync(DomainGroup group, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        if (writeOperation == WriteOperationKind.DeleteResource)
         {
-            await base.OnWritingAsync(group, writeOperation, cancellationToken);
-
-            if (writeOperation == WriteOperationKind.DeleteResource)
-            {
-                _groupToDelete = await base.GetGroupToDeleteAsync(group.Id, cancellationToken);
-            }
+            _groupToDelete = await base.GetGroupToDeleteAsync(group.Id, cancellationToken);
         }
+    }
 
-        public override async Task OnWriteSucceededAsync(DomainGroup group, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            await base.OnWriteSucceededAsync(group, writeOperation, cancellationToken);
+    public override async Task OnWriteSucceededAsync(DomainGroup group, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        await base.OnWriteSucceededAsync(group, writeOperation, cancellationToken);
 
-            await FinishWriteAsync(group, writeOperation, cancellationToken);
-        }
+        await FinishWriteAsync(group, writeOperation, cancellationToken);
+    }
 
-        protected override Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken)
-        {
-            return _messageBroker.PostMessageAsync(message, cancellationToken);
-        }
+    protected override Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken)
+    {
+        return _messageBroker.PostMessageAsync(message, cancellationToken);
+    }
 
-        protected override Task<DomainGroup?> GetGroupToDeleteAsync(Guid groupId, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(_groupToDelete);
-        }
+    protected override Task<DomainGroup?> GetGroupToDeleteAsync(Guid groupId, CancellationToken cancellationToken)
+    {
+        return Task.FromResult(_groupToDelete);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.Group.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.Group.cs
index 31a01feb99..e35efaeb52 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.Group.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.Group.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
@@ -10,579 +6,578 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery;
+
+public sealed partial class FireForgetTests
 {
-    public sealed partial class FireForgetTests
+    [Fact]
+    public async Task Create_group_sends_messages()
     {
-        [Fact]
-        public async Task Create_group_sends_messages()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            string newGroupName = _fakers.DomainGroup.Generate().Name;
+        string newGroupName = _fakers.DomainGroup.Generate().Name;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainGroups",
+                attributes = new
                 {
-                    type = "domainGroups",
-                    attributes = new
-                    {
-                        name = newGroupName
-                    }
+                    name = newGroupName
                 }
-            };
+            }
+        };
 
-            const string route = "/domainGroups";
+        const string route = "/domainGroups";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newGroupName));
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newGroupName));
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            messageBroker.SentMessages.ShouldHaveCount(1);
+        messageBroker.SentMessages.ShouldHaveCount(1);
 
-            Guid newGroupId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        Guid newGroupId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            var content = messageBroker.SentMessages[0].GetContentAs<GroupCreatedContent>();
-            content.GroupId.Should().Be(newGroupId);
-            content.GroupName.Should().Be(newGroupName);
-        }
+        var content = messageBroker.SentMessages[0].GetContentAs<GroupCreatedContent>();
+        content.GroupId.Should().Be(newGroupId);
+        content.GroupName.Should().Be(newGroupName);
+    }
 
-        [Fact]
-        public async Task Create_group_with_users_sends_messages()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+    [Fact]
+    public async Task Create_group_with_users_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
+        DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
 
-            DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
-            existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
+        DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
+        existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
 
-            string newGroupName = _fakers.DomainGroup.Generate().Name;
+        string newGroupName = _fakers.DomainGroup.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithOtherGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithOtherGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainGroups",
+                attributes = new
                 {
-                    type = "domainGroups",
-                    attributes = new
-                    {
-                        name = newGroupName
-                    },
-                    relationships = new
+                    name = newGroupName
+                },
+                relationships = new
+                {
+                    users = new
                     {
-                        users = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
+                            {
+                                type = "domainUsers",
+                                id = existingUserWithoutGroup.StringId
+                            },
+                            new
                             {
-                                new
-                                {
-                                    type = "domainUsers",
-                                    id = existingUserWithoutGroup.StringId
-                                },
-                                new
-                                {
-                                    type = "domainUsers",
-                                    id = existingUserWithOtherGroup.StringId
-                                }
+                                type = "domainUsers",
+                                id = existingUserWithOtherGroup.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/domainGroups";
+        const string route = "/domainGroups";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newGroupName));
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newGroupName));
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            messageBroker.SentMessages.ShouldHaveCount(3);
+        messageBroker.SentMessages.ShouldHaveCount(3);
 
-            Guid newGroupId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        Guid newGroupId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            var content1 = messageBroker.SentMessages[0].GetContentAs<GroupCreatedContent>();
-            content1.GroupId.Should().Be(newGroupId);
-            content1.GroupName.Should().Be(newGroupName);
+        var content1 = messageBroker.SentMessages[0].GetContentAs<GroupCreatedContent>();
+        content1.GroupId.Should().Be(newGroupId);
+        content1.GroupName.Should().Be(newGroupName);
 
-            var content2 = messageBroker.SentMessages[1].GetContentAs<UserAddedToGroupContent>();
-            content2.UserId.Should().Be(existingUserWithoutGroup.Id);
-            content2.GroupId.Should().Be(newGroupId);
+        var content2 = messageBroker.SentMessages[1].GetContentAs<UserAddedToGroupContent>();
+        content2.UserId.Should().Be(existingUserWithoutGroup.Id);
+        content2.GroupId.Should().Be(newGroupId);
 
-            var content3 = messageBroker.SentMessages[2].GetContentAs<UserMovedToGroupContent>();
-            content3.UserId.Should().Be(existingUserWithOtherGroup.Id);
-            content3.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
-            content3.AfterGroupId.Should().Be(newGroupId);
-        }
+        var content3 = messageBroker.SentMessages[2].GetContentAs<UserMovedToGroupContent>();
+        content3.UserId.Should().Be(existingUserWithOtherGroup.Id);
+        content3.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
+        content3.AfterGroupId.Should().Be(newGroupId);
+    }
 
-        [Fact]
-        public async Task Update_group_sends_messages()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+    [Fact]
+    public async Task Update_group_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            string newGroupName = _fakers.DomainGroup.Generate().Name;
+        string newGroupName = _fakers.DomainGroup.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Groups.Add(existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Groups.Add(existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainGroups",
+                id = existingGroup.StringId,
+                attributes = new
                 {
-                    type = "domainGroups",
-                    id = existingGroup.StringId,
-                    attributes = new
-                    {
-                        name = newGroupName
-                    }
+                    name = newGroupName
                 }
-            };
+            }
+        };
 
-            string route = $"/domainGroups/{existingGroup.StringId}";
+        string route = $"/domainGroups/{existingGroup.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            messageBroker.SentMessages.ShouldHaveCount(1);
+        messageBroker.SentMessages.ShouldHaveCount(1);
 
-            var content = messageBroker.SentMessages[0].GetContentAs<GroupRenamedContent>();
-            content.GroupId.Should().Be(existingGroup.StringId);
-            content.BeforeGroupName.Should().Be(existingGroup.Name);
-            content.AfterGroupName.Should().Be(newGroupName);
-        }
+        var content = messageBroker.SentMessages[0].GetContentAs<GroupRenamedContent>();
+        content.GroupId.Should().Be(existingGroup.StringId);
+        content.BeforeGroupName.Should().Be(existingGroup.Name);
+        content.AfterGroupName.Should().Be(newGroupName);
+    }
 
-        [Fact]
-        public async Task Update_group_with_users_sends_messages()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+    [Fact]
+    public async Task Update_group_with_users_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
+        DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
 
-            DomainUser existingUserWithSameGroup1 = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup1.Group = existingGroup;
+        DomainUser existingUserWithSameGroup1 = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup1.Group = existingGroup;
 
-            DomainUser existingUserWithSameGroup2 = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup2.Group = existingGroup;
+        DomainUser existingUserWithSameGroup2 = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup2.Group = existingGroup;
 
-            DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
-            existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
+        DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
+        existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithSameGroup1, existingUserWithSameGroup2, existingUserWithOtherGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithSameGroup1, existingUserWithSameGroup2, existingUserWithOtherGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainGroups",
+                id = existingGroup.StringId,
+                relationships = new
                 {
-                    type = "domainGroups",
-                    id = existingGroup.StringId,
-                    relationships = new
+                    users = new
                     {
-                        users = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
+                            {
+                                type = "domainUsers",
+                                id = existingUserWithoutGroup.StringId
+                            },
+                            new
+                            {
+                                type = "domainUsers",
+                                id = existingUserWithSameGroup1.StringId
+                            },
+                            new
                             {
-                                new
-                                {
-                                    type = "domainUsers",
-                                    id = existingUserWithoutGroup.StringId
-                                },
-                                new
-                                {
-                                    type = "domainUsers",
-                                    id = existingUserWithSameGroup1.StringId
-                                },
-                                new
-                                {
-                                    type = "domainUsers",
-                                    id = existingUserWithOtherGroup.StringId
-                                }
+                                type = "domainUsers",
+                                id = existingUserWithOtherGroup.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/domainGroups/{existingGroup.StringId}";
+        string route = $"/domainGroups/{existingGroup.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
-
-            messageBroker.SentMessages.ShouldHaveCount(3);
-
-            var content1 = messageBroker.SentMessages[0].GetContentAs<UserAddedToGroupContent>();
-            content1.UserId.Should().Be(existingUserWithoutGroup.Id);
-            content1.GroupId.Should().Be(existingGroup.Id);
-
-            var content2 = messageBroker.SentMessages[1].GetContentAs<UserMovedToGroupContent>();
-            content2.UserId.Should().Be(existingUserWithOtherGroup.Id);
-            content2.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
-            content2.AfterGroupId.Should().Be(existingGroup.Id);
-
-            var content3 = messageBroker.SentMessages[2].GetContentAs<UserRemovedFromGroupContent>();
-            content3.UserId.Should().Be(existingUserWithSameGroup2.Id);
-            content3.GroupId.Should().Be(existingGroup.Id);
-        }
-
-        [Fact]
-        public async Task Delete_group_sends_messages()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
+
+        messageBroker.SentMessages.ShouldHaveCount(3);
+
+        var content1 = messageBroker.SentMessages[0].GetContentAs<UserAddedToGroupContent>();
+        content1.UserId.Should().Be(existingUserWithoutGroup.Id);
+        content1.GroupId.Should().Be(existingGroup.Id);
+
+        var content2 = messageBroker.SentMessages[1].GetContentAs<UserMovedToGroupContent>();
+        content2.UserId.Should().Be(existingUserWithOtherGroup.Id);
+        content2.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
+        content2.AfterGroupId.Should().Be(existingGroup.Id);
+
+        var content3 = messageBroker.SentMessages[2].GetContentAs<UserRemovedFromGroupContent>();
+        content3.UserId.Should().Be(existingUserWithSameGroup2.Id);
+        content3.GroupId.Should().Be(existingGroup.Id);
+    }
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+    [Fact]
+    public async Task Delete_group_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Groups.Add(existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            string route = $"/domainGroups/{existingGroup.StringId}";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Groups.Add(existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        string route = $"/domainGroups/{existingGroup.StringId}";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            responseDocument.Should().BeEmpty();
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        responseDocument.Should().BeEmpty();
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            messageBroker.SentMessages.ShouldHaveCount(1);
+        messageBroker.SentMessages.ShouldHaveCount(1);
 
-            var content = messageBroker.SentMessages[0].GetContentAs<GroupDeletedContent>();
-            content.GroupId.Should().Be(existingGroup.StringId);
-        }
+        var content = messageBroker.SentMessages[0].GetContentAs<GroupDeletedContent>();
+        content.GroupId.Should().Be(existingGroup.StringId);
+    }
 
-        [Fact]
-        public async Task Delete_group_with_users_sends_messages()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+    [Fact]
+    public async Task Delete_group_with_users_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
-            existingGroup.Users = _fakers.DomainUser.Generate(1).ToHashSet();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        existingGroup.Users = _fakers.DomainUser.Generate(1).ToHashSet();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Groups.Add(existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Groups.Add(existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/domainGroups/{existingGroup.StringId}";
+        string route = $"/domainGroups/{existingGroup.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            messageBroker.SentMessages.ShouldHaveCount(2);
+        messageBroker.SentMessages.ShouldHaveCount(2);
 
-            var content1 = messageBroker.SentMessages[0].GetContentAs<UserRemovedFromGroupContent>();
-            content1.UserId.Should().Be(existingGroup.Users.ElementAt(0).Id);
-            content1.GroupId.Should().Be(existingGroup.StringId);
+        var content1 = messageBroker.SentMessages[0].GetContentAs<UserRemovedFromGroupContent>();
+        content1.UserId.Should().Be(existingGroup.Users.ElementAt(0).Id);
+        content1.GroupId.Should().Be(existingGroup.StringId);
 
-            var content2 = messageBroker.SentMessages[1].GetContentAs<GroupDeletedContent>();
-            content2.GroupId.Should().Be(existingGroup.StringId);
-        }
+        var content2 = messageBroker.SentMessages[1].GetContentAs<GroupDeletedContent>();
+        content2.GroupId.Should().Be(existingGroup.StringId);
+    }
 
-        [Fact]
-        public async Task Replace_users_in_group_sends_messages()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+    [Fact]
+    public async Task Replace_users_in_group_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
+        DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
 
-            DomainUser existingUserWithSameGroup1 = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup1.Group = existingGroup;
+        DomainUser existingUserWithSameGroup1 = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup1.Group = existingGroup;
 
-            DomainUser existingUserWithSameGroup2 = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup2.Group = existingGroup;
+        DomainUser existingUserWithSameGroup2 = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup2.Group = existingGroup;
 
-            DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
-            existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
+        DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
+        existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithSameGroup1, existingUserWithSameGroup2, existingUserWithOtherGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithSameGroup1, existingUserWithSameGroup2, existingUserWithOtherGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUserWithoutGroup.StringId
-                    },
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUserWithSameGroup1.StringId
-                    },
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUserWithOtherGroup.StringId
-                    }
+                    type = "domainUsers",
+                    id = existingUserWithoutGroup.StringId
+                },
+                new
+                {
+                    type = "domainUsers",
+                    id = existingUserWithSameGroup1.StringId
+                },
+                new
+                {
+                    type = "domainUsers",
+                    id = existingUserWithOtherGroup.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
+        string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
-
-            messageBroker.SentMessages.ShouldHaveCount(3);
-
-            var content1 = messageBroker.SentMessages[0].GetContentAs<UserAddedToGroupContent>();
-            content1.UserId.Should().Be(existingUserWithoutGroup.Id);
-            content1.GroupId.Should().Be(existingGroup.Id);
-
-            var content2 = messageBroker.SentMessages[1].GetContentAs<UserMovedToGroupContent>();
-            content2.UserId.Should().Be(existingUserWithOtherGroup.Id);
-            content2.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
-            content2.AfterGroupId.Should().Be(existingGroup.Id);
-
-            var content3 = messageBroker.SentMessages[2].GetContentAs<UserRemovedFromGroupContent>();
-            content3.UserId.Should().Be(existingUserWithSameGroup2.Id);
-            content3.GroupId.Should().Be(existingGroup.Id);
-        }
-
-        [Fact]
-        public async Task Add_users_to_group_sends_messages()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
+
+        messageBroker.SentMessages.ShouldHaveCount(3);
+
+        var content1 = messageBroker.SentMessages[0].GetContentAs<UserAddedToGroupContent>();
+        content1.UserId.Should().Be(existingUserWithoutGroup.Id);
+        content1.GroupId.Should().Be(existingGroup.Id);
+
+        var content2 = messageBroker.SentMessages[1].GetContentAs<UserMovedToGroupContent>();
+        content2.UserId.Should().Be(existingUserWithOtherGroup.Id);
+        content2.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
+        content2.AfterGroupId.Should().Be(existingGroup.Id);
+
+        var content3 = messageBroker.SentMessages[2].GetContentAs<UserRemovedFromGroupContent>();
+        content3.UserId.Should().Be(existingUserWithSameGroup2.Id);
+        content3.GroupId.Should().Be(existingGroup.Id);
+    }
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+    [Fact]
+    public async Task Add_users_to_group_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            DomainUser existingUserWithSameGroup = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup.Group = existingGroup;
+        DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
 
-            DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
-            existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
+        DomainUser existingUserWithSameGroup = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup.Group = existingGroup;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithSameGroup, existingUserWithOtherGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
+        existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithSameGroup, existingUserWithOtherGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUserWithoutGroup.StringId
-                    },
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUserWithOtherGroup.StringId
-                    }
+                    type = "domainUsers",
+                    id = existingUserWithoutGroup.StringId
+                },
+                new
+                {
+                    type = "domainUsers",
+                    id = existingUserWithOtherGroup.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
+        string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnAddToRelationshipAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnAddToRelationshipAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            messageBroker.SentMessages.ShouldHaveCount(2);
+        messageBroker.SentMessages.ShouldHaveCount(2);
 
-            var content1 = messageBroker.SentMessages[0].GetContentAs<UserAddedToGroupContent>();
-            content1.UserId.Should().Be(existingUserWithoutGroup.Id);
-            content1.GroupId.Should().Be(existingGroup.Id);
+        var content1 = messageBroker.SentMessages[0].GetContentAs<UserAddedToGroupContent>();
+        content1.UserId.Should().Be(existingUserWithoutGroup.Id);
+        content1.GroupId.Should().Be(existingGroup.Id);
 
-            var content2 = messageBroker.SentMessages[1].GetContentAs<UserMovedToGroupContent>();
-            content2.UserId.Should().Be(existingUserWithOtherGroup.Id);
-            content2.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
-            content2.AfterGroupId.Should().Be(existingGroup.Id);
-        }
+        var content2 = messageBroker.SentMessages[1].GetContentAs<UserMovedToGroupContent>();
+        content2.UserId.Should().Be(existingUserWithOtherGroup.Id);
+        content2.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
+        content2.AfterGroupId.Should().Be(existingGroup.Id);
+    }
 
-        [Fact]
-        public async Task Remove_users_from_group_sends_messages()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+    [Fact]
+    public async Task Remove_users_from_group_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            DomainUser existingUserWithSameGroup1 = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup1.Group = existingGroup;
+        DomainUser existingUserWithSameGroup1 = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup1.Group = existingGroup;
 
-            DomainUser existingUserWithSameGroup2 = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup2.Group = existingGroup;
+        DomainUser existingUserWithSameGroup2 = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup2.Group = existingGroup;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Users.AddRange(existingUserWithSameGroup1, existingUserWithSameGroup2);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Users.AddRange(existingUserWithSameGroup1, existingUserWithSameGroup2);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUserWithSameGroup2.StringId
-                    }
+                    type = "domainUsers",
+                    id = existingUserWithSameGroup2.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
+        string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnRemoveFromRelationshipAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnRemoveFromRelationshipAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            messageBroker.SentMessages.ShouldHaveCount(1);
+        messageBroker.SentMessages.ShouldHaveCount(1);
 
-            var content = messageBroker.SentMessages[0].GetContentAs<UserRemovedFromGroupContent>();
-            content.UserId.Should().Be(existingUserWithSameGroup2.Id);
-            content.GroupId.Should().Be(existingGroup.Id);
-        }
+        var content = messageBroker.SentMessages[0].GetContentAs<UserRemovedFromGroupContent>();
+        content.UserId.Should().Be(existingUserWithSameGroup2.Id);
+        content.GroupId.Should().Be(existingGroup.Id);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.User.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.User.cs
index b6014d9fb0..35b2666c02 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.User.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.User.cs
@@ -1,7 +1,4 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
@@ -9,639 +6,638 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery;
+
+public sealed partial class FireForgetTests
 {
-    public sealed partial class FireForgetTests
+    [Fact]
+    public async Task Create_user_sends_messages()
     {
-        [Fact]
-        public async Task Create_user_sends_messages()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            string newLoginName = _fakers.DomainUser.Generate().LoginName;
-            string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+        string newLoginName = _fakers.DomainUser.Generate().LoginName;
+        string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainUsers",
+                attributes = new
                 {
-                    type = "domainUsers",
-                    attributes = new
-                    {
-                        loginName = newLoginName,
-                        displayName = newDisplayName
-                    }
+                    loginName = newLoginName,
+                    displayName = newDisplayName
                 }
-            };
+            }
+        };
 
-            const string route = "/domainUsers";
+        const string route = "/domainUsers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("loginName").With(value => value.Should().Be(newLoginName));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(newDisplayName));
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("loginName").With(value => value.Should().Be(newLoginName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(newDisplayName));
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            messageBroker.SentMessages.ShouldHaveCount(1);
+        messageBroker.SentMessages.ShouldHaveCount(1);
 
-            Guid newUserId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        Guid newUserId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            var content = messageBroker.SentMessages[0].GetContentAs<UserCreatedContent>();
-            content.UserId.Should().Be(newUserId);
-            content.UserLoginName.Should().Be(newLoginName);
-            content.UserDisplayName.Should().Be(newDisplayName);
-        }
+        var content = messageBroker.SentMessages[0].GetContentAs<UserCreatedContent>();
+        content.UserId.Should().Be(newUserId);
+        content.UserLoginName.Should().Be(newLoginName);
+        content.UserDisplayName.Should().Be(newDisplayName);
+    }
 
-        [Fact]
-        public async Task Create_user_in_group_sends_messages()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+    [Fact]
+    public async Task Create_user_in_group_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            string newLoginName = _fakers.DomainUser.Generate().LoginName;
+        string newLoginName = _fakers.DomainUser.Generate().LoginName;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Groups.Add(existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Groups.Add(existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainUsers",
+                attributes = new
                 {
-                    type = "domainUsers",
-                    attributes = new
-                    {
-                        loginName = newLoginName
-                    },
-                    relationships = new
+                    loginName = newLoginName
+                },
+                relationships = new
+                {
+                    group = new
                     {
-                        group = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "domainGroups",
-                                id = existingGroup.StringId
-                            }
+                            type = "domainGroups",
+                            id = existingGroup.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/domainUsers";
+        const string route = "/domainUsers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("loginName").With(value => value.Should().Be(newLoginName));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().BeNull());
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("loginName").With(value => value.Should().Be(newLoginName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().BeNull());
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            messageBroker.SentMessages.ShouldHaveCount(2);
+        messageBroker.SentMessages.ShouldHaveCount(2);
 
-            Guid newUserId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        Guid newUserId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            var content1 = messageBroker.SentMessages[0].GetContentAs<UserCreatedContent>();
-            content1.UserId.Should().Be(newUserId);
-            content1.UserLoginName.Should().Be(newLoginName);
-            content1.UserDisplayName.Should().BeNull();
+        var content1 = messageBroker.SentMessages[0].GetContentAs<UserCreatedContent>();
+        content1.UserId.Should().Be(newUserId);
+        content1.UserLoginName.Should().Be(newLoginName);
+        content1.UserDisplayName.Should().BeNull();
 
-            var content2 = messageBroker.SentMessages[1].GetContentAs<UserAddedToGroupContent>();
-            content2.UserId.Should().Be(newUserId);
-            content2.GroupId.Should().Be(existingGroup.Id);
-        }
+        var content2 = messageBroker.SentMessages[1].GetContentAs<UserAddedToGroupContent>();
+        content2.UserId.Should().Be(newUserId);
+        content2.GroupId.Should().Be(existingGroup.Id);
+    }
 
-        [Fact]
-        public async Task Update_user_sends_messages()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+    [Fact]
+    public async Task Update_user_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
+        DomainUser existingUser = _fakers.DomainUser.Generate();
 
-            string newLoginName = _fakers.DomainUser.Generate().LoginName;
-            string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+        string newLoginName = _fakers.DomainUser.Generate().LoginName;
+        string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Users.Add(existingUser);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Users.Add(existingUser);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainUsers",
+                id = existingUser.StringId,
+                attributes = new
                 {
-                    type = "domainUsers",
-                    id = existingUser.StringId,
-                    attributes = new
-                    {
-                        loginName = newLoginName,
-                        displayName = newDisplayName
-                    }
+                    loginName = newLoginName,
+                    displayName = newDisplayName
                 }
-            };
+            }
+        };
 
-            string route = $"/domainUsers/{existingUser.StringId}";
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
-
-            messageBroker.SentMessages.ShouldHaveCount(2);
-
-            var content1 = messageBroker.SentMessages[0].GetContentAs<UserLoginNameChangedContent>();
-            content1.UserId.Should().Be(existingUser.Id);
-            content1.BeforeUserLoginName.Should().Be(existingUser.LoginName);
-            content1.AfterUserLoginName.Should().Be(newLoginName);
-
-            var content2 = messageBroker.SentMessages[1].GetContentAs<UserDisplayNameChangedContent>();
-            content2.UserId.Should().Be(existingUser.Id);
-            content2.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
-            content2.AfterUserDisplayName.Should().Be(newDisplayName);
-        }
-
-        [Fact]
-        public async Task Update_user_clear_group_sends_messages()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
+
+        messageBroker.SentMessages.ShouldHaveCount(2);
+
+        var content1 = messageBroker.SentMessages[0].GetContentAs<UserLoginNameChangedContent>();
+        content1.UserId.Should().Be(existingUser.Id);
+        content1.BeforeUserLoginName.Should().Be(existingUser.LoginName);
+        content1.AfterUserLoginName.Should().Be(newLoginName);
+
+        var content2 = messageBroker.SentMessages[1].GetContentAs<UserDisplayNameChangedContent>();
+        content2.UserId.Should().Be(existingUser.Id);
+        content2.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
+        content2.AfterUserDisplayName.Should().Be(newDisplayName);
+    }
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            existingUser.Group = _fakers.DomainGroup.Generate();
+    [Fact]
+    public async Task Update_user_clear_group_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        existingUser.Group = _fakers.DomainGroup.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Users.Add(existingUser);
-                await dbContext.SaveChangesAsync();
-            });
+        string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Users.Add(existingUser);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainUsers",
+                id = existingUser.StringId,
+                attributes = new
                 {
-                    type = "domainUsers",
-                    id = existingUser.StringId,
-                    attributes = new
-                    {
-                        displayName = newDisplayName
-                    },
-                    relationships = new
+                    displayName = newDisplayName
+                },
+                relationships = new
+                {
+                    group = new
                     {
-                        group = new
-                        {
-                            data = (object?)null
-                        }
+                        data = (object?)null
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/domainUsers/{existingUser.StringId}";
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
-
-            messageBroker.SentMessages.ShouldHaveCount(2);
-
-            var content1 = messageBroker.SentMessages[0].GetContentAs<UserDisplayNameChangedContent>();
-            content1.UserId.Should().Be(existingUser.Id);
-            content1.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
-            content1.AfterUserDisplayName.Should().Be(newDisplayName);
-
-            var content2 = messageBroker.SentMessages[1].GetContentAs<UserRemovedFromGroupContent>();
-            content2.UserId.Should().Be(existingUser.Id);
-            content2.GroupId.Should().Be(existingUser.Group.Id);
-        }
-
-        [Fact]
-        public async Task Update_user_add_to_group_sends_messages()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
+
+        messageBroker.SentMessages.ShouldHaveCount(2);
+
+        var content1 = messageBroker.SentMessages[0].GetContentAs<UserDisplayNameChangedContent>();
+        content1.UserId.Should().Be(existingUser.Id);
+        content1.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
+        content1.AfterUserDisplayName.Should().Be(newDisplayName);
+
+        var content2 = messageBroker.SentMessages[1].GetContentAs<UserRemovedFromGroupContent>();
+        content2.UserId.Should().Be(existingUser.Id);
+        content2.GroupId.Should().Be(existingUser.Group.Id);
+    }
+
+    [Fact]
+    public async Task Update_user_add_to_group_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+        string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingUser, existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingUser, existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainUsers",
+                id = existingUser.StringId,
+                attributes = new
                 {
-                    type = "domainUsers",
-                    id = existingUser.StringId,
-                    attributes = new
-                    {
-                        displayName = newDisplayName
-                    },
-                    relationships = new
+                    displayName = newDisplayName
+                },
+                relationships = new
+                {
+                    group = new
                     {
-                        group = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "domainGroups",
-                                id = existingGroup.StringId
-                            }
+                            type = "domainGroups",
+                            id = existingGroup.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/domainUsers/{existingUser.StringId}";
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
-
-            messageBroker.SentMessages.ShouldHaveCount(2);
-
-            var content1 = messageBroker.SentMessages[0].GetContentAs<UserDisplayNameChangedContent>();
-            content1.UserId.Should().Be(existingUser.Id);
-            content1.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
-            content1.AfterUserDisplayName.Should().Be(newDisplayName);
-
-            var content2 = messageBroker.SentMessages[1].GetContentAs<UserAddedToGroupContent>();
-            content2.UserId.Should().Be(existingUser.Id);
-            content2.GroupId.Should().Be(existingGroup.Id);
-        }
-
-        [Fact]
-        public async Task Update_user_move_to_group_sends_messages()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
+
+        messageBroker.SentMessages.ShouldHaveCount(2);
+
+        var content1 = messageBroker.SentMessages[0].GetContentAs<UserDisplayNameChangedContent>();
+        content1.UserId.Should().Be(existingUser.Id);
+        content1.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
+        content1.AfterUserDisplayName.Should().Be(newDisplayName);
+
+        var content2 = messageBroker.SentMessages[1].GetContentAs<UserAddedToGroupContent>();
+        content2.UserId.Should().Be(existingUser.Id);
+        content2.GroupId.Should().Be(existingGroup.Id);
+    }
+
+    [Fact]
+    public async Task Update_user_move_to_group_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            existingUser.Group = _fakers.DomainGroup.Generate();
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        existingUser.Group = _fakers.DomainGroup.Generate();
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+        string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingUser, existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingUser, existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainUsers",
+                id = existingUser.StringId,
+                attributes = new
                 {
-                    type = "domainUsers",
-                    id = existingUser.StringId,
-                    attributes = new
-                    {
-                        displayName = newDisplayName
-                    },
-                    relationships = new
+                    displayName = newDisplayName
+                },
+                relationships = new
+                {
+                    group = new
                     {
-                        group = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "domainGroups",
-                                id = existingGroup.StringId
-                            }
+                            type = "domainGroups",
+                            id = existingGroup.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/domainUsers/{existingUser.StringId}";
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
-
-            messageBroker.SentMessages.ShouldHaveCount(2);
-
-            var content1 = messageBroker.SentMessages[0].GetContentAs<UserDisplayNameChangedContent>();
-            content1.UserId.Should().Be(existingUser.Id);
-            content1.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
-            content1.AfterUserDisplayName.Should().Be(newDisplayName);
-
-            var content2 = messageBroker.SentMessages[1].GetContentAs<UserMovedToGroupContent>();
-            content2.UserId.Should().Be(existingUser.Id);
-            content2.BeforeGroupId.Should().Be(existingUser.Group.Id);
-            content2.AfterGroupId.Should().Be(existingGroup.Id);
-        }
-
-        [Fact]
-        public async Task Delete_user_sends_messages()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
+
+        messageBroker.SentMessages.ShouldHaveCount(2);
+
+        var content1 = messageBroker.SentMessages[0].GetContentAs<UserDisplayNameChangedContent>();
+        content1.UserId.Should().Be(existingUser.Id);
+        content1.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
+        content1.AfterUserDisplayName.Should().Be(newDisplayName);
+
+        var content2 = messageBroker.SentMessages[1].GetContentAs<UserMovedToGroupContent>();
+        content2.UserId.Should().Be(existingUser.Id);
+        content2.BeforeGroupId.Should().Be(existingUser.Group.Id);
+        content2.AfterGroupId.Should().Be(existingGroup.Id);
+    }
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
+    [Fact]
+    public async Task Delete_user_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Users.Add(existingUser);
-                await dbContext.SaveChangesAsync();
-            });
+        DomainUser existingUser = _fakers.DomainUser.Generate();
 
-            string route = $"/domainUsers/{existingUser.StringId}";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Users.Add(existingUser);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            responseDocument.Should().BeEmpty();
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        responseDocument.Should().BeEmpty();
 
-            messageBroker.SentMessages.ShouldHaveCount(1);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
+
+        messageBroker.SentMessages.ShouldHaveCount(1);
+
+        var content = messageBroker.SentMessages[0].GetContentAs<UserDeletedContent>();
+        content.UserId.Should().Be(existingUser.Id);
+    }
+
+    [Fact]
+    public async Task Delete_user_in_group_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            var content = messageBroker.SentMessages[0].GetContentAs<UserDeletedContent>();
-            content.UserId.Should().Be(existingUser.Id);
-        }
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        existingUser.Group = _fakers.DomainGroup.Generate();
 
-        [Fact]
-        public async Task Delete_user_in_group_sends_messages()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+            dbContext.Users.Add(existingUser);
+            await dbContext.SaveChangesAsync();
+        });
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            existingUser.Group = _fakers.DomainGroup.Generate();
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Users.Add(existingUser);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            string route = $"/domainUsers/{existingUser.StringId}";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        responseDocument.Should().BeEmpty();
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            responseDocument.Should().BeEmpty();
+        messageBroker.SentMessages.ShouldHaveCount(2);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        var content1 = messageBroker.SentMessages[0].GetContentAs<UserRemovedFromGroupContent>();
+        content1.UserId.Should().Be(existingUser.Id);
+        content1.GroupId.Should().Be(existingUser.Group.Id);
 
-            messageBroker.SentMessages.ShouldHaveCount(2);
+        var content2 = messageBroker.SentMessages[1].GetContentAs<UserDeletedContent>();
+        content2.UserId.Should().Be(existingUser.Id);
+    }
 
-            var content1 = messageBroker.SentMessages[0].GetContentAs<UserRemovedFromGroupContent>();
-            content1.UserId.Should().Be(existingUser.Id);
-            content1.GroupId.Should().Be(existingUser.Group.Id);
+    [Fact]
+    public async Task Clear_group_from_user_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            var content2 = messageBroker.SentMessages[1].GetContentAs<UserDeletedContent>();
-            content2.UserId.Should().Be(existingUser.Id);
-        }
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        existingUser.Group = _fakers.DomainGroup.Generate();
 
-        [Fact]
-        public async Task Clear_group_from_user_sends_messages()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+            dbContext.Users.Add(existingUser);
+            await dbContext.SaveChangesAsync();
+        });
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            existingUser.Group = _fakers.DomainGroup.Generate();
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Users.Add(existingUser);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/domainUsers/{existingUser.StringId}/relationships/group";
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            string route = $"/domainUsers/{existingUser.StringId}/relationships/group";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        responseDocument.Should().BeEmpty();
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            responseDocument.Should().BeEmpty();
+        messageBroker.SentMessages.ShouldHaveCount(1);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        var content = messageBroker.SentMessages[0].GetContentAs<UserRemovedFromGroupContent>();
+        content.UserId.Should().Be(existingUser.Id);
+        content.GroupId.Should().Be(existingUser.Group.Id);
+    }
 
-            messageBroker.SentMessages.ShouldHaveCount(1);
+    [Fact]
+    public async Task Assign_group_to_user_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            var content = messageBroker.SentMessages[0].GetContentAs<UserRemovedFromGroupContent>();
-            content.UserId.Should().Be(existingUser.Id);
-            content.GroupId.Should().Be(existingUser.Group.Id);
-        }
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-        [Fact]
-        public async Task Assign_group_to_user_sends_messages()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+            dbContext.AddInRange(existingUser, existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingUser, existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
-                {
-                    type = "domainGroups",
-                    id = existingGroup.StringId
-                }
-            };
+                type = "domainGroups",
+                id = existingGroup.StringId
+            }
+        };
 
-            string route = $"/domainUsers/{existingUser.StringId}/relationships/group";
+        string route = $"/domainUsers/{existingUser.StringId}/relationships/group";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            messageBroker.SentMessages.ShouldHaveCount(1);
+        messageBroker.SentMessages.ShouldHaveCount(1);
 
-            var content = messageBroker.SentMessages[0].GetContentAs<UserAddedToGroupContent>();
-            content.UserId.Should().Be(existingUser.Id);
-            content.GroupId.Should().Be(existingGroup.Id);
-        }
+        var content = messageBroker.SentMessages[0].GetContentAs<UserAddedToGroupContent>();
+        content.UserId.Should().Be(existingUser.Id);
+        content.GroupId.Should().Be(existingGroup.Id);
+    }
 
-        [Fact]
-        public async Task Replace_group_for_user_sends_messages()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+    [Fact]
+    public async Task Replace_group_for_user_sends_messages()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            existingUser.Group = _fakers.DomainGroup.Generate();
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        existingUser.Group = _fakers.DomainGroup.Generate();
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingUser, existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingUser, existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
-                {
-                    type = "domainGroups",
-                    id = existingGroup.StringId
-                }
-            };
+                type = "domainGroups",
+                id = existingGroup.StringId
+            }
+        };
 
-            string route = $"/domainUsers/{existingUser.StringId}/relationships/group";
+        string route = $"/domainUsers/{existingUser.StringId}/relationships/group";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
-
-            messageBroker.SentMessages.ShouldHaveCount(1);
-
-            var content = messageBroker.SentMessages[0].GetContentAs<UserMovedToGroupContent>();
-            content.UserId.Should().Be(existingUser.Id);
-            content.BeforeGroupId.Should().Be(existingUser.Group.Id);
-            content.AfterGroupId.Should().Be(existingGroup.Id);
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
+
+        messageBroker.SentMessages.ShouldHaveCount(1);
+
+        var content = messageBroker.SentMessages[0].GetContentAs<UserMovedToGroupContent>();
+        content.UserId.Should().Be(existingUser.Id);
+        content.BeforeGroupId.Should().Be(existingUser.Group.Id);
+        content.AfterGroupId.Should().Be(existingGroup.Id);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.cs
index 93932d1acb..89afb428f1 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetTests.cs
@@ -1,7 +1,4 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -9,114 +6,113 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery;
+
+public sealed partial class FireForgetTests : IClassFixture<IntegrationTestContext<TestableStartup<FireForgetDbContext>, FireForgetDbContext>>
 {
-    public sealed partial class FireForgetTests : IClassFixture<IntegrationTestContext<TestableStartup<FireForgetDbContext>, FireForgetDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<FireForgetDbContext>, FireForgetDbContext> _testContext;
-        private readonly DomainFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<FireForgetDbContext>, FireForgetDbContext> _testContext;
+    private readonly DomainFakers _fakers = new();
 
-        public FireForgetTests(IntegrationTestContext<TestableStartup<FireForgetDbContext>, FireForgetDbContext> testContext)
-        {
-            _testContext = testContext;
+    public FireForgetTests(IntegrationTestContext<TestableStartup<FireForgetDbContext>, FireForgetDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<DomainUsersController>();
-            testContext.UseController<DomainGroupsController>();
+        testContext.UseController<DomainUsersController>();
+        testContext.UseController<DomainGroupsController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<FireForgetUserDefinition>();
-                services.AddResourceDefinition<FireForgetGroupDefinition>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<FireForgetUserDefinition>();
+            services.AddResourceDefinition<FireForgetGroupDefinition>();
 
-                services.AddSingleton<MessageBroker>();
-                services.AddSingleton<ResourceDefinitionHitCounter>();
-            });
+            services.AddSingleton<MessageBroker>();
+            services.AddSingleton<ResourceDefinitionHitCounter>();
+        });
 
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
-            messageBroker.Reset();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+        messageBroker.Reset();
 
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            hitCounter.Reset();
-        }
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        hitCounter.Reset();
+    }
 
-        [Fact]
-        public async Task Does_not_send_message_on_write_error()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+    [Fact]
+    public async Task Does_not_send_message_on_write_error()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
 
-            string unknownUserId = Unknown.StringId.For<DomainUser, Guid>();
+        string unknownUserId = Unknown.StringId.For<DomainUser, Guid>();
 
-            string route = $"/domainUsers/{unknownUserId}";
+        string route = $"/domainUsers/{unknownUserId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'domainUsers' with ID '{unknownUserId}' does not exist.");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'domainUsers' with ID '{unknownUserId}' does not exist.");
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync)
+        }, options => options.WithStrictOrdering());
 
-            messageBroker.SentMessages.Should().BeEmpty();
-        }
+        messageBroker.SentMessages.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Does_not_rollback_on_message_delivery_error()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+    [Fact]
+    public async Task Does_not_rollback_on_message_delivery_error()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
-            messageBroker.SimulateFailure = true;
+        var messageBroker = _testContext.Factory.Services.GetRequiredService<MessageBroker>();
+        messageBroker.SimulateFailure = true;
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
+        DomainUser existingUser = _fakers.DomainUser.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<DomainUser>();
-                dbContext.Users.Add(existingUser);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<DomainUser>();
+            dbContext.Users.Add(existingUser);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/domainUsers/{existingUser.StringId}";
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.ServiceUnavailable);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.ServiceUnavailable);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.ServiceUnavailable);
-            error.Title.Should().Be("Message delivery failed.");
-            error.Detail.Should().BeNull();
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.ServiceUnavailable);
+        error.Title.Should().Be("Message delivery failed.");
+        error.Detail.Should().BeNull();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            messageBroker.SentMessages.ShouldHaveCount(1);
+        messageBroker.SentMessages.ShouldHaveCount(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                DomainUser? user = await dbContext.Users.FirstWithIdOrDefaultAsync(existingUser.Id);
-                user.Should().BeNull();
-            });
-        }
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            DomainUser? user = await dbContext.Users.FirstWithIdOrDefaultAsync(existingUser.Id);
+            user.Should().BeNull();
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetUserDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetUserDefinition.cs
index 512c340222..c72cd667f0 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetUserDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/FireForgetUserDefinition.cs
@@ -1,51 +1,47 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class FireForgetUserDefinition : MessagingUserDefinition
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class FireForgetUserDefinition : MessagingUserDefinition
+    private readonly MessageBroker _messageBroker;
+    private DomainUser? _userToDelete;
+
+    public FireForgetUserDefinition(IResourceGraph resourceGraph, FireForgetDbContext dbContext, MessageBroker messageBroker,
+        ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, dbContext.Users, hitCounter)
     {
-        private readonly MessageBroker _messageBroker;
-        private DomainUser? _userToDelete;
+        _messageBroker = messageBroker;
+    }
 
-        public FireForgetUserDefinition(IResourceGraph resourceGraph, FireForgetDbContext dbContext, MessageBroker messageBroker,
-            ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, dbContext.Users, hitCounter)
-        {
-            _messageBroker = messageBroker;
-        }
+    public override async Task OnWritingAsync(DomainUser user, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        await base.OnWritingAsync(user, writeOperation, cancellationToken);
 
-        public override async Task OnWritingAsync(DomainUser user, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        if (writeOperation == WriteOperationKind.DeleteResource)
         {
-            await base.OnWritingAsync(user, writeOperation, cancellationToken);
-
-            if (writeOperation == WriteOperationKind.DeleteResource)
-            {
-                _userToDelete = await base.GetUserToDeleteAsync(user.Id, cancellationToken);
-            }
+            _userToDelete = await base.GetUserToDeleteAsync(user.Id, cancellationToken);
         }
+    }
 
-        public override async Task OnWriteSucceededAsync(DomainUser user, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            await base.OnWriteSucceededAsync(user, writeOperation, cancellationToken);
+    public override async Task OnWriteSucceededAsync(DomainUser user, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        await base.OnWriteSucceededAsync(user, writeOperation, cancellationToken);
 
-            await FinishWriteAsync(user, writeOperation, cancellationToken);
-        }
+        await FinishWriteAsync(user, writeOperation, cancellationToken);
+    }
 
-        protected override Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken)
-        {
-            return _messageBroker.PostMessageAsync(message, cancellationToken);
-        }
+    protected override Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken)
+    {
+        return _messageBroker.PostMessageAsync(message, cancellationToken);
+    }
 
-        protected override Task<DomainUser?> GetUserToDeleteAsync(Guid userId, CancellationToken cancellationToken)
-        {
-            return Task.FromResult(_userToDelete);
-        }
+    protected override Task<DomainUser?> GetUserToDeleteAsync(Guid userId, CancellationToken cancellationToken)
+    {
+        return Task.FromResult(_userToDelete);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/MessageBroker.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/MessageBroker.cs
index 1fbf64df46..a0872e382b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/MessageBroker.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/FireAndForgetDelivery/MessageBroker.cs
@@ -1,39 +1,35 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Errors;
 using JsonApiDotNetCore.Serialization.Objects;
 using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.FireAndForgetDelivery;
+
+public sealed class MessageBroker
 {
-    public sealed class MessageBroker
-    {
-        internal IList<OutgoingMessage> SentMessages { get; } = new List<OutgoingMessage>();
+    internal IList<OutgoingMessage> SentMessages { get; } = new List<OutgoingMessage>();
 
-        internal bool SimulateFailure { get; set; }
+    internal bool SimulateFailure { get; set; }
 
-        internal void Reset()
-        {
-            SimulateFailure = false;
-            SentMessages.Clear();
-        }
+    internal void Reset()
+    {
+        SimulateFailure = false;
+        SentMessages.Clear();
+    }
 
-        internal Task PostMessageAsync(OutgoingMessage message, CancellationToken cancellationToken)
-        {
-            cancellationToken.ThrowIfCancellationRequested();
-            SentMessages.Add(message);
+    internal Task PostMessageAsync(OutgoingMessage message, CancellationToken cancellationToken)
+    {
+        cancellationToken.ThrowIfCancellationRequested();
+        SentMessages.Add(message);
 
-            if (SimulateFailure)
+        if (SimulateFailure)
+        {
+            throw new JsonApiException(new ErrorObject(HttpStatusCode.ServiceUnavailable)
             {
-                throw new JsonApiException(new ErrorObject(HttpStatusCode.ServiceUnavailable)
-                {
-                    Title = "Message delivery failed."
-                });
-            }
-
-            return Task.CompletedTask;
+                Title = "Message delivery failed."
+            });
         }
+
+        return Task.CompletedTask;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupCreatedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupCreatedContent.cs
index 8b13860f7a..c7c400ae4f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupCreatedContent.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupCreatedContent.cs
@@ -1,20 +1,18 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class GroupCreatedContent : IMessageContent
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class GroupCreatedContent : IMessageContent
-    {
-        public int FormatVersion => 1;
+    public int FormatVersion => 1;
 
-        public Guid GroupId { get; }
-        public string GroupName { get; }
+    public Guid GroupId { get; }
+    public string GroupName { get; }
 
-        public GroupCreatedContent(Guid groupId, string groupName)
-        {
-            GroupId = groupId;
-            GroupName = groupName;
-        }
+    public GroupCreatedContent(Guid groupId, string groupName)
+    {
+        GroupId = groupId;
+        GroupName = groupName;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupDeletedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupDeletedContent.cs
index 7dc9d4e93f..338b88a676 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupDeletedContent.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupDeletedContent.cs
@@ -1,18 +1,16 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class GroupDeletedContent : IMessageContent
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class GroupDeletedContent : IMessageContent
-    {
-        public int FormatVersion => 1;
+    public int FormatVersion => 1;
 
-        public Guid GroupId { get; }
+    public Guid GroupId { get; }
 
-        public GroupDeletedContent(Guid groupId)
-        {
-            GroupId = groupId;
-        }
+    public GroupDeletedContent(Guid groupId)
+    {
+        GroupId = groupId;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupRenamedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupRenamedContent.cs
index 068c1dabdd..2412e9c8c1 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupRenamedContent.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/GroupRenamedContent.cs
@@ -1,22 +1,20 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class GroupRenamedContent : IMessageContent
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class GroupRenamedContent : IMessageContent
-    {
-        public int FormatVersion => 1;
+    public int FormatVersion => 1;
 
-        public Guid GroupId { get; }
-        public string BeforeGroupName { get; }
-        public string AfterGroupName { get; }
+    public Guid GroupId { get; }
+    public string BeforeGroupName { get; }
+    public string AfterGroupName { get; }
 
-        public GroupRenamedContent(Guid groupId, string beforeGroupName, string afterGroupName)
-        {
-            GroupId = groupId;
-            BeforeGroupName = beforeGroupName;
-            AfterGroupName = afterGroupName;
-        }
+    public GroupRenamedContent(Guid groupId, string beforeGroupName, string afterGroupName)
+    {
+        GroupId = groupId;
+        BeforeGroupName = beforeGroupName;
+        AfterGroupName = afterGroupName;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/IMessageContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/IMessageContent.cs
index 74fc43ab80..07ddcf9b10 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/IMessageContent.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/IMessageContent.cs
@@ -1,8 +1,7 @@
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
+
+public interface IMessageContent
 {
-    public interface IMessageContent
-    {
-        // Increment when content structure changes.
-        int FormatVersion { get; }
-    }
+    // Increment when content structure changes.
+    int FormatVersion { get; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/OutgoingMessage.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/OutgoingMessage.cs
index eb797263a8..bedbf79889 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/OutgoingMessage.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/OutgoingMessage.cs
@@ -1,36 +1,37 @@
 using System.Text.Json;
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[NoResource]
+public sealed class OutgoingMessage
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class OutgoingMessage
-    {
-        public long Id { get; set; }
-        public string Type { get; set; }
-        public int FormatVersion { get; set; }
-        public string Content { get; set; }
+    public long Id { get; set; }
+    public string Type { get; set; }
+    public int FormatVersion { get; set; }
+    public string Content { get; set; }
 
-        private OutgoingMessage(string type, int formatVersion, string content)
-        {
-            Type = type;
-            FormatVersion = formatVersion;
-            Content = content;
-        }
+    private OutgoingMessage(string type, int formatVersion, string content)
+    {
+        Type = type;
+        FormatVersion = formatVersion;
+        Content = content;
+    }
 
-        public T GetContentAs<T>()
-            where T : IMessageContent
-        {
-            string namespacePrefix = typeof(IMessageContent).Namespace!;
-            var contentType = System.Type.GetType($"{namespacePrefix}.{Type}", true)!;
+    public T GetContentAs<T>()
+        where T : IMessageContent
+    {
+        string namespacePrefix = typeof(IMessageContent).Namespace!;
+        var contentType = System.Type.GetType($"{namespacePrefix}.{Type}", true)!;
 
-            return (T)JsonSerializer.Deserialize(Content, contentType)!;
-        }
+        return (T)JsonSerializer.Deserialize(Content, contentType)!;
+    }
 
-        public static OutgoingMessage CreateFromContent(IMessageContent content)
-        {
-            string value = JsonSerializer.Serialize(content, content.GetType());
-            return new OutgoingMessage(content.GetType().Name, content.FormatVersion, value);
-        }
+    public static OutgoingMessage CreateFromContent(IMessageContent content)
+    {
+        string value = JsonSerializer.Serialize(content, content.GetType());
+        return new OutgoingMessage(content.GetType().Name, content.FormatVersion, value);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserAddedToGroupContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserAddedToGroupContent.cs
index e4cf0d0864..fd8400b9a4 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserAddedToGroupContent.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserAddedToGroupContent.cs
@@ -1,20 +1,18 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class UserAddedToGroupContent : IMessageContent
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class UserAddedToGroupContent : IMessageContent
-    {
-        public int FormatVersion => 1;
+    public int FormatVersion => 1;
 
-        public Guid UserId { get; }
-        public Guid GroupId { get; }
+    public Guid UserId { get; }
+    public Guid GroupId { get; }
 
-        public UserAddedToGroupContent(Guid userId, Guid groupId)
-        {
-            UserId = userId;
-            GroupId = groupId;
-        }
+    public UserAddedToGroupContent(Guid userId, Guid groupId)
+    {
+        UserId = userId;
+        GroupId = groupId;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserCreatedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserCreatedContent.cs
index c6de505362..8c9f2c08f7 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserCreatedContent.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserCreatedContent.cs
@@ -1,22 +1,20 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class UserCreatedContent : IMessageContent
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class UserCreatedContent : IMessageContent
-    {
-        public int FormatVersion => 1;
+    public int FormatVersion => 1;
 
-        public Guid UserId { get; }
-        public string UserLoginName { get; }
-        public string? UserDisplayName { get; }
+    public Guid UserId { get; }
+    public string UserLoginName { get; }
+    public string? UserDisplayName { get; }
 
-        public UserCreatedContent(Guid userId, string userLoginName, string? userDisplayName)
-        {
-            UserId = userId;
-            UserLoginName = userLoginName;
-            UserDisplayName = userDisplayName;
-        }
+    public UserCreatedContent(Guid userId, string userLoginName, string? userDisplayName)
+    {
+        UserId = userId;
+        UserLoginName = userLoginName;
+        UserDisplayName = userDisplayName;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDeletedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDeletedContent.cs
index 21d5789b25..f0a5a30102 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDeletedContent.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDeletedContent.cs
@@ -1,18 +1,16 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class UserDeletedContent : IMessageContent
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class UserDeletedContent : IMessageContent
-    {
-        public int FormatVersion => 1;
+    public int FormatVersion => 1;
 
-        public Guid UserId { get; }
+    public Guid UserId { get; }
 
-        public UserDeletedContent(Guid userId)
-        {
-            UserId = userId;
-        }
+    public UserDeletedContent(Guid userId)
+    {
+        UserId = userId;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDisplayNameChangedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDisplayNameChangedContent.cs
index 64be5883ab..aff93ee7db 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDisplayNameChangedContent.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserDisplayNameChangedContent.cs
@@ -1,22 +1,20 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class UserDisplayNameChangedContent : IMessageContent
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class UserDisplayNameChangedContent : IMessageContent
-    {
-        public int FormatVersion => 1;
+    public int FormatVersion => 1;
 
-        public Guid UserId { get; }
-        public string? BeforeUserDisplayName { get; }
-        public string? AfterUserDisplayName { get; }
+    public Guid UserId { get; }
+    public string? BeforeUserDisplayName { get; }
+    public string? AfterUserDisplayName { get; }
 
-        public UserDisplayNameChangedContent(Guid userId, string? beforeUserDisplayName, string? afterUserDisplayName)
-        {
-            UserId = userId;
-            BeforeUserDisplayName = beforeUserDisplayName;
-            AfterUserDisplayName = afterUserDisplayName;
-        }
+    public UserDisplayNameChangedContent(Guid userId, string? beforeUserDisplayName, string? afterUserDisplayName)
+    {
+        UserId = userId;
+        BeforeUserDisplayName = beforeUserDisplayName;
+        AfterUserDisplayName = afterUserDisplayName;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserLoginNameChangedContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserLoginNameChangedContent.cs
index 8adc213fa2..d835220aa0 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserLoginNameChangedContent.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserLoginNameChangedContent.cs
@@ -1,22 +1,20 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class UserLoginNameChangedContent : IMessageContent
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class UserLoginNameChangedContent : IMessageContent
-    {
-        public int FormatVersion => 1;
+    public int FormatVersion => 1;
 
-        public Guid UserId { get; }
-        public string BeforeUserLoginName { get; }
-        public string AfterUserLoginName { get; }
+    public Guid UserId { get; }
+    public string BeforeUserLoginName { get; }
+    public string AfterUserLoginName { get; }
 
-        public UserLoginNameChangedContent(Guid userId, string beforeUserLoginName, string afterUserLoginName)
-        {
-            UserId = userId;
-            BeforeUserLoginName = beforeUserLoginName;
-            AfterUserLoginName = afterUserLoginName;
-        }
+    public UserLoginNameChangedContent(Guid userId, string beforeUserLoginName, string afterUserLoginName)
+    {
+        UserId = userId;
+        BeforeUserLoginName = beforeUserLoginName;
+        AfterUserLoginName = afterUserLoginName;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserMovedToGroupContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserMovedToGroupContent.cs
index 2f1234734e..766422e595 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserMovedToGroupContent.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserMovedToGroupContent.cs
@@ -1,22 +1,20 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class UserMovedToGroupContent : IMessageContent
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class UserMovedToGroupContent : IMessageContent
-    {
-        public int FormatVersion => 1;
+    public int FormatVersion => 1;
 
-        public Guid UserId { get; }
-        public Guid BeforeGroupId { get; }
-        public Guid AfterGroupId { get; }
+    public Guid UserId { get; }
+    public Guid BeforeGroupId { get; }
+    public Guid AfterGroupId { get; }
 
-        public UserMovedToGroupContent(Guid userId, Guid beforeGroupId, Guid afterGroupId)
-        {
-            UserId = userId;
-            BeforeGroupId = beforeGroupId;
-            AfterGroupId = afterGroupId;
-        }
+    public UserMovedToGroupContent(Guid userId, Guid beforeGroupId, Guid afterGroupId)
+    {
+        UserId = userId;
+        BeforeGroupId = beforeGroupId;
+        AfterGroupId = afterGroupId;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserRemovedFromGroupContent.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserRemovedFromGroupContent.cs
index 8bc1805942..8623d101b9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserRemovedFromGroupContent.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/Messages/UserRemovedFromGroupContent.cs
@@ -1,20 +1,18 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class UserRemovedFromGroupContent : IMessageContent
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class UserRemovedFromGroupContent : IMessageContent
-    {
-        public int FormatVersion => 1;
+    public int FormatVersion => 1;
 
-        public Guid UserId { get; }
-        public Guid GroupId { get; }
+    public Guid UserId { get; }
+    public Guid GroupId { get; }
 
-        public UserRemovedFromGroupContent(Guid userId, Guid groupId)
-        {
-            UserId = userId;
-            GroupId = groupId;
-        }
+    public UserRemovedFromGroupContent(Guid userId, Guid groupId)
+    {
+        UserId = userId;
+        GroupId = groupId;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingGroupDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingGroupDefinition.cs
index e08f8398e8..ce8e10c62e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingGroupDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingGroupDefinition.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources;
@@ -10,176 +5,175 @@
 using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices;
+
+public abstract class MessagingGroupDefinition : HitCountingResourceDefinition<DomainGroup, Guid>
 {
-    public abstract class MessagingGroupDefinition : HitCountingResourceDefinition<DomainGroup, Guid>
-    {
-        private readonly DbSet<DomainUser> _userSet;
-        private readonly DbSet<DomainGroup> _groupSet;
-        private readonly List<OutgoingMessage> _pendingMessages = new();
+    private readonly DbSet<DomainUser> _userSet;
+    private readonly DbSet<DomainGroup> _groupSet;
+    private readonly List<OutgoingMessage> _pendingMessages = new();
+
+    private string? _beforeGroupName;
+
+    protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Writing;
 
-        private string? _beforeGroupName;
+    protected MessagingGroupDefinition(IResourceGraph resourceGraph, DbSet<DomainUser> userSet, DbSet<DomainGroup> groupSet,
+        ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, hitCounter)
+    {
+        _userSet = userSet;
+        _groupSet = groupSet;
+    }
 
-        protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Writing;
+    public override async Task OnPrepareWriteAsync(DomainGroup group, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        await base.OnPrepareWriteAsync(group, writeOperation, cancellationToken);
 
-        protected MessagingGroupDefinition(IResourceGraph resourceGraph, DbSet<DomainUser> userSet, DbSet<DomainGroup> groupSet,
-            ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, hitCounter)
+        if (writeOperation == WriteOperationKind.CreateResource)
         {
-            _userSet = userSet;
-            _groupSet = groupSet;
+            group.Id = Guid.NewGuid();
         }
-
-        public override async Task OnPrepareWriteAsync(DomainGroup group, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        else if (writeOperation == WriteOperationKind.UpdateResource)
         {
-            await base.OnPrepareWriteAsync(group, writeOperation, cancellationToken);
-
-            if (writeOperation == WriteOperationKind.CreateResource)
-            {
-                group.Id = Guid.NewGuid();
-            }
-            else if (writeOperation == WriteOperationKind.UpdateResource)
-            {
-                _beforeGroupName = group.Name;
-            }
+            _beforeGroupName = group.Name;
         }
+    }
+
+    public override async Task OnSetToManyRelationshipAsync(DomainGroup group, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        await base.OnSetToManyRelationshipAsync(group, hasManyRelationship, rightResourceIds, writeOperation, cancellationToken);
 
-        public override async Task OnSetToManyRelationshipAsync(DomainGroup group, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        if (hasManyRelationship.Property.Name == nameof(DomainGroup.Users))
         {
-            await base.OnSetToManyRelationshipAsync(group, hasManyRelationship, rightResourceIds, writeOperation, cancellationToken);
+            HashSet<Guid> rightUserIds = rightResourceIds.Select(resource => (Guid)resource.GetTypedId()).ToHashSet();
 
-            if (hasManyRelationship.Property.Name == nameof(DomainGroup.Users))
-            {
-                HashSet<Guid> rightUserIds = rightResourceIds.Select(resource => (Guid)resource.GetTypedId()).ToHashSet();
+            List<DomainUser> beforeUsers = await _userSet.Include(user => user.Group).Where(user => rightUserIds.Contains(user.Id))
+                .ToListAsync(cancellationToken);
 
-                List<DomainUser> beforeUsers = await _userSet.Include(user => user.Group).Where(user => rightUserIds.Contains(user.Id))
-                    .ToListAsync(cancellationToken);
+            foreach (DomainUser beforeUser in beforeUsers)
+            {
+                IMessageContent? content = null;
 
-                foreach (DomainUser beforeUser in beforeUsers)
+                if (beforeUser.Group == null)
+                {
+                    content = new UserAddedToGroupContent(beforeUser.Id, group.Id);
+                }
+                else if (beforeUser.Group != null && beforeUser.Group.Id != group.Id)
                 {
-                    IMessageContent? content = null;
-
-                    if (beforeUser.Group == null)
-                    {
-                        content = new UserAddedToGroupContent(beforeUser.Id, group.Id);
-                    }
-                    else if (beforeUser.Group != null && beforeUser.Group.Id != group.Id)
-                    {
-                        content = new UserMovedToGroupContent(beforeUser.Id, beforeUser.Group.Id, group.Id);
-                    }
-
-                    if (content != null)
-                    {
-                        var message = OutgoingMessage.CreateFromContent(content);
-                        _pendingMessages.Add(message);
-                    }
+                    content = new UserMovedToGroupContent(beforeUser.Id, beforeUser.Group.Id, group.Id);
                 }
 
-                foreach (DomainUser userToRemoveFromGroup in group.Users.Where(user => !rightUserIds.Contains(user.Id)))
+                if (content != null)
                 {
-                    var content = new UserRemovedFromGroupContent(userToRemoveFromGroup.Id, group.Id);
                     var message = OutgoingMessage.CreateFromContent(content);
                     _pendingMessages.Add(message);
                 }
             }
+
+            foreach (DomainUser userToRemoveFromGroup in group.Users.Where(user => !rightUserIds.Contains(user.Id)))
+            {
+                var content = new UserRemovedFromGroupContent(userToRemoveFromGroup.Id, group.Id);
+                var message = OutgoingMessage.CreateFromContent(content);
+                _pendingMessages.Add(message);
+            }
         }
+    }
 
-        public override async Task OnAddToRelationshipAsync(Guid groupId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
+    public override async Task OnAddToRelationshipAsync(Guid groupId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        await base.OnAddToRelationshipAsync(groupId, hasManyRelationship, rightResourceIds, cancellationToken);
+
+        if (hasManyRelationship.Property.Name == nameof(DomainGroup.Users))
         {
-            await base.OnAddToRelationshipAsync(groupId, hasManyRelationship, rightResourceIds, cancellationToken);
+            HashSet<Guid> rightUserIds = rightResourceIds.Select(resource => (Guid)resource.GetTypedId()).ToHashSet();
 
-            if (hasManyRelationship.Property.Name == nameof(DomainGroup.Users))
+            List<DomainUser> beforeUsers = await _userSet.Include(user => user.Group).Where(user => rightUserIds.Contains(user.Id))
+                .ToListAsync(cancellationToken);
+
+            foreach (DomainUser beforeUser in beforeUsers)
             {
-                HashSet<Guid> rightUserIds = rightResourceIds.Select(resource => (Guid)resource.GetTypedId()).ToHashSet();
+                IMessageContent? content = null;
 
-                List<DomainUser> beforeUsers = await _userSet.Include(user => user.Group).Where(user => rightUserIds.Contains(user.Id))
-                    .ToListAsync(cancellationToken);
+                if (beforeUser.Group == null)
+                {
+                    content = new UserAddedToGroupContent(beforeUser.Id, groupId);
+                }
+                else if (beforeUser.Group != null && beforeUser.Group.Id != groupId)
+                {
+                    content = new UserMovedToGroupContent(beforeUser.Id, beforeUser.Group.Id, groupId);
+                }
 
-                foreach (DomainUser beforeUser in beforeUsers)
+                if (content != null)
                 {
-                    IMessageContent? content = null;
-
-                    if (beforeUser.Group == null)
-                    {
-                        content = new UserAddedToGroupContent(beforeUser.Id, groupId);
-                    }
-                    else if (beforeUser.Group != null && beforeUser.Group.Id != groupId)
-                    {
-                        content = new UserMovedToGroupContent(beforeUser.Id, beforeUser.Group.Id, groupId);
-                    }
-
-                    if (content != null)
-                    {
-                        var message = OutgoingMessage.CreateFromContent(content);
-                        _pendingMessages.Add(message);
-                    }
+                    var message = OutgoingMessage.CreateFromContent(content);
+                    _pendingMessages.Add(message);
                 }
             }
         }
+    }
+
+    public override async Task OnRemoveFromRelationshipAsync(DomainGroup group, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        await base.OnRemoveFromRelationshipAsync(group, hasManyRelationship, rightResourceIds, cancellationToken);
 
-        public override async Task OnRemoveFromRelationshipAsync(DomainGroup group, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
+        if (hasManyRelationship.Property.Name == nameof(DomainGroup.Users))
         {
-            await base.OnRemoveFromRelationshipAsync(group, hasManyRelationship, rightResourceIds, cancellationToken);
+            HashSet<Guid> rightUserIds = rightResourceIds.Select(resource => (Guid)resource.GetTypedId()).ToHashSet();
 
-            if (hasManyRelationship.Property.Name == nameof(DomainGroup.Users))
+            foreach (DomainUser userToRemoveFromGroup in group.Users.Where(user => rightUserIds.Contains(user.Id)))
             {
-                HashSet<Guid> rightUserIds = rightResourceIds.Select(resource => (Guid)resource.GetTypedId()).ToHashSet();
-
-                foreach (DomainUser userToRemoveFromGroup in group.Users.Where(user => rightUserIds.Contains(user.Id)))
-                {
-                    var content = new UserRemovedFromGroupContent(userToRemoveFromGroup.Id, group.Id);
-                    var message = OutgoingMessage.CreateFromContent(content);
-                    _pendingMessages.Add(message);
-                }
+                var content = new UserRemovedFromGroupContent(userToRemoveFromGroup.Id, group.Id);
+                var message = OutgoingMessage.CreateFromContent(content);
+                _pendingMessages.Add(message);
             }
         }
+    }
 
-        protected async Task FinishWriteAsync(DomainGroup group, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    protected async Task FinishWriteAsync(DomainGroup group, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (writeOperation == WriteOperationKind.CreateResource)
         {
-            if (writeOperation == WriteOperationKind.CreateResource)
+            var message = OutgoingMessage.CreateFromContent(new GroupCreatedContent(group.Id, group.Name));
+            await FlushMessageAsync(message, cancellationToken);
+        }
+        else if (writeOperation == WriteOperationKind.UpdateResource)
+        {
+            if (_beforeGroupName != group.Name)
             {
-                var message = OutgoingMessage.CreateFromContent(new GroupCreatedContent(group.Id, group.Name));
+                var message = OutgoingMessage.CreateFromContent(new GroupRenamedContent(group.Id, _beforeGroupName!, group.Name));
                 await FlushMessageAsync(message, cancellationToken);
             }
-            else if (writeOperation == WriteOperationKind.UpdateResource)
-            {
-                if (_beforeGroupName != group.Name)
-                {
-                    var message = OutgoingMessage.CreateFromContent(new GroupRenamedContent(group.Id, _beforeGroupName!, group.Name));
-                    await FlushMessageAsync(message, cancellationToken);
-                }
-            }
-            else if (writeOperation == WriteOperationKind.DeleteResource)
-            {
-                DomainGroup? groupToDelete = await GetGroupToDeleteAsync(group.Id, cancellationToken);
+        }
+        else if (writeOperation == WriteOperationKind.DeleteResource)
+        {
+            DomainGroup? groupToDelete = await GetGroupToDeleteAsync(group.Id, cancellationToken);
 
-                if (groupToDelete != null)
+            if (groupToDelete != null)
+            {
+                foreach (DomainUser user in groupToDelete.Users)
                 {
-                    foreach (DomainUser user in groupToDelete.Users)
-                    {
-                        var removeMessage = OutgoingMessage.CreateFromContent(new UserRemovedFromGroupContent(user.Id, group.Id));
-                        await FlushMessageAsync(removeMessage, cancellationToken);
-                    }
+                    var removeMessage = OutgoingMessage.CreateFromContent(new UserRemovedFromGroupContent(user.Id, group.Id));
+                    await FlushMessageAsync(removeMessage, cancellationToken);
                 }
-
-                var deleteMessage = OutgoingMessage.CreateFromContent(new GroupDeletedContent(group.Id));
-                await FlushMessageAsync(deleteMessage, cancellationToken);
             }
 
-            foreach (OutgoingMessage nextMessage in _pendingMessages)
-            {
-                await FlushMessageAsync(nextMessage, cancellationToken);
-            }
+            var deleteMessage = OutgoingMessage.CreateFromContent(new GroupDeletedContent(group.Id));
+            await FlushMessageAsync(deleteMessage, cancellationToken);
         }
 
-        protected abstract Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken);
-
-        protected virtual async Task<DomainGroup?> GetGroupToDeleteAsync(Guid groupId, CancellationToken cancellationToken)
+        foreach (OutgoingMessage nextMessage in _pendingMessages)
         {
-            return await _groupSet.Include(group => group.Users).FirstOrDefaultAsync(group => group.Id == groupId, cancellationToken);
+            await FlushMessageAsync(nextMessage, cancellationToken);
         }
     }
+
+    protected abstract Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken);
+
+    protected virtual async Task<DomainGroup?> GetGroupToDeleteAsync(Guid groupId, CancellationToken cancellationToken)
+    {
+        return await _groupSet.Include(group => group.Users).FirstOrDefaultAsync(group => group.Id == groupId, cancellationToken);
+    }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingUserDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingUserDefinition.cs
index 4af5076cca..499c572b88 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingUserDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/MessagingUserDefinition.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources;
@@ -9,122 +5,121 @@
 using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices;
+
+public abstract class MessagingUserDefinition : HitCountingResourceDefinition<DomainUser, Guid>
 {
-    public abstract class MessagingUserDefinition : HitCountingResourceDefinition<DomainUser, Guid>
-    {
-        private readonly DbSet<DomainUser> _userSet;
-        private readonly List<OutgoingMessage> _pendingMessages = new();
+    private readonly DbSet<DomainUser> _userSet;
+    private readonly List<OutgoingMessage> _pendingMessages = new();
+
+    private string? _beforeLoginName;
+    private string? _beforeDisplayName;
 
-        private string? _beforeLoginName;
-        private string? _beforeDisplayName;
+    protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Writing;
 
-        protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Writing;
+    protected MessagingUserDefinition(IResourceGraph resourceGraph, DbSet<DomainUser> userSet, ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, hitCounter)
+    {
+        _userSet = userSet;
+    }
 
-        protected MessagingUserDefinition(IResourceGraph resourceGraph, DbSet<DomainUser> userSet, ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, hitCounter)
+    public override async Task OnPrepareWriteAsync(DomainUser user, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        await base.OnPrepareWriteAsync(user, writeOperation, cancellationToken);
+
+        if (writeOperation == WriteOperationKind.CreateResource)
+        {
+            user.Id = Guid.NewGuid();
+        }
+        else if (writeOperation == WriteOperationKind.UpdateResource)
         {
-            _userSet = userSet;
+            _beforeLoginName = user.LoginName;
+            _beforeDisplayName = user.DisplayName;
         }
+    }
 
-        public override async Task OnPrepareWriteAsync(DomainUser user, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    public override async Task<IIdentifiable?> OnSetToOneRelationshipAsync(DomainUser user, HasOneAttribute hasOneRelationship, IIdentifiable? rightResourceId,
+        WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        await base.OnSetToOneRelationshipAsync(user, hasOneRelationship, rightResourceId, writeOperation, cancellationToken);
+
+        if (hasOneRelationship.Property.Name == nameof(DomainUser.Group))
         {
-            await base.OnPrepareWriteAsync(user, writeOperation, cancellationToken);
+            var afterGroupId = (Guid?)rightResourceId?.GetTypedId();
+            IMessageContent? content = null;
 
-            if (writeOperation == WriteOperationKind.CreateResource)
+            if (user.Group != null && afterGroupId == null)
             {
-                user.Id = Guid.NewGuid();
+                content = new UserRemovedFromGroupContent(user.Id, user.Group.Id);
             }
-            else if (writeOperation == WriteOperationKind.UpdateResource)
+            else if (user.Group == null && afterGroupId != null)
             {
-                _beforeLoginName = user.LoginName;
-                _beforeDisplayName = user.DisplayName;
+                content = new UserAddedToGroupContent(user.Id, afterGroupId.Value);
             }
-        }
-
-        public override async Task<IIdentifiable?> OnSetToOneRelationshipAsync(DomainUser user, HasOneAttribute hasOneRelationship,
-            IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            await base.OnSetToOneRelationshipAsync(user, hasOneRelationship, rightResourceId, writeOperation, cancellationToken);
-
-            if (hasOneRelationship.Property.Name == nameof(DomainUser.Group))
+            else if (user.Group != null && afterGroupId != null && user.Group.Id != afterGroupId)
             {
-                var afterGroupId = (Guid?)rightResourceId?.GetTypedId();
-                IMessageContent? content = null;
-
-                if (user.Group != null && afterGroupId == null)
-                {
-                    content = new UserRemovedFromGroupContent(user.Id, user.Group.Id);
-                }
-                else if (user.Group == null && afterGroupId != null)
-                {
-                    content = new UserAddedToGroupContent(user.Id, afterGroupId.Value);
-                }
-                else if (user.Group != null && afterGroupId != null && user.Group.Id != afterGroupId)
-                {
-                    content = new UserMovedToGroupContent(user.Id, user.Group.Id, afterGroupId.Value);
-                }
-
-                if (content != null)
-                {
-                    var message = OutgoingMessage.CreateFromContent(content);
-                    _pendingMessages.Add(message);
-                }
+                content = new UserMovedToGroupContent(user.Id, user.Group.Id, afterGroupId.Value);
             }
 
-            return rightResourceId;
+            if (content != null)
+            {
+                var message = OutgoingMessage.CreateFromContent(content);
+                _pendingMessages.Add(message);
+            }
         }
 
-        protected async Task FinishWriteAsync(DomainUser user, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        return rightResourceId;
+    }
+
+    protected async Task FinishWriteAsync(DomainUser user, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        if (writeOperation == WriteOperationKind.CreateResource)
+        {
+            var content = new UserCreatedContent(user.Id, user.LoginName, user.DisplayName);
+            var message = OutgoingMessage.CreateFromContent(content);
+            await FlushMessageAsync(message, cancellationToken);
+        }
+        else if (writeOperation == WriteOperationKind.UpdateResource)
         {
-            if (writeOperation == WriteOperationKind.CreateResource)
+            if (_beforeLoginName != user.LoginName)
             {
-                var content = new UserCreatedContent(user.Id, user.LoginName, user.DisplayName);
+                var content = new UserLoginNameChangedContent(user.Id, _beforeLoginName!, user.LoginName);
                 var message = OutgoingMessage.CreateFromContent(content);
                 await FlushMessageAsync(message, cancellationToken);
             }
-            else if (writeOperation == WriteOperationKind.UpdateResource)
-            {
-                if (_beforeLoginName != user.LoginName)
-                {
-                    var content = new UserLoginNameChangedContent(user.Id, _beforeLoginName!, user.LoginName);
-                    var message = OutgoingMessage.CreateFromContent(content);
-                    await FlushMessageAsync(message, cancellationToken);
-                }
-
-                if (_beforeDisplayName != user.DisplayName)
-                {
-                    var content = new UserDisplayNameChangedContent(user.Id, _beforeDisplayName!, user.DisplayName);
-                    var message = OutgoingMessage.CreateFromContent(content);
-                    await FlushMessageAsync(message, cancellationToken);
-                }
-            }
-            else if (writeOperation == WriteOperationKind.DeleteResource)
-            {
-                DomainUser? userToDelete = await GetUserToDeleteAsync(user.Id, cancellationToken);
-
-                if (userToDelete?.Group != null)
-                {
-                    var content = new UserRemovedFromGroupContent(user.Id, userToDelete.Group.Id);
-                    var message = OutgoingMessage.CreateFromContent(content);
-                    await FlushMessageAsync(message, cancellationToken);
-                }
 
-                var deleteMessage = OutgoingMessage.CreateFromContent(new UserDeletedContent(user.Id));
-                await FlushMessageAsync(deleteMessage, cancellationToken);
+            if (_beforeDisplayName != user.DisplayName)
+            {
+                var content = new UserDisplayNameChangedContent(user.Id, _beforeDisplayName!, user.DisplayName);
+                var message = OutgoingMessage.CreateFromContent(content);
+                await FlushMessageAsync(message, cancellationToken);
             }
+        }
+        else if (writeOperation == WriteOperationKind.DeleteResource)
+        {
+            DomainUser? userToDelete = await GetUserToDeleteAsync(user.Id, cancellationToken);
 
-            foreach (OutgoingMessage nextMessage in _pendingMessages)
+            if (userToDelete?.Group != null)
             {
-                await FlushMessageAsync(nextMessage, cancellationToken);
+                var content = new UserRemovedFromGroupContent(user.Id, userToDelete.Group.Id);
+                var message = OutgoingMessage.CreateFromContent(content);
+                await FlushMessageAsync(message, cancellationToken);
             }
-        }
 
-        protected abstract Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken);
+            var deleteMessage = OutgoingMessage.CreateFromContent(new UserDeletedContent(user.Id));
+            await FlushMessageAsync(deleteMessage, cancellationToken);
+        }
 
-        protected virtual async Task<DomainUser?> GetUserToDeleteAsync(Guid userId, CancellationToken cancellationToken)
+        foreach (OutgoingMessage nextMessage in _pendingMessages)
         {
-            return await _userSet.Include(domainUser => domainUser.Group).FirstOrDefaultAsync(domainUser => domainUser.Id == userId, cancellationToken);
+            await FlushMessageAsync(nextMessage, cancellationToken);
         }
     }
+
+    protected abstract Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken);
+
+    protected virtual async Task<DomainUser?> GetUserToDeleteAsync(Guid userId, CancellationToken cancellationToken)
+    {
+        return await _userSet.Include(domainUser => domainUser.Group).FirstOrDefaultAsync(domainUser => domainUser.Id == userId, cancellationToken);
+    }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxDbContext.cs
index 87e8d63707..f2a88e1c8d 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxDbContext.cs
@@ -2,18 +2,17 @@
 using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class OutboxDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class OutboxDbContext : DbContext
-    {
-        public DbSet<DomainUser> Users => Set<DomainUser>();
-        public DbSet<DomainGroup> Groups => Set<DomainGroup>();
-        public DbSet<OutgoingMessage> OutboxMessages => Set<OutgoingMessage>();
+    public DbSet<DomainUser> Users => Set<DomainUser>();
+    public DbSet<DomainGroup> Groups => Set<DomainGroup>();
+    public DbSet<OutgoingMessage> OutboxMessages => Set<OutgoingMessage>();
 
-        public OutboxDbContext(DbContextOptions<OutboxDbContext> options)
-            : base(options)
-        {
-        }
+    public OutboxDbContext(DbContextOptions<OutboxDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxGroupDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxGroupDefinition.cs
index f79bce5e00..8aaef59e35 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxGroupDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxGroupDefinition.cs
@@ -1,34 +1,31 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class OutboxGroupDefinition : MessagingGroupDefinition
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class OutboxGroupDefinition : MessagingGroupDefinition
-    {
-        private readonly DbSet<OutgoingMessage> _outboxMessageSet;
+    private readonly DbSet<OutgoingMessage> _outboxMessageSet;
 
-        public OutboxGroupDefinition(IResourceGraph resourceGraph, OutboxDbContext dbContext, ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, dbContext.Users, dbContext.Groups, hitCounter)
-        {
-            _outboxMessageSet = dbContext.OutboxMessages;
-        }
+    public OutboxGroupDefinition(IResourceGraph resourceGraph, OutboxDbContext dbContext, ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, dbContext.Users, dbContext.Groups, hitCounter)
+    {
+        _outboxMessageSet = dbContext.OutboxMessages;
+    }
 
-        public override async Task OnWritingAsync(DomainGroup group, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            await base.OnWritingAsync(group, writeOperation, cancellationToken);
+    public override async Task OnWritingAsync(DomainGroup group, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        await base.OnWritingAsync(group, writeOperation, cancellationToken);
 
-            await FinishWriteAsync(group, writeOperation, cancellationToken);
-        }
+        await FinishWriteAsync(group, writeOperation, cancellationToken);
+    }
 
-        protected override async Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken)
-        {
-            await _outboxMessageSet.AddAsync(message, cancellationToken);
-        }
+    protected override async Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken)
+    {
+        await _outboxMessageSet.AddAsync(message, cancellationToken);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.Group.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.Group.cs
index 4bbe4e4aa7..a5c61d1f70 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.Group.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.Group.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
@@ -12,619 +7,618 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern;
+
+public sealed partial class OutboxTests
 {
-    public sealed partial class OutboxTests
+    [Fact]
+    public async Task Create_group_writes_to_outbox()
     {
-        [Fact]
-        public async Task Create_group_writes_to_outbox()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            string newGroupName = _fakers.DomainGroup.Generate().Name;
+        string newGroupName = _fakers.DomainGroup.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainGroups",
+                attributes = new
                 {
-                    type = "domainGroups",
-                    attributes = new
-                    {
-                        name = newGroupName
-                    }
+                    name = newGroupName
                 }
-            };
+            }
+        };
 
-            const string route = "/domainGroups";
+        const string route = "/domainGroups";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newGroupName));
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newGroupName));
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            Guid newGroupId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        Guid newGroupId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(1);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(1);
 
-                var content = messages[0].GetContentAs<GroupCreatedContent>();
-                content.GroupId.Should().Be(newGroupId);
-                content.GroupName.Should().Be(newGroupName);
-            });
-        }
+            var content = messages[0].GetContentAs<GroupCreatedContent>();
+            content.GroupId.Should().Be(newGroupId);
+            content.GroupName.Should().Be(newGroupName);
+        });
+    }
 
-        [Fact]
-        public async Task Create_group_with_users_writes_to_outbox()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+    [Fact]
+    public async Task Create_group_with_users_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
+        DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
 
-            DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
-            existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
+        DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
+        existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
 
-            string newGroupName = _fakers.DomainGroup.Generate().Name;
+        string newGroupName = _fakers.DomainGroup.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithOtherGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithOtherGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainGroups",
+                attributes = new
                 {
-                    type = "domainGroups",
-                    attributes = new
-                    {
-                        name = newGroupName
-                    },
-                    relationships = new
+                    name = newGroupName
+                },
+                relationships = new
+                {
+                    users = new
                     {
-                        users = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "domainUsers",
-                                    id = existingUserWithoutGroup.StringId
-                                },
-                                new
-                                {
-                                    type = "domainUsers",
-                                    id = existingUserWithOtherGroup.StringId
-                                }
+                                type = "domainUsers",
+                                id = existingUserWithoutGroup.StringId
+                            },
+                            new
+                            {
+                                type = "domainUsers",
+                                id = existingUserWithOtherGroup.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/domainGroups";
+        const string route = "/domainGroups";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newGroupName));
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newGroupName));
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            Guid newGroupId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        Guid newGroupId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(3);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(3);
+
+            var content1 = messages[0].GetContentAs<GroupCreatedContent>();
+            content1.GroupId.Should().Be(newGroupId);
+            content1.GroupName.Should().Be(newGroupName);
+
+            var content2 = messages[1].GetContentAs<UserAddedToGroupContent>();
+            content2.UserId.Should().Be(existingUserWithoutGroup.Id);
+            content2.GroupId.Should().Be(newGroupId);
+
+            var content3 = messages[2].GetContentAs<UserMovedToGroupContent>();
+            content3.UserId.Should().Be(existingUserWithOtherGroup.Id);
+            content3.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
+            content3.AfterGroupId.Should().Be(newGroupId);
+        });
+    }
 
-                var content1 = messages[0].GetContentAs<GroupCreatedContent>();
-                content1.GroupId.Should().Be(newGroupId);
-                content1.GroupName.Should().Be(newGroupName);
+    [Fact]
+    public async Task Update_group_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-                var content2 = messages[1].GetContentAs<UserAddedToGroupContent>();
-                content2.UserId.Should().Be(existingUserWithoutGroup.Id);
-                content2.GroupId.Should().Be(newGroupId);
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-                var content3 = messages[2].GetContentAs<UserMovedToGroupContent>();
-                content3.UserId.Should().Be(existingUserWithOtherGroup.Id);
-                content3.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
-                content3.AfterGroupId.Should().Be(newGroupId);
-            });
-        }
+        string newGroupName = _fakers.DomainGroup.Generate().Name;
 
-        [Fact]
-        public async Task Update_group_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
-
-            string newGroupName = _fakers.DomainGroup.Generate().Name;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Groups.Add(existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Groups.Add(existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainGroups",
+                id = existingGroup.StringId,
+                attributes = new
                 {
-                    type = "domainGroups",
-                    id = existingGroup.StringId,
-                    attributes = new
-                    {
-                        name = newGroupName
-                    }
+                    name = newGroupName
                 }
-            };
+            }
+        };
 
-            string route = $"/domainGroups/{existingGroup.StringId}";
+        string route = $"/domainGroups/{existingGroup.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(1);
+        responseDocument.Should().BeEmpty();
 
-                var content = messages[0].GetContentAs<GroupRenamedContent>();
-                content.GroupId.Should().Be(existingGroup.StringId);
-                content.BeforeGroupName.Should().Be(existingGroup.Name);
-                content.AfterGroupName.Should().Be(newGroupName);
-            });
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-        [Fact]
-        public async Task Update_group_with_users_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(1);
+
+            var content = messages[0].GetContentAs<GroupRenamedContent>();
+            content.GroupId.Should().Be(existingGroup.StringId);
+            content.BeforeGroupName.Should().Be(existingGroup.Name);
+            content.AfterGroupName.Should().Be(newGroupName);
+        });
+    }
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+    [Fact]
+    public async Task Update_group_with_users_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            DomainUser existingUserWithSameGroup1 = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup1.Group = existingGroup;
+        DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
 
-            DomainUser existingUserWithSameGroup2 = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup2.Group = existingGroup;
+        DomainUser existingUserWithSameGroup1 = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup1.Group = existingGroup;
 
-            DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
-            existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
+        DomainUser existingUserWithSameGroup2 = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup2.Group = existingGroup;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithSameGroup1, existingUserWithSameGroup2, existingUserWithOtherGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
+        existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
 
-            var requestBody = new
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithSameGroup1, existingUserWithSameGroup2, existingUserWithOtherGroup);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainGroups",
+                id = existingGroup.StringId,
+                relationships = new
                 {
-                    type = "domainGroups",
-                    id = existingGroup.StringId,
-                    relationships = new
+                    users = new
                     {
-                        users = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "domainUsers",
-                                    id = existingUserWithoutGroup.StringId
-                                },
-                                new
-                                {
-                                    type = "domainUsers",
-                                    id = existingUserWithSameGroup1.StringId
-                                },
-                                new
-                                {
-                                    type = "domainUsers",
-                                    id = existingUserWithOtherGroup.StringId
-                                }
+                                type = "domainUsers",
+                                id = existingUserWithoutGroup.StringId
+                            },
+                            new
+                            {
+                                type = "domainUsers",
+                                id = existingUserWithSameGroup1.StringId
+                            },
+                            new
+                            {
+                                type = "domainUsers",
+                                id = existingUserWithOtherGroup.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/domainGroups/{existingGroup.StringId}";
+        string route = $"/domainGroups/{existingGroup.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(3);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-                var content1 = messages[0].GetContentAs<UserAddedToGroupContent>();
-                content1.UserId.Should().Be(existingUserWithoutGroup.Id);
-                content1.GroupId.Should().Be(existingGroup.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(3);
+
+            var content1 = messages[0].GetContentAs<UserAddedToGroupContent>();
+            content1.UserId.Should().Be(existingUserWithoutGroup.Id);
+            content1.GroupId.Should().Be(existingGroup.Id);
+
+            var content2 = messages[1].GetContentAs<UserMovedToGroupContent>();
+            content2.UserId.Should().Be(existingUserWithOtherGroup.Id);
+            content2.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
+            content2.AfterGroupId.Should().Be(existingGroup.Id);
+
+            var content3 = messages[2].GetContentAs<UserRemovedFromGroupContent>();
+            content3.UserId.Should().Be(existingUserWithSameGroup2.Id);
+            content3.GroupId.Should().Be(existingGroup.Id);
+        });
+    }
 
-                var content2 = messages[1].GetContentAs<UserMovedToGroupContent>();
-                content2.UserId.Should().Be(existingUserWithOtherGroup.Id);
-                content2.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
-                content2.AfterGroupId.Should().Be(existingGroup.Id);
+    [Fact]
+    public async Task Delete_group_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-                var content3 = messages[2].GetContentAs<UserRemovedFromGroupContent>();
-                content3.UserId.Should().Be(existingUserWithSameGroup2.Id);
-                content3.GroupId.Should().Be(existingGroup.Id);
-            });
-        }
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-        [Fact]
-        public async Task Delete_group_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Groups.Add(existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        string route = $"/domainGroups/{existingGroup.StringId}";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Groups.Add(existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            string route = $"/domainGroups/{existingGroup.StringId}";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        responseDocument.Should().BeEmpty();
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(1);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+            var content = messages[0].GetContentAs<GroupDeletedContent>();
+            content.GroupId.Should().Be(existingGroup.StringId);
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(1);
+    [Fact]
+    public async Task Delete_group_with_users_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-                var content = messages[0].GetContentAs<GroupDeletedContent>();
-                content.GroupId.Should().Be(existingGroup.StringId);
-            });
-        }
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        existingGroup.Users = _fakers.DomainUser.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Delete_group_with_users_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
-            existingGroup.Users = _fakers.DomainUser.Generate(1).ToHashSet();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Groups.Add(existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Groups.Add(existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/domainGroups/{existingGroup.StringId}";
+        string route = $"/domainGroups/{existingGroup.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(2);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(2);
 
-                var content1 = messages[0].GetContentAs<UserRemovedFromGroupContent>();
-                content1.UserId.Should().Be(existingGroup.Users.ElementAt(0).Id);
-                content1.GroupId.Should().Be(existingGroup.StringId);
+            var content1 = messages[0].GetContentAs<UserRemovedFromGroupContent>();
+            content1.UserId.Should().Be(existingGroup.Users.ElementAt(0).Id);
+            content1.GroupId.Should().Be(existingGroup.StringId);
 
-                var content2 = messages[1].GetContentAs<GroupDeletedContent>();
-                content2.GroupId.Should().Be(existingGroup.StringId);
-            });
-        }
+            var content2 = messages[1].GetContentAs<GroupDeletedContent>();
+            content2.GroupId.Should().Be(existingGroup.StringId);
+        });
+    }
 
-        [Fact]
-        public async Task Replace_users_in_group_writes_to_outbox()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+    [Fact]
+    public async Task Replace_users_in_group_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
+        DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
 
-            DomainUser existingUserWithSameGroup1 = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup1.Group = existingGroup;
+        DomainUser existingUserWithSameGroup1 = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup1.Group = existingGroup;
 
-            DomainUser existingUserWithSameGroup2 = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup2.Group = existingGroup;
+        DomainUser existingUserWithSameGroup2 = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup2.Group = existingGroup;
 
-            DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
-            existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
+        DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
+        existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithSameGroup1, existingUserWithSameGroup2, existingUserWithOtherGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithSameGroup1, existingUserWithSameGroup2, existingUserWithOtherGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUserWithoutGroup.StringId
-                    },
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUserWithSameGroup1.StringId
-                    },
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUserWithOtherGroup.StringId
-                    }
+                    type = "domainUsers",
+                    id = existingUserWithoutGroup.StringId
+                },
+                new
+                {
+                    type = "domainUsers",
+                    id = existingUserWithSameGroup1.StringId
+                },
+                new
+                {
+                    type = "domainUsers",
+                    id = existingUserWithOtherGroup.StringId
                 }
-            };
-
-            string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
+            }
+        };
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            responseDocument.Should().BeEmpty();
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(3);
-
-                var content1 = messages[0].GetContentAs<UserAddedToGroupContent>();
-                content1.UserId.Should().Be(existingUserWithoutGroup.Id);
-                content1.GroupId.Should().Be(existingGroup.Id);
+        responseDocument.Should().BeEmpty();
 
-                var content2 = messages[1].GetContentAs<UserMovedToGroupContent>();
-                content2.UserId.Should().Be(existingUserWithOtherGroup.Id);
-                content2.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
-                content2.AfterGroupId.Should().Be(existingGroup.Id);
-
-                var content3 = messages[2].GetContentAs<UserRemovedFromGroupContent>();
-                content3.UserId.Should().Be(existingUserWithSameGroup2.Id);
-                content3.GroupId.Should().Be(existingGroup.Id);
-            });
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnSetToManyRelationshipAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-        [Fact]
-        public async Task Add_users_to_group_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(3);
+
+            var content1 = messages[0].GetContentAs<UserAddedToGroupContent>();
+            content1.UserId.Should().Be(existingUserWithoutGroup.Id);
+            content1.GroupId.Should().Be(existingGroup.Id);
+
+            var content2 = messages[1].GetContentAs<UserMovedToGroupContent>();
+            content2.UserId.Should().Be(existingUserWithOtherGroup.Id);
+            content2.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
+            content2.AfterGroupId.Should().Be(existingGroup.Id);
+
+            var content3 = messages[2].GetContentAs<UserRemovedFromGroupContent>();
+            content3.UserId.Should().Be(existingUserWithSameGroup2.Id);
+            content3.GroupId.Should().Be(existingGroup.Id);
+        });
+    }
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+    [Fact]
+    public async Task Add_users_to_group_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            DomainUser existingUserWithSameGroup = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup.Group = existingGroup;
+        DomainUser existingUserWithoutGroup = _fakers.DomainUser.Generate();
 
-            DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
-            existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
+        DomainUser existingUserWithSameGroup = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup.Group = existingGroup;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithSameGroup, existingUserWithOtherGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        DomainUser existingUserWithOtherGroup = _fakers.DomainUser.Generate();
+        existingUserWithOtherGroup.Group = _fakers.DomainGroup.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Users.AddRange(existingUserWithoutGroup, existingUserWithSameGroup, existingUserWithOtherGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUserWithoutGroup.StringId
-                    },
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUserWithOtherGroup.StringId
-                    }
+                    type = "domainUsers",
+                    id = existingUserWithoutGroup.StringId
+                },
+                new
+                {
+                    type = "domainUsers",
+                    id = existingUserWithOtherGroup.StringId
                 }
-            };
-
-            string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
-
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+            }
+        };
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
 
-            responseDocument.Should().BeEmpty();
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnAddToRelationshipAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(2);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                var content1 = messages[0].GetContentAs<UserAddedToGroupContent>();
-                content1.UserId.Should().Be(existingUserWithoutGroup.Id);
-                content1.GroupId.Should().Be(existingGroup.Id);
+        responseDocument.Should().BeEmpty();
 
-                var content2 = messages[1].GetContentAs<UserMovedToGroupContent>();
-                content2.UserId.Should().Be(existingUserWithOtherGroup.Id);
-                content2.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
-                content2.AfterGroupId.Should().Be(existingGroup.Id);
-            });
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnAddToRelationshipAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-        [Fact]
-        public async Task Remove_users_from_group_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(2);
+
+            var content1 = messages[0].GetContentAs<UserAddedToGroupContent>();
+            content1.UserId.Should().Be(existingUserWithoutGroup.Id);
+            content1.GroupId.Should().Be(existingGroup.Id);
+
+            var content2 = messages[1].GetContentAs<UserMovedToGroupContent>();
+            content2.UserId.Should().Be(existingUserWithOtherGroup.Id);
+            content2.BeforeGroupId.Should().Be(existingUserWithOtherGroup.Group.Id);
+            content2.AfterGroupId.Should().Be(existingGroup.Id);
+        });
+    }
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+    [Fact]
+    public async Task Remove_users_from_group_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            DomainUser existingUserWithSameGroup1 = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup1.Group = existingGroup;
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            DomainUser existingUserWithSameGroup2 = _fakers.DomainUser.Generate();
-            existingUserWithSameGroup2.Group = existingGroup;
+        DomainUser existingUserWithSameGroup1 = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup1.Group = existingGroup;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Users.AddRange(existingUserWithSameGroup1, existingUserWithSameGroup2);
-                await dbContext.SaveChangesAsync();
-            });
+        DomainUser existingUserWithSameGroup2 = _fakers.DomainUser.Generate();
+        existingUserWithSameGroup2.Group = existingGroup;
 
-            var requestBody = new
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Users.AddRange(existingUserWithSameGroup1, existingUserWithSameGroup2);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUserWithSameGroup2.StringId
-                    }
+                    type = "domainUsers",
+                    id = existingUserWithSameGroup2.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
+        string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnRemoveFromRelationshipAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnRemoveFromRelationshipAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(1);
-
-                var content = messages[0].GetContentAs<UserRemovedFromGroupContent>();
-                content.UserId.Should().Be(existingUserWithSameGroup2.Id);
-                content.GroupId.Should().Be(existingGroup.Id);
-            });
-        }
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(1);
+
+            var content = messages[0].GetContentAs<UserRemovedFromGroupContent>();
+            content.UserId.Should().Be(existingUserWithSameGroup2.Id);
+            content.GroupId.Should().Be(existingGroup.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.User.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.User.cs
index 8b233b272c..ee8c6aaa58 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.User.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.User.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
@@ -12,687 +7,686 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern;
+
+public sealed partial class OutboxTests
 {
-    public sealed partial class OutboxTests
+    [Fact]
+    public async Task Create_user_writes_to_outbox()
     {
-        [Fact]
-        public async Task Create_user_writes_to_outbox()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            string newLoginName = _fakers.DomainUser.Generate().LoginName;
-            string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+        string newLoginName = _fakers.DomainUser.Generate().LoginName;
+        string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainUsers",
+                attributes = new
                 {
-                    type = "domainUsers",
-                    attributes = new
-                    {
-                        loginName = newLoginName,
-                        displayName = newDisplayName
-                    }
+                    loginName = newLoginName,
+                    displayName = newDisplayName
                 }
-            };
+            }
+        };
 
-            const string route = "/domainUsers";
+        const string route = "/domainUsers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("loginName").With(value => value.Should().Be(newLoginName));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(newDisplayName));
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("loginName").With(value => value.Should().Be(newLoginName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(newDisplayName));
 
-            Guid newUserId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(1);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-                var content = messages[0].GetContentAs<UserCreatedContent>();
-                content.UserId.Should().Be(newUserId);
-                content.UserLoginName.Should().Be(newLoginName);
-                content.UserDisplayName.Should().Be(newDisplayName);
-            });
-        }
+        Guid newUserId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-        [Fact]
-        public async Task Create_user_in_group_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(1);
+
+            var content = messages[0].GetContentAs<UserCreatedContent>();
+            content.UserId.Should().Be(newUserId);
+            content.UserLoginName.Should().Be(newLoginName);
+            content.UserDisplayName.Should().Be(newDisplayName);
+        });
+    }
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+    [Fact]
+    public async Task Create_user_in_group_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            string newLoginName = _fakers.DomainUser.Generate().LoginName;
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Groups.Add(existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        string newLoginName = _fakers.DomainUser.Generate().LoginName;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Groups.Add(existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainUsers",
+                attributes = new
                 {
-                    type = "domainUsers",
-                    attributes = new
-                    {
-                        loginName = newLoginName
-                    },
-                    relationships = new
+                    loginName = newLoginName
+                },
+                relationships = new
+                {
+                    group = new
                     {
-                        group = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "domainGroups",
-                                id = existingGroup.StringId
-                            }
+                            type = "domainGroups",
+                            id = existingGroup.StringId
                         }
                     }
                 }
-            };
-
-            const string route = "/domainUsers";
+            }
+        };
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        const string route = "/domainUsers";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("loginName").With(value => value.Should().Be(newLoginName));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().BeNull());
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
-
-            Guid newUserId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(2);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("loginName").With(value => value.Should().Be(newLoginName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().BeNull());
 
-                var content1 = messages[0].GetContentAs<UserCreatedContent>();
-                content1.UserId.Should().Be(newUserId);
-                content1.UserLoginName.Should().Be(newLoginName);
-                content1.UserDisplayName.Should().BeNull();
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-                var content2 = messages[1].GetContentAs<UserAddedToGroupContent>();
-                content2.UserId.Should().Be(newUserId);
-                content2.GroupId.Should().Be(existingGroup.Id);
-            });
-        }
+        Guid newUserId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-        [Fact]
-        public async Task Update_user_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(2);
+
+            var content1 = messages[0].GetContentAs<UserCreatedContent>();
+            content1.UserId.Should().Be(newUserId);
+            content1.UserLoginName.Should().Be(newLoginName);
+            content1.UserDisplayName.Should().BeNull();
+
+            var content2 = messages[1].GetContentAs<UserAddedToGroupContent>();
+            content2.UserId.Should().Be(newUserId);
+            content2.GroupId.Should().Be(existingGroup.Id);
+        });
+    }
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
+    [Fact]
+    public async Task Update_user_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            string newLoginName = _fakers.DomainUser.Generate().LoginName;
-            string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+        DomainUser existingUser = _fakers.DomainUser.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Users.Add(existingUser);
-                await dbContext.SaveChangesAsync();
-            });
+        string newLoginName = _fakers.DomainUser.Generate().LoginName;
+        string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
 
-            var requestBody = new
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Users.Add(existingUser);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainUsers",
+                id = existingUser.StringId,
+                attributes = new
                 {
-                    type = "domainUsers",
-                    id = existingUser.StringId,
-                    attributes = new
-                    {
-                        loginName = newLoginName,
-                        displayName = newDisplayName
-                    }
+                    loginName = newLoginName,
+                    displayName = newDisplayName
                 }
-            };
-
-            string route = $"/domainUsers/{existingUser.StringId}";
-
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+            }
+        };
 
-            responseDocument.Should().BeEmpty();
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(2);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                var content1 = messages[0].GetContentAs<UserLoginNameChangedContent>();
-                content1.UserId.Should().Be(existingUser.Id);
-                content1.BeforeUserLoginName.Should().Be(existingUser.LoginName);
-                content1.AfterUserLoginName.Should().Be(newLoginName);
+        responseDocument.Should().BeEmpty();
 
-                var content2 = messages[1].GetContentAs<UserDisplayNameChangedContent>();
-                content2.UserId.Should().Be(existingUser.Id);
-                content2.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
-                content2.AfterUserDisplayName.Should().Be(newDisplayName);
-            });
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-        [Fact]
-        public async Task Update_user_clear_group_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(2);
+
+            var content1 = messages[0].GetContentAs<UserLoginNameChangedContent>();
+            content1.UserId.Should().Be(existingUser.Id);
+            content1.BeforeUserLoginName.Should().Be(existingUser.LoginName);
+            content1.AfterUserLoginName.Should().Be(newLoginName);
+
+            var content2 = messages[1].GetContentAs<UserDisplayNameChangedContent>();
+            content2.UserId.Should().Be(existingUser.Id);
+            content2.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
+            content2.AfterUserDisplayName.Should().Be(newDisplayName);
+        });
+    }
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            existingUser.Group = _fakers.DomainGroup.Generate();
+    [Fact]
+    public async Task Update_user_clear_group_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        existingUser.Group = _fakers.DomainGroup.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Users.Add(existingUser);
-                await dbContext.SaveChangesAsync();
-            });
+        string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Users.Add(existingUser);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainUsers",
+                id = existingUser.StringId,
+                attributes = new
                 {
-                    type = "domainUsers",
-                    id = existingUser.StringId,
-                    attributes = new
-                    {
-                        displayName = newDisplayName
-                    },
-                    relationships = new
+                    displayName = newDisplayName
+                },
+                relationships = new
+                {
+                    group = new
                     {
-                        group = new
-                        {
-                            data = (object?)null
-                        }
+                        data = (object?)null
                     }
                 }
-            };
-
-            string route = $"/domainUsers/{existingUser.StringId}";
-
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+            }
+        };
 
-            responseDocument.Should().BeEmpty();
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(2);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                var content1 = messages[0].GetContentAs<UserDisplayNameChangedContent>();
-                content1.UserId.Should().Be(existingUser.Id);
-                content1.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
-                content1.AfterUserDisplayName.Should().Be(newDisplayName);
+        responseDocument.Should().BeEmpty();
 
-                var content2 = messages[1].GetContentAs<UserRemovedFromGroupContent>();
-                content2.UserId.Should().Be(existingUser.Id);
-                content2.GroupId.Should().Be(existingUser.Group.Id);
-            });
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-        [Fact]
-        public async Task Update_user_add_to_group_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(2);
+
+            var content1 = messages[0].GetContentAs<UserDisplayNameChangedContent>();
+            content1.UserId.Should().Be(existingUser.Id);
+            content1.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
+            content1.AfterUserDisplayName.Should().Be(newDisplayName);
+
+            var content2 = messages[1].GetContentAs<UserRemovedFromGroupContent>();
+            content2.UserId.Should().Be(existingUser.Id);
+            content2.GroupId.Should().Be(existingUser.Group.Id);
+        });
+    }
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+    [Fact]
+    public async Task Update_user_add_to_group_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.AddInRange(existingUser, existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.AddInRange(existingUser, existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainUsers",
+                id = existingUser.StringId,
+                attributes = new
                 {
-                    type = "domainUsers",
-                    id = existingUser.StringId,
-                    attributes = new
-                    {
-                        displayName = newDisplayName
-                    },
-                    relationships = new
+                    displayName = newDisplayName
+                },
+                relationships = new
+                {
+                    group = new
                     {
-                        group = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "domainGroups",
-                                id = existingGroup.StringId
-                            }
+                            type = "domainGroups",
+                            id = existingGroup.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/domainUsers/{existingUser.StringId}";
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(2);
-
-                var content1 = messages[0].GetContentAs<UserDisplayNameChangedContent>();
-                content1.UserId.Should().Be(existingUser.Id);
-                content1.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
-                content1.AfterUserDisplayName.Should().Be(newDisplayName);
-
-                var content2 = messages[1].GetContentAs<UserAddedToGroupContent>();
-                content2.UserId.Should().Be(existingUser.Id);
-                content2.GroupId.Should().Be(existingGroup.Id);
-            });
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-        [Fact]
-        public async Task Update_user_move_to_group_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(2);
+
+            var content1 = messages[0].GetContentAs<UserDisplayNameChangedContent>();
+            content1.UserId.Should().Be(existingUser.Id);
+            content1.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
+            content1.AfterUserDisplayName.Should().Be(newDisplayName);
+
+            var content2 = messages[1].GetContentAs<UserAddedToGroupContent>();
+            content2.UserId.Should().Be(existingUser.Id);
+            content2.GroupId.Should().Be(existingGroup.Id);
+        });
+    }
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            existingUser.Group = _fakers.DomainGroup.Generate();
+    [Fact]
+    public async Task Update_user_move_to_group_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        existingUser.Group = _fakers.DomainGroup.Generate();
 
-            string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.AddInRange(existingUser, existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        string newDisplayName = _fakers.DomainUser.Generate().DisplayName!;
 
-            var requestBody = new
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.AddInRange(existingUser, existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "domainUsers",
+                id = existingUser.StringId,
+                attributes = new
                 {
-                    type = "domainUsers",
-                    id = existingUser.StringId,
-                    attributes = new
-                    {
-                        displayName = newDisplayName
-                    },
-                    relationships = new
+                    displayName = newDisplayName
+                },
+                relationships = new
+                {
+                    group = new
                     {
-                        group = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "domainGroups",
-                                id = existingGroup.StringId
-                            }
+                            type = "domainGroups",
+                            id = existingGroup.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/domainUsers/{existingUser.StringId}";
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(2);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(2);
+
+            var content1 = messages[0].GetContentAs<UserDisplayNameChangedContent>();
+            content1.UserId.Should().Be(existingUser.Id);
+            content1.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
+            content1.AfterUserDisplayName.Should().Be(newDisplayName);
+
+            var content2 = messages[1].GetContentAs<UserMovedToGroupContent>();
+            content2.UserId.Should().Be(existingUser.Id);
+            content2.BeforeGroupId.Should().Be(existingUser.Group.Id);
+            content2.AfterGroupId.Should().Be(existingGroup.Id);
+        });
+    }
 
-                var content1 = messages[0].GetContentAs<UserDisplayNameChangedContent>();
-                content1.UserId.Should().Be(existingUser.Id);
-                content1.BeforeUserDisplayName.Should().Be(existingUser.DisplayName);
-                content1.AfterUserDisplayName.Should().Be(newDisplayName);
+    [Fact]
+    public async Task Delete_user_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-                var content2 = messages[1].GetContentAs<UserMovedToGroupContent>();
-                content2.UserId.Should().Be(existingUser.Id);
-                content2.BeforeGroupId.Should().Be(existingUser.Group.Id);
-                content2.AfterGroupId.Should().Be(existingGroup.Id);
-            });
-        }
+        DomainUser existingUser = _fakers.DomainUser.Generate();
 
-        [Fact]
-        public async Task Delete_user_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Users.Add(existingUser);
+            await dbContext.SaveChangesAsync();
+        });
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Users.Add(existingUser);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            string route = $"/domainUsers/{existingUser.StringId}";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        responseDocument.Should().BeEmpty();
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(1);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+            var content = messages[0].GetContentAs<UserDeletedContent>();
+            content.UserId.Should().Be(existingUser.Id);
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(1);
+    [Fact]
+    public async Task Delete_user_in_group_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-                var content = messages[0].GetContentAs<UserDeletedContent>();
-                content.UserId.Should().Be(existingUser.Id);
-            });
-        }
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        existingUser.Group = _fakers.DomainGroup.Generate();
 
-        [Fact]
-        public async Task Delete_user_in_group_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Users.Add(existingUser);
+            await dbContext.SaveChangesAsync();
+        });
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            existingUser.Group = _fakers.DomainGroup.Generate();
+        string route = $"/domainUsers/{existingUser.StringId}";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Users.Add(existingUser);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            string route = $"/domainUsers/{existingUser.StringId}";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        responseDocument.Should().BeEmpty();
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(2);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+            var content1 = messages[0].GetContentAs<UserRemovedFromGroupContent>();
+            content1.UserId.Should().Be(existingUser.Id);
+            content1.GroupId.Should().Be(existingUser.Group.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(2);
+            var content2 = messages[1].GetContentAs<UserDeletedContent>();
+            content2.UserId.Should().Be(existingUser.Id);
+        });
+    }
 
-                var content1 = messages[0].GetContentAs<UserRemovedFromGroupContent>();
-                content1.UserId.Should().Be(existingUser.Id);
-                content1.GroupId.Should().Be(existingUser.Group.Id);
+    [Fact]
+    public async Task Clear_group_from_user_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-                var content2 = messages[1].GetContentAs<UserDeletedContent>();
-                content2.UserId.Should().Be(existingUser.Id);
-            });
-        }
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        existingUser.Group = _fakers.DomainGroup.Generate();
 
-        [Fact]
-        public async Task Clear_group_from_user_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.Users.Add(existingUser);
+            await dbContext.SaveChangesAsync();
+        });
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            existingUser.Group = _fakers.DomainGroup.Generate();
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.Users.Add(existingUser);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/domainUsers/{existingUser.StringId}/relationships/group";
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            string route = $"/domainUsers/{existingUser.StringId}/relationships/group";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        responseDocument.Should().BeEmpty();
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(1);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+            var content = messages[0].GetContentAs<UserRemovedFromGroupContent>();
+            content.UserId.Should().Be(existingUser.Id);
+            content.GroupId.Should().Be(existingUser.Group.Id);
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(1);
+    [Fact]
+    public async Task Assign_group_to_user_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-                var content = messages[0].GetContentAs<UserRemovedFromGroupContent>();
-                content.UserId.Should().Be(existingUser.Id);
-                content.GroupId.Should().Be(existingUser.Group.Id);
-            });
-        }
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-        [Fact]
-        public async Task Assign_group_to_user_writes_to_outbox()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.AddInRange(existingUser, existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.AddInRange(existingUser, existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
-                {
-                    type = "domainGroups",
-                    id = existingGroup.StringId
-                }
-            };
+                type = "domainGroups",
+                id = existingGroup.StringId
+            }
+        };
 
-            string route = $"/domainUsers/{existingUser.StringId}/relationships/group";
+        string route = $"/domainUsers/{existingUser.StringId}/relationships/group";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(1);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(1);
 
-                var content = messages[0].GetContentAs<UserAddedToGroupContent>();
-                content.UserId.Should().Be(existingUser.Id);
-                content.GroupId.Should().Be(existingGroup.Id);
-            });
-        }
+            var content = messages[0].GetContentAs<UserAddedToGroupContent>();
+            content.UserId.Should().Be(existingUser.Id);
+            content.GroupId.Should().Be(existingGroup.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Replace_group_for_user_writes_to_outbox()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+    [Fact]
+    public async Task Replace_group_for_user_writes_to_outbox()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
-            existingUser.Group = _fakers.DomainGroup.Generate();
+        DomainUser existingUser = _fakers.DomainUser.Generate();
+        existingUser.Group = _fakers.DomainGroup.Generate();
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.AddInRange(existingUser, existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.AddInRange(existingUser, existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
-                {
-                    type = "domainGroups",
-                    id = existingGroup.StringId
-                }
-            };
+                type = "domainGroups",
+                id = existingGroup.StringId
+            }
+        };
 
-            string route = $"/domainUsers/{existingUser.StringId}/relationships/group";
+        string route = $"/domainUsers/{existingUser.StringId}/relationships/group";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
-                (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnPrepareWriteAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnSetToOneRelationshipAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWritingAsync),
+            (typeof(DomainUser), ResourceDefinitionExtensibilityPoints.OnWriteSucceededAsync)
+        }, options => options.WithStrictOrdering());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.ShouldHaveCount(1);
-
-                var content = messages[0].GetContentAs<UserMovedToGroupContent>();
-                content.UserId.Should().Be(existingUser.Id);
-                content.BeforeGroupId.Should().Be(existingUser.Group.Id);
-                content.AfterGroupId.Should().Be(existingGroup.Id);
-            });
-        }
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.ShouldHaveCount(1);
+
+            var content = messages[0].GetContentAs<UserMovedToGroupContent>();
+            content.UserId.Should().Be(existingUser.Id);
+            content.BeforeGroupId.Should().Be(existingUser.Group.Id);
+            content.AfterGroupId.Should().Be(existingGroup.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.cs
index 5c4a353a1b..a67c539c85 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -13,96 +8,94 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern;
+// Implements the Transactional Outbox Microservices pattern, described at: https://microservices.io/patterns/data/transactional-outbox.html
+
+public sealed partial class OutboxTests : IClassFixture<IntegrationTestContext<TestableStartup<OutboxDbContext>, OutboxDbContext>>
 {
-    // Implements the Transactional Outbox Microservices pattern, described at: https://microservices.io/patterns/data/transactional-outbox.html
+    private readonly IntegrationTestContext<TestableStartup<OutboxDbContext>, OutboxDbContext> _testContext;
+    private readonly DomainFakers _fakers = new();
 
-    public sealed partial class OutboxTests : IClassFixture<IntegrationTestContext<TestableStartup<OutboxDbContext>, OutboxDbContext>>
+    public OutboxTests(IntegrationTestContext<TestableStartup<OutboxDbContext>, OutboxDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<OutboxDbContext>, OutboxDbContext> _testContext;
-        private readonly DomainFakers _fakers = new();
-
-        public OutboxTests(IntegrationTestContext<TestableStartup<OutboxDbContext>, OutboxDbContext> testContext)
-        {
-            _testContext = testContext;
+        _testContext = testContext;
 
-            testContext.UseController<DomainUsersController>();
-            testContext.UseController<DomainGroupsController>();
+        testContext.UseController<DomainUsersController>();
+        testContext.UseController<DomainGroupsController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<OutboxUserDefinition>();
-                services.AddResourceDefinition<OutboxGroupDefinition>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<OutboxUserDefinition>();
+            services.AddResourceDefinition<OutboxGroupDefinition>();
 
-                services.AddSingleton<ResourceDefinitionHitCounter>();
-            });
+            services.AddSingleton<ResourceDefinitionHitCounter>();
+        });
 
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            hitCounter.Reset();
-        }
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        hitCounter.Reset();
+    }
 
-        [Fact]
-        public async Task Does_not_add_to_outbox_on_write_error()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+    [Fact]
+    public async Task Does_not_add_to_outbox_on_write_error()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            DomainGroup existingGroup = _fakers.DomainGroup.Generate();
+        DomainGroup existingGroup = _fakers.DomainGroup.Generate();
 
-            DomainUser existingUser = _fakers.DomainUser.Generate();
+        DomainUser existingUser = _fakers.DomainUser.Generate();
 
-            string unknownUserId = Unknown.StringId.For<DomainUser, Guid>();
+        string unknownUserId = Unknown.StringId.For<DomainUser, Guid>();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<OutgoingMessage>();
-                dbContext.AddInRange(existingGroup, existingUser);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<OutgoingMessage>();
+            dbContext.AddInRange(existingGroup, existingUser);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
+                {
+                    type = "domainUsers",
+                    id = existingUser.StringId!
+                },
+                new
                 {
-                    new
-                    {
-                        type = "domainUsers",
-                        id = existingUser.StringId!
-                    },
-                    new
-                    {
-                        type = "domainUsers",
-                        id = unknownUserId
-                    }
+                    type = "domainUsers",
+                    id = unknownUserId
                 }
-            };
+            }
+        };
 
-            string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
+        string route = $"/domainGroups/{existingGroup.StringId}/relationships/users";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'domainUsers' with ID '{unknownUserId}' in relationship 'users' does not exist.");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'domainUsers' with ID '{unknownUserId}' in relationship 'users' does not exist.");
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnAddToRelationshipAsync),
-                (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync)
-            }, options => options.WithStrictOrdering());
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnAddToRelationshipAsync),
+            (typeof(DomainGroup), ResourceDefinitionExtensibilityPoints.OnWritingAsync)
+        }, options => options.WithStrictOrdering());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
-                messages.Should().BeEmpty();
-            });
-        }
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<OutgoingMessage> messages = await dbContext.OutboxMessages.OrderBy(message => message.Id).ToListAsync();
+            messages.Should().BeEmpty();
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxUserDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxUserDefinition.cs
index c071842d09..8076c944ec 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxUserDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/TransactionalOutboxPattern/OutboxUserDefinition.cs
@@ -1,34 +1,31 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCoreTests.IntegrationTests.Microservices.Messages;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern
+namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices.TransactionalOutboxPattern;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class OutboxUserDefinition : MessagingUserDefinition
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class OutboxUserDefinition : MessagingUserDefinition
-    {
-        private readonly DbSet<OutgoingMessage> _outboxMessageSet;
+    private readonly DbSet<OutgoingMessage> _outboxMessageSet;
 
-        public OutboxUserDefinition(IResourceGraph resourceGraph, OutboxDbContext dbContext, ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, dbContext.Users, hitCounter)
-        {
-            _outboxMessageSet = dbContext.OutboxMessages;
-        }
+    public OutboxUserDefinition(IResourceGraph resourceGraph, OutboxDbContext dbContext, ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, dbContext.Users, hitCounter)
+    {
+        _outboxMessageSet = dbContext.OutboxMessages;
+    }
 
-        public override async Task OnWritingAsync(DomainUser user, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-        {
-            await base.OnWritingAsync(user, writeOperation, cancellationToken);
+    public override async Task OnWritingAsync(DomainUser user, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+    {
+        await base.OnWritingAsync(user, writeOperation, cancellationToken);
 
-            await FinishWriteAsync(user, writeOperation, cancellationToken);
-        }
+        await FinishWriteAsync(user, writeOperation, cancellationToken);
+    }
 
-        protected override async Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken)
-        {
-            await _outboxMessageSet.AddAsync(message, cancellationToken);
-        }
+    protected override async Task FlushMessageAsync(OutgoingMessage message, CancellationToken cancellationToken)
+    {
+        await _outboxMessageSet.AddAsync(message, cancellationToken);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/IHasTenant.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/IHasTenant.cs
index a936cf9de1..b293ba7e47 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/IHasTenant.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/IHasTenant.cs
@@ -1,11 +1,9 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy
+namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public interface IHasTenant
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public interface IHasTenant
-    {
-        Guid TenantId { get; set; }
-    }
+    Guid TenantId { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/ITenantProvider.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/ITenantProvider.cs
index d3bef58692..244a4a6b83 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/ITenantProvider.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/ITenantProvider.cs
@@ -1,11 +1,8 @@
-using System;
+namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy
+public interface ITenantProvider
 {
-    public interface ITenantProvider
-    {
-        // An implementation would obtain the tenant ID from the request, for example from the incoming
-        // authentication token, a custom HTTP header, the route or a query string parameter.
-        Guid TenantId { get; }
-    }
+    // An implementation would obtain the tenant ID from the request, for example from the incoming
+    // authentication token, a custom HTTP header, the route or a query string parameter.
+    Guid TenantId { get; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyDbContext.cs
index 59bc69faff..ce54a154d8 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyDbContext.cs
@@ -3,33 +3,32 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy
+namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class MultiTenancyDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class MultiTenancyDbContext : DbContext
-    {
-        private readonly ITenantProvider _tenantProvider;
+    private readonly ITenantProvider _tenantProvider;
 
-        public DbSet<WebShop> WebShops => Set<WebShop>();
-        public DbSet<WebProduct> WebProducts => Set<WebProduct>();
+    public DbSet<WebShop> WebShops => Set<WebShop>();
+    public DbSet<WebProduct> WebProducts => Set<WebProduct>();
 
-        public MultiTenancyDbContext(DbContextOptions<MultiTenancyDbContext> options, ITenantProvider tenantProvider)
-            : base(options)
-        {
-            _tenantProvider = tenantProvider;
-        }
+    public MultiTenancyDbContext(DbContextOptions<MultiTenancyDbContext> options, ITenantProvider tenantProvider)
+        : base(options)
+    {
+        _tenantProvider = tenantProvider;
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<WebShop>()
-                .HasMany(webShop => webShop.Products)
-                .WithOne(webProduct => webProduct.Shop);
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<WebShop>()
+            .HasMany(webShop => webShop.Products)
+            .WithOne(webProduct => webProduct.Shop);
 
-            builder.Entity<WebShop>()
-                .HasQueryFilter(webShop => webShop.TenantId == _tenantProvider.TenantId);
+        builder.Entity<WebShop>()
+            .HasQueryFilter(webShop => webShop.TenantId == _tenantProvider.TenantId);
 
-            builder.Entity<WebProduct>()
-                .HasQueryFilter(webProduct => webProduct.Shop.TenantId == _tenantProvider.TenantId);
-        }
+        builder.Entity<WebProduct>()
+            .HasQueryFilter(webProduct => webProduct.Shop.TenantId == _tenantProvider.TenantId);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyFakers.cs
index 669ad84200..564985f107 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyFakers.cs
@@ -1,26 +1,24 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy
+namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
+
+internal sealed class MultiTenancyFakers : FakerContainer
 {
-    internal sealed class MultiTenancyFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<WebShop>> _lazyWebShopFaker = new(() =>
-            new Faker<WebShop>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(webShop => webShop.Url, faker => faker.Internet.Url()));
+    private readonly Lazy<Faker<WebShop>> _lazyWebShopFaker = new(() =>
+        new Faker<WebShop>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(webShop => webShop.Url, faker => faker.Internet.Url()));
 
-        private readonly Lazy<Faker<WebProduct>> _lazyWebProductFaker = new(() =>
-            new Faker<WebProduct>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(webProduct => webProduct.Name, faker => faker.Commerce.ProductName())
-                .RuleFor(webProduct => webProduct.Price, faker => faker.Finance.Amount()));
+    private readonly Lazy<Faker<WebProduct>> _lazyWebProductFaker = new(() =>
+        new Faker<WebProduct>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(webProduct => webProduct.Name, faker => faker.Commerce.ProductName())
+            .RuleFor(webProduct => webProduct.Price, faker => faker.Finance.Amount()));
 
-        public Faker<WebShop> WebShop => _lazyWebShopFaker.Value;
-        public Faker<WebProduct> WebProduct => _lazyWebProductFaker.Value;
-    }
+    public Faker<WebShop> WebShop => _lazyWebShopFaker.Value;
+    public Faker<WebProduct> WebProduct => _lazyWebProductFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyTests.cs
index 992b19c40e..0ddbe8efd0 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -12,1052 +8,1051 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy
+namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
+
+public sealed class MultiTenancyTests : IClassFixture<IntegrationTestContext<TestableStartup<MultiTenancyDbContext>, MultiTenancyDbContext>>
 {
-    public sealed class MultiTenancyTests : IClassFixture<IntegrationTestContext<TestableStartup<MultiTenancyDbContext>, MultiTenancyDbContext>>
+    private static readonly Guid ThisTenantId = RouteTenantProvider.TenantRegistry["nld"];
+    private static readonly Guid OtherTenantId = RouteTenantProvider.TenantRegistry["ita"];
+
+    private readonly IntegrationTestContext<TestableStartup<MultiTenancyDbContext>, MultiTenancyDbContext> _testContext;
+    private readonly MultiTenancyFakers _fakers = new();
+
+    public MultiTenancyTests(IntegrationTestContext<TestableStartup<MultiTenancyDbContext>, MultiTenancyDbContext> testContext)
     {
-        private static readonly Guid ThisTenantId = RouteTenantProvider.TenantRegistry["nld"];
-        private static readonly Guid OtherTenantId = RouteTenantProvider.TenantRegistry["ita"];
+        _testContext = testContext;
 
-        private readonly IntegrationTestContext<TestableStartup<MultiTenancyDbContext>, MultiTenancyDbContext> _testContext;
-        private readonly MultiTenancyFakers _fakers = new();
+        testContext.UseController<WebShopsController>();
+        testContext.UseController<WebProductsController>();
 
-        public MultiTenancyTests(IntegrationTestContext<TestableStartup<MultiTenancyDbContext>, MultiTenancyDbContext> testContext)
+        testContext.ConfigureServicesBeforeStartup(services =>
         {
-            _testContext = testContext;
-
-            testContext.UseController<WebShopsController>();
-            testContext.UseController<WebProductsController>();
+            services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
+            services.AddScoped<ITenantProvider, RouteTenantProvider>();
+        });
 
-            testContext.ConfigureServicesBeforeStartup(services =>
-            {
-                services.AddSingleton<IHttpContextAccessor, HttpContextAccessor>();
-                services.AddScoped<ITenantProvider, RouteTenantProvider>();
-            });
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceService<MultiTenantResourceService<WebShop, int>>();
+            services.AddResourceService<MultiTenantResourceService<WebProduct, int>>();
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceService<MultiTenantResourceService<WebShop, int>>();
-                services.AddResourceService<MultiTenantResourceService<WebProduct, int>>();
-            });
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.UseRelativeLinks = true;
+        options.IncludeTotalResourceCount = true;
+    }
 
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.UseRelativeLinks = true;
-            options.IncludeTotalResourceCount = true;
-        }
+    [Fact]
+    public async Task Get_primary_resources_hides_other_tenants()
+    {
+        // Arrange
+        List<WebShop> shops = _fakers.WebShop.Generate(2);
+        shops[0].TenantId = OtherTenantId;
+        shops[1].TenantId = ThisTenantId;
 
-        [Fact]
-        public async Task Get_primary_resources_hides_other_tenants()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<WebShop> shops = _fakers.WebShop.Generate(2);
-            shops[0].TenantId = OtherTenantId;
-            shops[1].TenantId = ThisTenantId;
+            await dbContext.ClearTableAsync<WebShop>();
+            dbContext.WebShops.AddRange(shops);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<WebShop>();
-                dbContext.WebShops.AddRange(shops);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/nld/shops";
 
-            const string route = "/nld/shops";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(shops[1].StringId);
+    }
+
+    [Fact]
+    public async Task Filter_on_primary_resources_hides_other_tenants()
+    {
+        // Arrange
+        List<WebShop> shops = _fakers.WebShop.Generate(2);
+        shops[0].TenantId = OtherTenantId;
+        shops[0].Products = _fakers.WebProduct.Generate(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(shops[1].StringId);
-        }
+        shops[1].TenantId = ThisTenantId;
+        shops[1].Products = _fakers.WebProduct.Generate(1);
 
-        [Fact]
-        public async Task Filter_on_primary_resources_hides_other_tenants()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<WebShop> shops = _fakers.WebShop.Generate(2);
-            shops[0].TenantId = OtherTenantId;
-            shops[0].Products = _fakers.WebProduct.Generate(1);
+            await dbContext.ClearTableAsync<WebShop>();
+            dbContext.WebShops.AddRange(shops);
+            await dbContext.SaveChangesAsync();
+        });
 
-            shops[1].TenantId = ThisTenantId;
-            shops[1].Products = _fakers.WebProduct.Generate(1);
+        const string route = "/nld/shops?filter=has(products)";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<WebShop>();
-                dbContext.WebShops.AddRange(shops);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            const string route = "/nld/shops?filter=has(products)";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(shops[1].StringId);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    [Fact]
+    public async Task Get_primary_resources_with_include_hides_other_tenants()
+    {
+        // Arrange
+        List<WebShop> shops = _fakers.WebShop.Generate(2);
+        shops[0].TenantId = OtherTenantId;
+        shops[0].Products = _fakers.WebProduct.Generate(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(shops[1].StringId);
-        }
+        shops[1].TenantId = ThisTenantId;
+        shops[1].Products = _fakers.WebProduct.Generate(1);
 
-        [Fact]
-        public async Task Get_primary_resources_with_include_hides_other_tenants()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<WebShop> shops = _fakers.WebShop.Generate(2);
-            shops[0].TenantId = OtherTenantId;
-            shops[0].Products = _fakers.WebProduct.Generate(1);
+            await dbContext.ClearTableAsync<WebShop>();
+            dbContext.WebShops.AddRange(shops);
+            await dbContext.SaveChangesAsync();
+        });
 
-            shops[1].TenantId = ThisTenantId;
-            shops[1].Products = _fakers.WebProduct.Generate(1);
+        const string route = "/nld/shops?include=products";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<WebShop>();
-                dbContext.WebShops.AddRange(shops);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/nld/shops?include=products";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Type.Should().Be("webShops");
+        responseDocument.Data.ManyValue[0].Id.Should().Be(shops[1].StringId);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Type.Should().Be("webShops");
-            responseDocument.Data.ManyValue[0].Id.Should().Be(shops[1].StringId);
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("webProducts");
+        responseDocument.Included[0].Id.Should().Be(shops[1].Products[0].StringId);
+    }
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("webProducts");
-            responseDocument.Included[0].Id.Should().Be(shops[1].Products[0].StringId);
-        }
+    [Fact]
+    public async Task Cannot_get_primary_resource_by_ID_from_other_tenant()
+    {
+        // Arrange
+        WebShop shop = _fakers.WebShop.Generate();
+        shop.TenantId = OtherTenantId;
 
-        [Fact]
-        public async Task Cannot_get_primary_resource_by_ID_from_other_tenant()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebShop shop = _fakers.WebShop.Generate();
-            shop.TenantId = OtherTenantId;
+            dbContext.WebShops.Add(shop);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebShops.Add(shop);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/nld/shops/{shop.StringId}";
 
-            string route = $"/nld/shops/{shop.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'webShops' with ID '{shop.StringId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'webShops' with ID '{shop.StringId}' does not exist.");
-        }
+    [Fact]
+    public async Task Cannot_get_secondary_resources_from_other_parent_tenant()
+    {
+        // Arrange
+        WebShop shop = _fakers.WebShop.Generate();
+        shop.TenantId = OtherTenantId;
+        shop.Products = _fakers.WebProduct.Generate(1);
 
-        [Fact]
-        public async Task Cannot_get_secondary_resources_from_other_parent_tenant()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebShop shop = _fakers.WebShop.Generate();
-            shop.TenantId = OtherTenantId;
-            shop.Products = _fakers.WebProduct.Generate(1);
+            dbContext.WebShops.Add(shop);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebShops.Add(shop);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/nld/shops/{shop.StringId}/products";
 
-            string route = $"/nld/shops/{shop.StringId}/products";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'webShops' with ID '{shop.StringId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'webShops' with ID '{shop.StringId}' does not exist.");
-        }
+    [Fact]
+    public async Task Cannot_get_secondary_resource_from_other_parent_tenant()
+    {
+        // Arrange
+        WebProduct product = _fakers.WebProduct.Generate();
+        product.Shop = _fakers.WebShop.Generate();
+        product.Shop.TenantId = OtherTenantId;
 
-        [Fact]
-        public async Task Cannot_get_secondary_resource_from_other_parent_tenant()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebProduct product = _fakers.WebProduct.Generate();
-            product.Shop = _fakers.WebShop.Generate();
-            product.Shop.TenantId = OtherTenantId;
+            dbContext.WebProducts.Add(product);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebProducts.Add(product);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/nld/products/{product.StringId}/shop";
 
-            string route = $"/nld/products/{product.StringId}/shop";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'webProducts' with ID '{product.StringId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'webProducts' with ID '{product.StringId}' does not exist.");
-        }
+    [Fact]
+    public async Task Cannot_get_ToMany_relationship_for_other_parent_tenant()
+    {
+        // Arrange
+        WebShop shop = _fakers.WebShop.Generate();
+        shop.TenantId = OtherTenantId;
+        shop.Products = _fakers.WebProduct.Generate(1);
 
-        [Fact]
-        public async Task Cannot_get_ToMany_relationship_for_other_parent_tenant()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebShop shop = _fakers.WebShop.Generate();
-            shop.TenantId = OtherTenantId;
-            shop.Products = _fakers.WebProduct.Generate(1);
+            dbContext.WebShops.Add(shop);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebShops.Add(shop);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/nld/shops/{shop.StringId}/relationships/products";
 
-            string route = $"/nld/shops/{shop.StringId}/relationships/products";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'webShops' with ID '{shop.StringId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'webShops' with ID '{shop.StringId}' does not exist.");
-        }
+    [Fact]
+    public async Task Cannot_get_ToOne_relationship_for_other_parent_tenant()
+    {
+        // Arrange
+        WebProduct product = _fakers.WebProduct.Generate();
+        product.Shop = _fakers.WebShop.Generate();
+        product.Shop.TenantId = OtherTenantId;
 
-        [Fact]
-        public async Task Cannot_get_ToOne_relationship_for_other_parent_tenant()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebProduct product = _fakers.WebProduct.Generate();
-            product.Shop = _fakers.WebShop.Generate();
-            product.Shop.TenantId = OtherTenantId;
+            dbContext.WebProducts.Add(product);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebProducts.Add(product);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/nld/products/{product.StringId}/relationships/shop";
 
-            string route = $"/nld/products/{product.StringId}/relationships/shop";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'webProducts' with ID '{product.StringId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'webProducts' with ID '{product.StringId}' does not exist.");
-        }
+    [Fact]
+    public async Task Can_create_resource()
+    {
+        // Arrange
+        string newShopUrl = _fakers.WebShop.Generate().Url;
 
-        [Fact]
-        public async Task Can_create_resource()
+        var requestBody = new
         {
-            // Arrange
-            string newShopUrl = _fakers.WebShop.Generate().Url;
-
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "webShops",
+                attributes = new
                 {
-                    type = "webShops",
-                    attributes = new
-                    {
-                        url = newShopUrl
-                    }
+                    url = newShopUrl
                 }
-            };
+            }
+        };
 
-            const string route = "/nld/shops";
+        const string route = "/nld/shops";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("url").With(value => value.Should().Be(newShopUrl));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("url").With(value => value.Should().Be(newShopUrl));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeNull();
 
-            int newShopId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newShopId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WebShop shopInDatabase = await dbContext.WebShops.IgnoreQueryFilters().FirstWithIdAsync(newShopId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WebShop shopInDatabase = await dbContext.WebShops.IgnoreQueryFilters().FirstWithIdAsync(newShopId);
 
-                shopInDatabase.Url.Should().Be(newShopUrl);
-                shopInDatabase.TenantId.Should().Be(ThisTenantId);
-            });
-        }
+            shopInDatabase.Url.Should().Be(newShopUrl);
+            shopInDatabase.TenantId.Should().Be(ThisTenantId);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_ToMany_relationship_to_other_tenant()
-        {
-            // Arrange
-            WebProduct existingProduct = _fakers.WebProduct.Generate();
-            existingProduct.Shop = _fakers.WebShop.Generate();
-            existingProduct.Shop.TenantId = OtherTenantId;
+    [Fact]
+    public async Task Cannot_create_resource_with_ToMany_relationship_to_other_tenant()
+    {
+        // Arrange
+        WebProduct existingProduct = _fakers.WebProduct.Generate();
+        existingProduct.Shop = _fakers.WebShop.Generate();
+        existingProduct.Shop.TenantId = OtherTenantId;
 
-            string newShopUrl = _fakers.WebShop.Generate().Url;
+        string newShopUrl = _fakers.WebShop.Generate().Url;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebProducts.Add(existingProduct);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WebProducts.Add(existingProduct);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "webShops",
+                attributes = new
                 {
-                    type = "webShops",
-                    attributes = new
-                    {
-                        url = newShopUrl
-                    },
-                    relationships = new
+                    url = newShopUrl
+                },
+                relationships = new
+                {
+                    products = new
                     {
-                        products = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "webProducts",
-                                    id = existingProduct.StringId
-                                }
+                                type = "webProducts",
+                                id = existingProduct.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/nld/shops";
+        const string route = "/nld/shops";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'webProducts' with ID '{existingProduct.StringId}' in relationship 'products' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'webProducts' with ID '{existingProduct.StringId}' in relationship 'products' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_ToOne_relationship_to_other_tenant()
-        {
-            // Arrange
-            WebShop existingShop = _fakers.WebShop.Generate();
-            existingShop.TenantId = OtherTenantId;
+    [Fact]
+    public async Task Cannot_create_resource_with_ToOne_relationship_to_other_tenant()
+    {
+        // Arrange
+        WebShop existingShop = _fakers.WebShop.Generate();
+        existingShop.TenantId = OtherTenantId;
 
-            string newProductName = _fakers.WebProduct.Generate().Name;
+        string newProductName = _fakers.WebProduct.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebShops.Add(existingShop);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WebShops.Add(existingShop);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "webProducts",
+                attributes = new
                 {
-                    type = "webProducts",
-                    attributes = new
-                    {
-                        name = newProductName
-                    },
-                    relationships = new
+                    name = newProductName
+                },
+                relationships = new
+                {
+                    shop = new
                     {
-                        shop = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "webShops",
-                                id = existingShop.StringId
-                            }
+                            type = "webShops",
+                            id = existingShop.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/nld/products";
+        const string route = "/nld/products";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'webShops' with ID '{existingShop.StringId}' in relationship 'shop' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'webShops' with ID '{existingShop.StringId}' in relationship 'shop' does not exist.");
+    }
 
-        [Fact]
-        public async Task Can_update_resource()
-        {
-            // Arrange
-            WebProduct existingProduct = _fakers.WebProduct.Generate();
-            existingProduct.Shop = _fakers.WebShop.Generate();
-            existingProduct.Shop.TenantId = ThisTenantId;
+    [Fact]
+    public async Task Can_update_resource()
+    {
+        // Arrange
+        WebProduct existingProduct = _fakers.WebProduct.Generate();
+        existingProduct.Shop = _fakers.WebShop.Generate();
+        existingProduct.Shop.TenantId = ThisTenantId;
 
-            string newProductName = _fakers.WebProduct.Generate().Name;
+        string newProductName = _fakers.WebProduct.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebProducts.Add(existingProduct);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WebProducts.Add(existingProduct);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "webProducts",
+                id = existingProduct.StringId,
+                attributes = new
                 {
-                    type = "webProducts",
-                    id = existingProduct.StringId,
-                    attributes = new
-                    {
-                        name = newProductName
-                    }
+                    name = newProductName
                 }
-            };
+            }
+        };
 
-            string route = $"/nld/products/{existingProduct.StringId}";
+        string route = $"/nld/products/{existingProduct.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WebProduct productInDatabase = await dbContext.WebProducts.IgnoreQueryFilters().FirstWithIdAsync(existingProduct.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WebProduct productInDatabase = await dbContext.WebProducts.IgnoreQueryFilters().FirstWithIdAsync(existingProduct.Id);
 
-                productInDatabase.Name.Should().Be(newProductName);
-                productInDatabase.Price.Should().Be(existingProduct.Price);
-            });
-        }
+            productInDatabase.Name.Should().Be(newProductName);
+            productInDatabase.Price.Should().Be(existingProduct.Price);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_from_other_tenant()
-        {
-            // Arrange
-            WebProduct existingProduct = _fakers.WebProduct.Generate();
-            existingProduct.Shop = _fakers.WebShop.Generate();
-            existingProduct.Shop.TenantId = OtherTenantId;
+    [Fact]
+    public async Task Cannot_update_resource_from_other_tenant()
+    {
+        // Arrange
+        WebProduct existingProduct = _fakers.WebProduct.Generate();
+        existingProduct.Shop = _fakers.WebShop.Generate();
+        existingProduct.Shop.TenantId = OtherTenantId;
 
-            string newProductName = _fakers.WebProduct.Generate().Name;
+        string newProductName = _fakers.WebProduct.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebProducts.Add(existingProduct);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WebProducts.Add(existingProduct);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "webProducts",
+                id = existingProduct.StringId,
+                attributes = new
                 {
-                    type = "webProducts",
-                    id = existingProduct.StringId,
-                    attributes = new
-                    {
-                        name = newProductName
-                    }
+                    name = newProductName
                 }
-            };
+            }
+        };
 
-            string route = $"/nld/products/{existingProduct.StringId}";
+        string route = $"/nld/products/{existingProduct.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'webProducts' with ID '{existingProduct.StringId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'webProducts' with ID '{existingProduct.StringId}' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_ToMany_relationship_to_other_tenant()
-        {
-            // Arrange
-            WebShop existingShop = _fakers.WebShop.Generate();
-            existingShop.TenantId = ThisTenantId;
+    [Fact]
+    public async Task Cannot_update_resource_with_ToMany_relationship_to_other_tenant()
+    {
+        // Arrange
+        WebShop existingShop = _fakers.WebShop.Generate();
+        existingShop.TenantId = ThisTenantId;
 
-            WebProduct existingProduct = _fakers.WebProduct.Generate();
-            existingProduct.Shop = _fakers.WebShop.Generate();
-            existingProduct.Shop.TenantId = OtherTenantId;
+        WebProduct existingProduct = _fakers.WebProduct.Generate();
+        existingProduct.Shop = _fakers.WebShop.Generate();
+        existingProduct.Shop.TenantId = OtherTenantId;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingShop, existingProduct);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingShop, existingProduct);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "webShops",
+                id = existingShop.StringId,
+                relationships = new
                 {
-                    type = "webShops",
-                    id = existingShop.StringId,
-                    relationships = new
+                    products = new
                     {
-                        products = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "webProducts",
-                                    id = existingProduct.StringId
-                                }
+                                type = "webProducts",
+                                id = existingProduct.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/nld/shops/{existingShop.StringId}";
+        string route = $"/nld/shops/{existingShop.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'webProducts' with ID '{existingProduct.StringId}' in relationship 'products' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'webProducts' with ID '{existingProduct.StringId}' in relationship 'products' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_ToOne_relationship_to_other_tenant()
-        {
-            // Arrange
-            WebProduct existingProduct = _fakers.WebProduct.Generate();
-            existingProduct.Shop = _fakers.WebShop.Generate();
-            existingProduct.Shop.TenantId = ThisTenantId;
+    [Fact]
+    public async Task Cannot_update_resource_with_ToOne_relationship_to_other_tenant()
+    {
+        // Arrange
+        WebProduct existingProduct = _fakers.WebProduct.Generate();
+        existingProduct.Shop = _fakers.WebShop.Generate();
+        existingProduct.Shop.TenantId = ThisTenantId;
 
-            WebShop existingShop = _fakers.WebShop.Generate();
-            existingShop.TenantId = OtherTenantId;
+        WebShop existingShop = _fakers.WebShop.Generate();
+        existingShop.TenantId = OtherTenantId;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingProduct, existingShop);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingProduct, existingShop);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "webProducts",
+                id = existingProduct.StringId,
+                relationships = new
                 {
-                    type = "webProducts",
-                    id = existingProduct.StringId,
-                    relationships = new
+                    shop = new
                     {
-                        shop = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "webShops",
-                                id = existingShop.StringId
-                            }
+                            type = "webShops",
+                            id = existingShop.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/nld/products/{existingProduct.StringId}";
+        string route = $"/nld/products/{existingProduct.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'webShops' with ID '{existingShop.StringId}' in relationship 'shop' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'webShops' with ID '{existingShop.StringId}' in relationship 'shop' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_ToMany_relationship_for_other_parent_tenant()
-        {
-            // Arrange
-            WebShop existingShop = _fakers.WebShop.Generate();
-            existingShop.TenantId = OtherTenantId;
-            existingShop.Products = _fakers.WebProduct.Generate(1);
+    [Fact]
+    public async Task Cannot_update_ToMany_relationship_for_other_parent_tenant()
+    {
+        // Arrange
+        WebShop existingShop = _fakers.WebShop.Generate();
+        existingShop.TenantId = OtherTenantId;
+        existingShop.Products = _fakers.WebProduct.Generate(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebShops.Add(existingShop);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WebShops.Add(existingShop);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            string route = $"/nld/shops/{existingShop.StringId}/relationships/products";
+        string route = $"/nld/shops/{existingShop.StringId}/relationships/products";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'webShops' with ID '{existingShop.StringId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'webShops' with ID '{existingShop.StringId}' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_ToMany_relationship_to_other_tenant()
-        {
-            // Arrange
-            WebShop existingShop = _fakers.WebShop.Generate();
-            existingShop.TenantId = ThisTenantId;
+    [Fact]
+    public async Task Cannot_update_ToMany_relationship_to_other_tenant()
+    {
+        // Arrange
+        WebShop existingShop = _fakers.WebShop.Generate();
+        existingShop.TenantId = ThisTenantId;
 
-            WebProduct existingProduct = _fakers.WebProduct.Generate();
-            existingProduct.Shop = _fakers.WebShop.Generate();
-            existingProduct.Shop.TenantId = OtherTenantId;
+        WebProduct existingProduct = _fakers.WebProduct.Generate();
+        existingProduct.Shop = _fakers.WebShop.Generate();
+        existingProduct.Shop.TenantId = OtherTenantId;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingShop, existingProduct);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingShop, existingProduct);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "webProducts",
-                        id = existingProduct.StringId
-                    }
+                    type = "webProducts",
+                    id = existingProduct.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/nld/shops/{existingShop.StringId}/relationships/products";
+        string route = $"/nld/shops/{existingShop.StringId}/relationships/products";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'webProducts' with ID '{existingProduct.StringId}' in relationship 'products' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'webProducts' with ID '{existingProduct.StringId}' in relationship 'products' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_ToOne_relationship_for_other_parent_tenant()
-        {
-            // Arrange
-            WebProduct existingProduct = _fakers.WebProduct.Generate();
-            existingProduct.Shop = _fakers.WebShop.Generate();
-            existingProduct.Shop.TenantId = OtherTenantId;
+    [Fact]
+    public async Task Cannot_update_ToOne_relationship_for_other_parent_tenant()
+    {
+        // Arrange
+        WebProduct existingProduct = _fakers.WebProduct.Generate();
+        existingProduct.Shop = _fakers.WebShop.Generate();
+        existingProduct.Shop.TenantId = OtherTenantId;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebProducts.Add(existingProduct);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WebProducts.Add(existingProduct);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            string route = $"/nld/products/{existingProduct.StringId}/relationships/shop";
+        string route = $"/nld/products/{existingProduct.StringId}/relationships/shop";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'webProducts' with ID '{existingProduct.StringId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'webProducts' with ID '{existingProduct.StringId}' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_ToOne_relationship_to_other_tenant()
-        {
-            // Arrange
-            WebProduct existingProduct = _fakers.WebProduct.Generate();
-            existingProduct.Shop = _fakers.WebShop.Generate();
-            existingProduct.Shop.TenantId = ThisTenantId;
+    [Fact]
+    public async Task Cannot_update_ToOne_relationship_to_other_tenant()
+    {
+        // Arrange
+        WebProduct existingProduct = _fakers.WebProduct.Generate();
+        existingProduct.Shop = _fakers.WebShop.Generate();
+        existingProduct.Shop.TenantId = ThisTenantId;
 
-            WebShop existingShop = _fakers.WebShop.Generate();
-            existingShop.TenantId = OtherTenantId;
+        WebShop existingShop = _fakers.WebShop.Generate();
+        existingShop.TenantId = OtherTenantId;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingProduct, existingShop);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingProduct, existingShop);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
-                {
-                    type = "webShops",
-                    id = existingShop.StringId
-                }
-            };
+                type = "webShops",
+                id = existingShop.StringId
+            }
+        };
 
-            string route = $"/nld/products/{existingProduct.StringId}/relationships/shop";
+        string route = $"/nld/products/{existingProduct.StringId}/relationships/shop";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'webShops' with ID '{existingShop.StringId}' in relationship 'shop' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'webShops' with ID '{existingShop.StringId}' in relationship 'shop' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_add_to_ToMany_relationship_for_other_parent_tenant()
-        {
-            // Arrange
-            WebShop existingShop = _fakers.WebShop.Generate();
-            existingShop.TenantId = OtherTenantId;
+    [Fact]
+    public async Task Cannot_add_to_ToMany_relationship_for_other_parent_tenant()
+    {
+        // Arrange
+        WebShop existingShop = _fakers.WebShop.Generate();
+        existingShop.TenantId = OtherTenantId;
 
-            WebProduct existingProduct = _fakers.WebProduct.Generate();
-            existingProduct.Shop = _fakers.WebShop.Generate();
-            existingProduct.Shop.TenantId = ThisTenantId;
+        WebProduct existingProduct = _fakers.WebProduct.Generate();
+        existingProduct.Shop = _fakers.WebShop.Generate();
+        existingProduct.Shop.TenantId = ThisTenantId;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingShop, existingProduct);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingShop, existingProduct);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "webProducts",
-                        id = existingProduct.StringId
-                    }
+                    type = "webProducts",
+                    id = existingProduct.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/nld/shops/{existingShop.StringId}/relationships/products";
+        string route = $"/nld/shops/{existingShop.StringId}/relationships/products";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'webShops' with ID '{existingShop.StringId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'webShops' with ID '{existingShop.StringId}' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_add_to_ToMany_relationship_with_other_tenant()
-        {
-            WebShop existingShop = _fakers.WebShop.Generate();
-            existingShop.TenantId = ThisTenantId;
+    [Fact]
+    public async Task Cannot_add_to_ToMany_relationship_with_other_tenant()
+    {
+        WebShop existingShop = _fakers.WebShop.Generate();
+        existingShop.TenantId = ThisTenantId;
 
-            WebProduct existingProduct = _fakers.WebProduct.Generate();
-            existingProduct.Shop = _fakers.WebShop.Generate();
-            existingProduct.Shop.TenantId = OtherTenantId;
+        WebProduct existingProduct = _fakers.WebProduct.Generate();
+        existingProduct.Shop = _fakers.WebShop.Generate();
+        existingProduct.Shop.TenantId = OtherTenantId;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingShop, existingProduct);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingShop, existingProduct);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "webProducts",
-                        id = existingProduct.StringId
-                    }
+                    type = "webProducts",
+                    id = existingProduct.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/nld/shops/{existingShop.StringId}/relationships/products";
+        string route = $"/nld/shops/{existingShop.StringId}/relationships/products";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'webProducts' with ID '{existingProduct.StringId}' in relationship 'products' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'webProducts' with ID '{existingProduct.StringId}' in relationship 'products' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_remove_from_ToMany_relationship_for_other_parent_tenant()
-        {
-            // Arrange
-            WebShop existingShop = _fakers.WebShop.Generate();
-            existingShop.TenantId = OtherTenantId;
-            existingShop.Products = _fakers.WebProduct.Generate(1);
+    [Fact]
+    public async Task Cannot_remove_from_ToMany_relationship_for_other_parent_tenant()
+    {
+        // Arrange
+        WebShop existingShop = _fakers.WebShop.Generate();
+        existingShop.TenantId = OtherTenantId;
+        existingShop.Products = _fakers.WebProduct.Generate(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebShops.Add(existingShop);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WebShops.Add(existingShop);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "webProducts",
-                        id = existingShop.Products[0].StringId
-                    }
+                    type = "webProducts",
+                    id = existingShop.Products[0].StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/nld/shops/{existingShop.StringId}/relationships/products";
+        string route = $"/nld/shops/{existingShop.StringId}/relationships/products";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'webShops' with ID '{existingShop.StringId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'webShops' with ID '{existingShop.StringId}' does not exist.");
+    }
+
+    [Fact]
+    public async Task Can_delete_resource()
+    {
+        // Arrange
+        WebProduct existingProduct = _fakers.WebProduct.Generate();
+        existingProduct.Shop = _fakers.WebShop.Generate();
+        existingProduct.Shop.TenantId = ThisTenantId;
 
-        [Fact]
-        public async Task Can_delete_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebProduct existingProduct = _fakers.WebProduct.Generate();
-            existingProduct.Shop = _fakers.WebShop.Generate();
-            existingProduct.Shop.TenantId = ThisTenantId;
+            dbContext.WebProducts.Add(existingProduct);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebProducts.Add(existingProduct);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/nld/products/{existingProduct.StringId}";
 
-            string route = $"/nld/products/{existingProduct.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WebProduct? productInDatabase = await dbContext.WebProducts.IgnoreQueryFilters().FirstWithIdOrDefaultAsync(existingProduct.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WebProduct? productInDatabase = await dbContext.WebProducts.IgnoreQueryFilters().FirstWithIdOrDefaultAsync(existingProduct.Id);
+            productInDatabase.Should().BeNull();
+        });
+    }
 
-                productInDatabase.Should().BeNull();
-            });
-        }
+    [Fact]
+    public async Task Cannot_delete_resource_from_other_tenant()
+    {
+        // Arrange
+        WebProduct existingProduct = _fakers.WebProduct.Generate();
+        existingProduct.Shop = _fakers.WebShop.Generate();
+        existingProduct.Shop.TenantId = OtherTenantId;
 
-        [Fact]
-        public async Task Cannot_delete_resource_from_other_tenant()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebProduct existingProduct = _fakers.WebProduct.Generate();
-            existingProduct.Shop = _fakers.WebShop.Generate();
-            existingProduct.Shop.TenantId = OtherTenantId;
+            dbContext.WebProducts.Add(existingProduct);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WebProducts.Add(existingProduct);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/nld/products/{existingProduct.StringId}";
 
-            string route = $"/nld/products/{existingProduct.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'webProducts' with ID '{existingProduct.StringId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'webProducts' with ID '{existingProduct.StringId}' does not exist.");
-        }
+    [Fact]
+    public async Task Renders_links_with_tenant_route_parameter()
+    {
+        // Arrange
+        WebShop shop = _fakers.WebShop.Generate();
+        shop.TenantId = ThisTenantId;
+        shop.Products = _fakers.WebProduct.Generate(1);
 
-        [Fact]
-        public async Task Renders_links_with_tenant_route_parameter()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebShop shop = _fakers.WebShop.Generate();
-            shop.TenantId = ThisTenantId;
-            shop.Products = _fakers.WebProduct.Generate(1);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<WebShop>();
-                dbContext.WebShops.Add(shop);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<WebShop>();
+            dbContext.WebShops.Add(shop);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/nld/shops?include=products";
+        const string route = "/nld/shops?include=products";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be(route);
-            responseDocument.Links.Related.Should().BeNull();
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be(route);
+        responseDocument.Links.Related.Should().BeNull();
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue[0].With(resource =>
-            {
-                string shopLink = $"/nld/shops/{shop.StringId}";
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            string shopLink = $"/nld/shops/{shop.StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(shopLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(shopLink);
 
-                resource.Relationships.ShouldContainKey("products").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{shopLink}/relationships/products");
-                    value.Links.Related.Should().Be($"{shopLink}/products");
-                });
+            resource.Relationships.ShouldContainKey("products").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{shopLink}/relationships/products");
+                value.Links.Related.Should().Be($"{shopLink}/products");
             });
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                string productLink = $"/nld/products/{shop.Products[0].StringId}";
+        responseDocument.Included[0].With(resource =>
+        {
+            string productLink = $"/nld/products/{shop.Products[0].StringId}";
 
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be(productLink);
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be(productLink);
 
-                resource.Relationships.ShouldContainKey("shop").With(value =>
-                {
-                    value.ShouldNotBeNull();
-                    value.Links.ShouldNotBeNull();
-                    value.Links.Self.Should().Be($"{productLink}/relationships/shop");
-                    value.Links.Related.Should().Be($"{productLink}/shop");
-                });
+            resource.Relationships.ShouldContainKey("shop").With(value =>
+            {
+                value.ShouldNotBeNull();
+                value.Links.ShouldNotBeNull();
+                value.Links.Self.Should().Be($"{productLink}/relationships/shop");
+                value.Links.Related.Should().Be($"{productLink}/shop");
             });
-        }
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenantResourceService.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenantResourceService.cs
index 2d3086a236..b46a8133d0 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenantResourceService.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenantResourceService.cs
@@ -1,7 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -11,76 +7,74 @@
 using JsonApiDotNetCore.Services;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy
+namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public class MultiTenantResourceService<TResource, TId> : JsonApiResourceService<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public class MultiTenantResourceService<TResource, TId> : JsonApiResourceService<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        private readonly ITenantProvider _tenantProvider;
+    private readonly ITenantProvider _tenantProvider;
 
-        private static bool ResourceHasTenant => typeof(IHasTenant).IsAssignableFrom(typeof(TResource));
+    private static bool ResourceHasTenant => typeof(IHasTenant).IsAssignableFrom(typeof(TResource));
 
-        public MultiTenantResourceService(ITenantProvider tenantProvider, IResourceRepositoryAccessor repositoryAccessor,
-            IQueryLayerComposer queryLayerComposer, IPaginationContext paginationContext, IJsonApiOptions options, ILoggerFactory loggerFactory,
-            IJsonApiRequest request, IResourceChangeTracker<TResource> resourceChangeTracker, IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(repositoryAccessor, queryLayerComposer, paginationContext, options, loggerFactory, request, resourceChangeTracker,
-                resourceDefinitionAccessor)
-        {
-            _tenantProvider = tenantProvider;
-        }
+    public MultiTenantResourceService(ITenantProvider tenantProvider, IResourceRepositoryAccessor repositoryAccessor, IQueryLayerComposer queryLayerComposer,
+        IPaginationContext paginationContext, IJsonApiOptions options, ILoggerFactory loggerFactory, IJsonApiRequest request,
+        IResourceChangeTracker<TResource> resourceChangeTracker, IResourceDefinitionAccessor resourceDefinitionAccessor)
+        : base(repositoryAccessor, queryLayerComposer, paginationContext, options, loggerFactory, request, resourceChangeTracker, resourceDefinitionAccessor)
+    {
+        _tenantProvider = tenantProvider;
+    }
 
-        protected override async Task InitializeResourceAsync(TResource resourceForDatabase, CancellationToken cancellationToken)
-        {
-            await base.InitializeResourceAsync(resourceForDatabase, cancellationToken);
+    protected override async Task InitializeResourceAsync(TResource resourceForDatabase, CancellationToken cancellationToken)
+    {
+        await base.InitializeResourceAsync(resourceForDatabase, cancellationToken);
 
-            if (ResourceHasTenant)
-            {
-                Guid tenantId = _tenantProvider.TenantId;
+        if (ResourceHasTenant)
+        {
+            Guid tenantId = _tenantProvider.TenantId;
 
-                var resourceWithTenant = (IHasTenant)resourceForDatabase;
-                resourceWithTenant.TenantId = tenantId;
-            }
+            var resourceWithTenant = (IHasTenant)resourceForDatabase;
+            resourceWithTenant.TenantId = tenantId;
         }
+    }
 
-        // To optimize performance, the default resource service does not always fetch all resources on write operations.
-        // We do that here, to assure everything belongs to the active tenant. On mismatch, a 404 error is thrown.
+    // To optimize performance, the default resource service does not always fetch all resources on write operations.
+    // We do that here, to assure everything belongs to the active tenant. On mismatch, a 404 error is thrown.
 
-        public override async Task<TResource?> CreateAsync(TResource resource, CancellationToken cancellationToken)
-        {
-            await AssertResourcesToAssignInRelationshipsExistAsync(resource, cancellationToken);
+    public override async Task<TResource?> CreateAsync(TResource resource, CancellationToken cancellationToken)
+    {
+        await AssertResourcesToAssignInRelationshipsExistAsync(resource, cancellationToken);
 
-            return await base.CreateAsync(resource, cancellationToken);
-        }
+        return await base.CreateAsync(resource, cancellationToken);
+    }
 
-        public override async Task<TResource?> UpdateAsync(TId id, TResource resource, CancellationToken cancellationToken)
-        {
-            await AssertResourcesToAssignInRelationshipsExistAsync(resource, cancellationToken);
+    public override async Task<TResource?> UpdateAsync(TId id, TResource resource, CancellationToken cancellationToken)
+    {
+        await AssertResourcesToAssignInRelationshipsExistAsync(resource, cancellationToken);
 
-            return await base.UpdateAsync(id, resource, cancellationToken);
-        }
+        return await base.UpdateAsync(id, resource, cancellationToken);
+    }
 
-        public override async Task SetRelationshipAsync(TId leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken)
-        {
-            await AssertRightResourcesExistAsync(rightValue, cancellationToken);
+    public override async Task SetRelationshipAsync(TId leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken)
+    {
+        await AssertRightResourcesExistAsync(rightValue, cancellationToken);
 
-            await base.SetRelationshipAsync(leftId, relationshipName, rightValue, cancellationToken);
-        }
+        await base.SetRelationshipAsync(leftId, relationshipName, rightValue, cancellationToken);
+    }
 
-        public override async Task AddToToManyRelationshipAsync(TId leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
-        {
-            _ = await GetPrimaryResourceByIdAsync(leftId, TopFieldSelection.OnlyIdAttribute, cancellationToken);
-            await AssertRightResourcesExistAsync(rightResourceIds, cancellationToken);
+    public override async Task AddToToManyRelationshipAsync(TId leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        _ = await GetPrimaryResourceByIdAsync(leftId, TopFieldSelection.OnlyIdAttribute, cancellationToken);
+        await AssertRightResourcesExistAsync(rightResourceIds, cancellationToken);
 
-            await base.AddToToManyRelationshipAsync(leftId, relationshipName, rightResourceIds, cancellationToken);
-        }
+        await base.AddToToManyRelationshipAsync(leftId, relationshipName, rightResourceIds, cancellationToken);
+    }
 
-        public override async Task DeleteAsync(TId id, CancellationToken cancellationToken)
-        {
-            _ = await GetPrimaryResourceByIdAsync(id, TopFieldSelection.OnlyIdAttribute, cancellationToken);
+    public override async Task DeleteAsync(TId id, CancellationToken cancellationToken)
+    {
+        _ = await GetPrimaryResourceByIdAsync(id, TopFieldSelection.OnlyIdAttribute, cancellationToken);
 
-            await base.DeleteAsync(id, cancellationToken);
-        }
+        await base.DeleteAsync(id, cancellationToken);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/RouteTenantProvider.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/RouteTenantProvider.cs
index 560944e8cb..f51c214f0e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/RouteTenantProvider.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/RouteTenantProvider.cs
@@ -1,37 +1,34 @@
-using System;
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Http;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy
+namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
+
+internal sealed class RouteTenantProvider : ITenantProvider
 {
-    internal sealed class RouteTenantProvider : ITenantProvider
+    // In reality, this would be looked up in a database. We'll keep it hardcoded for simplicity.
+    public static readonly IDictionary<string, Guid> TenantRegistry = new Dictionary<string, Guid>
     {
-        // In reality, this would be looked up in a database. We'll keep it hardcoded for simplicity.
-        public static readonly IDictionary<string, Guid> TenantRegistry = new Dictionary<string, Guid>
-        {
-            ["nld"] = Guid.NewGuid(),
-            ["ita"] = Guid.NewGuid()
-        };
+        ["nld"] = Guid.NewGuid(),
+        ["ita"] = Guid.NewGuid()
+    };
 
-        private readonly IHttpContextAccessor _httpContextAccessor;
+    private readonly IHttpContextAccessor _httpContextAccessor;
 
-        public Guid TenantId
+    public Guid TenantId
+    {
+        get
         {
-            get
+            if (_httpContextAccessor.HttpContext == null)
             {
-                if (_httpContextAccessor.HttpContext == null)
-                {
-                    throw new InvalidOperationException();
-                }
-
-                string? countryCode = (string?)_httpContextAccessor.HttpContext.Request.RouteValues["countryCode"];
-                return countryCode != null && TenantRegistry.TryGetValue(countryCode, out Guid tenantId) ? tenantId : Guid.Empty;
+                throw new InvalidOperationException();
             }
-        }
 
-        public RouteTenantProvider(IHttpContextAccessor httpContextAccessor)
-        {
-            _httpContextAccessor = httpContextAccessor;
+            string? countryCode = (string?)_httpContextAccessor.HttpContext.Request.RouteValues["countryCode"];
+            return countryCode != null && TenantRegistry.TryGetValue(countryCode, out Guid tenantId) ? tenantId : Guid.Empty;
         }
     }
+
+    public RouteTenantProvider(IHttpContextAccessor httpContextAccessor)
+    {
+        _httpContextAccessor = httpContextAccessor;
+    }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProduct.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProduct.cs
index 310aad6a8b..8bdf4bfb18 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProduct.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProduct.cs
@@ -2,18 +2,18 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy
+namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy")]
+public sealed class WebProduct : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class WebProduct : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [Attr]
-        public decimal Price { get; set; }
+    [Attr]
+    public decimal Price { get; set; }
 
-        [HasOne]
-        public WebShop Shop { get; set; } = null!;
-    }
+    [HasOne]
+    public WebShop Shop { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs
index 53a460376b..c11db3422e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebProductsController.cs
@@ -1,20 +1,15 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Controllers.Annotations;
-using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy
+namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
+
+// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
+public partial class WebProductsController
+{
+}
+
+[DisableRoutingConvention]
+[Route("{countryCode}/products")]
+partial class WebProductsController
 {
-    [DisableRoutingConvention]
-    [Route("{countryCode}/products")]
-    public sealed class WebProductsController : JsonApiController<WebProduct, int>
-    {
-        public WebProductsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<WebProduct, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShop.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShop.cs
index c5830276d8..5c06148ee5 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShop.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShop.cs
@@ -1,20 +1,18 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy
+namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy")]
+public sealed class WebShop : Identifiable<int>, IHasTenant
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class WebShop : Identifiable<int>, IHasTenant
-    {
-        [Attr]
-        public string Url { get; set; } = null!;
+    [Attr]
+    public string Url { get; set; } = null!;
 
-        public Guid TenantId { get; set; }
+    public Guid TenantId { get; set; }
 
-        [HasMany]
-        public IList<WebProduct> Products { get; set; } = new List<WebProduct>();
-    }
+    [HasMany]
+    public IList<WebProduct> Products { get; set; } = new List<WebProduct>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs
index 0907c67d25..b300e0095d 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/WebShopsController.cs
@@ -1,20 +1,15 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Controllers.Annotations;
-using JsonApiDotNetCore.Services;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy
+namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
+
+// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
+public partial class WebShopsController
+{
+}
+
+[DisableRoutingConvention]
+[Route("{countryCode}/shops")]
+partial class WebShopsController
 {
-    [DisableRoutingConvention]
-    [Route("{countryCode}/shops")]
-    public sealed class WebShopsController : JsonApiController<WebShop, int>
-    {
-        public WebShopsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<WebShop, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs
index fd84f2231b..4cb4581291 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoard.cs
@@ -3,13 +3,12 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions
+namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class DivingBoard : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class DivingBoard : Identifiable<int>
-    {
-        [Attr]
-        [Range(1, 20)]
-        public decimal HeightInMeters { get; set; }
-    }
+    [Attr]
+    [Range(1, 20)]
+    public decimal HeightInMeters { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoardsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoardsController.cs
index 673ddca0c8..55a3cd97da 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoardsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/DivingBoardsController.cs
@@ -3,14 +3,13 @@
 using JsonApiDotNetCore.Services;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions
+namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
+
+public sealed class DivingBoardsController : JsonApiController<DivingBoard, int>
 {
-    public sealed class DivingBoardsController : JsonApiController<DivingBoard, int>
+    public DivingBoardsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<DivingBoard, int> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
     {
-        public DivingBoardsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<DivingBoard, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/JsonKebabCaseNamingPolicy.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/JsonKebabCaseNamingPolicy.cs
index 1c50a67fb8..d47de4cf66 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/JsonKebabCaseNamingPolicy.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/JsonKebabCaseNamingPolicy.cs
@@ -1,83 +1,81 @@
-using System;
 using System.Text;
 using System.Text.Json;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions
+namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
+
+// Based on https://github.com/J0rgeSerran0/JsonNamingPolicy
+internal sealed class JsonKebabCaseNamingPolicy : JsonNamingPolicy
 {
-    // Based on https://github.com/J0rgeSerran0/JsonNamingPolicy
-    internal sealed class JsonKebabCaseNamingPolicy : JsonNamingPolicy
-    {
-        private const char Separator = '-';
+    private const char Separator = '-';
 
-        public static readonly JsonKebabCaseNamingPolicy Instance = new();
+    public static readonly JsonKebabCaseNamingPolicy Instance = new();
 
-        public override string ConvertName(string name)
+    public override string ConvertName(string name)
+    {
+        if (string.IsNullOrWhiteSpace(name))
         {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                return string.Empty;
-            }
+            return string.Empty;
+        }
 
-            ReadOnlySpan<char> spanName = name.Trim();
+        ReadOnlySpan<char> spanName = name.Trim();
 
-            var stringBuilder = new StringBuilder();
-            bool addCharacter = true;
+        var stringBuilder = new StringBuilder();
+        bool addCharacter = true;
 
-            bool isNextLower = false;
-            bool isNextUpper = false;
-            bool isNextSpace = false;
+        bool isNextLower = false;
+        bool isNextUpper = false;
+        bool isNextSpace = false;
 
-            for (int position = 0; position < spanName.Length; position++)
+        for (int position = 0; position < spanName.Length; position++)
+        {
+            if (position != 0)
             {
-                if (position != 0)
+                bool isCurrentSpace = spanName[position] == 32;
+                bool isPreviousSpace = spanName[position - 1] == 32;
+                bool isPreviousSeparator = spanName[position - 1] == 95;
+
+                if (position + 1 != spanName.Length)
                 {
-                    bool isCurrentSpace = spanName[position] == 32;
-                    bool isPreviousSpace = spanName[position - 1] == 32;
-                    bool isPreviousSeparator = spanName[position - 1] == 95;
+                    isNextLower = spanName[position + 1] > 96 && spanName[position + 1] < 123;
+                    isNextUpper = spanName[position + 1] > 64 && spanName[position + 1] < 91;
+                    isNextSpace = spanName[position + 1] == 32;
+                }
 
-                    if (position + 1 != spanName.Length)
-                    {
-                        isNextLower = spanName[position + 1] > 96 && spanName[position + 1] < 123;
-                        isNextUpper = spanName[position + 1] > 64 && spanName[position + 1] < 91;
-                        isNextSpace = spanName[position + 1] == 32;
-                    }
+                if (isCurrentSpace && (isPreviousSpace || isPreviousSeparator || isNextUpper || isNextSpace))
+                {
+                    addCharacter = false;
+                }
+                else
+                {
+                    bool isCurrentUpper = spanName[position] > 64 && spanName[position] < 91;
+                    bool isPreviousLower = spanName[position - 1] > 96 && spanName[position - 1] < 123;
+                    bool isPreviousNumber = spanName[position - 1] > 47 && spanName[position - 1] < 58;
 
-                    if (isCurrentSpace && (isPreviousSpace || isPreviousSeparator || isNextUpper || isNextSpace))
+                    if (isCurrentUpper && (isPreviousLower || isPreviousNumber || isNextLower || isNextSpace))
                     {
-                        addCharacter = false;
+                        stringBuilder.Append(Separator);
                     }
                     else
                     {
-                        bool isCurrentUpper = spanName[position] > 64 && spanName[position] < 91;
-                        bool isPreviousLower = spanName[position - 1] > 96 && spanName[position - 1] < 123;
-                        bool isPreviousNumber = spanName[position - 1] > 47 && spanName[position - 1] < 58;
-
-                        if (isCurrentUpper && (isPreviousLower || isPreviousNumber || isNextLower || isNextSpace))
+                        if (isCurrentSpace)
                         {
                             stringBuilder.Append(Separator);
-                        }
-                        else
-                        {
-                            if (isCurrentSpace)
-                            {
-                                stringBuilder.Append(Separator);
-                                addCharacter = false;
-                            }
+                            addCharacter = false;
                         }
                     }
                 }
-
-                if (addCharacter)
-                {
-                    stringBuilder.Append(spanName[position]);
-                }
-                else
-                {
-                    addCharacter = true;
-                }
             }
 
-            return stringBuilder.ToString().ToLower();
+            if (addCharacter)
+            {
+                stringBuilder.Append(spanName[position]);
+            }
+            else
+            {
+                addCharacter = true;
+            }
         }
+
+        return stringBuilder.ToString().ToLower();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingConventionStartup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingConventionStartup.cs
index 6114b514cb..cc0dfcd11d 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingConventionStartup.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingConventionStartup.cs
@@ -3,22 +3,21 @@
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions
+namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class KebabCasingConventionStartup<TDbContext> : TestableStartup<TDbContext>
+    where TDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class KebabCasingConventionStartup<TDbContext> : TestableStartup<TDbContext>
-        where TDbContext : DbContext
+    protected override void SetJsonApiOptions(JsonApiOptions options)
     {
-        protected override void SetJsonApiOptions(JsonApiOptions options)
-        {
-            base.SetJsonApiOptions(options);
+        base.SetJsonApiOptions(options);
 
-            options.Namespace = "public-api";
-            options.UseRelativeLinks = true;
-            options.IncludeTotalResourceCount = true;
+        options.Namespace = "public-api";
+        options.UseRelativeLinks = true;
+        options.IncludeTotalResourceCount = true;
 
-            options.SerializerOptions.PropertyNamingPolicy = JsonKebabCaseNamingPolicy.Instance;
-            options.SerializerOptions.DictionaryKeyPolicy = JsonKebabCaseNamingPolicy.Instance;
-        }
+        options.SerializerOptions.PropertyNamingPolicy = JsonKebabCaseNamingPolicy.Instance;
+        options.SerializerOptions.DictionaryKeyPolicy = JsonKebabCaseNamingPolicy.Instance;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingTests.cs
index d2be3f1c74..1f9b9a7b97 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/KebabCasingTests.cs
@@ -1,222 +1,218 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions
+namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
+
+public sealed class KebabCasingTests : IClassFixture<IntegrationTestContext<KebabCasingConventionStartup<NamingDbContext>, NamingDbContext>>
 {
-    public sealed class KebabCasingTests : IClassFixture<IntegrationTestContext<KebabCasingConventionStartup<NamingDbContext>, NamingDbContext>>
+    private readonly IntegrationTestContext<KebabCasingConventionStartup<NamingDbContext>, NamingDbContext> _testContext;
+    private readonly NamingFakers _fakers = new();
+
+    public KebabCasingTests(IntegrationTestContext<KebabCasingConventionStartup<NamingDbContext>, NamingDbContext> testContext)
     {
-        private readonly IntegrationTestContext<KebabCasingConventionStartup<NamingDbContext>, NamingDbContext> _testContext;
-        private readonly NamingFakers _fakers = new();
+        _testContext = testContext;
 
-        public KebabCasingTests(IntegrationTestContext<KebabCasingConventionStartup<NamingDbContext>, NamingDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<DivingBoardsController>();
+        testContext.UseController<SwimmingPoolsController>();
+    }
 
-            testContext.UseController<DivingBoardsController>();
-            testContext.UseController<SwimmingPoolsController>();
-        }
+    [Fact]
+    public async Task Can_get_resources_with_include()
+    {
+        // Arrange
+        List<SwimmingPool> pools = _fakers.SwimmingPool.Generate(2);
+        pools[1].DivingBoards = _fakers.DivingBoard.Generate(1);
 
-        [Fact]
-        public async Task Can_get_resources_with_include()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<SwimmingPool> pools = _fakers.SwimmingPool.Generate(2);
-            pools[1].DivingBoards = _fakers.DivingBoard.Generate(1);
+            await dbContext.ClearTableAsync<SwimmingPool>();
+            dbContext.SwimmingPools.AddRange(pools);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<SwimmingPool>();
-                dbContext.SwimmingPools.AddRange(pools);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/public-api/swimming-pools?include=diving-boards";
 
-            const string route = "/public-api/swimming-pools?include=diving-boards";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Type == "swimming-pools");
+        responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Attributes.ShouldContainKey("is-indoor") != null);
+        responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Relationships.ShouldContainKey("water-slides") != null);
+        responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Relationships.ShouldContainKey("diving-boards") != null);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Type == "swimming-pools");
-            responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Attributes.ShouldContainKey("is-indoor") != null);
-            responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Relationships.ShouldContainKey("water-slides") != null);
-            responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Relationships.ShouldContainKey("diving-boards") != null);
+        decimal height = pools[1].DivingBoards[0].HeightInMeters;
 
-            decimal height = pools[1].DivingBoards[0].HeightInMeters;
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("diving-boards");
+        responseDocument.Included[0].Id.Should().Be(pools[1].DivingBoards[0].StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("height-in-meters").With(value => value.As<decimal>().Should().BeApproximately(height));
+        responseDocument.Included[0].Relationships.Should().BeNull();
+        responseDocument.Included[0].Links.ShouldNotBeNull().Self.Should().Be($"/public-api/diving-boards/{pools[1].DivingBoards[0].StringId}");
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("diving-boards");
-            responseDocument.Included[0].Id.Should().Be(pools[1].DivingBoards[0].StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("height-in-meters").With(value => value.As<decimal>().Should().BeApproximately(height));
-            responseDocument.Included[0].Relationships.Should().BeNull();
-            responseDocument.Included[0].Links.ShouldNotBeNull().Self.Should().Be($"/public-api/diving-boards/{pools[1].DivingBoards[0].StringId}");
+        responseDocument.Meta.ShouldContainKey("total").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetInt32().Should().Be(2);
+        });
+    }
 
-            responseDocument.Meta.ShouldContainKey("total").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetInt32().Should().Be(2);
-            });
-        }
+    [Fact]
+    public async Task Can_filter_secondary_resources_with_sparse_fieldset()
+    {
+        // Arrange
+        SwimmingPool pool = _fakers.SwimmingPool.Generate();
+        pool.WaterSlides = _fakers.WaterSlide.Generate(2);
+        pool.WaterSlides[0].LengthInMeters = 1;
+        pool.WaterSlides[1].LengthInMeters = 5;
 
-        [Fact]
-        public async Task Can_filter_secondary_resources_with_sparse_fieldset()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            SwimmingPool pool = _fakers.SwimmingPool.Generate();
-            pool.WaterSlides = _fakers.WaterSlide.Generate(2);
-            pool.WaterSlides[0].LengthInMeters = 1;
-            pool.WaterSlides[1].LengthInMeters = 5;
+            dbContext.SwimmingPools.Add(pool);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.SwimmingPools.Add(pool);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/public-api/swimming-pools/{pool.StringId}/water-slides" +
+            "?filter=greaterThan(length-in-meters,'1')&fields[water-slides]=length-in-meters";
 
-            string route = $"/public-api/swimming-pools/{pool.StringId}/water-slides" +
-                "?filter=greaterThan(length-in-meters,'1')&fields[water-slides]=length-in-meters";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Type.Should().Be("water-slides");
+        responseDocument.Data.ManyValue[0].Id.Should().Be(pool.WaterSlides[1].StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Type.Should().Be("water-slides");
-            responseDocument.Data.ManyValue[0].Id.Should().Be(pool.WaterSlides[1].StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
-        }
+    [Fact]
+    public async Task Can_create_resource()
+    {
+        // Arrange
+        SwimmingPool newPool = _fakers.SwimmingPool.Generate();
 
-        [Fact]
-        public async Task Can_create_resource()
+        var requestBody = new
         {
-            // Arrange
-            SwimmingPool newPool = _fakers.SwimmingPool.Generate();
-
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "swimming-pools",
+                attributes = new Dictionary<string, object>
                 {
-                    type = "swimming-pools",
-                    attributes = new Dictionary<string, object>
-                    {
-                        ["is-indoor"] = newPool.IsIndoor
-                    }
+                    ["is-indoor"] = newPool.IsIndoor
                 }
-            };
+            }
+        };
 
-            const string route = "/public-api/swimming-pools";
+        const string route = "/public-api/swimming-pools";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("swimming-pools");
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("is-indoor").With(value => value.Should().Be(newPool.IsIndoor));
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("swimming-pools");
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("is-indoor").With(value => value.Should().Be(newPool.IsIndoor));
 
-            int newPoolId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
-            string poolLink = $"{route}/{newPoolId}";
+        int newPoolId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        string poolLink = $"{route}/{newPoolId}";
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("water-slides").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{poolLink}/relationships/water-slides");
-                value.Links.Related.Should().Be($"{poolLink}/water-slides");
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("water-slides").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{poolLink}/relationships/water-slides");
+            value.Links.Related.Should().Be($"{poolLink}/water-slides");
+        });
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("diving-boards").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{poolLink}/relationships/diving-boards");
-                value.Links.Related.Should().Be($"{poolLink}/diving-boards");
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("diving-boards").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{poolLink}/relationships/diving-boards");
+            value.Links.Related.Should().Be($"{poolLink}/diving-boards");
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                SwimmingPool poolInDatabase = await dbContext.SwimmingPools.FirstWithIdAsync(newPoolId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            SwimmingPool poolInDatabase = await dbContext.SwimmingPools.FirstWithIdAsync(newPoolId);
 
-                poolInDatabase.IsIndoor.Should().Be(newPool.IsIndoor);
-            });
-        }
+            poolInDatabase.IsIndoor.Should().Be(newPool.IsIndoor);
+        });
+    }
 
-        [Fact]
-        public async Task Applies_casing_convention_on_error_stack_trace()
-        {
-            // Arrange
-            const string requestBody = "{ \"data\": {";
+    [Fact]
+    public async Task Applies_casing_convention_on_error_stack_trace()
+    {
+        // Arrange
+        const string requestBody = "{ \"data\": {";
 
-            const string route = "/public-api/swimming-pools";
+        const string route = "/public-api/swimming-pools";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body.");
-            error.Meta.ShouldContainKey("stack-trace");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body.");
+        error.Meta.ShouldContainKey("stack-trace");
+    }
 
-        [Fact]
-        public async Task Applies_casing_convention_on_source_pointer_from_ModelState()
-        {
-            // Arrange
-            DivingBoard existingBoard = _fakers.DivingBoard.Generate();
+    [Fact]
+    public async Task Applies_casing_convention_on_source_pointer_from_ModelState()
+    {
+        // Arrange
+        DivingBoard existingBoard = _fakers.DivingBoard.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.DivingBoards.Add(existingBoard);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.DivingBoards.Add(existingBoard);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "diving-boards",
+                id = existingBoard.StringId,
+                attributes = new Dictionary<string, object>
                 {
-                    type = "diving-boards",
-                    id = existingBoard.StringId,
-                    attributes = new Dictionary<string, object>
-                    {
-                        ["height-in-meters"] = -1
-                    }
+                    ["height-in-meters"] = -1
                 }
-            };
+            }
+        };
 
-            string route = $"/public-api/diving-boards/{existingBoard.StringId}";
+        string route = $"/public-api/diving-boards/{existingBoard.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Input validation failed.");
-            error.Detail.Should().Be("The field HeightInMeters must be between 1 and 20.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/height-in-meters");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Input validation failed.");
+        error.Detail.Should().Be("The field HeightInMeters must be between 1 and 20.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/height-in-meters");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/NamingDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/NamingDbContext.cs
index 120c28ff72..d231a5f822 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/NamingDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/NamingDbContext.cs
@@ -1,18 +1,17 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions
+namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class NamingDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class NamingDbContext : DbContext
-    {
-        public DbSet<SwimmingPool> SwimmingPools => Set<SwimmingPool>();
-        public DbSet<WaterSlide> WaterSlides => Set<WaterSlide>();
-        public DbSet<DivingBoard> DivingBoards => Set<DivingBoard>();
+    public DbSet<SwimmingPool> SwimmingPools => Set<SwimmingPool>();
+    public DbSet<WaterSlide> WaterSlides => Set<WaterSlide>();
+    public DbSet<DivingBoard> DivingBoards => Set<DivingBoard>();
 
-        public NamingDbContext(DbContextOptions<NamingDbContext> options)
-            : base(options)
-        {
-        }
+    public NamingDbContext(DbContextOptions<NamingDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/NamingFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/NamingFakers.cs
index fa387cf3bf..e60dbdf525 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/NamingFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/NamingFakers.cs
@@ -1,31 +1,29 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions
+namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
+
+internal sealed class NamingFakers : FakerContainer
 {
-    internal sealed class NamingFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<SwimmingPool>> _lazySwimmingPoolFaker = new(() =>
-            new Faker<SwimmingPool>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(swimmingPool => swimmingPool.IsIndoor, faker => faker.Random.Bool()));
+    private readonly Lazy<Faker<SwimmingPool>> _lazySwimmingPoolFaker = new(() =>
+        new Faker<SwimmingPool>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(swimmingPool => swimmingPool.IsIndoor, faker => faker.Random.Bool()));
 
-        private readonly Lazy<Faker<WaterSlide>> _lazyWaterSlideFaker = new(() =>
-            new Faker<WaterSlide>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(waterSlide => waterSlide.LengthInMeters, faker => faker.Random.Decimal(3, 100)));
+    private readonly Lazy<Faker<WaterSlide>> _lazyWaterSlideFaker = new(() =>
+        new Faker<WaterSlide>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(waterSlide => waterSlide.LengthInMeters, faker => faker.Random.Decimal(3, 100)));
 
-        private readonly Lazy<Faker<DivingBoard>> _lazyDivingBoardFaker = new(() =>
-            new Faker<DivingBoard>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(divingBoard => divingBoard.HeightInMeters, faker => faker.Random.Decimal(1, 15)));
+    private readonly Lazy<Faker<DivingBoard>> _lazyDivingBoardFaker = new(() =>
+        new Faker<DivingBoard>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(divingBoard => divingBoard.HeightInMeters, faker => faker.Random.Decimal(1, 15)));
 
-        public Faker<SwimmingPool> SwimmingPool => _lazySwimmingPoolFaker.Value;
-        public Faker<WaterSlide> WaterSlide => _lazyWaterSlideFaker.Value;
-        public Faker<DivingBoard> DivingBoard => _lazyDivingBoardFaker.Value;
-    }
+    public Faker<SwimmingPool> SwimmingPool => _lazySwimmingPoolFaker.Value;
+    public Faker<WaterSlide> WaterSlide => _lazyWaterSlideFaker.Value;
+    public Faker<DivingBoard> DivingBoard => _lazyDivingBoardFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingConventionStartup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingConventionStartup.cs
index 0f863df251..c1c8cb8fa1 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingConventionStartup.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingConventionStartup.cs
@@ -3,22 +3,21 @@
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions
+namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class PascalCasingConventionStartup<TDbContext> : TestableStartup<TDbContext>
+    where TDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class PascalCasingConventionStartup<TDbContext> : TestableStartup<TDbContext>
-        where TDbContext : DbContext
+    protected override void SetJsonApiOptions(JsonApiOptions options)
     {
-        protected override void SetJsonApiOptions(JsonApiOptions options)
-        {
-            base.SetJsonApiOptions(options);
+        base.SetJsonApiOptions(options);
 
-            options.Namespace = "PublicApi";
-            options.UseRelativeLinks = true;
-            options.IncludeTotalResourceCount = true;
+        options.Namespace = "PublicApi";
+        options.UseRelativeLinks = true;
+        options.IncludeTotalResourceCount = true;
 
-            options.SerializerOptions.PropertyNamingPolicy = null;
-            options.SerializerOptions.DictionaryKeyPolicy = null;
-        }
+        options.SerializerOptions.PropertyNamingPolicy = null;
+        options.SerializerOptions.DictionaryKeyPolicy = null;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingTests.cs
index 6692bf337e..98334a432f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/PascalCasingTests.cs
@@ -1,222 +1,217 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions
+namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
+
+public sealed class PascalCasingTests : IClassFixture<IntegrationTestContext<PascalCasingConventionStartup<NamingDbContext>, NamingDbContext>>
 {
-    public sealed class PascalCasingTests : IClassFixture<IntegrationTestContext<PascalCasingConventionStartup<NamingDbContext>, NamingDbContext>>
+    private readonly IntegrationTestContext<PascalCasingConventionStartup<NamingDbContext>, NamingDbContext> _testContext;
+    private readonly NamingFakers _fakers = new();
+
+    public PascalCasingTests(IntegrationTestContext<PascalCasingConventionStartup<NamingDbContext>, NamingDbContext> testContext)
     {
-        private readonly IntegrationTestContext<PascalCasingConventionStartup<NamingDbContext>, NamingDbContext> _testContext;
-        private readonly NamingFakers _fakers = new();
+        _testContext = testContext;
 
-        public PascalCasingTests(IntegrationTestContext<PascalCasingConventionStartup<NamingDbContext>, NamingDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<DivingBoardsController>();
+        testContext.UseController<SwimmingPoolsController>();
+    }
 
-            testContext.UseController<DivingBoardsController>();
-            testContext.UseController<SwimmingPoolsController>();
-        }
+    [Fact]
+    public async Task Can_get_resources_with_include()
+    {
+        // Arrange
+        List<SwimmingPool> pools = _fakers.SwimmingPool.Generate(2);
+        pools[1].DivingBoards = _fakers.DivingBoard.Generate(1);
 
-        [Fact]
-        public async Task Can_get_resources_with_include()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<SwimmingPool> pools = _fakers.SwimmingPool.Generate(2);
-            pools[1].DivingBoards = _fakers.DivingBoard.Generate(1);
+            await dbContext.ClearTableAsync<SwimmingPool>();
+            dbContext.SwimmingPools.AddRange(pools);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<SwimmingPool>();
-                dbContext.SwimmingPools.AddRange(pools);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/PublicApi/SwimmingPools?include=DivingBoards";
 
-            const string route = "/PublicApi/SwimmingPools?include=DivingBoards";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Type == "SwimmingPools");
+        responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Attributes.ShouldContainKey("IsIndoor") != null);
+        responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Relationships.ShouldContainKey("WaterSlides") != null);
+        responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Relationships.ShouldContainKey("DivingBoards") != null);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Type == "SwimmingPools");
-            responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Attributes.ShouldContainKey("IsIndoor") != null);
-            responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Relationships.ShouldContainKey("WaterSlides") != null);
-            responseDocument.Data.ManyValue.Should().OnlyContain(resourceObject => resourceObject.Relationships.ShouldContainKey("DivingBoards") != null);
+        decimal height = pools[1].DivingBoards[0].HeightInMeters;
 
-            decimal height = pools[1].DivingBoards[0].HeightInMeters;
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("DivingBoards");
+        responseDocument.Included[0].Id.Should().Be(pools[1].DivingBoards[0].StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("HeightInMeters").With(value => value.As<decimal>().Should().BeApproximately(height));
+        responseDocument.Included[0].Relationships.Should().BeNull();
+        responseDocument.Included[0].Links.ShouldNotBeNull().Self.Should().Be($"/PublicApi/DivingBoards/{pools[1].DivingBoards[0].StringId}");
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("DivingBoards");
-            responseDocument.Included[0].Id.Should().Be(pools[1].DivingBoards[0].StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("HeightInMeters").With(value => value.As<decimal>().Should().BeApproximately(height));
-            responseDocument.Included[0].Relationships.Should().BeNull();
-            responseDocument.Included[0].Links.ShouldNotBeNull().Self.Should().Be($"/PublicApi/DivingBoards/{pools[1].DivingBoards[0].StringId}");
+        responseDocument.Meta.ShouldContainKey("Total").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetInt32().Should().Be(2);
+        });
+    }
 
-            responseDocument.Meta.ShouldContainKey("Total").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetInt32().Should().Be(2);
-            });
-        }
+    [Fact]
+    public async Task Can_filter_secondary_resources_with_sparse_fieldset()
+    {
+        // Arrange
+        SwimmingPool pool = _fakers.SwimmingPool.Generate();
+        pool.WaterSlides = _fakers.WaterSlide.Generate(2);
+        pool.WaterSlides[0].LengthInMeters = 1;
+        pool.WaterSlides[1].LengthInMeters = 5;
 
-        [Fact]
-        public async Task Can_filter_secondary_resources_with_sparse_fieldset()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            SwimmingPool pool = _fakers.SwimmingPool.Generate();
-            pool.WaterSlides = _fakers.WaterSlide.Generate(2);
-            pool.WaterSlides[0].LengthInMeters = 1;
-            pool.WaterSlides[1].LengthInMeters = 5;
+            dbContext.SwimmingPools.Add(pool);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.SwimmingPools.Add(pool);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/PublicApi/SwimmingPools/{pool.StringId}/WaterSlides" + "?filter=greaterThan(LengthInMeters,'1')&fields[WaterSlides]=LengthInMeters";
 
-            string route = $"/PublicApi/SwimmingPools/{pool.StringId}/WaterSlides" +
-                "?filter=greaterThan(LengthInMeters,'1')&fields[WaterSlides]=LengthInMeters";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Type.Should().Be("WaterSlides");
+        responseDocument.Data.ManyValue[0].Id.Should().Be(pool.WaterSlides[1].StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Type.Should().Be("WaterSlides");
-            responseDocument.Data.ManyValue[0].Id.Should().Be(pool.WaterSlides[1].StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
-        }
+    [Fact]
+    public async Task Can_create_resource()
+    {
+        // Arrange
+        SwimmingPool newPool = _fakers.SwimmingPool.Generate();
 
-        [Fact]
-        public async Task Can_create_resource()
+        var requestBody = new
         {
-            // Arrange
-            SwimmingPool newPool = _fakers.SwimmingPool.Generate();
-
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "SwimmingPools",
+                attributes = new Dictionary<string, object>
                 {
-                    type = "SwimmingPools",
-                    attributes = new Dictionary<string, object>
-                    {
-                        ["IsIndoor"] = newPool.IsIndoor
-                    }
+                    ["IsIndoor"] = newPool.IsIndoor
                 }
-            };
+            }
+        };
 
-            const string route = "/PublicApi/SwimmingPools";
+        const string route = "/PublicApi/SwimmingPools";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("SwimmingPools");
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("IsIndoor").With(value => value.Should().Be(newPool.IsIndoor));
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("SwimmingPools");
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("IsIndoor").With(value => value.Should().Be(newPool.IsIndoor));
 
-            int newPoolId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
-            string poolLink = $"{route}/{newPoolId}";
+        int newPoolId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        string poolLink = $"{route}/{newPoolId}";
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("WaterSlides").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{poolLink}/relationships/WaterSlides");
-                value.Links.Related.Should().Be($"{poolLink}/WaterSlides");
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("WaterSlides").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{poolLink}/relationships/WaterSlides");
+            value.Links.Related.Should().Be($"{poolLink}/WaterSlides");
+        });
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("DivingBoards").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.Should().Be($"{poolLink}/relationships/DivingBoards");
-                value.Links.Related.Should().Be($"{poolLink}/DivingBoards");
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("DivingBoards").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.Should().Be($"{poolLink}/relationships/DivingBoards");
+            value.Links.Related.Should().Be($"{poolLink}/DivingBoards");
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                SwimmingPool poolInDatabase = await dbContext.SwimmingPools.FirstWithIdAsync(newPoolId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            SwimmingPool poolInDatabase = await dbContext.SwimmingPools.FirstWithIdAsync(newPoolId);
 
-                poolInDatabase.IsIndoor.Should().Be(newPool.IsIndoor);
-            });
-        }
+            poolInDatabase.IsIndoor.Should().Be(newPool.IsIndoor);
+        });
+    }
 
-        [Fact]
-        public async Task Applies_casing_convention_on_error_stack_trace()
-        {
-            // Arrange
-            const string requestBody = "{ \"data\": {";
+    [Fact]
+    public async Task Applies_casing_convention_on_error_stack_trace()
+    {
+        // Arrange
+        const string requestBody = "{ \"data\": {";
 
-            const string route = "/PublicApi/SwimmingPools";
+        const string route = "/PublicApi/SwimmingPools";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body.");
-            error.Meta.ShouldContainKey("StackTrace");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body.");
+        error.Meta.ShouldContainKey("StackTrace");
+    }
 
-        [Fact]
-        public async Task Applies_casing_convention_on_source_pointer_from_ModelState()
-        {
-            // Arrange
-            DivingBoard existingBoard = _fakers.DivingBoard.Generate();
+    [Fact]
+    public async Task Applies_casing_convention_on_source_pointer_from_ModelState()
+    {
+        // Arrange
+        DivingBoard existingBoard = _fakers.DivingBoard.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.DivingBoards.Add(existingBoard);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.DivingBoards.Add(existingBoard);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "DivingBoards",
+                id = existingBoard.StringId,
+                attributes = new Dictionary<string, object>
                 {
-                    type = "DivingBoards",
-                    id = existingBoard.StringId,
-                    attributes = new Dictionary<string, object>
-                    {
-                        ["HeightInMeters"] = -1
-                    }
+                    ["HeightInMeters"] = -1
                 }
-            };
+            }
+        };
 
-            string route = $"/PublicApi/DivingBoards/{existingBoard.StringId}";
+        string route = $"/PublicApi/DivingBoards/{existingBoard.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Input validation failed.");
-            error.Detail.Should().Be("The field HeightInMeters must be between 1 and 20.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/HeightInMeters");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Input validation failed.");
+        error.Detail.Should().Be("The field HeightInMeters must be between 1 and 20.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/HeightInMeters");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs
index fa05fec5ed..2b715edc7d 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPool.cs
@@ -1,20 +1,18 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions
+namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class SwimmingPool : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class SwimmingPool : Identifiable<int>
-    {
-        [Attr]
-        public bool IsIndoor { get; set; }
+    [Attr]
+    public bool IsIndoor { get; set; }
 
-        [HasMany]
-        public IList<WaterSlide> WaterSlides { get; set; } = new List<WaterSlide>();
+    [HasMany]
+    public IList<WaterSlide> WaterSlides { get; set; } = new List<WaterSlide>();
 
-        [HasMany]
-        public IList<DivingBoard> DivingBoards { get; set; } = new List<DivingBoard>();
-    }
+    [HasMany]
+    public IList<DivingBoard> DivingBoards { get; set; } = new List<DivingBoard>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPoolsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPoolsController.cs
index 7147413c51..b87206097b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPoolsController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/SwimmingPoolsController.cs
@@ -3,14 +3,13 @@
 using JsonApiDotNetCore.Services;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions
+namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
+
+public sealed class SwimmingPoolsController : JsonApiController<SwimmingPool, int>
 {
-    public sealed class SwimmingPoolsController : JsonApiController<SwimmingPool, int>
+    public SwimmingPoolsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<SwimmingPool, int> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
     {
-        public SwimmingPoolsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<SwimmingPool, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs
index 7c436bb5e4..95bda04456 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/WaterSlide.cs
@@ -2,12 +2,11 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions
+namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class WaterSlide : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class WaterSlide : Identifiable<int>
-    {
-        [Attr]
-        public decimal LengthInMeters { get; set; }
-    }
+    [Attr]
+    public decimal LengthInMeters { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/DuplicateKnownResourcesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/DuplicateKnownResourcesController.cs
new file mode 100644
index 0000000000..b127a8cc81
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/DuplicateKnownResourcesController.cs
@@ -0,0 +1,15 @@
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Services;
+using Microsoft.Extensions.Logging;
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers;
+
+public sealed class DuplicateKnownResourcesController : JsonApiController<KnownResource, int>
+{
+    public DuplicateKnownResourcesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<KnownResource, int> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
+    {
+    }
+}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/DuplicateResourceControllerTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/DuplicateResourceControllerTests.cs
new file mode 100644
index 0000000000..7fec2a877e
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/DuplicateResourceControllerTests.cs
@@ -0,0 +1,30 @@
+using FluentAssertions;
+using JsonApiDotNetCore.Errors;
+using TestBuildingBlocks;
+using Xunit;
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers;
+
+public sealed class DuplicateResourceControllerTests : IntegrationTestContext<TestableStartup<KnownDbContext>, KnownDbContext>
+{
+    public DuplicateResourceControllerTests()
+    {
+        UseController<KnownResourcesController>();
+        UseController<DuplicateKnownResourcesController>();
+    }
+
+    [Fact]
+    public void Fails_at_startup_when_multiple_controllers_exist_for_same_resource_type()
+    {
+        // Act
+        Action action = () => _ = Factory;
+
+        // Assert
+        action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage("Multiple controllers found for resource type 'knownResources'.");
+    }
+
+    public override void Dispose()
+    {
+        // Prevents crash when test cleanup tries to access lazily constructed Factory.
+    }
+}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/EmptyDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/EmptyDbContext.cs
new file mode 100644
index 0000000000..f4a24e1d00
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/EmptyDbContext.cs
@@ -0,0 +1,13 @@
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore;
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class EmptyDbContext : DbContext
+{
+    public EmptyDbContext(DbContextOptions<EmptyDbContext> options)
+        : base(options)
+    {
+    }
+}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/KnownDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/KnownDbContext.cs
new file mode 100644
index 0000000000..39014e85b3
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/KnownDbContext.cs
@@ -0,0 +1,15 @@
+using JetBrains.Annotations;
+using Microsoft.EntityFrameworkCore;
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class KnownDbContext : DbContext
+{
+    public DbSet<KnownResource> KnownResources => Set<KnownResource>();
+
+    public KnownDbContext(DbContextOptions<KnownDbContext> options)
+        : base(options)
+    {
+    }
+}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/KnownResource.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/KnownResource.cs
new file mode 100644
index 0000000000..a5a25efbb0
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/KnownResource.cs
@@ -0,0 +1,13 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers")]
+public sealed class KnownResource : Identifiable<int>
+{
+    [Attr]
+    public string? Value { get; set; }
+}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiController.cs
index 3f108548ac..170a8eb194 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiController.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiController.cs
@@ -1,55 +1,52 @@
-using System.IO;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers;
+
+[Route("[controller]")]
+public sealed class NonJsonApiController : ControllerBase
 {
-    [Route("[controller]")]
-    public sealed class NonJsonApiController : ControllerBase
+    [HttpGet]
+    public IActionResult Get()
     {
-        [HttpGet]
-        public IActionResult Get()
-        {
-            string[] result =
-            {
-                "Welcome!"
-            };
-
-            return Ok(result);
-        }
-
-        [HttpPost]
-        public async Task<IActionResult> PostAsync()
+        string[] result =
         {
-            string name = await new StreamReader(Request.Body).ReadToEndAsync();
+            "Welcome!"
+        };
 
-            if (string.IsNullOrEmpty(name))
-            {
-                return BadRequest("Please send your name.");
-            }
+        return Ok(result);
+    }
 
-            string result = $"Hello, {name}";
-            return Ok(result);
-        }
+    [HttpPost]
+    public async Task<IActionResult> PostAsync()
+    {
+        string name = await new StreamReader(Request.Body).ReadToEndAsync();
 
-        [HttpPut]
-        public IActionResult Put([FromBody] string name)
+        if (string.IsNullOrEmpty(name))
         {
-            string result = $"Hi, {name}";
-            return Ok(result);
+            return BadRequest("Please send your name.");
         }
 
-        [HttpPatch]
-        public IActionResult Patch(string name)
-        {
-            string result = $"Good day, {name}";
-            return Ok(result);
-        }
+        string result = $"Hello, {name}";
+        return Ok(result);
+    }
 
-        [HttpDelete]
-        public IActionResult Delete()
-        {
-            return Ok("Bye.");
-        }
+    [HttpPut]
+    public IActionResult Put([FromBody] string name)
+    {
+        string result = $"Hi, {name}";
+        return Ok(result);
+    }
+
+    [HttpPatch]
+    public IActionResult Patch(string name)
+    {
+        string result = $"Good day, {name}";
+        return Ok(result);
+    }
+
+    [HttpDelete]
+    public IActionResult Delete()
+    {
+        return Ok("Bye.");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiControllerTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiControllerTests.cs
index 1aa854b281..9c3364f4c5 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiControllerTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiControllerTests.cs
@@ -1,160 +1,157 @@
 using System.Net;
-using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Threading.Tasks;
 using FluentAssertions;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers;
+
+public sealed class NonJsonApiControllerTests : IClassFixture<IntegrationTestContext<TestableStartup<EmptyDbContext>, EmptyDbContext>>
 {
-    public sealed class NonJsonApiControllerTests : IClassFixture<IntegrationTestContext<TestableStartup<NonJsonApiDbContext>, NonJsonApiDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<NonJsonApiDbContext>, NonJsonApiDbContext> _testContext;
+    private readonly IntegrationTestContext<TestableStartup<EmptyDbContext>, EmptyDbContext> _testContext;
 
-        public NonJsonApiControllerTests(IntegrationTestContext<TestableStartup<NonJsonApiDbContext>, NonJsonApiDbContext> testContext)
-        {
-            _testContext = testContext;
+    public NonJsonApiControllerTests(IntegrationTestContext<TestableStartup<EmptyDbContext>, EmptyDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<NonJsonApiController>();
-        }
+        testContext.UseController<NonJsonApiController>();
+    }
 
-        [Fact]
-        public async Task Get_skips_middleware_and_formatters()
-        {
-            // Arrange
-            using var request = new HttpRequestMessage(HttpMethod.Get, "/NonJsonApi");
+    [Fact]
+    public async Task Get_skips_middleware_and_formatters()
+    {
+        // Arrange
+        using var request = new HttpRequestMessage(HttpMethod.Get, "/NonJsonApi");
 
-            HttpClient client = _testContext.Factory.CreateClient();
+        HttpClient client = _testContext.Factory.CreateClient();
 
-            // Act
-            HttpResponseMessage httpResponse = await client.SendAsync(request);
+        // Act
+        HttpResponseMessage httpResponse = await client.SendAsync(request);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be("application/json; charset=utf-8");
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
+        httpResponse.Content.Headers.ContentType.ToString().Should().Be("application/json; charset=utf-8");
 
-            string responseText = await httpResponse.Content.ReadAsStringAsync();
-            responseText.Should().Be("[\"Welcome!\"]");
-        }
+        string responseText = await httpResponse.Content.ReadAsStringAsync();
+        responseText.Should().Be("[\"Welcome!\"]");
+    }
 
-        [Fact]
-        public async Task Post_skips_middleware_and_formatters()
+    [Fact]
+    public async Task Post_skips_middleware_and_formatters()
+    {
+        // Arrange
+        using var request = new HttpRequestMessage(HttpMethod.Post, "/NonJsonApi")
         {
-            // Arrange
-            using var request = new HttpRequestMessage(HttpMethod.Post, "/NonJsonApi")
+            Content = new StringContent("Jack")
             {
-                Content = new StringContent("Jack")
+                Headers =
                 {
-                    Headers =
-                    {
-                        ContentType = new MediaTypeHeaderValue("text/plain")
-                    }
+                    ContentType = new MediaTypeHeaderValue("text/plain")
                 }
-            };
+            }
+        };
 
-            HttpClient client = _testContext.Factory.CreateClient();
+        HttpClient client = _testContext.Factory.CreateClient();
 
-            // Act
-            HttpResponseMessage httpResponse = await client.SendAsync(request);
+        // Act
+        HttpResponseMessage httpResponse = await client.SendAsync(request);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
+        httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
 
-            string responseText = await httpResponse.Content.ReadAsStringAsync();
-            responseText.Should().Be("Hello, Jack");
-        }
+        string responseText = await httpResponse.Content.ReadAsStringAsync();
+        responseText.Should().Be("Hello, Jack");
+    }
 
-        [Fact]
-        public async Task Post_skips_error_handler()
-        {
-            // Arrange
-            using var request = new HttpRequestMessage(HttpMethod.Post, "/NonJsonApi");
+    [Fact]
+    public async Task Post_skips_error_handler()
+    {
+        // Arrange
+        using var request = new HttpRequestMessage(HttpMethod.Post, "/NonJsonApi");
 
-            HttpClient client = _testContext.Factory.CreateClient();
+        HttpClient client = _testContext.Factory.CreateClient();
 
-            // Act
-            HttpResponseMessage httpResponse = await client.SendAsync(request);
+        // Act
+        HttpResponseMessage httpResponse = await client.SendAsync(request);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
-            httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
+        httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
 
-            string responseText = await httpResponse.Content.ReadAsStringAsync();
-            responseText.Should().Be("Please send your name.");
-        }
+        string responseText = await httpResponse.Content.ReadAsStringAsync();
+        responseText.Should().Be("Please send your name.");
+    }
 
-        [Fact]
-        public async Task Put_skips_middleware_and_formatters()
+    [Fact]
+    public async Task Put_skips_middleware_and_formatters()
+    {
+        // Arrange
+        using var request = new HttpRequestMessage(HttpMethod.Put, "/NonJsonApi")
         {
-            // Arrange
-            using var request = new HttpRequestMessage(HttpMethod.Put, "/NonJsonApi")
+            Content = new StringContent("\"Jane\"")
             {
-                Content = new StringContent("\"Jane\"")
+                Headers =
                 {
-                    Headers =
-                    {
-                        ContentType = new MediaTypeHeaderValue("application/json")
-                    }
+                    ContentType = new MediaTypeHeaderValue("application/json")
                 }
-            };
+            }
+        };
 
-            HttpClient client = _testContext.Factory.CreateClient();
+        HttpClient client = _testContext.Factory.CreateClient();
 
-            // Act
-            HttpResponseMessage httpResponse = await client.SendAsync(request);
+        // Act
+        HttpResponseMessage httpResponse = await client.SendAsync(request);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
+        httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
 
-            string responseText = await httpResponse.Content.ReadAsStringAsync();
-            responseText.Should().Be("Hi, Jane");
-        }
+        string responseText = await httpResponse.Content.ReadAsStringAsync();
+        responseText.Should().Be("Hi, Jane");
+    }
 
-        [Fact]
-        public async Task Patch_skips_middleware_and_formatters()
-        {
-            // Arrange
-            using var request = new HttpRequestMessage(HttpMethod.Patch, "/NonJsonApi?name=Janice");
+    [Fact]
+    public async Task Patch_skips_middleware_and_formatters()
+    {
+        // Arrange
+        using var request = new HttpRequestMessage(HttpMethod.Patch, "/NonJsonApi?name=Janice");
 
-            HttpClient client = _testContext.Factory.CreateClient();
+        HttpClient client = _testContext.Factory.CreateClient();
 
-            // Act
-            HttpResponseMessage httpResponse = await client.SendAsync(request);
+        // Act
+        HttpResponseMessage httpResponse = await client.SendAsync(request);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
+        httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
 
-            string responseText = await httpResponse.Content.ReadAsStringAsync();
-            responseText.Should().Be("Good day, Janice");
-        }
+        string responseText = await httpResponse.Content.ReadAsStringAsync();
+        responseText.Should().Be("Good day, Janice");
+    }
 
-        [Fact]
-        public async Task Delete_skips_middleware_and_formatters()
-        {
-            // Arrange
-            using var request = new HttpRequestMessage(HttpMethod.Delete, "/NonJsonApi");
+    [Fact]
+    public async Task Delete_skips_middleware_and_formatters()
+    {
+        // Arrange
+        using var request = new HttpRequestMessage(HttpMethod.Delete, "/NonJsonApi");
 
-            HttpClient client = _testContext.Factory.CreateClient();
+        HttpClient client = _testContext.Factory.CreateClient();
 
-            // Act
-            HttpResponseMessage httpResponse = await client.SendAsync(request);
+        // Act
+        HttpResponseMessage httpResponse = await client.SendAsync(request);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-            httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
-            httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        httpResponse.Content.Headers.ContentType.ShouldNotBeNull();
+        httpResponse.Content.Headers.ContentType.ToString().Should().Be("text/plain; charset=utf-8");
 
-            string responseText = await httpResponse.Content.ReadAsStringAsync();
-            responseText.Should().Be("Bye.");
-        }
+        string responseText = await httpResponse.Content.ReadAsStringAsync();
+        responseText.Should().Be("Bye.");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiDbContext.cs
deleted file mode 100644
index 5fb6d1d42e..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/NonJsonApiDbContext.cs
+++ /dev/null
@@ -1,14 +0,0 @@
-using JetBrains.Annotations;
-using Microsoft.EntityFrameworkCore;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers
-{
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class NonJsonApiDbContext : DbContext
-    {
-        public NonJsonApiDbContext(DbContextOptions<NonJsonApiDbContext> options)
-            : base(options)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/UnknownResource.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/UnknownResource.cs
index 5dc9f2f6ce..d7d27464fd 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/UnknownResource.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/UnknownResource.cs
@@ -1,11 +1,12 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers")]
+public sealed class UnknownResource : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class UnknownResource : Identifiable<int>
-    {
-        public string? Value { get; set; }
-    }
+    public string? Value { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/UnknownResourceControllerTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/UnknownResourceControllerTests.cs
index d2803c195c..1cfb3cc34c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/UnknownResourceControllerTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/UnknownResourceControllerTests.cs
@@ -1,32 +1,30 @@
-using System;
 using FluentAssertions;
 using JsonApiDotNetCore.Errors;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers;
+
+public sealed class UnknownResourceControllerTests : IntegrationTestContext<TestableStartup<EmptyDbContext>, EmptyDbContext>
 {
-    public sealed class UnknownResourceControllerTests : IntegrationTestContext<TestableStartup<NonJsonApiDbContext>, NonJsonApiDbContext>
+    public UnknownResourceControllerTests()
     {
-        public UnknownResourceControllerTests()
-        {
-            UseController<UnknownResourcesController>();
-        }
+        UseController<UnknownResourcesController>();
+    }
 
-        [Fact]
-        public void Fails_at_startup_when_using_controller_for_resource_type_that_is_not_registered_in_resource_graph()
-        {
-            // Act
-            Action action = () => _ = Factory;
+    [Fact]
+    public void Fails_at_startup_when_using_controller_for_resource_type_that_is_not_registered_in_resource_graph()
+    {
+        // Act
+        Action action = () => _ = Factory;
 
-            // Assert
-            action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage($"Controller '{typeof(UnknownResourcesController)}' " +
-                $"depends on resource type '{typeof(UnknownResource)}', which does not exist in the resource graph.");
-        }
+        // Assert
+        action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage($"Controller '{typeof(UnknownResourcesController)}' " +
+            $"depends on resource type '{typeof(UnknownResource)}', which does not exist in the resource graph.");
+    }
 
-        public override void Dispose()
-        {
-            // Prevents crash when test cleanup tries to access lazily constructed Factory.
-        }
+    public override void Dispose()
+    {
+        // Prevents crash when test cleanup tries to access lazily constructed Factory.
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/UnknownResourcesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/UnknownResourcesController.cs
deleted file mode 100644
index 82bb597266..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NonJsonApiControllers/UnknownResourcesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.NonJsonApiControllers
-{
-    public sealed class UnknownResourcesController : JsonApiController<UnknownResource, int>
-    {
-        public UnknownResourcesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<UnknownResource, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs
index 17b0d478e8..20c95ea769 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/AccountPreferences.cs
@@ -2,12 +2,11 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class AccountPreferences : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class AccountPreferences : Identifiable<int>
-    {
-        [Attr]
-        public bool UseDarkTheme { get; set; }
-    }
+    [Attr]
+    public bool UseDarkTheme { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs
index 0e6371e356..2f90ed2615 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Appointment.cs
@@ -1,23 +1,21 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class Appointment : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Appointment : Identifiable<int>
-    {
-        [Attr]
-        public string Title { get; set; } = null!;
+    [Attr]
+    public string Title { get; set; } = null!;
 
-        [Attr]
-        public string? Description { get; set; }
+    [Attr]
+    public string? Description { get; set; }
 
-        [Attr]
-        public DateTimeOffset StartTime { get; set; }
+    [Attr]
+    public DateTimeOffset StartTime { get; set; }
 
-        [Attr]
-        public DateTimeOffset EndTime { get; set; }
-    }
+    [Attr]
+    public DateTimeOffset EndTime { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Blog.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Blog.cs
index f421a0d67c..58a4546ef5 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Blog.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Blog.cs
@@ -1,27 +1,25 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
+public sealed class Blog : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Blog : Identifiable<int>
-    {
-        [Attr]
-        public string Title { get; set; } = null!;
+    [Attr]
+    public string Title { get; set; } = null!;
 
-        [Attr]
-        public string PlatformName { get; set; } = null!;
+    [Attr]
+    public string PlatformName { get; set; } = null!;
 
-        [Attr(Capabilities = AttrCapabilities.All & ~(AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange))]
-        public bool ShowAdvertisements => PlatformName.EndsWith("(using free account)", StringComparison.Ordinal);
+    [Attr(Capabilities = AttrCapabilities.All & ~(AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange))]
+    public bool ShowAdvertisements => PlatformName.EndsWith("(using free account)", StringComparison.Ordinal);
 
-        [HasMany]
-        public IList<BlogPost> Posts { get; set; } = new List<BlogPost>();
+    [HasMany]
+    public IList<BlogPost> Posts { get; set; } = new List<BlogPost>();
 
-        [HasOne]
-        public WebAccount? Owner { get; set; }
-    }
+    [HasOne]
+    public WebAccount? Owner { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPost.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPost.cs
index 2e809d651e..a5edb3123f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPost.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPost.cs
@@ -1,32 +1,31 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
+public sealed class BlogPost : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class BlogPost : Identifiable<int>
-    {
-        [Attr]
-        public string Caption { get; set; } = null!;
+    [Attr]
+    public string Caption { get; set; } = null!;
 
-        [Attr]
-        public string Url { get; set; } = null!;
+    [Attr]
+    public string Url { get; set; } = null!;
 
-        [HasOne]
-        public WebAccount? Author { get; set; }
+    [HasOne]
+    public WebAccount? Author { get; set; }
 
-        [HasOne]
-        public WebAccount? Reviewer { get; set; }
+    [HasOne]
+    public WebAccount? Reviewer { get; set; }
 
-        [HasMany]
-        public ISet<Label> Labels { get; set; } = new HashSet<Label>();
+    [HasMany]
+    public ISet<Label> Labels { get; set; } = new HashSet<Label>();
 
-        [HasMany]
-        public ISet<Comment> Comments { get; set; } = new HashSet<Comment>();
+    [HasMany]
+    public ISet<Comment> Comments { get; set; } = new HashSet<Comment>();
 
-        [HasOne(CanInclude = false)]
-        public Blog? Parent { get; set; }
-    }
+    [HasOne(CanInclude = false)]
+    public Blog? Parent { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPostsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPostsController.cs
deleted file mode 100644
index b8eb194e80..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogPostsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
-{
-    public sealed class BlogPostsController : JsonApiController<BlogPost, int>
-    {
-        public BlogPostsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<BlogPost, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogsController.cs
deleted file mode 100644
index 4fb4ad7eea..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/BlogsController.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
-{
-    public sealed class BlogsController : JsonApiController<Blog, int>
-    {
-        public BlogsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<Blog, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Calendar.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Calendar.cs
index ba66badfad..46d82cb7fb 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Calendar.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Calendar.cs
@@ -1,23 +1,22 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
+public sealed class Calendar : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Calendar : Identifiable<int>
-    {
-        [Attr]
-        public string? TimeZone { get; set; }
+    [Attr]
+    public string? TimeZone { get; set; }
 
-        [Attr]
-        public bool ShowWeekNumbers { get; set; }
+    [Attr]
+    public bool ShowWeekNumbers { get; set; }
 
-        [Attr]
-        public int DefaultAppointmentDurationInMinutes { get; set; }
+    [Attr]
+    public int DefaultAppointmentDurationInMinutes { get; set; }
 
-        [HasMany]
-        public ISet<Appointment> Appointments { get; set; } = new HashSet<Appointment>();
-    }
+    [HasMany]
+    public ISet<Appointment> Appointments { get; set; } = new HashSet<Appointment>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CalendarsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CalendarsController.cs
deleted file mode 100644
index 64c0c1060c..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CalendarsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
-{
-    public sealed class CalendarsController : JsonApiController<Calendar, int>
-    {
-        public CalendarsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Calendar, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Comment.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Comment.cs
index 1e0b6b5b6e..6c8baa0a97 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Comment.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Comment.cs
@@ -1,23 +1,22 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
+public sealed class Comment : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Comment : Identifiable<int>
-    {
-        [Attr]
-        public string Text { get; set; } = null!;
+    [Attr]
+    public string Text { get; set; } = null!;
 
-        [Attr]
-        public DateTime CreatedAt { get; set; }
+    [Attr]
+    public DateTime CreatedAt { get; set; }
 
-        [HasOne]
-        public WebAccount? Author { get; set; }
+    [HasOne]
+    public WebAccount? Author { get; set; }
 
-        [HasOne]
-        public BlogPost Parent { get; set; } = null!;
-    }
+    [HasOne]
+    public BlogPost Parent { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CommentsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CommentsController.cs
deleted file mode 100644
index b287d173fd..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/CommentsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
-{
-    public sealed class CommentsController : JsonApiController<Comment, int>
-    {
-        public CommentsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Comment, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs
index 76df3f3458..49a6c99ad6 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDataTypeTests.cs
@@ -1,12 +1,8 @@
-using System;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Reflection;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
+using System.Web;
 using FluentAssertions;
-using FluentAssertions.Common;
 using FluentAssertions.Extensions;
 using Humanizer;
 using JsonApiDotNetCore.Configuration;
@@ -15,347 +11,374 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering;
+
+public sealed class FilterDataTypeTests : IClassFixture<IntegrationTestContext<TestableStartup<FilterDbContext>, FilterDbContext>>
 {
-    public sealed class FilterDataTypeTests : IClassFixture<IntegrationTestContext<TestableStartup<FilterDbContext>, FilterDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<FilterDbContext>, FilterDbContext> _testContext;
+
+    public FilterDataTypeTests(IntegrationTestContext<TestableStartup<FilterDbContext>, FilterDbContext> testContext)
+    {
+        _testContext = testContext;
+
+        testContext.UseController<FilterableResourcesController>();
+
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.EnableLegacyFilterNotation = false;
+
+        if (!options.SerializerOptions.Converters.Any(converter => converter is JsonStringEnumMemberConverter))
+        {
+            options.SerializerOptions.Converters.Add(new JsonStringEnumMemberConverter());
+            options.SerializerOptions.Converters.Add(new JsonTimeSpanConverter());
+        }
+    }
+
+    [Theory]
+    [InlineData(nameof(FilterableResource.SomeString), "text")]
+    [InlineData(nameof(FilterableResource.SomeNullableString), "text")]
+    [InlineData(nameof(FilterableResource.SomeBoolean), true)]
+    [InlineData(nameof(FilterableResource.SomeNullableBoolean), true)]
+    [InlineData(nameof(FilterableResource.SomeInt32), 1)]
+    [InlineData(nameof(FilterableResource.SomeNullableInt32), 1)]
+    [InlineData(nameof(FilterableResource.SomeUnsignedInt64), 1ul)]
+    [InlineData(nameof(FilterableResource.SomeNullableUnsignedInt64), 1ul)]
+    [InlineData(nameof(FilterableResource.SomeDouble), 0.5d)]
+    [InlineData(nameof(FilterableResource.SomeNullableDouble), 0.5d)]
+    [InlineData(nameof(FilterableResource.SomeEnum), DayOfWeek.Saturday)]
+    [InlineData(nameof(FilterableResource.SomeNullableEnum), DayOfWeek.Saturday)]
+    public async Task Can_filter_equality_on_type(string propertyName, object propertyValue)
     {
-        private readonly IntegrationTestContext<TestableStartup<FilterDbContext>, FilterDbContext> _testContext;
+        // Arrange
+        var resource = new FilterableResource();
+        PropertyInfo? property = typeof(FilterableResource).GetProperty(propertyName);
+        property?.SetValue(resource, propertyValue);
 
-        public FilterDataTypeTests(IntegrationTestContext<TestableStartup<FilterDbContext>, FilterDbContext> testContext)
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            _testContext = testContext;
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, new FilterableResource());
+            await dbContext.SaveChangesAsync();
+        });
 
-            testContext.UseController<FilterableResourcesController>();
+        string attributeName = propertyName.Camelize();
+        string route = $"/filterableResources?filter=equals({attributeName},'{propertyValue}')";
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.EnableLegacyFilterNotation = false;
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            if (!options.SerializerOptions.Converters.Any(converter => converter is JsonStringEnumMemberConverter))
-            {
-                options.SerializerOptions.Converters.Add(new JsonStringEnumMemberConverter());
-                options.SerializerOptions.Converters.Add(new JsonTimeSpanConverter());
-            }
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey(attributeName).With(value => value.Should().Be(value));
+    }
 
-        [Theory]
-        [InlineData(nameof(FilterableResource.SomeString), "text")]
-        [InlineData(nameof(FilterableResource.SomeNullableString), "text")]
-        [InlineData(nameof(FilterableResource.SomeBoolean), true)]
-        [InlineData(nameof(FilterableResource.SomeNullableBoolean), true)]
-        [InlineData(nameof(FilterableResource.SomeInt32), 1)]
-        [InlineData(nameof(FilterableResource.SomeNullableInt32), 1)]
-        [InlineData(nameof(FilterableResource.SomeUnsignedInt64), 1ul)]
-        [InlineData(nameof(FilterableResource.SomeNullableUnsignedInt64), 1ul)]
-        [InlineData(nameof(FilterableResource.SomeDouble), 0.5d)]
-        [InlineData(nameof(FilterableResource.SomeNullableDouble), 0.5d)]
-        [InlineData(nameof(FilterableResource.SomeEnum), DayOfWeek.Saturday)]
-        [InlineData(nameof(FilterableResource.SomeNullableEnum), DayOfWeek.Saturday)]
-        public async Task Can_filter_equality_on_type(string propertyName, object propertyValue)
+    [Fact]
+    public async Task Can_filter_equality_on_type_Decimal()
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource();
-            PropertyInfo? property = typeof(FilterableResource).GetProperty(propertyName);
-            property?.SetValue(resource, propertyValue);
+            SomeDecimal = 0.5m
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, new FilterableResource());
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, new FilterableResource());
+            await dbContext.SaveChangesAsync();
+        });
 
-            string attributeName = propertyName.Camelize();
-            string route = $"/filterableResources?filter=equals({attributeName},'{propertyValue}')";
+        string route = $"/filterableResources?filter=equals(someDecimal,'{resource.SomeDecimal}')";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey(attributeName).With(value => value.Should().Be(value));
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someDecimal").With(value => value.Should().Be(resource.SomeDecimal));
+    }
 
-        [Fact]
-        public async Task Can_filter_equality_on_type_Decimal()
+    [Fact]
+    public async Task Can_filter_equality_on_type_Guid()
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeDecimal = 0.5m
-            };
+            SomeGuid = Guid.NewGuid()
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, new FilterableResource());
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, new FilterableResource());
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/filterableResources?filter=equals(someDecimal,'{resource.SomeDecimal}')";
+        string route = $"/filterableResources?filter=equals(someGuid,'{resource.SomeGuid}')";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someDecimal").With(value => value.Should().Be(resource.SomeDecimal));
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someGuid").With(value => value.Should().Be(resource.SomeGuid));
+    }
 
-        [Fact]
-        public async Task Can_filter_equality_on_type_Guid()
+    [Fact]
+    public async Task Can_filter_equality_on_type_DateTime_in_local_time_zone()
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeGuid = Guid.NewGuid()
-            };
+            SomeDateTimeInLocalZone = 27.January(2003).At(11, 22, 33, 44)
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, new FilterableResource());
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, new FilterableResource());
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/filterableResources?filter=equals(someGuid,'{resource.SomeGuid}')";
+        string route = $"/filterableResources?filter=equals(someDateTimeInLocalZone,'{resource.SomeDateTimeInLocalZone:O}')";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someGuid").With(value => value.Should().Be(resource.SomeGuid));
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-        [Fact]
-        public async Task Can_filter_equality_on_type_DateTime()
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someDateTimeInLocalZone")
+            .With(value => value.Should().Be(resource.SomeDateTimeInLocalZone));
+    }
+
+    [Fact]
+    public async Task Can_filter_equality_on_type_DateTime_in_UTC_time_zone()
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeDateTime = 27.January(2003).At(11, 22, 33, 44)
-            };
+            SomeDateTimeInUtcZone = 27.January(2003).At(11, 22, 33, 44).AsUtc()
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, new FilterableResource());
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, new FilterableResource());
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/filterableResources?filter=equals(someDateTime,'{resource.SomeDateTime:O}')";
+        string route = $"/filterableResources?filter=equals(someDateTimeInUtcZone,'{resource.SomeDateTimeInUtcZone:O}')";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someDateTime")
-                .With(value => value.As<DateTime>().Should().BeCloseTo(resource.SomeDateTime));
-        }
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someDateTimeInUtcZone")
+            .With(value => value.Should().Be(resource.SomeDateTimeInUtcZone));
+    }
 
-        [Fact]
-        public async Task Can_filter_equality_on_type_DateTimeOffset()
+    [Fact]
+    public async Task Can_filter_equality_on_type_DateTimeOffset_in_UTC_time_zone()
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeDateTimeOffset = 27.January(2003).At(11, 22, 33, 44).ToDateTimeOffset(TimeSpan.FromHours(3))
-            };
+            SomeDateTimeOffset = 27.January(2003).At(11, 22, 33, 44).AsUtc()
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, new FilterableResource());
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, new FilterableResource());
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/filterableResources?filter=equals(someDateTimeOffset,'{WebUtility.UrlEncode(resource.SomeDateTimeOffset.ToString("O"))}')";
+        string route = $"/filterableResources?filter=equals(someDateTimeOffset,'{HttpUtility.UrlEncode(resource.SomeDateTimeOffset.ToString("O"))}')";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someDateTimeOffset").With(value => value.Should().Be(resource.SomeDateTimeOffset));
+    }
 
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someDateTimeOffset")
-                .With(value => value.As<DateTimeOffset>().Should().BeCloseTo(resource.SomeDateTimeOffset));
-        }
+    [Fact]
+    public async Task Can_filter_equality_on_type_TimeSpan()
+    {
+        // Arrange
+        var resource = new FilterableResource
+        {
+            SomeTimeSpan = new TimeSpan(1, 2, 3, 4, 5)
+        };
 
-        [Fact]
-        public async Task Can_filter_equality_on_type_TimeSpan()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeTimeSpan = new TimeSpan(1, 2, 3, 4, 5)
-            };
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, new FilterableResource());
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, new FilterableResource());
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/filterableResources?filter=equals(someTimeSpan,'{resource.SomeTimeSpan}')";
 
-            string route = $"/filterableResources?filter=equals(someTimeSpan,'{resource.SomeTimeSpan}')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someTimeSpan").With(value => value.Should().Be(resource.SomeTimeSpan));
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someTimeSpan").With(value => value.Should().Be(resource.SomeTimeSpan));
-        }
+    [Fact]
+    public async Task Cannot_filter_equality_on_incompatible_value()
+    {
+        // Arrange
+        var resource = new FilterableResource
+        {
+            SomeInt32 = 1
+        };
 
-        [Fact]
-        public async Task Cannot_filter_equality_on_incompatible_value()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeInt32 = 1
-            };
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, new FilterableResource());
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/filterableResources?filter=equals(someInt32,'ABC')";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
-
-            responseDocument.Errors.ShouldHaveCount(1);
-
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Query creation failed due to incompatible types.");
-            error.Detail.Should().Be("Failed to convert 'ABC' of type 'String' to type 'Int32'.");
-            error.Source.Should().BeNull();
-        }
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, new FilterableResource());
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/filterableResources?filter=equals(someInt32,'ABC')";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-        [Theory]
-        [InlineData(nameof(FilterableResource.SomeNullableString))]
-        [InlineData(nameof(FilterableResource.SomeNullableBoolean))]
-        [InlineData(nameof(FilterableResource.SomeNullableInt32))]
-        [InlineData(nameof(FilterableResource.SomeNullableUnsignedInt64))]
-        [InlineData(nameof(FilterableResource.SomeNullableDecimal))]
-        [InlineData(nameof(FilterableResource.SomeNullableDouble))]
-        [InlineData(nameof(FilterableResource.SomeNullableGuid))]
-        [InlineData(nameof(FilterableResource.SomeNullableDateTime))]
-        [InlineData(nameof(FilterableResource.SomeNullableDateTimeOffset))]
-        [InlineData(nameof(FilterableResource.SomeNullableTimeSpan))]
-        [InlineData(nameof(FilterableResource.SomeNullableEnum))]
-        public async Task Can_filter_is_null_on_type(string propertyName)
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Query creation failed due to incompatible types.");
+        error.Detail.Should().Be("Failed to convert 'ABC' of type 'String' to type 'Int32'.");
+        error.Source.Should().BeNull();
+    }
+
+    [Theory]
+    [InlineData(nameof(FilterableResource.SomeNullableString))]
+    [InlineData(nameof(FilterableResource.SomeNullableBoolean))]
+    [InlineData(nameof(FilterableResource.SomeNullableInt32))]
+    [InlineData(nameof(FilterableResource.SomeNullableUnsignedInt64))]
+    [InlineData(nameof(FilterableResource.SomeNullableDecimal))]
+    [InlineData(nameof(FilterableResource.SomeNullableDouble))]
+    [InlineData(nameof(FilterableResource.SomeNullableGuid))]
+    [InlineData(nameof(FilterableResource.SomeNullableDateTime))]
+    [InlineData(nameof(FilterableResource.SomeNullableDateTimeOffset))]
+    [InlineData(nameof(FilterableResource.SomeNullableTimeSpan))]
+    [InlineData(nameof(FilterableResource.SomeNullableEnum))]
+    public async Task Can_filter_is_null_on_type(string propertyName)
+    {
+        // Arrange
+        var resource = new FilterableResource();
+        PropertyInfo? property = typeof(FilterableResource).GetProperty(propertyName);
+        property?.SetValue(resource, null);
+
+        var otherResource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource();
-            PropertyInfo? property = typeof(FilterableResource).GetProperty(propertyName);
-            property?.SetValue(resource, null);
-
-            var otherResource = new FilterableResource
-            {
-                SomeNullableString = "X",
-                SomeNullableBoolean = true,
-                SomeNullableInt32 = 1,
-                SomeNullableUnsignedInt64 = 1,
-                SomeNullableDecimal = 1,
-                SomeNullableDouble = 1,
-                SomeNullableGuid = Guid.NewGuid(),
-                SomeNullableDateTime = 1.January(2001),
-                SomeNullableDateTimeOffset = 1.January(2001).ToDateTimeOffset(TimeSpan.FromHours(-1)),
-                SomeNullableTimeSpan = TimeSpan.FromHours(1),
-                SomeNullableEnum = DayOfWeek.Friday
-            };
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, otherResource);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string attributeName = propertyName.Camelize();
-            string route = $"/filterableResources?filter=equals({attributeName},null)";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey(attributeName).With(value => value.Should().BeNull());
-        }
+            SomeNullableString = "X",
+            SomeNullableBoolean = true,
+            SomeNullableInt32 = 1,
+            SomeNullableUnsignedInt64 = 1,
+            SomeNullableDecimal = 1,
+            SomeNullableDouble = 1,
+            SomeNullableGuid = Guid.NewGuid(),
+            SomeNullableDateTime = 1.January(2001).AsUtc(),
+            SomeNullableDateTimeOffset = 1.January(2001).AsUtc(),
+            SomeNullableTimeSpan = TimeSpan.FromHours(1),
+            SomeNullableEnum = DayOfWeek.Friday
+        };
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, otherResource);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string attributeName = propertyName.Camelize();
+        string route = $"/filterableResources?filter=equals({attributeName},null)";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey(attributeName).With(value => value.Should().BeNull());
+    }
 
-        [Theory]
-        [InlineData(nameof(FilterableResource.SomeNullableString))]
-        [InlineData(nameof(FilterableResource.SomeNullableBoolean))]
-        [InlineData(nameof(FilterableResource.SomeNullableInt32))]
-        [InlineData(nameof(FilterableResource.SomeNullableUnsignedInt64))]
-        [InlineData(nameof(FilterableResource.SomeNullableDecimal))]
-        [InlineData(nameof(FilterableResource.SomeNullableDouble))]
-        [InlineData(nameof(FilterableResource.SomeNullableGuid))]
-        [InlineData(nameof(FilterableResource.SomeNullableDateTime))]
-        [InlineData(nameof(FilterableResource.SomeNullableDateTimeOffset))]
-        [InlineData(nameof(FilterableResource.SomeNullableTimeSpan))]
-        [InlineData(nameof(FilterableResource.SomeNullableEnum))]
-        public async Task Can_filter_is_not_null_on_type(string propertyName)
+    [Theory]
+    [InlineData(nameof(FilterableResource.SomeNullableString))]
+    [InlineData(nameof(FilterableResource.SomeNullableBoolean))]
+    [InlineData(nameof(FilterableResource.SomeNullableInt32))]
+    [InlineData(nameof(FilterableResource.SomeNullableUnsignedInt64))]
+    [InlineData(nameof(FilterableResource.SomeNullableDecimal))]
+    [InlineData(nameof(FilterableResource.SomeNullableDouble))]
+    [InlineData(nameof(FilterableResource.SomeNullableGuid))]
+    [InlineData(nameof(FilterableResource.SomeNullableDateTime))]
+    [InlineData(nameof(FilterableResource.SomeNullableDateTimeOffset))]
+    [InlineData(nameof(FilterableResource.SomeNullableTimeSpan))]
+    [InlineData(nameof(FilterableResource.SomeNullableEnum))]
+    public async Task Can_filter_is_not_null_on_type(string propertyName)
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeNullableString = "X",
-                SomeNullableBoolean = true,
-                SomeNullableInt32 = 1,
-                SomeNullableUnsignedInt64 = 1,
-                SomeNullableDecimal = 1,
-                SomeNullableDouble = 1,
-                SomeNullableGuid = Guid.NewGuid(),
-                SomeNullableDateTime = 1.January(2001),
-                SomeNullableDateTimeOffset = 1.January(2001).ToDateTimeOffset(TimeSpan.FromHours(-1)),
-                SomeNullableTimeSpan = TimeSpan.FromHours(1),
-                SomeNullableEnum = DayOfWeek.Friday
-            };
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, new FilterableResource());
-                await dbContext.SaveChangesAsync();
-            });
-
-            string attributeName = propertyName.Camelize();
-            string route = $"/filterableResources?filter=not(equals({attributeName},null))";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey(attributeName).With(value => value.Should().NotBeNull());
-        }
+            SomeNullableString = "X",
+            SomeNullableBoolean = true,
+            SomeNullableInt32 = 1,
+            SomeNullableUnsignedInt64 = 1,
+            SomeNullableDecimal = 1,
+            SomeNullableDouble = 1,
+            SomeNullableGuid = Guid.NewGuid(),
+            SomeNullableDateTime = 1.January(2001).AsUtc(),
+            SomeNullableDateTimeOffset = 1.January(2001).AsUtc(),
+            SomeNullableTimeSpan = TimeSpan.FromHours(1),
+            SomeNullableEnum = DayOfWeek.Friday
+        };
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, new FilterableResource());
+            await dbContext.SaveChangesAsync();
+        });
+
+        string attributeName = propertyName.Camelize();
+        string route = $"/filterableResources?filter=not(equals({attributeName},null))";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey(attributeName).With(value => value.Should().NotBeNull());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDbContext.cs
index 525008a6cb..1c6c7eff32 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDbContext.cs
@@ -1,16 +1,24 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering
+// @formatter:wrap_chained_method_calls chop_always
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class FilterDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class FilterDbContext : DbContext
+    public DbSet<FilterableResource> FilterableResources => Set<FilterableResource>();
+
+    public FilterDbContext(DbContextOptions<FilterDbContext> options)
+        : base(options)
     {
-        public DbSet<FilterableResource> FilterableResources => Set<FilterableResource>();
+    }
 
-        public FilterDbContext(DbContextOptions<FilterDbContext> options)
-            : base(options)
-        {
-        }
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<FilterableResource>()
+            .Property(resource => resource.SomeDateTimeInLocalZone)
+            .HasColumnType("timestamp without time zone");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs
index 92dce6788a..aadea81768 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterDepthTests.cs
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Extensions;
 using JsonApiDotNetCore.Configuration;
@@ -11,540 +7,531 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering;
+
+public sealed class FilterDepthTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
 {
-    public sealed class FilterDepthTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
-        private readonly QueryStringFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
+    private readonly QueryStringFakers _fakers = new();
 
-        public FilterDepthTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
-        {
-            _testContext = testContext;
+    public FilterDepthTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<BlogsController>();
-            testContext.UseController<BlogPostsController>();
+        testContext.UseController<BlogsController>();
+        testContext.UseController<BlogPostsController>();
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.EnableLegacyFilterNotation = false;
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.EnableLegacyFilterNotation = false;
+    }
 
-            options.DisableTopPagination = false;
-            options.DisableChildrenPagination = false;
-        }
+    [Fact]
+    public async Task Can_filter_in_primary_resources()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(2);
+        posts[0].Caption = "One";
+        posts[1].Caption = "Two";
 
-        [Fact]
-        public async Task Can_filter_in_primary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(2);
-            posts[0].Caption = "One";
-            posts[1].Caption = "Two";
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/blogPosts?filter=equals(caption,'Two')";
 
-            const string route = "/blogPosts?filter=equals(caption,'Two')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(posts[1].StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(posts[1].StringId);
-        }
+    [Fact]
+    public async Task Cannot_filter_in_single_primary_resource()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
 
-        [Fact]
-        public async Task Cannot_filter_in_single_primary_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogPosts/{post.StringId}?filter=equals(caption,'Two')";
 
-            string route = $"/blogPosts/{post.StringId}?filter=equals(caption,'Two')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified filter is invalid.");
+        error.Detail.Should().Be("This query string parameter can only be used on a collection of resources (not on a single resource).");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("filter");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified filter is invalid.");
-            error.Detail.Should().Be("This query string parameter can only be used on a collection of resources (not on a single resource).");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("filter");
-        }
+    [Fact]
+    public async Task Can_filter_in_secondary_resources()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Posts = _fakers.BlogPost.Generate(2);
+        blog.Posts[0].Caption = "One";
+        blog.Posts[1].Caption = "Two";
 
-        [Fact]
-        public async Task Can_filter_in_secondary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Posts = _fakers.BlogPost.Generate(2);
-            blog.Posts[0].Caption = "One";
-            blog.Posts[1].Caption = "Two";
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogs/{blog.StringId}/posts?filter=equals(caption,'Two')";
 
-            string route = $"/blogs/{blog.StringId}/posts?filter=equals(caption,'Two')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[1].StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[1].StringId);
-        }
+    [Fact]
+    public async Task Cannot_filter_in_single_secondary_resource()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
 
-        [Fact]
-        public async Task Cannot_filter_in_single_secondary_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/blogPosts/{post.StringId}/author?filter=equals(displayName,'John Smith')";
+        string route = $"/blogPosts/{post.StringId}/author?filter=equals(displayName,'John Smith')";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified filter is invalid.");
-            error.Detail.Should().Be("This query string parameter can only be used on a collection of resources (not on a single resource).");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("filter");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified filter is invalid.");
+        error.Detail.Should().Be("This query string parameter can only be used on a collection of resources (not on a single resource).");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("filter");
+    }
 
-        [Fact]
-        public async Task Can_filter_on_ManyToOne_relationship()
-        {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(3);
-            posts[0].Author = _fakers.WebAccount.Generate();
-            posts[0].Author!.UserName = "Conner";
-            posts[1].Author = _fakers.WebAccount.Generate();
-            posts[1].Author!.UserName = "Smith";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/blogPosts?include=author&filter=or(equals(author.userName,'Smith'),equals(author,null))";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue.Should().ContainSingle(post => post.Id == posts[1].StringId);
-            responseDocument.Data.ManyValue.Should().ContainSingle(post => post.Id == posts[2].StringId);
-
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Id.Should().Be(posts[1].Author!.StringId);
-        }
-
-        [Fact]
-        public async Task Can_filter_on_OneToMany_relationship()
+    [Fact]
+    public async Task Can_filter_on_ManyToOne_relationship()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(3);
+        posts[0].Author = _fakers.WebAccount.Generate();
+        posts[0].Author!.UserName = "Conner";
+        posts[1].Author = _fakers.WebAccount.Generate();
+        posts[1].Author!.UserName = "Smith";
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Blog> blogs = _fakers.Blog.Generate(2);
-            blogs[1].Posts = _fakers.BlogPost.Generate(1);
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Blog>();
-                dbContext.Blogs.AddRange(blogs);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/blogPosts?include=author&filter=or(equals(author.userName,'Smith'),equals(author,null))";
 
-            const string route = "/blogs?filter=greaterThan(count(posts),'0')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue.Should().ContainSingle(post => post.Id == posts[1].StringId);
+        responseDocument.Data.ManyValue.Should().ContainSingle(post => post.Id == posts[2].StringId);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
-        }
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Id.Should().Be(posts[1].Author!.StringId);
+    }
 
-        [Fact]
-        public async Task Can_filter_on_OneToMany_relationship_with_nested_condition()
+    [Fact]
+    public async Task Can_filter_on_OneToMany_relationship()
+    {
+        // Arrange
+        List<Blog> blogs = _fakers.Blog.Generate(2);
+        blogs[1].Posts = _fakers.BlogPost.Generate(1);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Blog> blogs = _fakers.Blog.Generate(2);
-            blogs[0].Posts = _fakers.BlogPost.Generate(1);
-            blogs[1].Posts = _fakers.BlogPost.Generate(1);
-            blogs[1].Posts[0].Comments = _fakers.Comment.Generate(1).ToHashSet();
-            blogs[1].Posts[0].Comments.ElementAt(0).Text = "ABC";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Blog>();
-                dbContext.Blogs.AddRange(blogs);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/blogs?filter=has(posts,has(comments,startsWith(text,'A')))";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
-        }
-
-        [Fact]
-        public async Task Can_filter_on_ManyToMany_relationship()
+            await dbContext.ClearTableAsync<Blog>();
+            dbContext.Blogs.AddRange(blogs);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/blogs?filter=greaterThan(count(posts),'0')";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
+    }
+
+    [Fact]
+    public async Task Can_filter_on_OneToMany_relationship_with_nested_condition()
+    {
+        // Arrange
+        List<Blog> blogs = _fakers.Blog.Generate(2);
+        blogs[0].Posts = _fakers.BlogPost.Generate(1);
+        blogs[1].Posts = _fakers.BlogPost.Generate(1);
+        blogs[1].Posts[0].Comments = _fakers.Comment.Generate(1).ToHashSet();
+        blogs[1].Posts[0].Comments.ElementAt(0).Text = "ABC";
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(2);
-            posts[1].Labels = _fakers.Label.Generate(1).ToHashSet();
+            await dbContext.ClearTableAsync<Blog>();
+            dbContext.Blogs.AddRange(blogs);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/blogs?filter=has(posts,has(comments,startsWith(text,'A')))";
 
-            const string route = "/blogPosts?filter=has(labels)";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(posts[1].StringId);
-        }
+    [Fact]
+    public async Task Can_filter_on_ManyToMany_relationship()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(2);
+        posts[1].Labels = _fakers.Label.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Can_filter_on_ManyToMany_relationship_with_nested_condition()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Blog> blogs = _fakers.Blog.Generate(2);
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            blogs[0].Posts = _fakers.BlogPost.Generate(1);
+        const string route = "/blogPosts?filter=has(labels)";
 
-            blogs[1].Posts = _fakers.BlogPost.Generate(1);
-            blogs[1].Posts[0].Labels = _fakers.Label.Generate(1).ToHashSet();
-            blogs[1].Posts[0].Labels.ElementAt(0).Color = LabelColor.Green;
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Blog>();
-                dbContext.Blogs.AddRange(blogs);
-                await dbContext.SaveChangesAsync();
-            });
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            const string route = "/blogs?filter=has(posts,has(labels,equals(color,'Green')))";
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(posts[1].StringId);
+    }
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+    [Fact]
+    public async Task Can_filter_on_ManyToMany_relationship_with_nested_condition()
+    {
+        // Arrange
+        List<Blog> blogs = _fakers.Blog.Generate(2);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        blogs[0].Posts = _fakers.BlogPost.Generate(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
-        }
+        blogs[1].Posts = _fakers.BlogPost.Generate(1);
+        blogs[1].Posts[0].Labels = _fakers.Label.Generate(1).ToHashSet();
+        blogs[1].Posts[0].Labels.ElementAt(0).Color = LabelColor.Green;
 
-        [Fact]
-        public async Task Can_filter_in_scope_of_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Posts = _fakers.BlogPost.Generate(2);
-            blog.Posts[0].Caption = "One";
-            blog.Posts[1].Caption = "Two";
+            await dbContext.ClearTableAsync<Blog>();
+            dbContext.Blogs.AddRange(blogs);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Blog>();
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/blogs?filter=has(posts,has(labels,equals(color,'Green')))";
 
-            const string route = "/blogs?include=posts&filter[posts]=equals(caption,'Two')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
+    [Fact]
+    public async Task Can_filter_in_scope_of_OneToMany_relationship()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Posts = _fakers.BlogPost.Generate(2);
+        blog.Posts[0].Caption = "One";
+        blog.Posts[1].Caption = "Two";
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Id.Should().Be(blog.Posts[1].StringId);
-        }
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Blog>();
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-        [Fact]
-        public async Task Can_filter_in_scope_of_OneToMany_relationship_on_secondary_endpoint()
+        const string route = "/blogs?include=posts&filter[posts]=equals(caption,'Two')";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Id.Should().Be(blog.Posts[1].StringId);
+    }
+
+    [Fact]
+    public async Task Can_filter_in_scope_of_OneToMany_relationship_on_secondary_endpoint()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Owner = _fakers.WebAccount.Generate();
+        blog.Owner.Posts = _fakers.BlogPost.Generate(2);
+        blog.Owner.Posts[0].Caption = "One";
+        blog.Owner.Posts[1].Caption = "Two";
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Owner = _fakers.WebAccount.Generate();
-            blog.Owner.Posts = _fakers.BlogPost.Generate(2);
-            blog.Owner.Posts[0].Caption = "One";
-            blog.Owner.Posts[1].Caption = "Two";
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/blogs/{blog.StringId}/owner?include=posts&filter[posts]=equals(caption,'Two')";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/blogs/{blog.StringId}/owner?include=posts&filter[posts]=equals(caption,'Two')";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Id.Should().Be(blog.Owner.Posts[1].StringId);
+    }
+
+    [Fact]
+    public async Task Can_filter_in_scope_of_ManyToMany_relationship()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(2);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        posts[0].Labels = _fakers.Label.Generate(1).ToHashSet();
+        posts[0].Labels.ElementAt(0).Name = "Cold";
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Id.Should().Be(blog.Owner.Posts[1].StringId);
-        }
+        posts[1].Labels = _fakers.Label.Generate(1).ToHashSet();
+        posts[1].Labels.ElementAt(0).Name = "Hot";
 
-        [Fact]
-        public async Task Can_filter_in_scope_of_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(2);
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/blogPosts?include=labels&filter[labels]=equals(name,'Hot')";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Id.Should().Be(posts[1].Labels.First().StringId);
+    }
 
-            posts[0].Labels = _fakers.Label.Generate(1).ToHashSet();
-            posts[0].Labels.ElementAt(0).Name = "Cold";
+    [Fact]
+    public async Task Can_filter_in_scope_of_relationship_chain()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Owner = _fakers.WebAccount.Generate();
+        blog.Owner.Posts = _fakers.BlogPost.Generate(2);
+        blog.Owner.Posts[0].Caption = "One";
+        blog.Owner.Posts[1].Caption = "Two";
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Blog>();
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            posts[1].Labels = _fakers.Label.Generate(1).ToHashSet();
-            posts[1].Labels.ElementAt(0).Name = "Hot";
+        const string route = "/blogs?include=owner.posts&filter[owner.posts]=equals(caption,'Two')";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Workaround for https://github.com/dotnet/efcore/issues/21026
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.DisableTopPagination = false;
-            options.DisableChildrenPagination = true;
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            const string route = "/blogPosts?include=labels&filter[labels]=equals(name,'Hot')";
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Included.ShouldHaveCount(2);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(blog.Owner.StringId);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Included[1].Type.Should().Be("blogPosts");
+        responseDocument.Included[1].Id.Should().Be(blog.Owner.Posts[1].StringId);
+    }
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Id.Should().Be(posts[1].Labels.First().StringId);
-        }
+    [Fact]
+    public async Task Can_filter_in_same_scope_multiple_times()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(3);
+        posts[0].Caption = "One";
+        posts[1].Caption = "Two";
+        posts[2].Caption = "Three";
 
-        [Fact]
-        public async Task Can_filter_in_scope_of_relationship_chain()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Owner = _fakers.WebAccount.Generate();
-            blog.Owner.Posts = _fakers.BlogPost.Generate(2);
-            blog.Owner.Posts[0].Caption = "One";
-            blog.Owner.Posts[1].Caption = "Two";
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/blogPosts?filter=equals(caption,'One')&filter=equals(caption,'Three')";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Blog>();
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            const string route = "/blogs?include=owner.posts&filter[owner.posts]=equals(caption,'Two')";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(posts[0].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(posts[2].StringId);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    [Fact]
+    public async Task Can_filter_in_same_scope_multiple_times_using_legacy_notation()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.EnableLegacyFilterNotation = true;
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        List<BlogPost> posts = _fakers.BlogPost.Generate(3);
+        posts[0].Author = _fakers.WebAccount.Generate();
+        posts[1].Author = _fakers.WebAccount.Generate();
+        posts[2].Author = _fakers.WebAccount.Generate();
 
-            responseDocument.Included.ShouldHaveCount(2);
+        posts[0].Author!.UserName = "Joe";
+        posts[0].Author!.DisplayName = "Smith";
 
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(blog.Owner.StringId);
+        posts[1].Author!.UserName = "John";
+        posts[1].Author!.DisplayName = "Doe";
 
-            responseDocument.Included[1].Type.Should().Be("blogPosts");
-            responseDocument.Included[1].Id.Should().Be(blog.Owner.Posts[1].StringId);
-        }
+        posts[2].Author!.UserName = "Jack";
+        posts[2].Author!.DisplayName = "Miller";
 
-        [Fact]
-        public async Task Can_filter_in_same_scope_multiple_times()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(3);
-            posts[0].Caption = "One";
-            posts[1].Caption = "Two";
-            posts[2].Caption = "Three";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/blogPosts?filter=equals(caption,'One')&filter=equals(caption,'Three')";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(posts[0].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(posts[2].StringId);
-        }
-
-        [Fact]
-        public async Task Can_filter_in_same_scope_multiple_times_using_legacy_notation()
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/blogPosts?filter[author.userName]=John&filter[author.displayName]=Smith";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(posts[0].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(posts[1].StringId);
+    }
+
+    [Fact]
+    public async Task Can_filter_in_multiple_scopes()
+    {
+        // Arrange
+        List<Blog> blogs = _fakers.Blog.Generate(2);
+        blogs[1].Title = "Technology";
+        blogs[1].Owner = _fakers.WebAccount.Generate();
+        blogs[1].Owner!.UserName = "Smith";
+        blogs[1].Owner!.Posts = _fakers.BlogPost.Generate(2);
+        blogs[1].Owner!.Posts[0].Caption = "One";
+        blogs[1].Owner!.Posts[1].Caption = "Two";
+        blogs[1].Owner!.Posts[1].Comments = _fakers.Comment.Generate(2).ToHashSet();
+        blogs[1].Owner!.Posts[1].Comments.ElementAt(0).CreatedAt = 1.January(2000).AsUtc();
+        blogs[1].Owner!.Posts[1].Comments.ElementAt(1).CreatedAt = 10.January(2010).AsUtc();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.EnableLegacyFilterNotation = true;
+            await dbContext.ClearTableAsync<Blog>();
+            dbContext.Blogs.AddRange(blogs);
+            await dbContext.SaveChangesAsync();
+        });
 
-            List<BlogPost> posts = _fakers.BlogPost.Generate(3);
-            posts[0].Author = _fakers.WebAccount.Generate();
-            posts[1].Author = _fakers.WebAccount.Generate();
-            posts[2].Author = _fakers.WebAccount.Generate();
+        // @formatter:keep_existing_linebreaks true
 
-            posts[0].Author!.UserName = "Joe";
-            posts[0].Author!.DisplayName = "Smith";
+        const string route = "/blogs?include=owner.posts.comments&" +
+            "filter=and(equals(title,'Technology'),has(owner.posts),equals(owner.userName,'Smith'))&" +
+            "filter[owner.posts]=equals(caption,'Two')&" +
+            "filter[owner.posts.comments]=greaterThan(createdAt,'2005-05-05Z')";
 
-            posts[1].Author!.UserName = "John";
-            posts[1].Author!.DisplayName = "Doe";
+        // @formatter:keep_existing_linebreaks restore
 
-            posts[2].Author!.UserName = "Jack";
-            posts[2].Author!.DisplayName = "Miller";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            const string route = "/blogPosts?filter[author.userName]=John&filter[author.displayName]=Smith";
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Included.ShouldHaveCount(3);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(blogs[1].Owner!.StringId);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(posts[0].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(posts[1].StringId);
-        }
+        responseDocument.Included[1].Type.Should().Be("blogPosts");
+        responseDocument.Included[1].Id.Should().Be(blogs[1].Owner!.Posts[1].StringId);
 
-        [Fact]
-        public async Task Can_filter_in_multiple_scopes()
-        {
-            // Arrange
-            List<Blog> blogs = _fakers.Blog.Generate(2);
-            blogs[1].Title = "Technology";
-            blogs[1].Owner = _fakers.WebAccount.Generate();
-            blogs[1].Owner!.UserName = "Smith";
-            blogs[1].Owner!.Posts = _fakers.BlogPost.Generate(2);
-            blogs[1].Owner!.Posts[0].Caption = "One";
-            blogs[1].Owner!.Posts[1].Caption = "Two";
-            blogs[1].Owner!.Posts[1].Comments = _fakers.Comment.Generate(2).ToHashSet();
-            blogs[1].Owner!.Posts[1].Comments.ElementAt(0).CreatedAt = 1.January(2000);
-            blogs[1].Owner!.Posts[1].Comments.ElementAt(1).CreatedAt = 10.January(2010);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Blog>();
-                dbContext.Blogs.AddRange(blogs);
-                await dbContext.SaveChangesAsync();
-            });
-
-            // @formatter:keep_existing_linebreaks true
-
-            const string route = "/blogs?include=owner.posts.comments&" +
-                "filter=and(equals(title,'Technology'),has(owner.posts),equals(owner.userName,'Smith'))&" +
-                "filter[owner.posts]=equals(caption,'Two')&" +
-                "filter[owner.posts.comments]=greaterThan(createdAt,'2005-05-05')";
-
-            // @formatter:keep_existing_linebreaks restore
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
-
-            responseDocument.Included.ShouldHaveCount(3);
-
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(blogs[1].Owner!.StringId);
-
-            responseDocument.Included[1].Type.Should().Be("blogPosts");
-            responseDocument.Included[1].Id.Should().Be(blogs[1].Owner!.Posts[1].StringId);
-
-            responseDocument.Included[2].Type.Should().Be("comments");
-            responseDocument.Included[2].Id.Should().Be(blogs[1].Owner!.Posts[1].Comments.ElementAt(1).StringId);
-        }
+        responseDocument.Included[2].Type.Should().Be("comments");
+        responseDocument.Included[2].Id.Should().Be(blogs[1].Owner!.Posts[1].Comments.ElementAt(1).StringId);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs
index 5661252801..3ad9499d05 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterOperatorTests.cs
@@ -1,10 +1,8 @@
-using System;
-using System.Collections.Generic;
+using System.Globalization;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using System.Web;
 using FluentAssertions;
+using FluentAssertions.Extensions;
 using Humanizer;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
@@ -13,601 +11,643 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering;
+
+public sealed class FilterOperatorTests : IClassFixture<IntegrationTestContext<TestableStartup<FilterDbContext>, FilterDbContext>>
 {
-    public sealed class FilterOperatorTests : IClassFixture<IntegrationTestContext<TestableStartup<FilterDbContext>, FilterDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<FilterDbContext>, FilterDbContext> _testContext;
+
+    public FilterOperatorTests(IntegrationTestContext<TestableStartup<FilterDbContext>, FilterDbContext> testContext)
+    {
+        _testContext = testContext;
+
+        testContext.UseController<FilterableResourcesController>();
+
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.EnableLegacyFilterNotation = false;
+    }
+
+    [Fact]
+    public async Task Can_filter_equality_on_special_characters()
     {
-        private readonly IntegrationTestContext<TestableStartup<FilterDbContext>, FilterDbContext> _testContext;
+        // Arrange
+        var resource = new FilterableResource
+        {
+            SomeString = "This, that & more + some"
+        };
 
-        public FilterOperatorTests(IntegrationTestContext<TestableStartup<FilterDbContext>, FilterDbContext> testContext)
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            _testContext = testContext;
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, new FilterableResource());
+            await dbContext.SaveChangesAsync();
+        });
 
-            testContext.UseController<FilterableResourcesController>();
+        string route = $"/filterableResources?filter=equals(someString,'{HttpUtility.UrlEncode(resource.SomeString)}')";
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.EnableLegacyFilterNotation = false;
-        }
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-        [Fact]
-        public async Task Can_filter_equality_on_special_characters()
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someString").With(value => value.Should().Be(resource.SomeString));
+    }
+
+    [Fact]
+    public async Task Can_filter_equality_on_two_attributes_of_same_type()
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeString = "This, that & more"
-            };
+            SomeInt32 = 5,
+            OtherInt32 = 5
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, new FilterableResource());
-                await dbContext.SaveChangesAsync();
-            });
+        var otherResource = new FilterableResource
+        {
+            SomeInt32 = 5,
+            OtherInt32 = 10
+        };
 
-            string route = $"/filterableResources?filter=equals(someString,'{HttpUtility.UrlEncode(resource.SomeString)}')";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, otherResource);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/filterableResources?filter=equals(someInt32,otherInt32)";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someString").With(value => value.Should().Be(resource.SomeString));
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someInt32").With(value => value.Should().Be(resource.SomeInt32));
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("otherInt32").With(value => value.Should().Be(resource.OtherInt32));
+    }
 
-        [Fact]
-        public async Task Can_filter_equality_on_two_attributes_of_same_type()
+    [Fact]
+    public async Task Can_filter_equality_on_two_attributes_of_same_nullable_type()
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeInt32 = 5,
-                OtherInt32 = 5
-            };
+            SomeNullableInt32 = 5,
+            OtherNullableInt32 = 5
+        };
 
-            var otherResource = new FilterableResource
-            {
-                SomeInt32 = 5,
-                OtherInt32 = 10
-            };
+        var otherResource = new FilterableResource
+        {
+            SomeNullableInt32 = 5,
+            OtherNullableInt32 = 10
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, otherResource);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, otherResource);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/filterableResources?filter=equals(someInt32,otherInt32)";
+        const string route = "/filterableResources?filter=equals(someNullableInt32,otherNullableInt32)";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someInt32").With(value => value.Should().Be(resource.SomeInt32));
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("otherInt32").With(value => value.Should().Be(resource.OtherInt32));
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someNullableInt32").With(value => value.Should().Be(resource.SomeNullableInt32));
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("otherNullableInt32").With(value => value.Should().Be(resource.OtherNullableInt32));
+    }
 
-        [Fact]
-        public async Task Can_filter_equality_on_two_attributes_of_same_nullable_type()
+    [Fact]
+    public async Task Can_filter_equality_on_two_attributes_with_nullable_at_start()
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeNullableInt32 = 5,
-                OtherNullableInt32 = 5
-            };
+            SomeInt32 = 5,
+            SomeNullableInt32 = 5
+        };
 
-            var otherResource = new FilterableResource
-            {
-                SomeNullableInt32 = 5,
-                OtherNullableInt32 = 10
-            };
+        var otherResource = new FilterableResource
+        {
+            SomeInt32 = 5,
+            SomeNullableInt32 = 10
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, otherResource);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, otherResource);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/filterableResources?filter=equals(someNullableInt32,otherNullableInt32)";
+        const string route = "/filterableResources?filter=equals(someNullableInt32,someInt32)";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someNullableInt32").With(value => value.Should().Be(resource.SomeNullableInt32));
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("otherNullableInt32").With(value => value.Should().Be(resource.OtherNullableInt32));
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someInt32").With(value => value.Should().Be(resource.SomeInt32));
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someNullableInt32").With(value => value.Should().Be(resource.SomeNullableInt32));
+    }
 
-        [Fact]
-        public async Task Can_filter_equality_on_two_attributes_with_nullable_at_start()
+    [Fact]
+    public async Task Can_filter_equality_on_two_attributes_with_nullable_at_end()
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeInt32 = 5,
-                SomeNullableInt32 = 5
-            };
+            SomeInt32 = 5,
+            SomeNullableInt32 = 5
+        };
 
-            var otherResource = new FilterableResource
-            {
-                SomeInt32 = 5,
-                SomeNullableInt32 = 10
-            };
+        var otherResource = new FilterableResource
+        {
+            SomeInt32 = 5,
+            SomeNullableInt32 = 10
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, otherResource);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, otherResource);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/filterableResources?filter=equals(someNullableInt32,someInt32)";
+        const string route = "/filterableResources?filter=equals(someInt32,someNullableInt32)";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someInt32").With(value => value.Should().Be(resource.SomeInt32));
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someNullableInt32").With(value => value.Should().Be(resource.SomeNullableInt32));
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someInt32").With(value => value.Should().Be(resource.SomeInt32));
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someNullableInt32").With(value => value.Should().Be(resource.SomeNullableInt32));
+    }
 
-        [Fact]
-        public async Task Can_filter_equality_on_two_attributes_with_nullable_at_end()
+    [Fact]
+    public async Task Can_filter_equality_on_two_attributes_of_compatible_types()
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeInt32 = 5,
-                SomeNullableInt32 = 5
-            };
+            SomeInt32 = 5,
+            SomeUnsignedInt64 = 5
+        };
 
-            var otherResource = new FilterableResource
-            {
-                SomeInt32 = 5,
-                SomeNullableInt32 = 10
-            };
+        var otherResource = new FilterableResource
+        {
+            SomeInt32 = 5,
+            SomeUnsignedInt64 = 10
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, otherResource);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, otherResource);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/filterableResources?filter=equals(someInt32,someNullableInt32)";
+        const string route = "/filterableResources?filter=equals(someInt32,someUnsignedInt64)";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someInt32").With(value => value.Should().Be(resource.SomeInt32));
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someNullableInt32").With(value => value.Should().Be(resource.SomeNullableInt32));
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someInt32").With(value => value.Should().Be(resource.SomeInt32));
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someUnsignedInt64").With(value => value.Should().Be(resource.SomeUnsignedInt64));
+    }
+
+    [Fact]
+    public async Task Cannot_filter_equality_on_two_attributes_of_incompatible_types()
+    {
+        // Arrange
+        const string route = "/filterableResources?filter=equals(someDouble,someTimeSpan)";
 
-        [Fact]
-        public async Task Can_filter_equality_on_two_attributes_of_compatible_types()
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Query creation failed due to incompatible types.");
+        error.Detail.Should().Be("No coercion operator is defined between types 'System.TimeSpan' and 'System.Double'.");
+        error.Source.Should().BeNull();
+    }
+
+    [Theory]
+    [InlineData(19, 21, ComparisonOperator.LessThan, 20)]
+    [InlineData(19, 21, ComparisonOperator.LessThan, 21)]
+    [InlineData(19, 21, ComparisonOperator.LessOrEqual, 20)]
+    [InlineData(19, 21, ComparisonOperator.LessOrEqual, 19)]
+    [InlineData(21, 19, ComparisonOperator.GreaterThan, 20)]
+    [InlineData(21, 19, ComparisonOperator.GreaterThan, 19)]
+    [InlineData(21, 19, ComparisonOperator.GreaterOrEqual, 20)]
+    [InlineData(21, 19, ComparisonOperator.GreaterOrEqual, 21)]
+    public async Task Can_filter_comparison_on_whole_number(int matchingValue, int nonMatchingValue, ComparisonOperator filterOperator, double filterValue)
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeInt32 = 5,
-                SomeUnsignedInt64 = 5
-            };
+            SomeInt32 = matchingValue
+        };
 
-            var otherResource = new FilterableResource
-            {
-                SomeInt32 = 5,
-                SomeUnsignedInt64 = 10
-            };
+        var otherResource = new FilterableResource
+        {
+            SomeInt32 = nonMatchingValue
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, otherResource);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/filterableResources?filter=equals(someInt32,someUnsignedInt64)";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someInt32").With(value => value.Should().Be(resource.SomeInt32));
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someUnsignedInt64").With(value => value.Should().Be(resource.SomeUnsignedInt64));
-        }
-
-        [Fact]
-        public async Task Cannot_filter_equality_on_two_attributes_of_incompatible_types()
-        {
-            // Arrange
-            const string route = "/filterableResources?filter=equals(someDouble,someTimeSpan)";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
-
-            responseDocument.Errors.ShouldHaveCount(1);
-
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Query creation failed due to incompatible types.");
-            error.Detail.Should().Be("No coercion operator is defined between types 'System.TimeSpan' and 'System.Double'.");
-            error.Source.Should().BeNull();
-        }
-
-        [Theory]
-        [InlineData(19, 21, ComparisonOperator.LessThan, 20)]
-        [InlineData(19, 21, ComparisonOperator.LessThan, 21)]
-        [InlineData(19, 21, ComparisonOperator.LessOrEqual, 20)]
-        [InlineData(19, 21, ComparisonOperator.LessOrEqual, 19)]
-        [InlineData(21, 19, ComparisonOperator.GreaterThan, 20)]
-        [InlineData(21, 19, ComparisonOperator.GreaterThan, 19)]
-        [InlineData(21, 19, ComparisonOperator.GreaterOrEqual, 20)]
-        [InlineData(21, 19, ComparisonOperator.GreaterOrEqual, 21)]
-        public async Task Can_filter_comparison_on_whole_number(int matchingValue, int nonMatchingValue, ComparisonOperator filterOperator, double filterValue)
-        {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeInt32 = matchingValue
-            };
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, otherResource);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var otherResource = new FilterableResource
-            {
-                SomeInt32 = nonMatchingValue
-            };
+        string route = $"/filterableResources?filter={filterOperator.ToString().Camelize()}(someInt32,'{filterValue}')";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, otherResource);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/filterableResources?filter={filterOperator.ToString().Camelize()}(someInt32,'{filterValue}')";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someInt32").With(value => value.Should().Be(resource.SomeInt32));
-        }
-
-        [Theory]
-        [InlineData(1.9, 2.1, ComparisonOperator.LessThan, 2.0)]
-        [InlineData(1.9, 2.1, ComparisonOperator.LessThan, 2.1)]
-        [InlineData(1.9, 2.1, ComparisonOperator.LessOrEqual, 2.0)]
-        [InlineData(1.9, 2.1, ComparisonOperator.LessOrEqual, 1.9)]
-        [InlineData(2.1, 1.9, ComparisonOperator.GreaterThan, 2.0)]
-        [InlineData(2.1, 1.9, ComparisonOperator.GreaterThan, 1.9)]
-        [InlineData(2.1, 1.9, ComparisonOperator.GreaterOrEqual, 2.0)]
-        [InlineData(2.1, 1.9, ComparisonOperator.GreaterOrEqual, 2.1)]
-        public async Task Can_filter_comparison_on_fractional_number(double matchingValue, double nonMatchingValue, ComparisonOperator filterOperator,
-            double filterValue)
-        {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeDouble = matchingValue
-            };
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            var otherResource = new FilterableResource
-            {
-                SomeDouble = nonMatchingValue
-            };
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, otherResource);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/filterableResources?filter={filterOperator.ToString().Camelize()}(someDouble,'{filterValue}')";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someDouble").With(value => value.Should().Be(resource.SomeDouble));
-        }
-
-        [Theory]
-        [InlineData("2001-01-01", "2001-01-09", ComparisonOperator.LessThan, "2001-01-05")]
-        [InlineData("2001-01-01", "2001-01-09", ComparisonOperator.LessThan, "2001-01-09")]
-        [InlineData("2001-01-01", "2001-01-09", ComparisonOperator.LessOrEqual, "2001-01-05")]
-        [InlineData("2001-01-01", "2001-01-09", ComparisonOperator.LessOrEqual, "2001-01-01")]
-        [InlineData("2001-01-09", "2001-01-01", ComparisonOperator.GreaterThan, "2001-01-05")]
-        [InlineData("2001-01-09", "2001-01-01", ComparisonOperator.GreaterThan, "2001-01-01")]
-        [InlineData("2001-01-09", "2001-01-01", ComparisonOperator.GreaterOrEqual, "2001-01-05")]
-        [InlineData("2001-01-09", "2001-01-01", ComparisonOperator.GreaterOrEqual, "2001-01-09")]
-        public async Task Can_filter_comparison_on_DateTime(string matchingDateTime, string nonMatchingDateTime, ComparisonOperator filterOperator,
-            string filterDateTime)
-        {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeDateTime = DateTime.ParseExact(matchingDateTime, "yyyy-MM-dd", null)
-            };
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someInt32").With(value => value.Should().Be(resource.SomeInt32));
+    }
 
-            var otherResource = new FilterableResource
-            {
-                SomeDateTime = DateTime.ParseExact(nonMatchingDateTime, "yyyy-MM-dd", null)
-            };
+    [Theory]
+    [InlineData(1.9, 2.1, ComparisonOperator.LessThan, 2.0)]
+    [InlineData(1.9, 2.1, ComparisonOperator.LessThan, 2.1)]
+    [InlineData(1.9, 2.1, ComparisonOperator.LessOrEqual, 2.0)]
+    [InlineData(1.9, 2.1, ComparisonOperator.LessOrEqual, 1.9)]
+    [InlineData(2.1, 1.9, ComparisonOperator.GreaterThan, 2.0)]
+    [InlineData(2.1, 1.9, ComparisonOperator.GreaterThan, 1.9)]
+    [InlineData(2.1, 1.9, ComparisonOperator.GreaterOrEqual, 2.0)]
+    [InlineData(2.1, 1.9, ComparisonOperator.GreaterOrEqual, 2.1)]
+    public async Task Can_filter_comparison_on_fractional_number(double matchingValue, double nonMatchingValue, ComparisonOperator filterOperator,
+        double filterValue)
+    {
+        // Arrange
+        var resource = new FilterableResource
+        {
+            SomeDouble = matchingValue
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, otherResource);
-                await dbContext.SaveChangesAsync();
-            });
+        var otherResource = new FilterableResource
+        {
+            SomeDouble = nonMatchingValue
+        };
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, otherResource);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/filterableResources?filter={filterOperator.ToString().Camelize()}(someDouble,'{filterValue}')";
 
-            string route = $"/filterableResources?filter={filterOperator.ToString().Camelize()}(someDateTime," +
-                $"'{DateTime.ParseExact(filterDateTime, "yyyy-MM-dd", null)}')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someDouble").With(value => value.Should().Be(resource.SomeDouble));
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
+    [Theory]
+    [InlineData("2001-01-01", "2001-01-09", ComparisonOperator.LessThan, "2001-01-05")]
+    [InlineData("2001-01-01", "2001-01-09", ComparisonOperator.LessThan, "2001-01-09")]
+    [InlineData("2001-01-01", "2001-01-09", ComparisonOperator.LessOrEqual, "2001-01-05")]
+    [InlineData("2001-01-01", "2001-01-09", ComparisonOperator.LessOrEqual, "2001-01-01")]
+    [InlineData("2001-01-09", "2001-01-01", ComparisonOperator.GreaterThan, "2001-01-05")]
+    [InlineData("2001-01-09", "2001-01-01", ComparisonOperator.GreaterThan, "2001-01-01")]
+    [InlineData("2001-01-09", "2001-01-01", ComparisonOperator.GreaterOrEqual, "2001-01-05")]
+    [InlineData("2001-01-09", "2001-01-01", ComparisonOperator.GreaterOrEqual, "2001-01-09")]
+    public async Task Can_filter_comparison_on_DateTime_in_local_time_zone(string matchingDateTime, string nonMatchingDateTime,
+        ComparisonOperator filterOperator, string filterDateTime)
+    {
+        // Arrange
+        var resource = new FilterableResource
+        {
+            SomeDateTimeInLocalZone = DateTime.Parse(matchingDateTime, CultureInfo.InvariantCulture).AsLocal()
+        };
 
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someDateTime")
-                .With(value => value.As<DateTime>().Should().BeCloseTo(resource.SomeDateTime));
-        }
+        var otherResource = new FilterableResource
+        {
+            SomeDateTimeInLocalZone = DateTime.Parse(nonMatchingDateTime, CultureInfo.InvariantCulture).AsLocal()
+        };
 
-        [Theory]
-        [InlineData("The fox jumped over the lazy dog", "Other", TextMatchKind.Contains, "jumped")]
-        [InlineData("The fox jumped over the lazy dog", "the fox...", TextMatchKind.Contains, "The")]
-        [InlineData("The fox jumped over the lazy dog", "The fox jumped", TextMatchKind.Contains, "dog")]
-        [InlineData("The fox jumped over the lazy dog", "Yesterday The fox...", TextMatchKind.StartsWith, "The")]
-        [InlineData("The fox jumped over the lazy dog", "over the lazy dog earlier", TextMatchKind.EndsWith, "dog")]
-        public async Task Can_filter_text_match(string matchingText, string nonMatchingText, TextMatchKind matchKind, string filterText)
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeString = matchingText
-            };
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, otherResource);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var otherResource = new FilterableResource
-            {
-                SomeString = nonMatchingText
-            };
+        string route = $"/filterableResources?filter={filterOperator.ToString().Camelize()}(someDateTimeInLocalZone,'{filterDateTime}')";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, otherResource);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/filterableResources?filter={matchKind.ToString().Camelize()}(someString,'{filterText}')";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someDateTimeInLocalZone")
+            .With(value => value.Should().Be(resource.SomeDateTimeInLocalZone));
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someString").With(value => value.Should().Be(resource.SomeString));
-        }
+    [Theory]
+    [InlineData("2001-01-01", "2001-01-09", ComparisonOperator.LessThan, "2001-01-05Z")]
+    [InlineData("2001-01-01", "2001-01-09", ComparisonOperator.LessThan, "2001-01-09Z")]
+    [InlineData("2001-01-01", "2001-01-09", ComparisonOperator.LessOrEqual, "2001-01-05Z")]
+    [InlineData("2001-01-01", "2001-01-09", ComparisonOperator.LessOrEqual, "2001-01-01Z")]
+    [InlineData("2001-01-09", "2001-01-01", ComparisonOperator.GreaterThan, "2001-01-05Z")]
+    [InlineData("2001-01-09", "2001-01-01", ComparisonOperator.GreaterThan, "2001-01-01Z")]
+    [InlineData("2001-01-09", "2001-01-01", ComparisonOperator.GreaterOrEqual, "2001-01-05Z")]
+    [InlineData("2001-01-09", "2001-01-01", ComparisonOperator.GreaterOrEqual, "2001-01-09Z")]
+    public async Task Can_filter_comparison_on_DateTime_in_UTC_time_zone(string matchingDateTime, string nonMatchingDateTime, ComparisonOperator filterOperator,
+        string filterDateTime)
+    {
+        // Arrange
+        var resource = new FilterableResource
+        {
+            SomeDateTimeInUtcZone = DateTime.Parse(matchingDateTime, CultureInfo.InvariantCulture).AsUtc()
+        };
 
-        [Theory]
-        [InlineData("two", "one two", "'one','two','three'")]
-        [InlineData("two", "nine", "'one','two','three','four','five'")]
-        public async Task Can_filter_in_set(string matchingText, string nonMatchingText, string filterText)
+        var otherResource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                SomeString = matchingText
-            };
+            SomeDateTimeInUtcZone = DateTime.Parse(nonMatchingDateTime, CultureInfo.InvariantCulture).AsUtc()
+        };
 
-            var otherResource = new FilterableResource
-            {
-                SomeString = nonMatchingText
-            };
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, otherResource);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, otherResource);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/filterableResources?filter={filterOperator.ToString().Camelize()}(someDateTimeInUtcZone,'{filterDateTime}')";
 
-            string route = $"/filterableResources?filter=any(someString,{filterText})";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someString").With(value => value.Should().Be(resource.SomeString));
-        }
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someDateTimeInUtcZone")
+            .With(value => value.Should().Be(resource.SomeDateTimeInUtcZone));
+    }
 
-        [Fact]
-        public async Task Can_filter_on_has()
+    [Theory]
+    [InlineData("The fox jumped over the lazy dog", "Other", TextMatchKind.Contains, "jumped")]
+    [InlineData("The fox jumped over the lazy dog", "the fox...", TextMatchKind.Contains, "The")]
+    [InlineData("The fox jumped over the lazy dog", "The fox jumped", TextMatchKind.Contains, "dog")]
+    [InlineData("The fox jumped over the lazy dog", "Yesterday The fox...", TextMatchKind.StartsWith, "The")]
+    [InlineData("The fox jumped over the lazy dog", "over the lazy dog earlier", TextMatchKind.EndsWith, "dog")]
+    public async Task Can_filter_text_match(string matchingText, string nonMatchingText, TextMatchKind matchKind, string filterText)
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
-            {
-                Children = new List<FilterableResource>
-                {
-                    new()
-                }
-            };
+            SomeString = matchingText
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, new FilterableResource());
-                await dbContext.SaveChangesAsync();
-            });
+        var otherResource = new FilterableResource
+        {
+            SomeString = nonMatchingText
+        };
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, otherResource);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/filterableResources?filter={matchKind.ToString().Camelize()}(someString,'{filterText}')";
 
-            const string route = "/filterableResources?filter=has(children)";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someString").With(value => value.Should().Be(resource.SomeString));
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(resource.StringId);
-        }
+    [Theory]
+    [InlineData("two", "one two", "'one','two','three'")]
+    [InlineData("two", "nine", "'one','two','three','four','five'")]
+    public async Task Can_filter_in_set(string matchingText, string nonMatchingText, string filterText)
+    {
+        // Arrange
+        var resource = new FilterableResource
+        {
+            SomeString = matchingText
+        };
 
-        [Fact]
-        public async Task Can_filter_on_has_with_nested_condition()
+        var otherResource = new FilterableResource
         {
-            // Arrange
-            var resources = new List<FilterableResource>
+            SomeString = nonMatchingText
+        };
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, otherResource);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/filterableResources?filter=any(someString,{filterText})";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("someString").With(value => value.Should().Be(resource.SomeString));
+    }
+
+    [Fact]
+    public async Task Can_filter_on_has()
+    {
+        // Arrange
+        var resource = new FilterableResource
+        {
+            Children = new List<FilterableResource>
             {
                 new()
+            }
+        };
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, new FilterableResource());
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/filterableResources?filter=has(children)";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(resource.StringId);
+    }
+
+    [Fact]
+    public async Task Can_filter_on_has_with_nested_condition()
+    {
+        // Arrange
+        var resources = new List<FilterableResource>
+        {
+            new()
+            {
+                Children = new List<FilterableResource>
                 {
-                    Children = new List<FilterableResource>
+                    new()
                     {
-                        new()
-                        {
-                            SomeBoolean = false
-                        }
+                        SomeBoolean = false
                     }
-                },
-                new()
+                }
+            },
+            new()
+            {
+                Children = new List<FilterableResource>
                 {
-                    Children = new List<FilterableResource>
+                    new()
                     {
-                        new()
-                        {
-                            SomeBoolean = true
-                        }
+                        SomeBoolean = true
                     }
                 }
-            };
+            }
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resources);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resources);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/filterableResources?filter=has(children,equals(someBoolean,'true'))";
+        const string route = "/filterableResources?filter=has(children,equals(someBoolean,'true'))";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(resources[1].StringId);
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(resources[1].StringId);
+    }
 
-        [Fact]
-        public async Task Can_filter_on_count()
+    [Fact]
+    public async Task Can_filter_on_count()
+    {
+        // Arrange
+        var resource = new FilterableResource
         {
-            // Arrange
-            var resource = new FilterableResource
+            Children = new List<FilterableResource>
             {
-                Children = new List<FilterableResource>
-                {
-                    new(),
-                    new()
-                }
-            };
+                new(),
+                new()
+            }
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource, new FilterableResource());
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource, new FilterableResource());
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/filterableResources?filter=equals(count(children),'2')";
+        const string route = "/filterableResources?filter=equals(count(children),'2')";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(resource.StringId);
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(resource.StringId);
+    }
 
-        [Theory]
-        [InlineData("and(equals(someString,'ABC'),equals(someInt32,'11'))")]
-        [InlineData("and(equals(someString,'ABC'),equals(someInt32,'11'),equals(someEnum,'Tuesday'))")]
-        [InlineData("or(equals(someString,'---'),lessThan(someInt32,'33'))")]
-        [InlineData("not(equals(someEnum,'Saturday'))")]
-        public async Task Can_filter_on_logical_functions(string filterExpression)
+    [Theory]
+    [InlineData("and(equals(someString,'ABC'),equals(someInt32,'11'))")]
+    [InlineData("and(equals(someString,'ABC'),equals(someInt32,'11'),equals(someEnum,'Tuesday'))")]
+    [InlineData("or(equals(someString,'---'),lessThan(someInt32,'33'))")]
+    [InlineData("not(equals(someEnum,'Saturday'))")]
+    public async Task Can_filter_on_logical_functions(string filterExpression)
+    {
+        // Arrange
+        var resource1 = new FilterableResource
         {
-            // Arrange
-            var resource1 = new FilterableResource
-            {
-                SomeString = "ABC",
-                SomeInt32 = 11,
-                SomeEnum = DayOfWeek.Tuesday
-            };
+            SomeString = "ABC",
+            SomeInt32 = 11,
+            SomeEnum = DayOfWeek.Tuesday
+        };
 
-            var resource2 = new FilterableResource
-            {
-                SomeString = "XYZ",
-                SomeInt32 = 99,
-                SomeEnum = DayOfWeek.Saturday
-            };
+        var resource2 = new FilterableResource
+        {
+            SomeString = "XYZ",
+            SomeInt32 = 99,
+            SomeEnum = DayOfWeek.Saturday
+        };
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<FilterableResource>();
-                dbContext.FilterableResources.AddRange(resource1, resource2);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<FilterableResource>();
+            dbContext.FilterableResources.AddRange(resource1, resource2);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/filterableResources?filter={filterExpression}";
+        string route = $"/filterableResources?filter={filterExpression}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(resource1.StringId);
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(resource1.StringId);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterTests.cs
index 1a1bf3e113..46636be696 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterTests.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -9,113 +6,112 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering;
+
+public sealed class FilterTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
 {
-    public sealed class FilterTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
+    private readonly QueryStringFakers _fakers = new();
+
+    public FilterTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
-        private readonly QueryStringFakers _fakers = new();
+        _testContext = testContext;
 
-        public FilterTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WebAccountsController>();
 
-            testContext.UseController<WebAccountsController>();
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.EnableLegacyFilterNotation = false;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.EnableLegacyFilterNotation = false;
-        }
+    [Fact]
+    public async Task Cannot_filter_in_unknown_scope()
+    {
+        // Arrange
+        const string route = $"/webAccounts?filter[{Unknown.Relationship}]=equals(title,null)";
 
-        [Fact]
-        public async Task Cannot_filter_in_unknown_scope()
-        {
-            // Arrange
-            string route = $"/webAccounts?filter[{Unknown.Relationship}]=equals(title,null)";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified filter is invalid.");
+        error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'webAccounts'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be($"filter[{Unknown.Relationship}]");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified filter is invalid.");
-            error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'webAccounts'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be($"filter[{Unknown.Relationship}]");
-        }
+    [Fact]
+    public async Task Cannot_filter_in_unknown_nested_scope()
+    {
+        // Arrange
+        const string route = $"/webAccounts?filter[posts.{Unknown.Relationship}]=equals(title,null)";
 
-        [Fact]
-        public async Task Cannot_filter_in_unknown_nested_scope()
-        {
-            // Arrange
-            string route = $"/webAccounts?filter[posts.{Unknown.Relationship}]=equals(title,null)";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified filter is invalid.");
+        error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' in 'posts.{Unknown.Relationship}' does not exist on resource type 'blogPosts'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be($"filter[posts.{Unknown.Relationship}]");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified filter is invalid.");
-            error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' in 'posts.{Unknown.Relationship}' does not exist on resource type 'blogPosts'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be($"filter[posts.{Unknown.Relationship}]");
-        }
+    [Fact]
+    public async Task Cannot_filter_on_attribute_with_blocked_capability()
+    {
+        // Arrange
+        const string route = "/webAccounts?filter=equals(dateOfBirth,null)";
 
-        [Fact]
-        public async Task Cannot_filter_on_attribute_with_blocked_capability()
-        {
-            // Arrange
-            const string route = "/webAccounts?filter=equals(dateOfBirth,null)";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Filtering on the requested attribute is not allowed.");
+        error.Detail.Should().Be("Filtering on attribute 'dateOfBirth' is not allowed.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("filter");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Filtering on the requested attribute is not allowed.");
-            error.Detail.Should().Be("Filtering on attribute 'dateOfBirth' is not allowed.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("filter");
-        }
+    [Fact]
+    public async Task Can_filter_on_ID()
+    {
+        // Arrange
+        List<WebAccount> accounts = _fakers.WebAccount.Generate(2);
 
-        [Fact]
-        public async Task Can_filter_on_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<WebAccount> accounts = _fakers.WebAccount.Generate(2);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<WebAccount>();
-                dbContext.Accounts.AddRange(accounts);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<WebAccount>();
+            dbContext.Accounts.AddRange(accounts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/webAccounts?filter=equals(id,'{accounts[0].StringId}')";
+        string route = $"/webAccounts?filter=equals(id,'{accounts[0].StringId}')";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(accounts[0].StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(accounts[0].UserName));
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(accounts[0].StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(accounts[0].UserName));
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResource.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResource.cs
index 1ef672c059..dbc0323e9c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResource.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResource.cs
@@ -1,87 +1,88 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering")]
+public sealed class FilterableResource : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class FilterableResource : Identifiable<int>
-    {
-        [Attr]
-        public string SomeString { get; set; } = string.Empty;
+    [Attr]
+    public string SomeString { get; set; } = string.Empty;
+
+    [Attr]
+    public string? SomeNullableString { get; set; }
 
-        [Attr]
-        public string? SomeNullableString { get; set; }
+    [Attr]
+    public bool SomeBoolean { get; set; }
 
-        [Attr]
-        public bool SomeBoolean { get; set; }
+    [Attr]
+    public bool? SomeNullableBoolean { get; set; }
 
-        [Attr]
-        public bool? SomeNullableBoolean { get; set; }
+    [Attr]
+    public int SomeInt32 { get; set; }
 
-        [Attr]
-        public int SomeInt32 { get; set; }
+    [Attr]
+    public int? SomeNullableInt32 { get; set; }
 
-        [Attr]
-        public int? SomeNullableInt32 { get; set; }
+    [Attr]
+    public int OtherInt32 { get; set; }
 
-        [Attr]
-        public int OtherInt32 { get; set; }
+    [Attr]
+    public int? OtherNullableInt32 { get; set; }
 
-        [Attr]
-        public int? OtherNullableInt32 { get; set; }
+    [Attr]
+    public ulong SomeUnsignedInt64 { get; set; }
 
-        [Attr]
-        public ulong SomeUnsignedInt64 { get; set; }
+    [Attr]
+    public ulong? SomeNullableUnsignedInt64 { get; set; }
 
-        [Attr]
-        public ulong? SomeNullableUnsignedInt64 { get; set; }
+    [Attr]
+    public decimal SomeDecimal { get; set; }
 
-        [Attr]
-        public decimal SomeDecimal { get; set; }
+    [Attr]
+    public decimal? SomeNullableDecimal { get; set; }
 
-        [Attr]
-        public decimal? SomeNullableDecimal { get; set; }
+    [Attr]
+    public double SomeDouble { get; set; }
 
-        [Attr]
-        public double SomeDouble { get; set; }
+    [Attr]
+    public double? SomeNullableDouble { get; set; }
 
-        [Attr]
-        public double? SomeNullableDouble { get; set; }
+    [Attr]
+    public Guid SomeGuid { get; set; }
 
-        [Attr]
-        public Guid SomeGuid { get; set; }
+    [Attr]
+    public Guid? SomeNullableGuid { get; set; }
 
-        [Attr]
-        public Guid? SomeNullableGuid { get; set; }
+    [Attr]
+    public DateTime SomeDateTimeInLocalZone { get; set; }
 
-        [Attr]
-        public DateTime SomeDateTime { get; set; }
+    [Attr]
+    public DateTime SomeDateTimeInUtcZone { get; set; }
 
-        [Attr]
-        public DateTime? SomeNullableDateTime { get; set; }
+    [Attr]
+    public DateTime? SomeNullableDateTime { get; set; }
 
-        [Attr]
-        public DateTimeOffset SomeDateTimeOffset { get; set; }
+    [Attr]
+    public DateTimeOffset SomeDateTimeOffset { get; set; }
 
-        [Attr]
-        public DateTimeOffset? SomeNullableDateTimeOffset { get; set; }
+    [Attr]
+    public DateTimeOffset? SomeNullableDateTimeOffset { get; set; }
 
-        [Attr]
-        public TimeSpan SomeTimeSpan { get; set; }
+    [Attr]
+    public TimeSpan SomeTimeSpan { get; set; }
 
-        [Attr]
-        public TimeSpan? SomeNullableTimeSpan { get; set; }
+    [Attr]
+    public TimeSpan? SomeNullableTimeSpan { get; set; }
 
-        [Attr]
-        public DayOfWeek SomeEnum { get; set; }
+    [Attr]
+    public DayOfWeek SomeEnum { get; set; }
 
-        [Attr]
-        public DayOfWeek? SomeNullableEnum { get; set; }
+    [Attr]
+    public DayOfWeek? SomeNullableEnum { get; set; }
 
-        [HasMany]
-        public ICollection<FilterableResource> Children { get; set; } = new List<FilterableResource>();
-    }
+    [HasMany]
+    public ICollection<FilterableResource> Children { get; set; } = new List<FilterableResource>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResourcesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResourcesController.cs
deleted file mode 100644
index 4ccd186fd5..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Filtering/FilterableResourcesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Filtering
-{
-    public sealed class FilterableResourcesController : JsonApiController<FilterableResource, int>
-    {
-        public FilterableResourcesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<FilterableResource, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs
index 85138d939a..87e79112de 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Includes/IncludeTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -11,984 +6,983 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Includes
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Includes;
+
+public sealed class IncludeTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
 {
-    public sealed class IncludeTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
+    private readonly QueryStringFakers _fakers = new();
+
+    public IncludeTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
-        private readonly QueryStringFakers _fakers = new();
+        _testContext = testContext;
+
+        testContext.UseController<BlogPostsController>();
+        testContext.UseController<BlogsController>();
+        testContext.UseController<CommentsController>();
+        testContext.UseController<WebAccountsController>();
+
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.MaximumIncludeDepth = null;
+    }
 
-        public IncludeTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
+    [Fact]
+    public async Task Can_include_in_primary_resources()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
+        post.Author = _fakers.WebAccount.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            _testContext = testContext;
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "blogPosts?include=author";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            testContext.UseController<BlogPostsController>();
-            testContext.UseController<BlogsController>();
-            testContext.UseController<CommentsController>();
-            testContext.UseController<WebAccountsController>();
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.MaximumIncludeDepth = null;
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(post.StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
 
-        [Fact]
-        public async Task Can_include_in_primary_resources()
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(post.Author.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(post.Author.DisplayName));
+    }
+
+    [Fact]
+    public async Task Can_include_in_primary_resource_by_ID()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
+        post.Author = _fakers.WebAccount.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
-            post.Author = _fakers.WebAccount.Generate();
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"blogPosts/{post.StringId}?include=author";
 
-            const string route = "blogPosts?include=author";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(post.StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(post.Author.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(post.Author.DisplayName));
+    }
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(post.Author.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(post.Author.DisplayName));
-        }
+    [Fact]
+    public async Task Can_include_in_secondary_resource()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Owner = _fakers.WebAccount.Generate();
+        blog.Owner.Posts = _fakers.BlogPost.Generate(1);
 
-        [Fact]
-        public async Task Can_include_in_primary_resource_by_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
-            post.Author = _fakers.WebAccount.Generate();
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogs/{blog.StringId}/owner?include=posts";
 
-            string route = $"blogPosts/{post.StringId}?include=author";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(blog.Owner.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(blog.Owner.DisplayName));
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("blogPosts");
+        responseDocument.Included[0].Id.Should().Be(blog.Owner.Posts[0].StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Owner.Posts[0].Caption));
+    }
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(post.Author.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(post.Author.DisplayName));
-        }
+    [Fact]
+    public async Task Can_include_in_secondary_resources()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Posts = _fakers.BlogPost.Generate(1);
+        blog.Posts[0].Author = _fakers.WebAccount.Generate();
 
-        [Fact]
-        public async Task Can_include_in_secondary_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Owner = _fakers.WebAccount.Generate();
-            blog.Owner.Posts = _fakers.BlogPost.Generate(1);
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogs/{blog.StringId}/posts?include=author";
 
-            string route = $"/blogs/{blog.StringId}/owner?include=posts";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Posts[0].Caption));
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(blog.Owner.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(blog.Owner.DisplayName));
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(blog.Posts[0].Author!.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(blog.Posts[0].Author!.DisplayName));
+    }
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("blogPosts");
-            responseDocument.Included[0].Id.Should().Be(blog.Owner.Posts[0].StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Owner.Posts[0].Caption));
-        }
+    [Fact]
+    public async Task Can_include_ToOne_relationships()
+    {
+        // Arrange
+        Comment comment = _fakers.Comment.Generate();
+        comment.Author = _fakers.WebAccount.Generate();
+        comment.Parent = _fakers.BlogPost.Generate();
 
-        [Fact]
-        public async Task Can_include_in_secondary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Posts = _fakers.BlogPost.Generate(1);
-            blog.Posts[0].Author = _fakers.WebAccount.Generate();
+            dbContext.Comments.Add(comment);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/comments/{comment.StringId}?include=author,parent";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/blogs/{blog.StringId}/posts?include=author";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(comment.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("text").With(value => value.Should().Be(comment.Text));
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Included.ShouldHaveCount(2);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Posts[0].Caption));
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(comment.Author.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(comment.Author.UserName));
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(blog.Posts[0].Author!.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(blog.Posts[0].Author!.DisplayName));
-        }
+        responseDocument.Included[1].Type.Should().Be("blogPosts");
+        responseDocument.Included[1].Id.Should().Be(comment.Parent.StringId);
+        responseDocument.Included[1].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(comment.Parent.Caption));
+    }
+
+    [Fact]
+    public async Task Can_include_OneToMany_relationship()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
+        post.Comments = _fakers.Comment.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Can_include_ToOne_relationships()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Comment comment = _fakers.Comment.Generate();
-            comment.Author = _fakers.WebAccount.Generate();
-            comment.Parent = _fakers.BlogPost.Generate();
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"blogPosts/{post.StringId}?include=comments";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
+
+        DateTime createdAt = post.Comments.Single().CreatedAt;
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("comments");
+        responseDocument.Included[0].Id.Should().Be(post.Comments.Single().StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("createdAt").With(value => value.Should().Be(createdAt));
+    }
+
+    [Fact]
+    public async Task Can_include_ManyToMany_relationship()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
+        post.Labels = _fakers.Label.Generate(1).ToHashSet();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"blogPosts/{post.StringId}?include=labels";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Comments.Add(comment);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/comments/{comment.StringId}?include=author,parent";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("labels");
+        responseDocument.Included[0].Id.Should().Be(post.Labels.Single().StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("name").With(value => value.Should().Be(post.Labels.Single().Name));
+    }
+
+    [Fact]
+    public async Task Can_include_ManyToMany_relationship_on_secondary_endpoint()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
+        post.Labels = _fakers.Label.Generate(1).ToHashSet();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(comment.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("text").With(value => value.Should().Be(comment.Text));
+        string route = $"/blogPosts/{post.StringId}/labels?include=posts";
 
-            responseDocument.Included.ShouldHaveCount(2);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(comment.Author.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(comment.Author.UserName));
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Included[1].Type.Should().Be("blogPosts");
-            responseDocument.Included[1].Id.Should().Be(comment.Parent.StringId);
-            responseDocument.Included[1].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(comment.Parent.Caption));
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Type.Should().Be("labels");
+        responseDocument.Data.ManyValue[0].Id.Should().Be(post.Labels.ElementAt(0).StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("name").With(value => value.Should().Be(post.Labels.Single().Name));
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("blogPosts");
+        responseDocument.Included[0].Id.Should().Be(post.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
+    }
+
+    [Fact]
+    public async Task Can_include_chain_of_ToOne_relationships()
+    {
+        // Arrange
+        Comment comment = _fakers.Comment.Generate();
+        comment.Parent = _fakers.BlogPost.Generate();
+        comment.Parent.Author = _fakers.WebAccount.Generate();
+        comment.Parent.Author.Preferences = _fakers.AccountPreferences.Generate();
 
-        [Fact]
-        public async Task Can_include_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
-            post.Comments = _fakers.Comment.Generate(1).ToHashSet();
+            dbContext.Comments.Add(comment);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"comments/{comment.StringId}?include=parent.author.preferences";
 
-            string route = $"blogPosts/{post.StringId}?include=comments";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(comment.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("text").With(value => value.Should().Be(comment.Text));
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
+        responseDocument.Included.ShouldHaveCount(3);
 
-            DateTime createdAt = post.Comments.Single().CreatedAt;
+        responseDocument.Included[0].Type.Should().Be("blogPosts");
+        responseDocument.Included[0].Id.Should().Be(comment.Parent.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(comment.Parent.Caption));
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("comments");
-            responseDocument.Included[0].Id.Should().Be(post.Comments.Single().StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("createdAt").With(value => value.As<DateTime>().Should().BeCloseTo(createdAt));
-        }
+        responseDocument.Included[1].Type.Should().Be("webAccounts");
+        responseDocument.Included[1].Id.Should().Be(comment.Parent.Author.StringId);
+        responseDocument.Included[1].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(comment.Parent.Author.DisplayName));
 
-        [Fact]
-        public async Task Can_include_ManyToMany_relationship()
+        bool useDarkTheme = comment.Parent.Author.Preferences.UseDarkTheme;
+
+        responseDocument.Included[2].Type.Should().Be("accountPreferences");
+        responseDocument.Included[2].Id.Should().Be(comment.Parent.Author.Preferences.StringId);
+        responseDocument.Included[2].Attributes.ShouldContainKey("useDarkTheme").With(value => value.Should().Be(useDarkTheme));
+    }
+
+    [Fact]
+    public async Task Can_include_chain_of_OneToMany_relationships()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Posts = _fakers.BlogPost.Generate(1);
+        blog.Posts[0].Comments = _fakers.Comment.Generate(1).ToHashSet();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
-            post.Labels = _fakers.Label.Generate(1).ToHashSet();
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogs/{blog.StringId}?include=posts.comments";
 
-            string route = $"blogPosts/{post.StringId}?include=labels";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(blog.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(blog.Title));
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
+        responseDocument.Included.ShouldHaveCount(2);
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("labels");
-            responseDocument.Included[0].Id.Should().Be(post.Labels.Single().StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("name").With(value => value.Should().Be(post.Labels.Single().Name));
-        }
+        responseDocument.Included[0].Type.Should().Be("blogPosts");
+        responseDocument.Included[0].Id.Should().Be(blog.Posts[0].StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Posts[0].Caption));
 
-        [Fact]
-        public async Task Can_include_ManyToMany_relationship_on_secondary_endpoint()
+        DateTime createdAt = blog.Posts[0].Comments.Single().CreatedAt;
+
+        responseDocument.Included[1].Type.Should().Be("comments");
+        responseDocument.Included[1].Id.Should().Be(blog.Posts[0].Comments.Single().StringId);
+        responseDocument.Included[1].Attributes.ShouldContainKey("createdAt").With(value => value.Should().Be(createdAt));
+    }
+
+    [Fact]
+    public async Task Can_include_chain_of_recursive_relationships()
+    {
+        // Arrange
+        Comment comment = _fakers.Comment.Generate();
+        comment.Parent = _fakers.BlogPost.Generate();
+        comment.Parent.Author = _fakers.WebAccount.Generate();
+        comment.Parent.Comments = _fakers.Comment.Generate(2).ToHashSet();
+        comment.Parent.Comments.ElementAt(0).Author = _fakers.WebAccount.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
-            post.Labels = _fakers.Label.Generate(1).ToHashSet();
+            dbContext.Comments.Add(comment);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/comments/{comment.StringId}?include=parent.comments.author";
 
-            string route = $"/blogPosts/{post.StringId}/labels?include=posts";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(comment.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("text").With(value => value.Should().Be(comment.Text));
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Type.Should().Be("labels");
-            responseDocument.Data.ManyValue[0].Id.Should().Be(post.Labels.ElementAt(0).StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("name").With(value => value.Should().Be(post.Labels.Single().Name));
+        responseDocument.Included.ShouldHaveCount(5);
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("blogPosts");
-            responseDocument.Included[0].Id.Should().Be(post.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
-        }
+        responseDocument.Included[0].Type.Should().Be("blogPosts");
+        responseDocument.Included[0].Id.Should().Be(comment.Parent.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(comment.Parent.Caption));
 
-        [Fact]
-        public async Task Can_include_chain_of_ToOne_relationships()
+        responseDocument.Included[1].Type.Should().Be("comments");
+        responseDocument.Included[1].Id.Should().Be(comment.StringId);
+        responseDocument.Included[1].Attributes.ShouldContainKey("text").With(value => value.Should().Be(comment.Text));
+
+        responseDocument.Included[2].Type.Should().Be("comments");
+        responseDocument.Included[2].Id.Should().Be(comment.Parent.Comments.ElementAt(0).StringId);
+        responseDocument.Included[2].Attributes.ShouldContainKey("text").With(value => value.Should().Be(comment.Parent.Comments.ElementAt(0).Text));
+
+        string userName = comment.Parent.Comments.ElementAt(0).Author!.UserName;
+
+        responseDocument.Included[3].Type.Should().Be("webAccounts");
+        responseDocument.Included[3].Id.Should().Be(comment.Parent.Comments.ElementAt(0).Author!.StringId);
+        responseDocument.Included[3].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(userName));
+
+        responseDocument.Included[4].Type.Should().Be("comments");
+        responseDocument.Included[4].Id.Should().Be(comment.Parent.Comments.ElementAt(1).StringId);
+        responseDocument.Included[4].Attributes.ShouldContainKey("text").With(value => value.Should().Be(comment.Parent.Comments.ElementAt(1).Text));
+    }
+
+    [Fact]
+    public async Task Can_include_chain_of_relationships_with_multiple_paths()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Posts = _fakers.BlogPost.Generate(1);
+        blog.Posts[0].Author = _fakers.WebAccount.Generate();
+        blog.Posts[0].Author!.Preferences = _fakers.AccountPreferences.Generate();
+        blog.Posts[0].Comments = _fakers.Comment.Generate(2).ToHashSet();
+        blog.Posts[0].Comments.ElementAt(0).Author = _fakers.WebAccount.Generate();
+        blog.Posts[0].Comments.ElementAt(0).Author!.Posts = _fakers.BlogPost.Generate(1);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Comment comment = _fakers.Comment.Generate();
-            comment.Parent = _fakers.BlogPost.Generate();
-            comment.Parent.Author = _fakers.WebAccount.Generate();
-            comment.Parent.Author.Preferences = _fakers.AccountPreferences.Generate();
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Comments.Add(comment);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogs/{blog.StringId}?include=posts.author.preferences,posts.comments.author.posts";
 
-            string route = $"comments/{comment.StringId}?include=parent.author.preferences";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(blog.StringId);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(comment.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("text").With(value => value.Should().Be(comment.Text));
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("posts").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldNotBeEmpty();
+            value.Data.ManyValue[0].Type.Should().Be("blogPosts");
+            value.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].StringId);
+        });
 
-            responseDocument.Included.ShouldHaveCount(3);
+        responseDocument.Included.ShouldHaveCount(7);
 
-            responseDocument.Included[0].Type.Should().Be("blogPosts");
-            responseDocument.Included[0].Id.Should().Be(comment.Parent.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(comment.Parent.Caption));
+        responseDocument.Included[0].Type.Should().Be("blogPosts");
+        responseDocument.Included[0].Id.Should().Be(blog.Posts[0].StringId);
 
-            responseDocument.Included[1].Type.Should().Be("webAccounts");
-            responseDocument.Included[1].Id.Should().Be(comment.Parent.Author.StringId);
-            responseDocument.Included[1].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(comment.Parent.Author.DisplayName));
+        responseDocument.Included[0].Relationships.ShouldContainKey("author").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Type.Should().Be("webAccounts");
+            value.Data.SingleValue.Id.Should().Be(blog.Posts[0].Author!.StringId);
+        });
 
-            bool useDarkTheme = comment.Parent.Author.Preferences.UseDarkTheme;
+        responseDocument.Included[0].Relationships.ShouldContainKey("comments").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldNotBeEmpty();
+            value.Data.ManyValue[0].Type.Should().Be("comments");
+            value.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].Comments.ElementAt(0).StringId);
+        });
 
-            responseDocument.Included[2].Type.Should().Be("accountPreferences");
-            responseDocument.Included[2].Id.Should().Be(comment.Parent.Author.Preferences.StringId);
-            responseDocument.Included[2].Attributes.ShouldContainKey("useDarkTheme").With(value => value.Should().Be(useDarkTheme));
-        }
+        responseDocument.Included[1].Type.Should().Be("webAccounts");
+        responseDocument.Included[1].Id.Should().Be(blog.Posts[0].Author!.StringId);
 
-        [Fact]
-        public async Task Can_include_chain_of_OneToMany_relationships()
+        responseDocument.Included[1].Relationships.ShouldContainKey("preferences").With(value =>
         {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Posts = _fakers.BlogPost.Generate(1);
-            blog.Posts[0].Comments = _fakers.Comment.Generate(1).ToHashSet();
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Type.Should().Be("accountPreferences");
+            value.Data.SingleValue.Id.Should().Be(blog.Posts[0].Author!.Preferences!.StringId);
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        responseDocument.Included[1].Relationships.ShouldContainKey("posts").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+        });
 
-            string route = $"/blogs/{blog.StringId}?include=posts.comments";
+        responseDocument.Included[2].Type.Should().Be("accountPreferences");
+        responseDocument.Included[2].Id.Should().Be(blog.Posts[0].Author!.Preferences!.StringId);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Included[3].Type.Should().Be("comments");
+        responseDocument.Included[3].Id.Should().Be(blog.Posts[0].Comments.ElementAt(0).StringId);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Included[3].Relationships.ShouldContainKey("author").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Type.Should().Be("webAccounts");
+            value.Data.SingleValue.Id.Should().Be(blog.Posts[0].Comments.ElementAt(0).Author!.StringId);
+        });
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(blog.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(blog.Title));
+        responseDocument.Included[4].Type.Should().Be("webAccounts");
+        responseDocument.Included[4].Id.Should().Be(blog.Posts[0].Comments.ElementAt(0).Author!.StringId);
 
-            responseDocument.Included.ShouldHaveCount(2);
+        responseDocument.Included[4].Relationships.ShouldContainKey("posts").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldNotBeEmpty();
+            value.Data.ManyValue[0].Type.Should().Be("blogPosts");
+            value.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].Comments.ElementAt(0).Author!.Posts[0].StringId);
+        });
 
-            responseDocument.Included[0].Type.Should().Be("blogPosts");
-            responseDocument.Included[0].Id.Should().Be(blog.Posts[0].StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Posts[0].Caption));
+        responseDocument.Included[4].Relationships.ShouldContainKey("preferences").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+        });
 
-            DateTime createdAt = blog.Posts[0].Comments.Single().CreatedAt;
+        responseDocument.Included[5].Type.Should().Be("blogPosts");
+        responseDocument.Included[5].Id.Should().Be(blog.Posts[0].Comments.ElementAt(0).Author!.Posts[0].StringId);
 
-            responseDocument.Included[1].Type.Should().Be("comments");
-            responseDocument.Included[1].Id.Should().Be(blog.Posts[0].Comments.Single().StringId);
-            responseDocument.Included[1].Attributes.ShouldContainKey("createdAt").With(value => value.As<DateTime>().Should().BeCloseTo(createdAt));
-        }
+        responseDocument.Included[5].Relationships.ShouldContainKey("author").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+        });
 
-        [Fact]
-        public async Task Can_include_chain_of_recursive_relationships()
+        responseDocument.Included[5].Relationships.ShouldContainKey("comments").With(value =>
         {
-            // Arrange
-            Comment comment = _fakers.Comment.Generate();
-            comment.Parent = _fakers.BlogPost.Generate();
-            comment.Parent.Author = _fakers.WebAccount.Generate();
-            comment.Parent.Comments = _fakers.Comment.Generate(2).ToHashSet();
-            comment.Parent.Comments.ElementAt(0).Author = _fakers.WebAccount.Generate();
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Comments.Add(comment);
-                await dbContext.SaveChangesAsync();
-            });
+        responseDocument.Included[6].Type.Should().Be("comments");
+        responseDocument.Included[6].Id.Should().Be(blog.Posts[0].Comments.ElementAt(1).StringId);
 
-            string route = $"/comments/{comment.StringId}?include=parent.comments.author";
+        responseDocument.Included[5].Relationships.ShouldContainKey("author").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+        });
+    }
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    [Fact]
+    public async Task Can_include_chain_of_relationships_with_reused_resources()
+    {
+        WebAccount author = _fakers.WebAccount.Generate();
+        author.Preferences = _fakers.AccountPreferences.Generate();
+        author.LoginAttempts = _fakers.LoginAttempt.Generate(1);
+
+        WebAccount reviewer = _fakers.WebAccount.Generate();
+        reviewer.Preferences = _fakers.AccountPreferences.Generate();
+        reviewer.LoginAttempts = _fakers.LoginAttempt.Generate(1);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(comment.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("text").With(value => value.Should().Be(comment.Text));
+        BlogPost post1 = _fakers.BlogPost.Generate();
+        post1.Author = author;
+        post1.Reviewer = reviewer;
 
-            responseDocument.Included.ShouldHaveCount(5);
+        WebAccount person = _fakers.WebAccount.Generate();
+        person.Preferences = _fakers.AccountPreferences.Generate();
+        person.LoginAttempts = _fakers.LoginAttempt.Generate(1);
 
-            responseDocument.Included[0].Type.Should().Be("blogPosts");
-            responseDocument.Included[0].Id.Should().Be(comment.Parent.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(comment.Parent.Caption));
+        BlogPost post2 = _fakers.BlogPost.Generate();
+        post2.Author = person;
+        post2.Reviewer = person;
 
-            responseDocument.Included[1].Type.Should().Be("comments");
-            responseDocument.Included[1].Id.Should().Be(comment.StringId);
-            responseDocument.Included[1].Attributes.ShouldContainKey("text").With(value => value.Should().Be(comment.Text));
-
-            responseDocument.Included[2].Type.Should().Be("comments");
-            responseDocument.Included[2].Id.Should().Be(comment.Parent.Comments.ElementAt(0).StringId);
-            responseDocument.Included[2].Attributes.ShouldContainKey("text").With(value => value.Should().Be(comment.Parent.Comments.ElementAt(0).Text));
-
-            string userName = comment.Parent.Comments.ElementAt(0).Author!.UserName;
-
-            responseDocument.Included[3].Type.Should().Be("webAccounts");
-            responseDocument.Included[3].Id.Should().Be(comment.Parent.Comments.ElementAt(0).Author!.StringId);
-            responseDocument.Included[3].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(userName));
-
-            responseDocument.Included[4].Type.Should().Be("comments");
-            responseDocument.Included[4].Id.Should().Be(comment.Parent.Comments.ElementAt(1).StringId);
-            responseDocument.Included[4].Attributes.ShouldContainKey("text").With(value => value.Should().Be(comment.Parent.Comments.ElementAt(1).Text));
-        }
-
-        [Fact]
-        public async Task Can_include_chain_of_relationships_with_multiple_paths()
-        {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Posts = _fakers.BlogPost.Generate(1);
-            blog.Posts[0].Author = _fakers.WebAccount.Generate();
-            blog.Posts[0].Author!.Preferences = _fakers.AccountPreferences.Generate();
-            blog.Posts[0].Comments = _fakers.Comment.Generate(2).ToHashSet();
-            blog.Posts[0].Comments.ElementAt(0).Author = _fakers.WebAccount.Generate();
-            blog.Posts[0].Comments.ElementAt(0).Author!.Posts = _fakers.BlogPost.Generate(1);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogs/{blog.StringId}?include=posts.author.preferences,posts.comments.author.posts";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(blog.StringId);
-
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("posts").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldNotBeEmpty();
-                value.Data.ManyValue[0].Type.Should().Be("blogPosts");
-                value.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].StringId);
-            });
-
-            responseDocument.Included.ShouldHaveCount(7);
-
-            responseDocument.Included[0].Type.Should().Be("blogPosts");
-            responseDocument.Included[0].Id.Should().Be(blog.Posts[0].StringId);
-
-            responseDocument.Included[0].Relationships.ShouldContainKey("author").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Type.Should().Be("webAccounts");
-                value.Data.SingleValue.Id.Should().Be(blog.Posts[0].Author!.StringId);
-            });
-
-            responseDocument.Included[0].Relationships.ShouldContainKey("comments").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldNotBeEmpty();
-                value.Data.ManyValue[0].Type.Should().Be("comments");
-                value.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].Comments.ElementAt(0).StringId);
-            });
-
-            responseDocument.Included[1].Type.Should().Be("webAccounts");
-            responseDocument.Included[1].Id.Should().Be(blog.Posts[0].Author!.StringId);
-
-            responseDocument.Included[1].Relationships.ShouldContainKey("preferences").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Type.Should().Be("accountPreferences");
-                value.Data.SingleValue.Id.Should().Be(blog.Posts[0].Author!.Preferences!.StringId);
-            });
-
-            responseDocument.Included[1].Relationships.ShouldContainKey("posts").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-            });
-
-            responseDocument.Included[2].Type.Should().Be("accountPreferences");
-            responseDocument.Included[2].Id.Should().Be(blog.Posts[0].Author!.Preferences!.StringId);
-
-            responseDocument.Included[3].Type.Should().Be("comments");
-            responseDocument.Included[3].Id.Should().Be(blog.Posts[0].Comments.ElementAt(0).StringId);
-
-            responseDocument.Included[3].Relationships.ShouldContainKey("author").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Type.Should().Be("webAccounts");
-                value.Data.SingleValue.Id.Should().Be(blog.Posts[0].Comments.ElementAt(0).Author!.StringId);
-            });
-
-            responseDocument.Included[4].Type.Should().Be("webAccounts");
-            responseDocument.Included[4].Id.Should().Be(blog.Posts[0].Comments.ElementAt(0).Author!.StringId);
-
-            responseDocument.Included[4].Relationships.ShouldContainKey("posts").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldNotBeEmpty();
-                value.Data.ManyValue[0].Type.Should().Be("blogPosts");
-                value.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].Comments.ElementAt(0).Author!.Posts[0].StringId);
-            });
-
-            responseDocument.Included[4].Relationships.ShouldContainKey("preferences").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-            });
-
-            responseDocument.Included[5].Type.Should().Be("blogPosts");
-            responseDocument.Included[5].Id.Should().Be(blog.Posts[0].Comments.ElementAt(0).Author!.Posts[0].StringId);
-
-            responseDocument.Included[5].Relationships.ShouldContainKey("author").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-            });
-
-            responseDocument.Included[5].Relationships.ShouldContainKey("comments").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-            });
-
-            responseDocument.Included[6].Type.Should().Be("comments");
-            responseDocument.Included[6].Id.Should().Be(blog.Posts[0].Comments.ElementAt(1).StringId);
-
-            responseDocument.Included[5].Relationships.ShouldContainKey("author").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-            });
-        }
-
-        [Fact]
-        public async Task Can_include_chain_of_relationships_with_reused_resources()
-        {
-            WebAccount author = _fakers.WebAccount.Generate();
-            author.Preferences = _fakers.AccountPreferences.Generate();
-            author.LoginAttempts = _fakers.LoginAttempt.Generate(1);
-
-            WebAccount reviewer = _fakers.WebAccount.Generate();
-            reviewer.Preferences = _fakers.AccountPreferences.Generate();
-            reviewer.LoginAttempts = _fakers.LoginAttempt.Generate(1);
-
-            BlogPost post1 = _fakers.BlogPost.Generate();
-            post1.Author = author;
-            post1.Reviewer = reviewer;
-
-            WebAccount person = _fakers.WebAccount.Generate();
-            person.Preferences = _fakers.AccountPreferences.Generate();
-            person.LoginAttempts = _fakers.LoginAttempt.Generate(1);
-
-            BlogPost post2 = _fakers.BlogPost.Generate();
-            post2.Author = person;
-            post2.Reviewer = person;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(post1, post2);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/blogPosts?include=reviewer.loginAttempts,author.preferences";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-
-            responseDocument.Data.ManyValue[0].Type.Should().Be("blogPosts");
-            responseDocument.Data.ManyValue[0].Id.Should().Be(post1.StringId);
-
-            responseDocument.Data.ManyValue[0].Relationships.ShouldContainKey("author").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Type.Should().Be("webAccounts");
-                value.Data.SingleValue.Id.Should().Be(author.StringId);
-            });
-
-            responseDocument.Data.ManyValue[0].Relationships.ShouldContainKey("reviewer").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Type.Should().Be("webAccounts");
-                value.Data.SingleValue.Id.Should().Be(reviewer.StringId);
-            });
-
-            responseDocument.Data.ManyValue[1].Type.Should().Be("blogPosts");
-            responseDocument.Data.ManyValue[1].Id.Should().Be(post2.StringId);
-
-            responseDocument.Data.ManyValue[1].Relationships.ShouldContainKey("author").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Type.Should().Be("webAccounts");
-                value.Data.SingleValue.Id.Should().Be(person.StringId);
-            });
-
-            responseDocument.Data.ManyValue[1].Relationships.ShouldContainKey("reviewer").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Type.Should().Be("webAccounts");
-                value.Data.SingleValue.Id.Should().Be(person.StringId);
-            });
-
-            responseDocument.Included.ShouldHaveCount(7);
-
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(author.StringId);
-
-            responseDocument.Included[0].Relationships.ShouldContainKey("preferences").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Type.Should().Be("accountPreferences");
-                value.Data.SingleValue.Id.Should().Be(author.Preferences.StringId);
-            });
-
-            responseDocument.Included[0].Relationships.ShouldContainKey("loginAttempts").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-            });
-
-            responseDocument.Included[1].Type.Should().Be("accountPreferences");
-            responseDocument.Included[1].Id.Should().Be(author.Preferences.StringId);
-
-            responseDocument.Included[2].Type.Should().Be("webAccounts");
-            responseDocument.Included[2].Id.Should().Be(reviewer.StringId);
-
-            responseDocument.Included[2].Relationships.ShouldContainKey("preferences").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-            });
-
-            responseDocument.Included[2].Relationships.ShouldContainKey("loginAttempts").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldNotBeEmpty();
-                value.Data.ManyValue[0].Type.Should().Be("loginAttempts");
-                value.Data.ManyValue[0].Id.Should().Be(reviewer.LoginAttempts[0].StringId);
-            });
-
-            responseDocument.Included[3].Type.Should().Be("loginAttempts");
-            responseDocument.Included[3].Id.Should().Be(reviewer.LoginAttempts[0].StringId);
-
-            responseDocument.Included[4].Type.Should().Be("webAccounts");
-            responseDocument.Included[4].Id.Should().Be(person.StringId);
-
-            responseDocument.Included[4].Relationships.ShouldContainKey("preferences").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Type.Should().Be("accountPreferences");
-                value.Data.SingleValue.Id.Should().Be(person.Preferences.StringId);
-            });
-
-            responseDocument.Included[4].Relationships.ShouldContainKey("loginAttempts").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldNotBeEmpty();
-                value.Data.ManyValue[0].Type.Should().Be("loginAttempts");
-                value.Data.ManyValue[0].Id.Should().Be(person.LoginAttempts[0].StringId);
-            });
-
-            responseDocument.Included[5].Type.Should().Be("accountPreferences");
-            responseDocument.Included[5].Id.Should().Be(person.Preferences.StringId);
-
-            responseDocument.Included[6].Type.Should().Be("loginAttempts");
-            responseDocument.Included[6].Id.Should().Be(person.LoginAttempts[0].StringId);
-        }
-
-        [Fact]
-        public async Task Can_include_chain_with_cyclic_dependency()
-        {
-            List<BlogPost> posts = _fakers.BlogPost.Generate(1);
-
-            Blog blog = _fakers.Blog.Generate();
-            blog.Posts = posts;
-            blog.Posts[0].Author = _fakers.WebAccount.Generate();
-            blog.Posts[0].Author!.Posts = posts;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogs/{blog.StringId}?include=posts.author.posts.author.posts.author";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("blogs");
-            responseDocument.Data.SingleValue.Id.Should().Be(blog.StringId);
-
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("posts").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldNotBeEmpty();
-                value.Data.ManyValue[0].Type.Should().Be("blogPosts");
-                value.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].StringId);
-            });
-
-            responseDocument.Included.ShouldHaveCount(2);
-
-            responseDocument.Included[0].Type.Should().Be("blogPosts");
-            responseDocument.Included[0].Id.Should().Be(blog.Posts[0].StringId);
-
-            responseDocument.Included[0].Relationships.ShouldContainKey("author").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Type.Should().Be("webAccounts");
-                value.Data.SingleValue.Id.Should().Be(blog.Posts[0].Author!.StringId);
-            });
-
-            responseDocument.Included[1].Type.Should().Be("webAccounts");
-            responseDocument.Included[1].Id.Should().Be(blog.Posts[0].Author!.StringId);
-
-            responseDocument.Included[1].Relationships.ShouldContainKey("posts").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldNotBeEmpty();
-                value.Data.ManyValue[0].Type.Should().Be("blogPosts");
-                value.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].StringId);
-            });
-        }
-
-        [Fact]
-        public async Task Prevents_duplicate_includes_over_single_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebAccount account = _fakers.WebAccount.Generate();
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(post1, post2);
+            await dbContext.SaveChangesAsync();
+        });
 
-            BlogPost post = _fakers.BlogPost.Generate();
-            post.Author = account;
-            post.Reviewer = account;
+        const string route = "/blogPosts?include=reviewer.loginAttempts,author.preferences";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/blogPosts/{post.StringId}?include=author&include=reviewer";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue[0].Type.Should().Be("blogPosts");
+        responseDocument.Data.ManyValue[0].Id.Should().Be(post1.StringId);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
+        responseDocument.Data.ManyValue[0].Relationships.ShouldContainKey("author").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Type.Should().Be("webAccounts");
+            value.Data.SingleValue.Id.Should().Be(author.StringId);
+        });
+
+        responseDocument.Data.ManyValue[0].Relationships.ShouldContainKey("reviewer").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Type.Should().Be("webAccounts");
+            value.Data.SingleValue.Id.Should().Be(reviewer.StringId);
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(account.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(account.UserName));
-        }
+        responseDocument.Data.ManyValue[1].Type.Should().Be("blogPosts");
+        responseDocument.Data.ManyValue[1].Id.Should().Be(post2.StringId);
 
-        [Fact]
-        public async Task Prevents_duplicate_includes_over_multiple_resources()
+        responseDocument.Data.ManyValue[1].Relationships.ShouldContainKey("author").With(value =>
         {
-            // Arrange
-            WebAccount account = _fakers.WebAccount.Generate();
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Type.Should().Be("webAccounts");
+            value.Data.SingleValue.Id.Should().Be(person.StringId);
+        });
 
-            List<BlogPost> posts = _fakers.BlogPost.Generate(2);
-            posts[0].Author = account;
-            posts[1].Author = account;
+        responseDocument.Data.ManyValue[1].Relationships.ShouldContainKey("reviewer").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Type.Should().Be("webAccounts");
+            value.Data.SingleValue.Id.Should().Be(person.StringId);
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
+        responseDocument.Included.ShouldHaveCount(7);
 
-            const string route = "/blogPosts?include=author";
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(author.StringId);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Included[0].Relationships.ShouldContainKey("preferences").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Type.Should().Be("accountPreferences");
+            value.Data.SingleValue.Id.Should().Be(author.Preferences.StringId);
+        });
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Included[0].Relationships.ShouldContainKey("loginAttempts").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+        });
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Included[1].Type.Should().Be("accountPreferences");
+        responseDocument.Included[1].Id.Should().Be(author.Preferences.StringId);
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(account.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(account.UserName));
-        }
+        responseDocument.Included[2].Type.Should().Be("webAccounts");
+        responseDocument.Included[2].Id.Should().Be(reviewer.StringId);
 
-        [Fact]
-        public async Task Cannot_include_unknown_relationship()
+        responseDocument.Included[2].Relationships.ShouldContainKey("preferences").With(value =>
         {
-            // Arrange
-            string route = $"/webAccounts?include={Unknown.Relationship}";
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Included[2].Relationships.ShouldContainKey("loginAttempts").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldNotBeEmpty();
+            value.Data.ManyValue[0].Type.Should().Be("loginAttempts");
+            value.Data.ManyValue[0].Id.Should().Be(reviewer.LoginAttempts[0].StringId);
+        });
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Included[3].Type.Should().Be("loginAttempts");
+        responseDocument.Included[3].Id.Should().Be(reviewer.LoginAttempts[0].StringId);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Included[4].Type.Should().Be("webAccounts");
+        responseDocument.Included[4].Id.Should().Be(person.StringId);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified include is invalid.");
-            error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'webAccounts'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("include");
-        }
+        responseDocument.Included[4].Relationships.ShouldContainKey("preferences").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Type.Should().Be("accountPreferences");
+            value.Data.SingleValue.Id.Should().Be(person.Preferences.StringId);
+        });
 
-        [Fact]
-        public async Task Cannot_include_unknown_nested_relationship()
+        responseDocument.Included[4].Relationships.ShouldContainKey("loginAttempts").With(value =>
         {
-            // Arrange
-            string route = $"/blogs?include=posts.{Unknown.Relationship}";
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldNotBeEmpty();
+            value.Data.ManyValue[0].Type.Should().Be("loginAttempts");
+            value.Data.ManyValue[0].Id.Should().Be(person.LoginAttempts[0].StringId);
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Included[5].Type.Should().Be("accountPreferences");
+        responseDocument.Included[5].Id.Should().Be(person.Preferences.StringId);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Included[6].Type.Should().Be("loginAttempts");
+        responseDocument.Included[6].Id.Should().Be(person.LoginAttempts[0].StringId);
+    }
 
-            responseDocument.Errors.ShouldHaveCount(1);
+    [Fact]
+    public async Task Can_include_chain_with_cyclic_dependency()
+    {
+        List<BlogPost> posts = _fakers.BlogPost.Generate(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified include is invalid.");
-            error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' in 'posts.{Unknown.Relationship}' does not exist on resource type 'blogPosts'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("include");
-        }
+        Blog blog = _fakers.Blog.Generate();
+        blog.Posts = posts;
+        blog.Posts[0].Author = _fakers.WebAccount.Generate();
+        blog.Posts[0].Author!.Posts = posts;
 
-        [Fact]
-        public async Task Cannot_include_relationship_with_blocked_capability()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            const string route = "/blogPosts?include=parent";
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        string route = $"/blogs/{blog.StringId}?include=posts.author.posts.author.posts.author";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Including the requested relationship is not allowed.");
-            error.Detail.Should().Be("Including the relationship 'parent' on 'blogPosts' is not allowed.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("include");
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("blogs");
+        responseDocument.Data.SingleValue.Id.Should().Be(blog.StringId);
 
-        [Fact]
-        public async Task Ignores_null_parent_in_nested_include()
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("posts").With(value =>
         {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(2);
-            posts[0].Reviewer = _fakers.WebAccount.Generate();
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldNotBeEmpty();
+            value.Data.ManyValue[0].Type.Should().Be("blogPosts");
+            value.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].StringId);
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
+        responseDocument.Included.ShouldHaveCount(2);
 
-            const string route = "/blogPosts?include=reviewer.preferences";
+        responseDocument.Included[0].Type.Should().Be("blogPosts");
+        responseDocument.Included[0].Id.Should().Be(blog.Posts[0].StringId);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Included[0].Relationships.ShouldContainKey("author").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Type.Should().Be("webAccounts");
+            value.Data.SingleValue.Id.Should().Be(blog.Posts[0].Author!.StringId);
+        });
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Included[1].Type.Should().Be("webAccounts");
+        responseDocument.Included[1].Id.Should().Be(blog.Posts[0].Author!.StringId);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Included[1].Relationships.ShouldContainKey("posts").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldNotBeEmpty();
+            value.Data.ManyValue[0].Type.Should().Be("blogPosts");
+            value.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].StringId);
+        });
+    }
+
+    [Fact]
+    public async Task Prevents_duplicate_includes_over_single_resource()
+    {
+        // Arrange
+        WebAccount account = _fakers.WebAccount.Generate();
 
-            responseDocument.Data.ManyValue.Should().OnlyContain(resource => resource.Relationships.ShouldContainKey("reviewer") != null);
+        BlogPost post = _fakers.BlogPost.Generate();
+        post.Author = account;
+        post.Reviewer = account;
 
-            ResourceObject[] postWithReviewer = responseDocument.Data.ManyValue
-                .Where(resource => resource.Relationships!.First(pair => pair.Key == "reviewer").Value!.Data.SingleValue != null).ToArray();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            postWithReviewer.ShouldHaveCount(1);
-            postWithReviewer[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(posts[0].Caption));
+        string route = $"/blogPosts/{post.StringId}?include=author&include=reviewer";
 
-            ResourceObject[] postWithoutReviewer = responseDocument.Data.ManyValue
-                .Where(resource => resource.Relationships!.First(pair => pair.Key == "reviewer").Value!.Data.SingleValue == null).ToArray();
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            postWithoutReviewer.ShouldHaveCount(1);
-            postWithoutReviewer[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(posts[1].Caption));
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(posts[0].Reviewer!.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(posts[0].Reviewer!.UserName));
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
 
-        [Fact]
-        public async Task Can_include_at_configured_maximum_inclusion_depth()
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(account.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(account.UserName));
+    }
+
+    [Fact]
+    public async Task Prevents_duplicate_includes_over_multiple_resources()
+    {
+        // Arrange
+        WebAccount account = _fakers.WebAccount.Generate();
+
+        List<BlogPost> posts = _fakers.BlogPost.Generate(2);
+        posts[0].Author = account;
+        posts[1].Author = account;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.MaximumIncludeDepth = 1;
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            Blog blog = _fakers.Blog.Generate();
+        const string route = "/blogPosts?include=author";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(account.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(account.UserName));
+    }
 
-            string route = $"/blogs/{blog.StringId}/posts?include=author,comments";
+    [Fact]
+    public async Task Cannot_include_unknown_relationship()
+    {
+        // Arrange
+        const string route = $"/webAccounts?include={Unknown.Relationship}";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified include is invalid.");
+        error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'webAccounts'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("include");
+    }
+
+    [Fact]
+    public async Task Cannot_include_unknown_nested_relationship()
+    {
+        // Arrange
+        const string route = $"/blogs?include=posts.{Unknown.Relationship}";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-        [Fact]
-        public async Task Cannot_exceed_configured_maximum_inclusion_depth()
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified include is invalid.");
+        error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' in 'posts.{Unknown.Relationship}' does not exist on resource type 'blogPosts'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("include");
+    }
+
+    [Fact]
+    public async Task Cannot_include_relationship_with_blocked_capability()
+    {
+        // Arrange
+        const string route = "/blogPosts?include=parent";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Including the requested relationship is not allowed.");
+        error.Detail.Should().Be("Including the relationship 'parent' on 'blogPosts' is not allowed.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("include");
+    }
+
+    [Fact]
+    public async Task Ignores_null_parent_in_nested_include()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(2);
+        posts[0].Reviewer = _fakers.WebAccount.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/blogPosts?include=reviewer.preferences";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+
+        responseDocument.Data.ManyValue.Should().OnlyContain(resource => resource.Relationships.ShouldContainKey("reviewer") != null);
+
+        ResourceObject[] postWithReviewer = responseDocument.Data.ManyValue
+            .Where(resource => resource.Relationships!.First(pair => pair.Key == "reviewer").Value!.Data.SingleValue != null).ToArray();
+
+        postWithReviewer.ShouldHaveCount(1);
+        postWithReviewer[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(posts[0].Caption));
+
+        ResourceObject[] postWithoutReviewer = responseDocument.Data.ManyValue
+            .Where(resource => resource.Relationships!.First(pair => pair.Key == "reviewer").Value!.Data.SingleValue == null).ToArray();
+
+        postWithoutReviewer.ShouldHaveCount(1);
+        postWithoutReviewer[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(posts[1].Caption));
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(posts[0].Reviewer!.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(posts[0].Reviewer!.UserName));
+    }
+
+    [Fact]
+    public async Task Can_include_at_configured_maximum_inclusion_depth()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.MaximumIncludeDepth = 1;
+
+        Blog blog = _fakers.Blog.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.MaximumIncludeDepth = 1;
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/blogs/{blog.StringId}/posts?include=author,comments";
+
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
+
+    [Fact]
+    public async Task Cannot_exceed_configured_maximum_inclusion_depth()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.MaximumIncludeDepth = 1;
 
-            const string route = "/blogs/123/owner?include=posts.comments";
+        const string route = "/blogs/123/owner?include=posts.comments";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified include is invalid.");
-            error.Detail.Should().Be("Including 'posts.comments' exceeds the maximum inclusion depth of 1.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("include");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified include is invalid.");
+        error.Detail.Should().Be("Including 'posts.comments' exceeds the maximum inclusion depth of 1.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("include");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs
index e4ddbbae38..acd1fa446c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Label.cs
@@ -1,20 +1,18 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class Label : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Label : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [Attr]
-        public LabelColor Color { get; set; }
+    [Attr]
+    public LabelColor Color { get; set; }
 
-        [HasMany]
-        public ISet<BlogPost> Posts { get; set; } = new HashSet<BlogPost>();
-    }
+    [HasMany]
+    public ISet<BlogPost> Posts { get; set; } = new HashSet<BlogPost>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LabelColor.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LabelColor.cs
index 5c888227e7..4402ecdb05 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LabelColor.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LabelColor.cs
@@ -1,14 +1,13 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[JsonConverter(typeof(JsonStringEnumMemberConverter))]
+public enum LabelColor
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    [JsonConverter(typeof(JsonStringEnumMemberConverter))]
-    public enum LabelColor
-    {
-        Red,
-        Green,
-        Blue
-    }
+    Red,
+    Green,
+    Blue
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LoginAttempt.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LoginAttempt.cs
index dcdb2bae95..73557d7fcf 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LoginAttempt.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/LoginAttempt.cs
@@ -1,17 +1,15 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class LoginAttempt : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class LoginAttempt : Identifiable<int>
-    {
-        [Attr]
-        public DateTimeOffset TriedAt { get; set; }
+    [Attr]
+    public DateTimeOffset TriedAt { get; set; }
 
-        [Attr]
-        public bool IsSucceeded { get; set; }
-    }
+    [Attr]
+    public bool IsSucceeded { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs
index 11e7f96806..0c0ddda035 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithTotalCountTests.cs
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -10,655 +6,645 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Pagination
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Pagination;
+
+public sealed class PaginationWithTotalCountTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
 {
-    public sealed class PaginationWithTotalCountTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
+    private const string HostPrefix = "http://localhost";
+    private const int DefaultPageSize = 5;
+
+    private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
+    private readonly QueryStringFakers _fakers = new();
+
+    public PaginationWithTotalCountTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
     {
-        private const string HostPrefix = "http://localhost";
-        private const int DefaultPageSize = 5;
+        _testContext = testContext;
+
+        testContext.UseController<BlogPostsController>();
+        testContext.UseController<BlogsController>();
+        testContext.UseController<WebAccountsController>();
+
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeTotalResourceCount = true;
+        options.DefaultPageSize = new PageSize(DefaultPageSize);
+        options.MaximumPageSize = null;
+        options.MaximumPageNumber = null;
+        options.AllowUnknownQueryStringParameters = true;
+    }
 
-        private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
-        private readonly QueryStringFakers _fakers = new();
+    [Fact]
+    public async Task Can_paginate_in_primary_resources()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(2);
 
-        public PaginationWithTotalCountTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            _testContext = testContext;
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            testContext.UseController<BlogPostsController>();
-            testContext.UseController<BlogsController>();
-            testContext.UseController<WebAccountsController>();
+        const string route = "/blogPosts?page[number]=2&page[size]=1";
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeTotalResourceCount = true;
-            options.DefaultPageSize = new PageSize(DefaultPageSize);
-            options.MaximumPageSize = null;
-            options.MaximumPageNumber = null;
-            options.AllowUnknownQueryStringParameters = true;
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            options.DisableTopPagination = false;
-            options.DisableChildrenPagination = false;
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(posts[1].StringId);
 
-        [Fact]
-        public async Task Can_paginate_in_primary_resources()
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts?page%5Bsize%5D=1");
+        responseDocument.Links.Last.Should().Be($"{HostPrefix}/blogPosts?page%5Bnumber%5D=2&page%5Bsize%5D=1");
+        responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
+        responseDocument.Links.Next.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Cannot_paginate_in_single_primary_endpoint()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(2);
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogPosts/{post.StringId}?page[number]=2";
 
-            const string route = "/blogPosts?page[number]=2&page[size]=1";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(posts[1].StringId);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified paging is invalid.");
+        error.Detail.Should().Be("This query string parameter can only be used on a collection of resources (not on a single resource).");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[number]");
+    }
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts?page%5Bsize%5D=1");
-            responseDocument.Links.Last.Should().Be($"{HostPrefix}/blogPosts?page%5Bnumber%5D=2&page%5Bsize%5D=1");
-            responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
-            responseDocument.Links.Next.Should().BeNull();
-        }
+    [Fact]
+    public async Task Can_paginate_in_secondary_resources()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Posts = _fakers.BlogPost.Generate(5);
+
+        Blog otherBlog = _fakers.Blog.Generate();
+        otherBlog.Posts = _fakers.BlogPost.Generate(1);
 
-        [Fact]
-        public async Task Cannot_paginate_in_single_primary_endpoint()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
+            dbContext.Blogs.AddRange(blog, otherBlog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogs/{blog.StringId}/posts?page[number]=3&page[size]=1";
 
-            string route = $"/blogPosts/{post.StringId}?page[number]=2";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[2].StringId);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/posts?page%5Bsize%5D=1");
+        responseDocument.Links.Last.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/posts?page%5Bnumber%5D=5&page%5Bsize%5D=1");
+        responseDocument.Links.Prev.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/posts?page%5Bnumber%5D=2&page%5Bsize%5D=1");
+        responseDocument.Links.Next.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/posts?page%5Bnumber%5D=4&page%5Bsize%5D=1");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified paging is invalid.");
-            error.Detail.Should().Be("This query string parameter can only be used on a collection of resources (not on a single resource).");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[number]");
-        }
+    [Fact]
+    public async Task Can_paginate_in_secondary_resources_without_inverse_relationship()
+    {
+        // Arrange
+        WebAccount? account = _fakers.WebAccount.Generate();
+        account.LoginAttempts = _fakers.LoginAttempt.Generate(2);
 
-        [Fact]
-        public async Task Can_paginate_in_secondary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Posts = _fakers.BlogPost.Generate(5);
-
-            Blog otherBlog = _fakers.Blog.Generate();
-            otherBlog.Posts = _fakers.BlogPost.Generate(1);
+            dbContext.Accounts.Add(account);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.AddRange(blog, otherBlog);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/webAccounts/{account.StringId}/loginAttempts?page[number]=2&page[size]=1";
 
-            string route = $"/blogs/{blog.StringId}/posts?page[number]=3&page[size]=1";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(account.LoginAttempts[1].StringId);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[2].StringId);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{HostPrefix}/webAccounts/{account.StringId}/loginAttempts?page%5Bsize%5D=1");
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
+        responseDocument.Links.Next.Should().Be($"{HostPrefix}/webAccounts/{account.StringId}/loginAttempts?page%5Bnumber%5D=3&page%5Bsize%5D=1");
+    }
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/posts?page%5Bsize%5D=1");
-            responseDocument.Links.Last.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/posts?page%5Bnumber%5D=5&page%5Bsize%5D=1");
-            responseDocument.Links.Prev.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/posts?page%5Bnumber%5D=2&page%5Bsize%5D=1");
-            responseDocument.Links.Next.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/posts?page%5Bnumber%5D=4&page%5Bsize%5D=1");
-        }
+    [Fact]
+    public async Task Cannot_paginate_in_single_secondary_endpoint()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
 
-        [Fact]
-        public async Task Can_paginate_in_secondary_resources_without_inverse_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebAccount? account = _fakers.WebAccount.Generate();
-            account.LoginAttempts = _fakers.LoginAttempt.Generate(2);
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Accounts.Add(account);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogPosts/{post.StringId}/author?page[size]=5";
 
-            string route = $"/webAccounts/{account.StringId}/loginAttempts?page[number]=2&page[size]=1";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(account.LoginAttempts[1].StringId);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified paging is invalid.");
+        error.Detail.Should().Be("This query string parameter can only be used on a collection of resources (not on a single resource).");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[size]");
+    }
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{HostPrefix}/webAccounts/{account.StringId}/loginAttempts?page%5Bsize%5D=1");
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
-            responseDocument.Links.Next.Should().Be($"{HostPrefix}/webAccounts/{account.StringId}/loginAttempts?page%5Bnumber%5D=3&page%5Bsize%5D=1");
-        }
+    [Fact]
+    public async Task Can_paginate_in_scope_of_OneToMany_relationship()
+    {
+        // Arrange
+        List<Blog> blogs = _fakers.Blog.Generate(3);
+        blogs[0].Posts = _fakers.BlogPost.Generate(2);
+        blogs[1].Posts = _fakers.BlogPost.Generate(2);
 
-        [Fact]
-        public async Task Cannot_paginate_in_single_secondary_endpoint()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
+            await dbContext.ClearTableAsync<Blog>();
+            dbContext.Blogs.AddRange(blogs);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/blogs?include=posts&page[number]=posts:2&page[size]=2,posts:1";
 
-            string route = $"/blogPosts/{post.StringId}/author?page[size]=5";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Included.ShouldHaveCount(2);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Included[0].Id.Should().Be(blogs[0].Posts[1].StringId);
+        responseDocument.Included[1].Id.Should().Be(blogs[1].Posts[1].StringId);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified paging is invalid.");
-            error.Detail.Should().Be("This query string parameter can only be used on a collection of resources (not on a single resource).");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[size]");
-        }
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{HostPrefix}/blogs?include=posts&page%5Bsize%5D=2,posts%3A1");
+        responseDocument.Links.Last.Should().Be($"{HostPrefix}/blogs?include=posts&page%5Bnumber%5D=2&page%5Bsize%5D=2,posts%3A1");
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().Be(responseDocument.Links.Last);
+    }
 
-        [Fact]
-        public async Task Can_paginate_in_scope_of_OneToMany_relationship()
-        {
-            // Arrange
-            List<Blog> blogs = _fakers.Blog.Generate(3);
-            blogs[0].Posts = _fakers.BlogPost.Generate(2);
-            blogs[1].Posts = _fakers.BlogPost.Generate(2);
+    [Fact]
+    public async Task Can_paginate_in_scope_of_OneToMany_relationship_on_secondary_endpoint()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Owner = _fakers.WebAccount.Generate();
+        blog.Owner.Posts = _fakers.BlogPost.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Blog>();
-                dbContext.Blogs.AddRange(blogs);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/blogs?include=posts&page[number]=posts:2&page[size]=2,posts:1";
+        string route = $"/blogs/{blog.StringId}/owner?include=posts&page[number]=posts:2&page[size]=posts:1";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Included.ShouldHaveCount(2);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Id.Should().Be(blog.Owner.Posts[1].StringId);
 
-            responseDocument.Included[0].Id.Should().Be(blogs[0].Posts[1].StringId);
-            responseDocument.Included[1].Id.Should().Be(blogs[1].Posts[1].StringId);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
+    }
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{HostPrefix}/blogs?include=posts&page%5Bsize%5D=2,posts%3A1");
-            responseDocument.Links.Last.Should().Be($"{HostPrefix}/blogs?include=posts&page%5Bnumber%5D=2&page%5Bsize%5D=2,posts%3A1");
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().Be(responseDocument.Links.Last);
-        }
+    [Fact]
+    public async Task Can_paginate_OneToMany_relationship_on_relationship_endpoint()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Posts = _fakers.BlogPost.Generate(4);
 
-        [Fact]
-        public async Task Can_paginate_in_scope_of_OneToMany_relationship_on_secondary_endpoint()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Owner = _fakers.WebAccount.Generate();
-            blog.Owner.Posts = _fakers.BlogPost.Generate(2);
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogs/{blog.StringId}/relationships/posts?page[number]=2&page[size]=1";
 
-            string route = $"/blogs/{blog.StringId}/owner?include=posts&page[number]=posts:2&page[size]=posts:1";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[1].StringId);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Id.Should().Be(blog.Owner.Posts[1].StringId);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/relationships/posts?page%5Bsize%5D=1");
+        responseDocument.Links.Last.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/relationships/posts?page%5Bnumber%5D=4&page%5Bsize%5D=1");
+        responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
+        responseDocument.Links.Next.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/relationships/posts?page%5Bnumber%5D=3&page%5Bsize%5D=1");
+    }
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
-        }
+    [Fact]
+    public async Task Can_paginate_OneToMany_relationship_on_relationship_endpoint_without_inverse_relationship()
+    {
+        // Arrange
+        WebAccount? account = _fakers.WebAccount.Generate();
+        account.LoginAttempts = _fakers.LoginAttempt.Generate(2);
 
-        [Fact]
-        public async Task Can_paginate_OneToMany_relationship_on_relationship_endpoint()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Posts = _fakers.BlogPost.Generate(4);
+            dbContext.Accounts.Add(account);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/webAccounts/{account.StringId}/relationships/loginAttempts?page[number]=2&page[size]=1";
 
-            string route = $"/blogs/{blog.StringId}/relationships/posts?page[number]=2&page[size]=1";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(account.LoginAttempts[1].StringId);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[1].StringId);
+        string basePath = $"{HostPrefix}/webAccounts/{account.StringId}/relationships/loginAttempts";
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/relationships/posts?page%5Bsize%5D=1");
-            responseDocument.Links.Last.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/relationships/posts?page%5Bnumber%5D=4&page%5Bsize%5D=1");
-            responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
-            responseDocument.Links.Next.Should().Be($"{HostPrefix}/blogs/{blog.StringId}/relationships/posts?page%5Bnumber%5D=3&page%5Bsize%5D=1");
-        }
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be(basePath + "?page%5Bsize%5D=1");
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
+        responseDocument.Links.Next.Should().Be(basePath + "?page%5Bnumber%5D=3&page%5Bsize%5D=1");
+    }
+
+    [Fact]
+    public async Task Can_paginate_in_scope_of_ManyToMany_relationship()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(2);
+        posts[0].Labels = _fakers.Label.Generate(2).ToHashSet();
+        posts[1].Labels = _fakers.Label.Generate(2).ToHashSet();
 
-        [Fact]
-        public async Task Can_paginate_OneToMany_relationship_on_relationship_endpoint_without_inverse_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebAccount? account = _fakers.WebAccount.Generate();
-            account.LoginAttempts = _fakers.LoginAttempt.Generate(2);
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Accounts.Add(account);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/blogPosts?include=labels&page[number]=labels:2&page[size]=labels:1";
 
-            string route = $"/webAccounts/{account.StringId}/relationships/loginAttempts?page[number]=2&page[size]=1";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Included.ShouldHaveCount(2);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(account.LoginAttempts[1].StringId);
+        responseDocument.Included[0].Id.Should().Be(posts[0].Labels.ElementAt(1).StringId);
+        responseDocument.Included[1].Id.Should().Be(posts[1].Labels.ElementAt(1).StringId);
 
-            string basePath = $"{HostPrefix}/webAccounts/{account.StringId}/relationships/loginAttempts";
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts?include=labels&page%5Bsize%5D=labels%3A1");
+        responseDocument.Links.Last.Should().Be(responseDocument.Links.First);
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
+    }
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be(basePath + "?page%5Bsize%5D=1");
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
-            responseDocument.Links.Next.Should().Be(basePath + "?page%5Bnumber%5D=3&page%5Bsize%5D=1");
-        }
+    [Fact]
+    public async Task Can_paginate_ManyToMany_relationship_on_relationship_endpoint()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
+        post.Labels = _fakers.Label.Generate(4).ToHashSet();
 
-        [Fact]
-        public async Task Can_paginate_in_scope_of_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(2);
-            posts[0].Labels = _fakers.Label.Generate(2).ToHashSet();
-            posts[1].Labels = _fakers.Label.Generate(2).ToHashSet();
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogPosts/{post.StringId}/relationships/labels?page[number]=2&page[size]=1";
 
-            // Workaround for https://github.com/dotnet/efcore/issues/21026
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.DisableTopPagination = true;
-            options.DisableChildrenPagination = false;
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            const string route = "/blogPosts?include=labels&page[number]=labels:2&page[size]=labels:1";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(post.Labels.ElementAt(1).StringId);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts/{post.StringId}/relationships/labels?page%5Bsize%5D=1");
+        responseDocument.Links.Last.Should().Be($"{HostPrefix}/blogPosts/{post.StringId}/relationships/labels?page%5Bnumber%5D=4&page%5Bsize%5D=1");
+        responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
+        responseDocument.Links.Next.Should().Be($"{HostPrefix}/blogPosts/{post.StringId}/relationships/labels?page%5Bnumber%5D=3&page%5Bsize%5D=1");
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Included.ShouldHaveCount(2);
+    [Fact]
+    public async Task Can_paginate_in_multiple_scopes()
+    {
+        // Arrange
+        List<Blog> blogs = _fakers.Blog.Generate(2);
+        blogs[1].Owner = _fakers.WebAccount.Generate();
+        blogs[1].Owner!.Posts = _fakers.BlogPost.Generate(2);
+        blogs[1].Owner!.Posts[1].Comments = _fakers.Comment.Generate(2).ToHashSet();
 
-            responseDocument.Included[0].Id.Should().Be(posts[0].Labels.ElementAt(1).StringId);
-            responseDocument.Included[1].Id.Should().Be(posts[1].Labels.ElementAt(1).StringId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Blog>();
+            dbContext.Blogs.AddRange(blogs);
+            await dbContext.SaveChangesAsync();
+        });
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts?include=labels&page%5Bsize%5D=labels%3A1");
-            responseDocument.Links.Last.Should().Be(responseDocument.Links.First);
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
-        }
+        const string route = "/blogs?include=owner.posts.comments&page[size]=1,owner.posts:1,owner.posts.comments:1&" +
+            "page[number]=2,owner.posts:2,owner.posts.comments:2";
 
-        [Fact]
-        public async Task Can_paginate_ManyToMany_relationship_on_relationship_endpoint()
-        {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
-            post.Labels = _fakers.Label.Generate(4).ToHashSet();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogPosts/{post.StringId}/relationships/labels?page[number]=2&page[size]=1";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(post.Labels.ElementAt(1).StringId);
-
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts/{post.StringId}/relationships/labels?page%5Bsize%5D=1");
-            responseDocument.Links.Last.Should().Be($"{HostPrefix}/blogPosts/{post.StringId}/relationships/labels?page%5Bnumber%5D=4&page%5Bsize%5D=1");
-            responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
-            responseDocument.Links.Next.Should().Be($"{HostPrefix}/blogPosts/{post.StringId}/relationships/labels?page%5Bnumber%5D=3&page%5Bsize%5D=1");
-        }
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-        [Fact]
-        public async Task Can_paginate_in_multiple_scopes()
-        {
-            // Arrange
-            List<Blog> blogs = _fakers.Blog.Generate(2);
-            blogs[1].Owner = _fakers.WebAccount.Generate();
-            blogs[1].Owner!.Posts = _fakers.BlogPost.Generate(2);
-            blogs[1].Owner!.Posts[1].Comments = _fakers.Comment.Generate(2).ToHashSet();
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Blog>();
-                dbContext.Blogs.AddRange(blogs);
-                await dbContext.SaveChangesAsync();
-            });
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
 
-            const string route = "/blogs?include=owner.posts.comments&page[size]=1,owner.posts:1,owner.posts.comments:1&" +
-                "page[number]=2,owner.posts:2,owner.posts.comments:2";
+        responseDocument.Included.ShouldHaveCount(3);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(blogs[1].Owner!.StringId);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Included[1].Type.Should().Be("blogPosts");
+        responseDocument.Included[1].Id.Should().Be(blogs[1].Owner!.Posts[1].StringId);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
+        responseDocument.Included[2].Type.Should().Be("comments");
+        responseDocument.Included[2].Id.Should().Be(blogs[1].Owner!.Posts[1].Comments.ElementAt(1).StringId);
 
-            responseDocument.Included.ShouldHaveCount(3);
+        const string linkPrefix = $"{HostPrefix}/blogs?include=owner.posts.comments";
 
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(blogs[1].Owner!.StringId);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{linkPrefix}&page%5Bsize%5D=1,owner.posts%3A1,owner.posts.comments%3A1");
+        responseDocument.Links.Last.Should().Be($"{linkPrefix}&page%5Bsize%5D=1,owner.posts%3A1,owner.posts.comments%3A1&page%5Bnumber%5D=2");
+        responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
+        responseDocument.Links.Next.Should().BeNull();
+    }
 
-            responseDocument.Included[1].Type.Should().Be("blogPosts");
-            responseDocument.Included[1].Id.Should().Be(blogs[1].Owner!.Posts[1].StringId);
+    [Fact]
+    public async Task Cannot_paginate_in_unknown_scope()
+    {
+        // Arrange
+        const string route = $"/webAccounts?page[number]={Unknown.Relationship}:1";
 
-            responseDocument.Included[2].Type.Should().Be("comments");
-            responseDocument.Included[2].Id.Should().Be(blogs[1].Owner!.Posts[1].Comments.ElementAt(1).StringId);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string linkPrefix = $"{HostPrefix}/blogs?include=owner.posts.comments";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{linkPrefix}&page%5Bsize%5D=1,owner.posts%3A1,owner.posts.comments%3A1");
-            responseDocument.Links.Last.Should().Be($"{linkPrefix}&page%5Bsize%5D=1,owner.posts%3A1,owner.posts.comments%3A1&page%5Bnumber%5D=2");
-            responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
-            responseDocument.Links.Next.Should().BeNull();
-        }
+        responseDocument.Errors.ShouldHaveCount(1);
 
-        [Fact]
-        public async Task Cannot_paginate_in_unknown_scope()
-        {
-            // Arrange
-            string route = $"/webAccounts?page[number]={Unknown.Relationship}:1";
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified paging is invalid.");
+        error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'webAccounts'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[number]");
+    }
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+    [Fact]
+    public async Task Cannot_paginate_in_unknown_nested_scope()
+    {
+        // Arrange
+        const string route = $"/webAccounts?page[size]=posts.{Unknown.Relationship}:1";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified paging is invalid.");
-            error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'webAccounts'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[number]");
-        }
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified paging is invalid.");
+        error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' in 'posts.{Unknown.Relationship}' does not exist on resource type 'blogPosts'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[size]");
+    }
+
+    [Fact]
+    public async Task Uses_default_page_number_and_size()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.DefaultPageSize = new PageSize(2);
+
+        Blog blog = _fakers.Blog.Generate();
+        blog.Posts = _fakers.BlogPost.Generate(3);
 
-        [Fact]
-        public async Task Cannot_paginate_in_unknown_nested_scope()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            string route = $"/webAccounts?page[size]=posts.{Unknown.Relationship}:1";
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        string route = $"/blogs/{blog.StringId}/posts";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified paging is invalid.");
-            error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' in 'posts.{Unknown.Relationship}' does not exist on resource type 'blogPosts'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[size]");
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(blog.Posts[1].StringId);
+
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
+        responseDocument.Links.Last.Should().Be($"{HostPrefix}{route}?page%5Bnumber%5D=2");
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().Be(responseDocument.Links.Last);
+    }
+
+    [Fact]
+    public async Task Returns_all_resources_when_paging_is_disabled()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.DefaultPageSize = null;
+
+        Blog blog = _fakers.Blog.Generate();
+        blog.Posts = _fakers.BlogPost.Generate(25);
 
-        [Fact]
-        public async Task Uses_default_page_number_and_size()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.DefaultPageSize = new PageSize(2);
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            Blog blog = _fakers.Blog.Generate();
-            blog.Posts = _fakers.BlogPost.Generate(3);
+        string route = $"/blogs/{blog.StringId}/posts";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/blogs/{blog.StringId}/posts";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.ManyValue.ShouldHaveCount(25);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(blog.Posts[1].StringId);
+    [Theory]
+    [InlineData(1, 1, 4, null, 2)]
+    [InlineData(2, 1, 4, 1, 3)]
+    [InlineData(3, 1, 4, 2, 4)]
+    [InlineData(4, 1, 4, 3, null)]
+    public async Task Renders_correct_top_level_links_for_page_number(int pageNumber, int? firstLink, int? lastLink, int? prevLink, int? nextLink)
+    {
+        // Arrange
+        WebAccount account = _fakers.WebAccount.Generate();
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be(responseDocument.Links.Self);
-            responseDocument.Links.Last.Should().Be($"{HostPrefix}{route}?page%5Bnumber%5D=2");
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().Be(responseDocument.Links.Last);
-        }
+        const int totalCount = 3 * DefaultPageSize + 3;
+        List<BlogPost> posts = _fakers.BlogPost.Generate(totalCount);
 
-        [Fact]
-        public async Task Returns_all_resources_when_paging_is_disabled()
+        foreach (BlogPost post in posts)
         {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.DefaultPageSize = null;
+            post.Author = account;
+        }
 
-            Blog blog = _fakers.Blog.Generate();
-            blog.Posts = _fakers.BlogPost.Generate(25);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        string routePrefix = $"/blogPosts?filter=equals(author.userName,'{account.UserName}')" +
+            "&fields[webAccounts]=userName&include=author&sort=id&foo=bar,baz";
 
-            string route = $"/blogs/{blog.StringId}/posts";
+        string route = $"{routePrefix}&page[number]={pageNumber}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(25);
+        responseDocument.ShouldNotBeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        if (firstLink != null)
+        {
+            string expected = $"{HostPrefix}{SetPageNumberInUrl(routePrefix, firstLink.Value)}";
+            responseDocument.Links.First.Should().Be(expected);
+        }
+        else
+        {
             responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
+        }
+
+        if (prevLink != null)
+        {
+            string expected = $"{HostPrefix}{SetPageNumberInUrl(routePrefix, prevLink.Value)}";
+            responseDocument.Links.Prev.Should().Be(expected);
+        }
+        else
+        {
             responseDocument.Links.Prev.Should().BeNull();
+        }
+
+        if (nextLink != null)
+        {
+            string expected = $"{HostPrefix}{SetPageNumberInUrl(routePrefix, nextLink.Value)}";
+            responseDocument.Links.Next.Should().Be(expected);
+        }
+        else
+        {
             responseDocument.Links.Next.Should().BeNull();
         }
 
-        [Theory]
-        [InlineData(1, 1, 4, null, 2)]
-        [InlineData(2, 1, 4, 1, 3)]
-        [InlineData(3, 1, 4, 2, 4)]
-        [InlineData(4, 1, 4, 3, null)]
-        public async Task Renders_correct_top_level_links_for_page_number(int pageNumber, int? firstLink, int? lastLink, int? prevLink, int? nextLink)
+        if (lastLink != null)
+        {
+            string expected = $"{HostPrefix}{SetPageNumberInUrl(routePrefix, lastLink.Value)}";
+            responseDocument.Links.Last.Should().Be(expected);
+        }
+        else
+        {
+            responseDocument.Links.Last.Should().BeNull();
+        }
+
+        static string SetPageNumberInUrl(string url, int pageNumber)
         {
-            // Arrange
-            WebAccount account = _fakers.WebAccount.Generate();
-            account.UserName = $"&{account.UserName}";
-
-            const int totalCount = 3 * DefaultPageSize + 3;
-            List<BlogPost> posts = _fakers.BlogPost.Generate(totalCount);
-
-            foreach (BlogPost post in posts)
-            {
-                post.Author = account;
-            }
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string routePrefix = $"/blogPosts?filter=equals(author.userName,'{WebUtility.UrlEncode(account.UserName)}')" +
-                "&fields[webAccounts]=userName&include=author&sort=id&foo=bar,baz";
-
-            string route = $"{routePrefix}&page[number]={pageNumber}";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.ShouldNotBeNull();
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-
-            if (firstLink != null)
-            {
-                string expected = $"{HostPrefix}{SetPageNumberInUrl(routePrefix, firstLink.Value)}";
-                responseDocument.Links.First.Should().Be(expected);
-            }
-            else
-            {
-                responseDocument.Links.First.Should().BeNull();
-            }
-
-            if (prevLink != null)
-            {
-                string expected = $"{HostPrefix}{SetPageNumberInUrl(routePrefix, prevLink.Value)}";
-                responseDocument.Links.Prev.Should().Be(expected);
-            }
-            else
-            {
-                responseDocument.Links.Prev.Should().BeNull();
-            }
-
-            if (nextLink != null)
-            {
-                string expected = $"{HostPrefix}{SetPageNumberInUrl(routePrefix, nextLink.Value)}";
-                responseDocument.Links.Next.Should().Be(expected);
-            }
-            else
-            {
-                responseDocument.Links.Next.Should().BeNull();
-            }
-
-            if (lastLink != null)
-            {
-                string expected = $"{HostPrefix}{SetPageNumberInUrl(routePrefix, lastLink.Value)}";
-                responseDocument.Links.Last.Should().Be(expected);
-            }
-            else
-            {
-                responseDocument.Links.Last.Should().BeNull();
-            }
-
-            static string SetPageNumberInUrl(string url, int pageNumber)
-            {
-                string link = pageNumber != 1 ? $"{url}&page[number]={pageNumber}" : url;
-                return link.Replace("[", "%5B").Replace("]", "%5D").Replace("'", "%27");
-            }
+            string link = pageNumber != 1 ? $"{url}&page[number]={pageNumber}" : url;
+            return link.Replace("[", "%5B").Replace("]", "%5D").Replace("'", "%27");
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithoutTotalCountTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithoutTotalCountTests.cs
index 0e6b39328a..896e2126d2 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithoutTotalCountTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/PaginationWithoutTotalCountTests.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -9,198 +6,197 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Pagination
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Pagination;
+
+public sealed class PaginationWithoutTotalCountTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
 {
-    public sealed class PaginationWithoutTotalCountTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
+    private const string HostPrefix = "http://localhost";
+    private const int DefaultPageSize = 5;
+
+    private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
+    private readonly QueryStringFakers _fakers = new();
+
+    public PaginationWithoutTotalCountTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
     {
-        private const string HostPrefix = "http://localhost";
-        private const int DefaultPageSize = 5;
+        _testContext = testContext;
 
-        private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
-        private readonly QueryStringFakers _fakers = new();
+        testContext.UseController<BlogPostsController>();
+        testContext.UseController<WebAccountsController>();
 
-        public PaginationWithoutTotalCountTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
-        {
-            _testContext = testContext;
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeTotalResourceCount = false;
+        options.DefaultPageSize = new PageSize(DefaultPageSize);
+        options.AllowUnknownQueryStringParameters = true;
+    }
+
+    [Fact]
+    public async Task Hides_pagination_links_when_unconstrained_page_size()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.DefaultPageSize = null;
 
-            testContext.UseController<BlogPostsController>();
-            testContext.UseController<WebAccountsController>();
+        const string route = "/blogPosts?foo=bar";
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeTotalResourceCount = false;
-            options.DefaultPageSize = new PageSize(DefaultPageSize);
-            options.AllowUnknownQueryStringParameters = true;
-        }
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-        [Fact]
-        public async Task Hides_pagination_links_when_unconstrained_page_size()
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Renders_pagination_links_when_page_size_is_specified_in_query_string_with_no_data()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.DefaultPageSize = null;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.DefaultPageSize = null;
+            await dbContext.ClearTableAsync<BlogPost>();
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/blogPosts?foo=bar";
+        const string route = "/blogPosts?page[size]=8&foo=bar";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().BeNull();
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
-        }
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts?page%5Bsize%5D=8&foo=bar");
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().BeNull();
+        responseDocument.Links.Next.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Renders_pagination_links_when_page_size_is_specified_in_query_string_with_no_data()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.DefaultPageSize = null;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/blogPosts?page[size]=8&foo=bar";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts?page%5Bsize%5D=8&foo=bar");
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().BeNull();
-            responseDocument.Links.Next.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Renders_pagination_links_when_page_number_is_specified_in_query_string_with_no_data()
+    [Fact]
+    public async Task Renders_pagination_links_when_page_number_is_specified_in_query_string_with_no_data()
+    {
+        // Arrange
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/blogPosts?page[number]=2&foo=bar";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts?foo=bar");
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
-            responseDocument.Links.Next.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Renders_pagination_links_when_page_number_is_specified_in_query_string_with_partially_filled_page()
+            await dbContext.ClearTableAsync<BlogPost>();
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/blogPosts?page[number]=2&foo=bar";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts?foo=bar");
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().Be(responseDocument.Links.First);
+        responseDocument.Links.Next.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Renders_pagination_links_when_page_number_is_specified_in_query_string_with_partially_filled_page()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(12);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(12);
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/blogPosts?foo=bar&page[number]=3";
 
-            const string route = "/blogPosts?foo=bar&page[number]=3";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.Should().HaveCountLessThan(DefaultPageSize);
 
-            responseDocument.Data.ManyValue.Should().HaveCountLessThan(DefaultPageSize);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts?foo=bar");
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().Be($"{HostPrefix}/blogPosts?foo=bar&page%5Bnumber%5D=2");
+        responseDocument.Links.Next.Should().BeNull();
+    }
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts?foo=bar");
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().Be($"{HostPrefix}/blogPosts?foo=bar&page%5Bnumber%5D=2");
-            responseDocument.Links.Next.Should().BeNull();
-        }
+    [Fact]
+    public async Task Renders_pagination_links_when_page_number_is_specified_in_query_string_with_full_page()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(DefaultPageSize * 3);
 
-        [Fact]
-        public async Task Renders_pagination_links_when_page_number_is_specified_in_query_string_with_full_page()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(DefaultPageSize * 3);
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/blogPosts?page[number]=3&foo=bar";
 
-            const string route = "/blogPosts?page[number]=3&foo=bar";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(DefaultPageSize);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(DefaultPageSize);
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts?foo=bar");
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().Be($"{HostPrefix}/blogPosts?page%5Bnumber%5D=2&foo=bar");
+        responseDocument.Links.Next.Should().Be($"{HostPrefix}/blogPosts?page%5Bnumber%5D=4&foo=bar");
+    }
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{HostPrefix}/blogPosts?foo=bar");
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().Be($"{HostPrefix}/blogPosts?page%5Bnumber%5D=2&foo=bar");
-            responseDocument.Links.Next.Should().Be($"{HostPrefix}/blogPosts?page%5Bnumber%5D=4&foo=bar");
-        }
+    [Fact]
+    public async Task Renders_pagination_links_when_page_number_is_specified_in_query_string_with_full_page_on_secondary_endpoint()
+    {
+        // Arrange
+        WebAccount account = _fakers.WebAccount.Generate();
+        account.Posts = _fakers.BlogPost.Generate(DefaultPageSize * 3);
 
-        [Fact]
-        public async Task Renders_pagination_links_when_page_number_is_specified_in_query_string_with_full_page_on_secondary_endpoint()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebAccount account = _fakers.WebAccount.Generate();
-            account.Posts = _fakers.BlogPost.Generate(DefaultPageSize * 3);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Accounts.Add(account);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Accounts.Add(account);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/webAccounts/{account.StringId}/posts?page[number]=3&foo=bar";
+        string route = $"/webAccounts/{account.StringId}/posts?page[number]=3&foo=bar";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(DefaultPageSize);
+        responseDocument.Data.ManyValue.ShouldHaveCount(DefaultPageSize);
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
-            responseDocument.Links.First.Should().Be($"{HostPrefix}/webAccounts/{account.StringId}/posts?foo=bar");
-            responseDocument.Links.Last.Should().BeNull();
-            responseDocument.Links.Prev.Should().Be($"{HostPrefix}/webAccounts/{account.StringId}/posts?page%5Bnumber%5D=2&foo=bar");
-            responseDocument.Links.Next.Should().Be($"{HostPrefix}/webAccounts/{account.StringId}/posts?page%5Bnumber%5D=4&foo=bar");
-        }
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be($"{HostPrefix}{route}");
+        responseDocument.Links.First.Should().Be($"{HostPrefix}/webAccounts/{account.StringId}/posts?foo=bar");
+        responseDocument.Links.Last.Should().BeNull();
+        responseDocument.Links.Prev.Should().Be($"{HostPrefix}/webAccounts/{account.StringId}/posts?page%5Bnumber%5D=2&foo=bar");
+        responseDocument.Links.Next.Should().Be($"{HostPrefix}/webAccounts/{account.StringId}/posts?page%5Bnumber%5D=4&foo=bar");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs
index 4afd77e8aa..659f3fc087 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationTests.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -9,153 +6,152 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Pagination
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Pagination;
+
+public sealed class RangeValidationTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
 {
-    public sealed class RangeValidationTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
+    private const int DefaultPageSize = 5;
+    private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
+    private readonly QueryStringFakers _fakers = new();
+
+    public RangeValidationTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
     {
-        private const int DefaultPageSize = 5;
-        private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
-        private readonly QueryStringFakers _fakers = new();
+        _testContext = testContext;
 
-        public RangeValidationTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<BlogsController>();
 
-            testContext.UseController<BlogsController>();
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.DefaultPageSize = new PageSize(DefaultPageSize);
+        options.MaximumPageSize = null;
+        options.MaximumPageNumber = null;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.DefaultPageSize = new PageSize(DefaultPageSize);
-            options.MaximumPageSize = null;
-            options.MaximumPageNumber = null;
-        }
+    [Fact]
+    public async Task Cannot_use_negative_page_number()
+    {
+        // Arrange
+        const string route = "/blogs?page[number]=-1";
 
-        [Fact]
-        public async Task Cannot_use_negative_page_number()
-        {
-            // Arrange
-            const string route = "/blogs?page[number]=-1";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified paging is invalid.");
+        error.Detail.Should().Be("Page number cannot be negative or zero.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[number]");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified paging is invalid.");
-            error.Detail.Should().Be("Page number cannot be negative or zero.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[number]");
-        }
+    [Fact]
+    public async Task Cannot_use_zero_page_number()
+    {
+        // Arrange
+        const string route = "/blogs?page[number]=0";
 
-        [Fact]
-        public async Task Cannot_use_zero_page_number()
-        {
-            // Arrange
-            const string route = "/blogs?page[number]=0";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified paging is invalid.");
+        error.Detail.Should().Be("Page number cannot be negative or zero.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[number]");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified paging is invalid.");
-            error.Detail.Should().Be("Page number cannot be negative or zero.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[number]");
-        }
+    [Fact]
+    public async Task Can_use_positive_page_number()
+    {
+        // Arrange
+        const string route = "/blogs?page[number]=20";
 
-        [Fact]
-        public async Task Can_use_positive_page_number()
-        {
-            // Arrange
-            const string route = "/blogs?page[number]=20";
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+    [Fact]
+    public async Task Returns_empty_set_of_resources_when_page_number_is_too_high()
+    {
+        // Arrange
+        List<Blog> blogs = _fakers.Blog.Generate(3);
 
-        [Fact]
-        public async Task Returns_empty_set_of_resources_when_page_number_is_too_high()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Blog> blogs = _fakers.Blog.Generate(3);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Blog>();
-                dbContext.Blogs.AddRange(blogs);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<Blog>();
+            dbContext.Blogs.AddRange(blogs);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/blogs?sort=id&page[size]=3&page[number]=2";
+        const string route = "/blogs?sort=id&page[size]=3&page[number]=2";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.Should().BeEmpty();
-        }
+        responseDocument.Data.ManyValue.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Cannot_use_negative_page_size()
-        {
-            // Arrange
-            const string route = "/blogs?page[size]=-1";
+    [Fact]
+    public async Task Cannot_use_negative_page_size()
+    {
+        // Arrange
+        const string route = "/blogs?page[size]=-1";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified paging is invalid.");
-            error.Detail.Should().Be("Page size cannot be negative.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[size]");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified paging is invalid.");
+        error.Detail.Should().Be("Page size cannot be negative.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[size]");
+    }
 
-        [Fact]
-        public async Task Can_use_zero_page_size()
-        {
-            // Arrange
-            const string route = "/blogs?page[size]=0";
+    [Fact]
+    public async Task Can_use_zero_page_size()
+    {
+        // Arrange
+        const string route = "/blogs?page[size]=0";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-        [Fact]
-        public async Task Can_use_positive_page_size()
-        {
-            // Arrange
-            const string route = "/blogs?page[size]=50";
+    [Fact]
+    public async Task Can_use_positive_page_size()
+    {
+        // Arrange
+        const string route = "/blogs?page[size]=50";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationWithMaximumTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationWithMaximumTests.cs
index a449b6565e..b98e50b5d4 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationWithMaximumTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Pagination/RangeValidationWithMaximumTests.cs
@@ -1,6 +1,4 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -8,148 +6,147 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Pagination
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Pagination;
+
+public sealed class RangeValidationWithMaximumTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
 {
-    public sealed class RangeValidationWithMaximumTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
+    private const int MaximumPageSize = 15;
+    private const int MaximumPageNumber = 20;
+    private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
+
+    public RangeValidationWithMaximumTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
+    {
+        _testContext = testContext;
+
+        testContext.UseController<BlogsController>();
+
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.DefaultPageSize = new PageSize(5);
+        options.MaximumPageSize = new PageSize(MaximumPageSize);
+        options.MaximumPageNumber = new PageNumber(MaximumPageNumber);
+    }
+
+    [Fact]
+    public async Task Can_use_page_number_below_maximum()
+    {
+        // Arrange
+        const int pageNumber = MaximumPageNumber - 1;
+        string route = $"/blogs?page[number]={pageNumber}";
+
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
+
+    [Fact]
+    public async Task Can_use_page_number_equal_to_maximum()
     {
-        private const int MaximumPageSize = 15;
-        private const int MaximumPageNumber = 20;
-        private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
-
-        public RangeValidationWithMaximumTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
-        {
-            _testContext = testContext;
-
-            testContext.UseController<BlogsController>();
-
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.DefaultPageSize = new PageSize(5);
-            options.MaximumPageSize = new PageSize(MaximumPageSize);
-            options.MaximumPageNumber = new PageNumber(MaximumPageNumber);
-        }
-
-        [Fact]
-        public async Task Can_use_page_number_below_maximum()
-        {
-            // Arrange
-            const int pageNumber = MaximumPageNumber - 1;
-            string route = $"/blogs?page[number]={pageNumber}";
-
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
-
-        [Fact]
-        public async Task Can_use_page_number_equal_to_maximum()
-        {
-            // Arrange
-            const int pageNumber = MaximumPageNumber;
-            string route = $"/blogs?page[number]={pageNumber}";
-
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
-
-        [Fact]
-        public async Task Cannot_use_page_number_over_maximum()
-        {
-            // Arrange
-            const int pageNumber = MaximumPageNumber + 1;
-            string route = $"/blogs?page[number]={pageNumber}";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
-
-            responseDocument.Errors.ShouldHaveCount(1);
-
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified paging is invalid.");
-            error.Detail.Should().Be($"Page number cannot be higher than {MaximumPageNumber}.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[number]");
-        }
-
-        [Fact]
-        public async Task Cannot_use_zero_page_size()
-        {
-            // Arrange
-            const string route = "/blogs?page[size]=0";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
-
-            responseDocument.Errors.ShouldHaveCount(1);
-
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified paging is invalid.");
-            error.Detail.Should().Be("Page size cannot be unconstrained.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[size]");
-        }
-
-        [Fact]
-        public async Task Can_use_page_size_below_maximum()
-        {
-            // Arrange
-            const int pageSize = MaximumPageSize - 1;
-            string route = $"/blogs?page[size]={pageSize}";
-
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
-
-        [Fact]
-        public async Task Can_use_page_size_equal_to_maximum()
-        {
-            // Arrange
-            const int pageSize = MaximumPageSize;
-            string route = $"/blogs?page[size]={pageSize}";
-
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
-
-        [Fact]
-        public async Task Cannot_use_page_size_over_maximum()
-        {
-            // Arrange
-            const int pageSize = MaximumPageSize + 1;
-            string route = $"/blogs?page[size]={pageSize}";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
-
-            responseDocument.Errors.ShouldHaveCount(1);
-
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified paging is invalid.");
-            error.Detail.Should().Be($"Page size cannot be higher than {MaximumPageSize}.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[size]");
-        }
+        // Arrange
+        const int pageNumber = MaximumPageNumber;
+        string route = $"/blogs?page[number]={pageNumber}";
+
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
+
+    [Fact]
+    public async Task Cannot_use_page_number_over_maximum()
+    {
+        // Arrange
+        const int pageNumber = MaximumPageNumber + 1;
+        string route = $"/blogs?page[number]={pageNumber}";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified paging is invalid.");
+        error.Detail.Should().Be($"Page number cannot be higher than {MaximumPageNumber}.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[number]");
+    }
+
+    [Fact]
+    public async Task Cannot_use_zero_page_size()
+    {
+        // Arrange
+        const string route = "/blogs?page[size]=0";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified paging is invalid.");
+        error.Detail.Should().Be("Page size cannot be unconstrained.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[size]");
+    }
+
+    [Fact]
+    public async Task Can_use_page_size_below_maximum()
+    {
+        // Arrange
+        const int pageSize = MaximumPageSize - 1;
+        string route = $"/blogs?page[size]={pageSize}";
+
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
+
+    [Fact]
+    public async Task Can_use_page_size_equal_to_maximum()
+    {
+        // Arrange
+        const int pageSize = MaximumPageSize;
+        string route = $"/blogs?page[size]={pageSize}";
+
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
+
+    [Fact]
+    public async Task Cannot_use_page_size_over_maximum()
+    {
+        // Arrange
+        const int pageSize = MaximumPageSize + 1;
+        string route = $"/blogs?page[size]={pageSize}";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified paging is invalid.");
+        error.Detail.Should().Be($"Page size cannot be higher than {MaximumPageSize}.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[size]");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringDbContext.cs
index ca7b41cb59..c1ab78e0a3 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringDbContext.cs
@@ -3,31 +3,30 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class QueryStringDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class QueryStringDbContext : DbContext
-    {
-        public DbSet<Blog> Blogs => Set<Blog>();
-        public DbSet<BlogPost> Posts => Set<BlogPost>();
-        public DbSet<Label> Labels => Set<Label>();
-        public DbSet<Comment> Comments => Set<Comment>();
-        public DbSet<WebAccount> Accounts => Set<WebAccount>();
-        public DbSet<AccountPreferences> AccountPreferences => Set<AccountPreferences>();
-        public DbSet<LoginAttempt> LoginAttempts => Set<LoginAttempt>();
-        public DbSet<Calendar> Calendars => Set<Calendar>();
-        public DbSet<Appointment> Appointments => Set<Appointment>();
+    public DbSet<Blog> Blogs => Set<Blog>();
+    public DbSet<BlogPost> Posts => Set<BlogPost>();
+    public DbSet<Label> Labels => Set<Label>();
+    public DbSet<Comment> Comments => Set<Comment>();
+    public DbSet<WebAccount> Accounts => Set<WebAccount>();
+    public DbSet<AccountPreferences> AccountPreferences => Set<AccountPreferences>();
+    public DbSet<LoginAttempt> LoginAttempts => Set<LoginAttempt>();
+    public DbSet<Calendar> Calendars => Set<Calendar>();
+    public DbSet<Appointment> Appointments => Set<Appointment>();
 
-        public QueryStringDbContext(DbContextOptions<QueryStringDbContext> options)
-            : base(options)
-        {
-        }
+    public QueryStringDbContext(DbContextOptions<QueryStringDbContext> options)
+        : base(options)
+    {
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<WebAccount>()
-                .HasMany(webAccount => webAccount.Posts)
-                .WithOne(blogPost => blogPost.Author!);
-        }
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<WebAccount>()
+            .HasMany(webAccount => webAccount.Posts)
+            .WithOne(blogPost => blogPost.Author!);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringFakers.cs
index 2cb411acb1..ab7fc4b77e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringFakers.cs
@@ -1,83 +1,82 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+internal sealed class QueryStringFakers : FakerContainer
 {
-    internal sealed class QueryStringFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<Blog>> _lazyBlogFaker = new(() =>
-            new Faker<Blog>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(blog => blog.Title, faker => faker.Lorem.Word())
-                .RuleFor(blog => blog.PlatformName, faker => faker.Company.CompanyName()));
+    private readonly Lazy<Faker<Blog>> _lazyBlogFaker = new(() =>
+        new Faker<Blog>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(blog => blog.Title, faker => faker.Lorem.Word())
+            .RuleFor(blog => blog.PlatformName, faker => faker.Company.CompanyName()));
 
-        private readonly Lazy<Faker<BlogPost>> _lazyBlogPostFaker = new(() =>
-            new Faker<BlogPost>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(blogPost => blogPost.Caption, faker => faker.Lorem.Sentence())
-                .RuleFor(blogPost => blogPost.Url, faker => faker.Internet.Url()));
+    private readonly Lazy<Faker<BlogPost>> _lazyBlogPostFaker = new(() =>
+        new Faker<BlogPost>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(blogPost => blogPost.Caption, faker => faker.Lorem.Sentence())
+            .RuleFor(blogPost => blogPost.Url, faker => faker.Internet.Url()));
 
-        private readonly Lazy<Faker<Label>> _lazyLabelFaker = new(() =>
-            new Faker<Label>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(label => label.Name, faker => faker.Lorem.Word())
-                .RuleFor(label => label.Color, faker => faker.PickRandom<LabelColor>()));
+    private readonly Lazy<Faker<Label>> _lazyLabelFaker = new(() =>
+        new Faker<Label>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(label => label.Name, faker => faker.Lorem.Word())
+            .RuleFor(label => label.Color, faker => faker.PickRandom<LabelColor>()));
 
-        private readonly Lazy<Faker<Comment>> _lazyCommentFaker = new(() =>
-            new Faker<Comment>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(comment => comment.Text, faker => faker.Lorem.Paragraph())
-                .RuleFor(comment => comment.CreatedAt, faker => faker.Date.Past()
-                    .TruncateToWholeMilliseconds()));
+    private readonly Lazy<Faker<Comment>> _lazyCommentFaker = new(() =>
+        new Faker<Comment>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(comment => comment.Text, faker => faker.Lorem.Paragraph())
+            .RuleFor(comment => comment.CreatedAt, faker => faker.Date.Past()
+                .TruncateToWholeMilliseconds()));
 
-        private readonly Lazy<Faker<WebAccount>> _lazyWebAccountFaker = new(() =>
-            new Faker<WebAccount>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(webAccount => webAccount.UserName, faker => faker.Person.UserName)
-                .RuleFor(webAccount => webAccount.Password, faker => faker.Internet.Password())
-                .RuleFor(webAccount => webAccount.DisplayName, faker => faker.Person.FullName)
-                .RuleFor(webAccount => webAccount.DateOfBirth, faker => faker.Person.DateOfBirth)
-                .RuleFor(webAccount => webAccount.EmailAddress, faker => faker.Internet.Email()));
+    private readonly Lazy<Faker<WebAccount>> _lazyWebAccountFaker = new(() =>
+        new Faker<WebAccount>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(webAccount => webAccount.UserName, faker => faker.Person.UserName)
+            .RuleFor(webAccount => webAccount.Password, faker => faker.Internet.Password())
+            .RuleFor(webAccount => webAccount.DisplayName, faker => faker.Person.FullName)
+            .RuleFor(webAccount => webAccount.DateOfBirth, faker => faker.Person.DateOfBirth.TruncateToWholeMilliseconds())
+            .RuleFor(webAccount => webAccount.EmailAddress, faker => faker.Internet.Email()));
 
-        private readonly Lazy<Faker<LoginAttempt>> _lazyLoginAttemptFaker = new(() =>
-            new Faker<LoginAttempt>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(loginAttempt => loginAttempt.TriedAt, faker => faker.Date.PastOffset())
-                .RuleFor(loginAttempt => loginAttempt.IsSucceeded, faker => faker.Random.Bool()));
+    private readonly Lazy<Faker<LoginAttempt>> _lazyLoginAttemptFaker = new(() =>
+        new Faker<LoginAttempt>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(loginAttempt => loginAttempt.TriedAt, faker => faker.Date.PastOffset()
+                .TruncateToWholeMilliseconds())
+            .RuleFor(loginAttempt => loginAttempt.IsSucceeded, faker => faker.Random.Bool()));
 
-        private readonly Lazy<Faker<AccountPreferences>> _lazyAccountPreferencesFaker = new(() =>
-            new Faker<AccountPreferences>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(accountPreferences => accountPreferences.UseDarkTheme, faker => faker.Random.Bool()));
+    private readonly Lazy<Faker<AccountPreferences>> _lazyAccountPreferencesFaker = new(() =>
+        new Faker<AccountPreferences>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(accountPreferences => accountPreferences.UseDarkTheme, faker => faker.Random.Bool()));
 
-        private readonly Lazy<Faker<Calendar>> _lazyCalendarFaker = new(() =>
-            new Faker<Calendar>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(calendar => calendar.TimeZone, faker => faker.Date.TimeZoneString())
-                .RuleFor(calendar => calendar.ShowWeekNumbers, faker => faker.Random.Bool())
-                .RuleFor(calendar => calendar.DefaultAppointmentDurationInMinutes, faker => faker.PickRandom(15, 30, 45, 60)));
+    private readonly Lazy<Faker<Calendar>> _lazyCalendarFaker = new(() =>
+        new Faker<Calendar>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(calendar => calendar.TimeZone, faker => faker.Date.TimeZoneString())
+            .RuleFor(calendar => calendar.ShowWeekNumbers, faker => faker.Random.Bool())
+            .RuleFor(calendar => calendar.DefaultAppointmentDurationInMinutes, faker => faker.PickRandom(15, 30, 45, 60)));
 
-        private readonly Lazy<Faker<Appointment>> _lazyAppointmentFaker = new(() =>
-            new Faker<Appointment>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(appointment => appointment.Title, faker => faker.Random.Word())
-                .RuleFor(appointment => appointment.Description, faker => faker.Lorem.Sentence())
-                .RuleFor(appointment => appointment.StartTime, faker => faker.Date.FutureOffset()
-                    .TruncateToWholeMilliseconds())
-                .RuleFor(appointment => appointment.EndTime, (faker, appointment) => appointment.StartTime.AddHours(faker.Random.Double(1, 4))));
+    private readonly Lazy<Faker<Appointment>> _lazyAppointmentFaker = new(() =>
+        new Faker<Appointment>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(appointment => appointment.Title, faker => faker.Random.Word())
+            .RuleFor(appointment => appointment.Description, faker => faker.Lorem.Sentence())
+            .RuleFor(appointment => appointment.StartTime, faker => faker.Date.FutureOffset()
+                .TruncateToWholeMilliseconds())
+            .RuleFor(appointment => appointment.EndTime, (faker, appointment) => appointment.StartTime.AddHours(faker.Random.Double(1, 4))));
 
-        public Faker<Blog> Blog => _lazyBlogFaker.Value;
-        public Faker<BlogPost> BlogPost => _lazyBlogPostFaker.Value;
-        public Faker<Label> Label => _lazyLabelFaker.Value;
-        public Faker<Comment> Comment => _lazyCommentFaker.Value;
-        public Faker<WebAccount> WebAccount => _lazyWebAccountFaker.Value;
-        public Faker<LoginAttempt> LoginAttempt => _lazyLoginAttemptFaker.Value;
-        public Faker<AccountPreferences> AccountPreferences => _lazyAccountPreferencesFaker.Value;
-        public Faker<Calendar> Calendar => _lazyCalendarFaker.Value;
-        public Faker<Appointment> Appointment => _lazyAppointmentFaker.Value;
-    }
+    public Faker<Blog> Blog => _lazyBlogFaker.Value;
+    public Faker<BlogPost> BlogPost => _lazyBlogPostFaker.Value;
+    public Faker<Label> Label => _lazyLabelFaker.Value;
+    public Faker<Comment> Comment => _lazyCommentFaker.Value;
+    public Faker<WebAccount> WebAccount => _lazyWebAccountFaker.Value;
+    public Faker<LoginAttempt> LoginAttempt => _lazyLoginAttemptFaker.Value;
+    public Faker<AccountPreferences> AccountPreferences => _lazyAccountPreferencesFaker.Value;
+    public Faker<Calendar> Calendar => _lazyCalendarFaker.Value;
+    public Faker<Appointment> Appointment => _lazyAppointmentFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringTests.cs
index 3db58ab446..bfaf7137ac 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringTests.cs
@@ -1,6 +1,4 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -8,91 +6,90 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+public sealed class QueryStringTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
 {
-    public sealed class QueryStringTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
+    private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
 
-        public QueryStringTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
-        {
-            _testContext = testContext;
+    public QueryStringTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<CalendarsController>();
-        }
+        testContext.UseController<CalendarsController>();
+    }
 
-        [Fact]
-        public async Task Cannot_use_unknown_query_string_parameter()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownQueryStringParameters = false;
+    [Fact]
+    public async Task Cannot_use_unknown_query_string_parameter()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownQueryStringParameters = false;
 
-            const string route = "/calendars?foo=bar";
+        const string route = "/calendars?foo=bar";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Unknown query string parameter.");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Unknown query string parameter.");
 
-            error.Detail.Should().Be("Query string parameter 'foo' is unknown. " +
-                "Set 'AllowUnknownQueryStringParameters' to 'true' in options to ignore unknown parameters.");
+        error.Detail.Should().Be("Query string parameter 'foo' is unknown. " +
+            "Set 'AllowUnknownQueryStringParameters' to 'true' in options to ignore unknown parameters.");
 
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("foo");
-        }
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("foo");
+    }
 
-        [Fact]
-        public async Task Can_use_unknown_query_string_parameter()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownQueryStringParameters = true;
+    [Fact]
+    public async Task Can_use_unknown_query_string_parameter()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownQueryStringParameters = true;
 
-            const string route = "/calendars?foo=bar";
+        const string route = "/calendars?foo=bar";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-        [Theory]
-        [InlineData("include")]
-        [InlineData("filter")]
-        [InlineData("sort")]
-        [InlineData("page[size]")]
-        [InlineData("page[number]")]
-        public async Task Cannot_use_empty_query_string_parameter_value(string parameterName)
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownQueryStringParameters = false;
+    [Theory]
+    [InlineData("include")]
+    [InlineData("filter")]
+    [InlineData("sort")]
+    [InlineData("page[size]")]
+    [InlineData("page[number]")]
+    public async Task Cannot_use_empty_query_string_parameter_value(string parameterName)
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownQueryStringParameters = false;
 
-            string route = $"calendars?{parameterName}=";
+        string route = $"calendars?{parameterName}=";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Missing query string parameter value.");
-            error.Detail.Should().Be($"Missing value for '{parameterName}' query string parameter.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be(parameterName);
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Missing query string parameter value.");
+        error.Detail.Should().Be($"Missing value for '{parameterName}' query string parameter.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be(parameterName);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerIgnoreConditionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerIgnoreConditionTests.cs
index d30dc949f3..855315f048 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerIgnoreConditionTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SerializerIgnoreConditionTests.cs
@@ -1,8 +1,5 @@
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Extensions;
 using JsonApiDotNetCore.Configuration;
@@ -11,75 +8,74 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+public sealed class SerializerIgnoreConditionTests : IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>
 {
-    public sealed class SerializerIgnoreConditionTests : IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>
-    {
-        private readonly QueryStringFakers _fakers = new();
+    private readonly QueryStringFakers _fakers = new();
 
-        public SerializerIgnoreConditionTests()
-        {
-            UseController<CalendarsController>();
-        }
+    public SerializerIgnoreConditionTests()
+    {
+        UseController<CalendarsController>();
+    }
 
-        [Theory]
-        [InlineData(JsonIgnoreCondition.Never, true, true)]
-        [InlineData(JsonIgnoreCondition.WhenWritingDefault, false, false)]
-        [InlineData(JsonIgnoreCondition.WhenWritingNull, false, true)]
-        public async Task Applies_configuration_for_ignore_condition(JsonIgnoreCondition configurationValue, bool expectNullValueInDocument,
-            bool expectDefaultValueInDocument)
-        {
-            // Arrange
-            var options = (JsonApiOptions)Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.SerializerOptions.DefaultIgnoreCondition = configurationValue;
+    [Theory]
+    [InlineData(JsonIgnoreCondition.Never, true, true)]
+    [InlineData(JsonIgnoreCondition.WhenWritingDefault, false, false)]
+    [InlineData(JsonIgnoreCondition.WhenWritingNull, false, true)]
+    public async Task Applies_configuration_for_ignore_condition(JsonIgnoreCondition configurationValue, bool expectNullValueInDocument,
+        bool expectDefaultValueInDocument)
+    {
+        // Arrange
+        var options = (JsonApiOptions)Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.SerializerOptions.DefaultIgnoreCondition = configurationValue;
 
-            Calendar calendar = _fakers.Calendar.Generate();
-            calendar.TimeZone = null;
-            calendar.DefaultAppointmentDurationInMinutes = default;
-            calendar.ShowWeekNumbers = true;
-            calendar.Appointments = _fakers.Appointment.Generate(1).ToHashSet();
-            calendar.Appointments.Single().Description = null;
-            calendar.Appointments.Single().StartTime = default;
-            calendar.Appointments.Single().EndTime = 1.January(2001);
+        Calendar calendar = _fakers.Calendar.Generate();
+        calendar.TimeZone = null;
+        calendar.DefaultAppointmentDurationInMinutes = default;
+        calendar.ShowWeekNumbers = true;
+        calendar.Appointments = _fakers.Appointment.Generate(1).ToHashSet();
+        calendar.Appointments.Single().Description = null;
+        calendar.Appointments.Single().StartTime = default;
+        calendar.Appointments.Single().EndTime = 1.January(2001).AsUtc();
 
-            await RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Calendars.Add(calendar);
-                await dbContext.SaveChangesAsync();
-            });
+        await RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Calendars.Add(calendar);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/calendars/{calendar.StringId}?include=appointments";
+        string route = $"/calendars/{calendar.StringId}?include=appointments";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Included.ShouldHaveCount(1);
 
-            if (expectNullValueInDocument)
-            {
-                responseDocument.Data.SingleValue.Attributes.ShouldContainKey("timeZone");
-                responseDocument.Included[0].Attributes.ShouldContainKey("description");
-            }
-            else
-            {
-                responseDocument.Data.SingleValue.Attributes.Should().NotContainKey("timeZone");
-                responseDocument.Included[0].Attributes.Should().NotContainKey("description");
-            }
+        if (expectNullValueInDocument)
+        {
+            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("timeZone");
+            responseDocument.Included[0].Attributes.ShouldContainKey("description");
+        }
+        else
+        {
+            responseDocument.Data.SingleValue.Attributes.Should().NotContainKey("timeZone");
+            responseDocument.Included[0].Attributes.Should().NotContainKey("description");
+        }
 
-            if (expectDefaultValueInDocument)
-            {
-                responseDocument.Data.SingleValue.Attributes.ShouldContainKey("defaultAppointmentDurationInMinutes");
-                responseDocument.Included[0].Attributes.ShouldContainKey("startTime");
-            }
-            else
-            {
-                responseDocument.Data.SingleValue.Attributes.Should().NotContainKey("defaultAppointmentDurationInMinutes");
-                responseDocument.Included[0].Attributes.Should().NotContainKey("startTime");
-            }
+        if (expectDefaultValueInDocument)
+        {
+            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("defaultAppointmentDurationInMinutes");
+            responseDocument.Included[0].Attributes.ShouldContainKey("startTime");
+        }
+        else
+        {
+            responseDocument.Data.SingleValue.Attributes.Should().NotContainKey("defaultAppointmentDurationInMinutes");
+            responseDocument.Included[0].Attributes.Should().NotContainKey("startTime");
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Sorting/SortTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Sorting/SortTests.cs
index 404342a554..71c376f06e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Sorting/SortTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/Sorting/SortTests.cs
@@ -1,587 +1,582 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Extensions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Sorting
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.Sorting;
+
+public sealed class SortTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
 {
-    public sealed class SortTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
+    private readonly QueryStringFakers _fakers = new();
+
+    public SortTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
-        private readonly QueryStringFakers _fakers = new();
+        _testContext = testContext;
 
-        public SortTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<BlogPostsController>();
+        testContext.UseController<BlogsController>();
+        testContext.UseController<WebAccountsController>();
+    }
 
-            testContext.UseController<BlogPostsController>();
-            testContext.UseController<BlogsController>();
-            testContext.UseController<WebAccountsController>();
-        }
+    [Fact]
+    public async Task Can_sort_in_primary_resources()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(3);
+        posts[0].Caption = "B";
+        posts[1].Caption = "A";
+        posts[2].Caption = "C";
 
-        [Fact]
-        public async Task Can_sort_in_primary_resources()
-        {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(3);
-            posts[0].Caption = "B";
-            posts[1].Caption = "A";
-            posts[2].Caption = "C";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/blogPosts?sort=caption";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(3);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(posts[1].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(posts[0].StringId);
-            responseDocument.Data.ManyValue[2].Id.Should().Be(posts[2].StringId);
-        }
-
-        [Fact]
-        public async Task Cannot_sort_in_single_primary_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/blogPosts?sort=caption";
 
-            string route = $"/blogPosts/{post.StringId}?sort=id";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
-
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue.ShouldHaveCount(3);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(posts[1].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(posts[0].StringId);
+        responseDocument.Data.ManyValue[2].Id.Should().Be(posts[2].StringId);
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified sort is invalid.");
-            error.Detail.Should().Be("This query string parameter can only be used on a collection of resources (not on a single resource).");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("sort");
-        }
+    [Fact]
+    public async Task Cannot_sort_in_single_primary_resource()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
 
-        [Fact]
-        public async Task Can_sort_in_secondary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Posts = _fakers.BlogPost.Generate(3);
-            blog.Posts[0].Caption = "B";
-            blog.Posts[1].Caption = "A";
-            blog.Posts[2].Caption = "C";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogs/{blog.StringId}/posts?sort=caption";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(3);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[1].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(blog.Posts[0].StringId);
-            responseDocument.Data.ManyValue[2].Id.Should().Be(blog.Posts[2].StringId);
-        }
-
-        [Fact]
-        public async Task Cannot_sort_in_single_secondary_resource()
-        {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogPosts/{post.StringId}?sort=id";
 
-            string route = $"/blogPosts/{post.StringId}/author?sort=id";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified sort is invalid.");
+        error.Detail.Should().Be("This query string parameter can only be used on a collection of resources (not on a single resource).");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("sort");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified sort is invalid.");
-            error.Detail.Should().Be("This query string parameter can only be used on a collection of resources (not on a single resource).");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("sort");
-        }
+    [Fact]
+    public async Task Can_sort_in_secondary_resources()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Posts = _fakers.BlogPost.Generate(3);
+        blog.Posts[0].Caption = "B";
+        blog.Posts[1].Caption = "A";
+        blog.Posts[2].Caption = "C";
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/blogs/{blog.StringId}/posts?sort=caption";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-        [Fact]
-        public async Task Can_sort_on_OneToMany_relationship()
+        responseDocument.Data.ManyValue.ShouldHaveCount(3);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[1].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(blog.Posts[0].StringId);
+        responseDocument.Data.ManyValue[2].Id.Should().Be(blog.Posts[2].StringId);
+    }
+
+    [Fact]
+    public async Task Cannot_sort_in_single_secondary_resource()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Blog> blogs = _fakers.Blog.Generate(2);
-            blogs[0].Posts = _fakers.BlogPost.Generate(2);
-            blogs[1].Posts = _fakers.BlogPost.Generate(1);
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Blog>();
-                dbContext.Blogs.AddRange(blogs);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/blogPosts/{post.StringId}/author?sort=id";
 
-            const string route = "/blogs?sort=count(posts)";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(blogs[0].StringId);
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified sort is invalid.");
+        error.Detail.Should().Be("This query string parameter can only be used on a collection of resources (not on a single resource).");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("sort");
+    }
 
-        [Fact]
-        public async Task Can_sort_on_ManyToMany_relationship()
+    [Fact]
+    public async Task Can_sort_on_OneToMany_relationship()
+    {
+        // Arrange
+        List<Blog> blogs = _fakers.Blog.Generate(2);
+        blogs[0].Posts = _fakers.BlogPost.Generate(2);
+        blogs[1].Posts = _fakers.BlogPost.Generate(1);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(2);
-            posts[0].Labels = _fakers.Label.Generate(1).ToHashSet();
-            posts[1].Labels = _fakers.Label.Generate(2).ToHashSet();
+            await dbContext.ClearTableAsync<Blog>();
+            dbContext.Blogs.AddRange(blogs);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/blogs?sort=count(posts)";
 
-            const string route = "/blogPosts?sort=-count(labels)";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(blogs[0].StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(posts[1].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(posts[0].StringId);
-        }
+    [Fact]
+    public async Task Can_sort_on_ManyToMany_relationship()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(2);
+        posts[0].Labels = _fakers.Label.Generate(1).ToHashSet();
+        posts[1].Labels = _fakers.Label.Generate(2).ToHashSet();
 
-        [Fact]
-        public async Task Can_sort_in_scope_of_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebAccount account = _fakers.WebAccount.Generate();
-            account.Posts = _fakers.BlogPost.Generate(3);
-            account.Posts[0].Caption = "B";
-            account.Posts[1].Caption = "A";
-            account.Posts[2].Caption = "C";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Accounts.Add(account);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/webAccounts/{account.StringId}?include=posts&sort[posts]=caption";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(account.StringId);
-
-            responseDocument.Included.ShouldHaveCount(3);
-            responseDocument.Included[0].Id.Should().Be(account.Posts[1].StringId);
-            responseDocument.Included[1].Id.Should().Be(account.Posts[0].StringId);
-            responseDocument.Included[2].Id.Should().Be(account.Posts[2].StringId);
-        }
-
-        [Fact]
-        public async Task Can_sort_in_scope_of_OneToMany_relationship_on_secondary_endpoint()
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/blogPosts?sort=-count(labels)";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(posts[1].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(posts[0].StringId);
+    }
+
+    [Fact]
+    public async Task Can_sort_in_scope_of_OneToMany_relationship()
+    {
+        // Arrange
+        WebAccount account = _fakers.WebAccount.Generate();
+        account.Posts = _fakers.BlogPost.Generate(3);
+        account.Posts[0].Caption = "B";
+        account.Posts[1].Caption = "A";
+        account.Posts[2].Caption = "C";
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Blog blog = _fakers.Blog.Generate();
-            blog.Owner = _fakers.WebAccount.Generate();
-            blog.Owner.Posts = _fakers.BlogPost.Generate(3);
-            blog.Owner.Posts[0].Caption = "B";
-            blog.Owner.Posts[1].Caption = "A";
-            blog.Owner.Posts[2].Caption = "C";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogs/{blog.StringId}/owner?include=posts&sort[posts]=caption";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(blog.Owner.StringId);
-
-            responseDocument.Included.ShouldHaveCount(3);
-            responseDocument.Included[0].Id.Should().Be(blog.Owner.Posts[1].StringId);
-            responseDocument.Included[1].Id.Should().Be(blog.Owner.Posts[0].StringId);
-            responseDocument.Included[2].Id.Should().Be(blog.Owner.Posts[2].StringId);
-        }
-
-        [Fact]
-        public async Task Can_sort_in_scope_of_ManyToMany_relationship()
+            dbContext.Accounts.Add(account);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/webAccounts/{account.StringId}?include=posts&sort[posts]=caption";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(account.StringId);
+
+        responseDocument.Included.ShouldHaveCount(3);
+        responseDocument.Included[0].Id.Should().Be(account.Posts[1].StringId);
+        responseDocument.Included[1].Id.Should().Be(account.Posts[0].StringId);
+        responseDocument.Included[2].Id.Should().Be(account.Posts[2].StringId);
+    }
+
+    [Fact]
+    public async Task Can_sort_in_scope_of_OneToMany_relationship_on_secondary_endpoint()
+    {
+        // Arrange
+        Blog blog = _fakers.Blog.Generate();
+        blog.Owner = _fakers.WebAccount.Generate();
+        blog.Owner.Posts = _fakers.BlogPost.Generate(3);
+        blog.Owner.Posts[0].Caption = "B";
+        blog.Owner.Posts[1].Caption = "A";
+        blog.Owner.Posts[2].Caption = "C";
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            BlogPost post = _fakers.BlogPost.Generate();
-            post.Labels = _fakers.Label.Generate(3).ToHashSet();
-            post.Labels.ElementAt(0).Name = "B";
-            post.Labels.ElementAt(1).Name = "A";
-            post.Labels.ElementAt(2).Name = "C";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogPosts/{post.StringId}?include=labels&sort[labels]=name";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
-
-            responseDocument.Included.ShouldHaveCount(3);
-            responseDocument.Included[0].Id.Should().Be(post.Labels.ElementAt(1).StringId);
-            responseDocument.Included[1].Id.Should().Be(post.Labels.ElementAt(0).StringId);
-            responseDocument.Included[2].Id.Should().Be(post.Labels.ElementAt(2).StringId);
-        }
-
-        [Fact]
-        public async Task Can_sort_on_multiple_fields_in_multiple_scopes()
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/blogs/{blog.StringId}/owner?include=posts&sort[posts]=caption";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(blog.Owner.StringId);
+
+        responseDocument.Included.ShouldHaveCount(3);
+        responseDocument.Included[0].Id.Should().Be(blog.Owner.Posts[1].StringId);
+        responseDocument.Included[1].Id.Should().Be(blog.Owner.Posts[0].StringId);
+        responseDocument.Included[2].Id.Should().Be(blog.Owner.Posts[2].StringId);
+    }
+
+    [Fact]
+    public async Task Can_sort_in_scope_of_ManyToMany_relationship()
+    {
+        // Arrange
+        BlogPost post = _fakers.BlogPost.Generate();
+        post.Labels = _fakers.Label.Generate(3).ToHashSet();
+        post.Labels.ElementAt(0).Name = "B";
+        post.Labels.ElementAt(1).Name = "A";
+        post.Labels.ElementAt(2).Name = "C";
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Blog> blogs = _fakers.Blog.Generate(2);
-            blogs[0].Title = "Z";
-            blogs[1].Title = "Y";
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/blogPosts/{post.StringId}?include=labels&sort[labels]=name";
 
-            blogs[0].Posts = _fakers.BlogPost.Generate(4);
-            blogs[0].Posts[0].Caption = "B";
-            blogs[0].Posts[1].Caption = "A";
-            blogs[0].Posts[2].Caption = "A";
-            blogs[0].Posts[3].Caption = "C";
-            blogs[0].Posts[0].Url = "";
-            blogs[0].Posts[1].Url = "www.some2.com";
-            blogs[0].Posts[2].Url = "www.some1.com";
-            blogs[0].Posts[3].Url = "";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            blogs[0].Posts[0].Comments = _fakers.Comment.Generate(3).ToHashSet();
-            blogs[0].Posts[0].Comments.ElementAt(0).CreatedAt = 1.January(2015);
-            blogs[0].Posts[0].Comments.ElementAt(1).CreatedAt = 1.January(2014);
-            blogs[0].Posts[0].Comments.ElementAt(2).CreatedAt = 1.January(2016);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Blog>();
-                dbContext.Blogs.AddRange(blogs);
-                await dbContext.SaveChangesAsync();
-            });
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
 
-            const string route = "/blogs?include=posts.comments&sort=title&sort[posts]=caption,url&sort[posts.comments]=-createdAt";
+        responseDocument.Included.ShouldHaveCount(3);
+        responseDocument.Included[0].Id.Should().Be(post.Labels.ElementAt(1).StringId);
+        responseDocument.Included[1].Id.Should().Be(post.Labels.ElementAt(0).StringId);
+        responseDocument.Included[2].Id.Should().Be(post.Labels.ElementAt(2).StringId);
+    }
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+    [Fact]
+    public async Task Can_sort_on_multiple_fields_in_multiple_scopes()
+    {
+        // Arrange
+        List<Blog> blogs = _fakers.Blog.Generate(2);
+        blogs[0].Title = "Z";
+        blogs[1].Title = "Y";
+
+        blogs[0].Posts = _fakers.BlogPost.Generate(4);
+        blogs[0].Posts[0].Caption = "B";
+        blogs[0].Posts[1].Caption = "A";
+        blogs[0].Posts[2].Caption = "A";
+        blogs[0].Posts[3].Caption = "C";
+        blogs[0].Posts[0].Url = "";
+        blogs[0].Posts[1].Url = "www.some2.com";
+        blogs[0].Posts[2].Url = "www.some1.com";
+        blogs[0].Posts[3].Url = "";
+
+        blogs[0].Posts[0].Comments = _fakers.Comment.Generate(3).ToHashSet();
+        blogs[0].Posts[0].Comments.ElementAt(0).CreatedAt = 1.January(2015).AsUtc();
+        blogs[0].Posts[0].Comments.ElementAt(1).CreatedAt = 1.January(2014).AsUtc();
+        blogs[0].Posts[0].Comments.ElementAt(2).CreatedAt = 1.January(2016).AsUtc();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Blog>();
+            dbContext.Blogs.AddRange(blogs);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        const string route = "/blogs?include=posts.comments&sort=title&sort[posts]=caption,url&sort[posts.comments]=-createdAt";
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(blogs[0].StringId);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Included.ShouldHaveCount(7);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Included[0].Type.Should().Be("blogPosts");
-            responseDocument.Included[0].Id.Should().Be(blogs[0].Posts[2].StringId);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(blogs[0].StringId);
 
-            responseDocument.Included[1].Type.Should().Be("blogPosts");
-            responseDocument.Included[1].Id.Should().Be(blogs[0].Posts[1].StringId);
+        responseDocument.Included.ShouldHaveCount(7);
 
-            responseDocument.Included[2].Type.Should().Be("blogPosts");
-            responseDocument.Included[2].Id.Should().Be(blogs[0].Posts[0].StringId);
+        responseDocument.Included[0].Type.Should().Be("blogPosts");
+        responseDocument.Included[0].Id.Should().Be(blogs[0].Posts[2].StringId);
 
-            responseDocument.Included[3].Type.Should().Be("comments");
-            responseDocument.Included[3].Id.Should().Be(blogs[0].Posts[0].Comments.ElementAt(2).StringId);
+        responseDocument.Included[1].Type.Should().Be("blogPosts");
+        responseDocument.Included[1].Id.Should().Be(blogs[0].Posts[1].StringId);
 
-            responseDocument.Included[4].Type.Should().Be("comments");
-            responseDocument.Included[4].Id.Should().Be(blogs[0].Posts[0].Comments.ElementAt(0).StringId);
+        responseDocument.Included[2].Type.Should().Be("blogPosts");
+        responseDocument.Included[2].Id.Should().Be(blogs[0].Posts[0].StringId);
 
-            responseDocument.Included[5].Type.Should().Be("comments");
-            responseDocument.Included[5].Id.Should().Be(blogs[0].Posts[0].Comments.ElementAt(1).StringId);
+        responseDocument.Included[3].Type.Should().Be("comments");
+        responseDocument.Included[3].Id.Should().Be(blogs[0].Posts[0].Comments.ElementAt(2).StringId);
 
-            responseDocument.Included[6].Type.Should().Be("blogPosts");
-            responseDocument.Included[6].Id.Should().Be(blogs[0].Posts[3].StringId);
-        }
+        responseDocument.Included[4].Type.Should().Be("comments");
+        responseDocument.Included[4].Id.Should().Be(blogs[0].Posts[0].Comments.ElementAt(0).StringId);
 
-        [Fact]
-        public async Task Can_sort_on_ManyToOne_relationship()
+        responseDocument.Included[5].Type.Should().Be("comments");
+        responseDocument.Included[5].Id.Should().Be(blogs[0].Posts[0].Comments.ElementAt(1).StringId);
+
+        responseDocument.Included[6].Type.Should().Be("blogPosts");
+        responseDocument.Included[6].Id.Should().Be(blogs[0].Posts[3].StringId);
+    }
+
+    [Fact]
+    public async Task Can_sort_on_ManyToOne_relationship()
+    {
+        // Arrange
+        List<BlogPost> posts = _fakers.BlogPost.Generate(2);
+        posts[0].Author = _fakers.WebAccount.Generate();
+        posts[1].Author = _fakers.WebAccount.Generate();
+
+        posts[0].Author!.DisplayName = "Conner";
+        posts[1].Author!.DisplayName = "Smith";
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<BlogPost> posts = _fakers.BlogPost.Generate(2);
-            posts[0].Author = _fakers.WebAccount.Generate();
-            posts[1].Author = _fakers.WebAccount.Generate();
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.AddRange(posts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            posts[0].Author!.DisplayName = "Conner";
-            posts[1].Author!.DisplayName = "Smith";
+        const string route = "/blogPosts?sort=-author.displayName";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.AddRange(posts);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            const string route = "/blogPosts?sort=-author.displayName";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(posts[1].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(posts[0].StringId);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    [Fact]
+    public async Task Can_sort_in_multiple_scopes()
+    {
+        // Arrange
+        List<Blog> blogs = _fakers.Blog.Generate(2);
+        blogs[0].Title = "Cooking";
+        blogs[1].Title = "Technology";
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(posts[1].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(posts[0].StringId);
-        }
+        blogs[1].Owner = _fakers.WebAccount.Generate();
+        blogs[1].Owner!.Posts = _fakers.BlogPost.Generate(2);
+        blogs[1].Owner!.Posts[0].Caption = "One";
+        blogs[1].Owner!.Posts[1].Caption = "Two";
 
-        [Fact]
-        public async Task Can_sort_in_multiple_scopes()
+        blogs[1].Owner!.Posts[1].Comments = _fakers.Comment.Generate(2).ToHashSet();
+        blogs[1].Owner!.Posts[1].Comments.ElementAt(0).CreatedAt = 1.January(2000).AsUtc();
+        blogs[1].Owner!.Posts[1].Comments.ElementAt(0).CreatedAt = 10.January(2010).AsUtc();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Blog> blogs = _fakers.Blog.Generate(2);
-            blogs[0].Title = "Cooking";
-            blogs[1].Title = "Technology";
+            await dbContext.ClearTableAsync<Blog>();
+            dbContext.Blogs.AddRange(blogs);
+            await dbContext.SaveChangesAsync();
+        });
 
-            blogs[1].Owner = _fakers.WebAccount.Generate();
-            blogs[1].Owner!.Posts = _fakers.BlogPost.Generate(2);
-            blogs[1].Owner!.Posts[0].Caption = "One";
-            blogs[1].Owner!.Posts[1].Caption = "Two";
+        const string route = "/blogs?include=owner.posts.comments&sort=-title&sort[owner.posts]=-caption&sort[owner.posts.comments]=-createdAt";
 
-            blogs[1].Owner!.Posts[1].Comments = _fakers.Comment.Generate(2).ToHashSet();
-            blogs[1].Owner!.Posts[1].Comments.ElementAt(0).CreatedAt = 1.January(2000);
-            blogs[1].Owner!.Posts[1].Comments.ElementAt(0).CreatedAt = 10.January(2010);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Blog>();
-                dbContext.Blogs.AddRange(blogs);
-                await dbContext.SaveChangesAsync();
-            });
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            const string route = "/blogs?include=owner.posts.comments&sort=-title&sort[owner.posts]=-caption&sort[owner.posts.comments]=-createdAt";
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(blogs[0].StringId);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Included.ShouldHaveCount(5);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(blogs[1].Owner!.StringId);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blogs[1].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(blogs[0].StringId);
+        responseDocument.Included[1].Type.Should().Be("blogPosts");
+        responseDocument.Included[1].Id.Should().Be(blogs[1].Owner!.Posts[1].StringId);
 
-            responseDocument.Included.ShouldHaveCount(5);
+        responseDocument.Included[2].Type.Should().Be("comments");
+        responseDocument.Included[2].Id.Should().Be(blogs[1].Owner!.Posts[1].Comments.ElementAt(1).StringId);
 
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(blogs[1].Owner!.StringId);
+        responseDocument.Included[3].Type.Should().Be("comments");
+        responseDocument.Included[3].Id.Should().Be(blogs[1].Owner!.Posts[1].Comments.ElementAt(0).StringId);
 
-            responseDocument.Included[1].Type.Should().Be("blogPosts");
-            responseDocument.Included[1].Id.Should().Be(blogs[1].Owner!.Posts[1].StringId);
+        responseDocument.Included[4].Type.Should().Be("blogPosts");
+        responseDocument.Included[4].Id.Should().Be(blogs[1].Owner!.Posts[0].StringId);
+    }
 
-            responseDocument.Included[2].Type.Should().Be("comments");
-            responseDocument.Included[2].Id.Should().Be(blogs[1].Owner!.Posts[1].Comments.ElementAt(1).StringId);
+    [Fact]
+    public async Task Cannot_sort_in_unknown_scope()
+    {
+        // Arrange
+        const string route = $"/webAccounts?sort[{Unknown.Relationship}]=id";
 
-            responseDocument.Included[3].Type.Should().Be("comments");
-            responseDocument.Included[3].Id.Should().Be(blogs[1].Owner!.Posts[1].Comments.ElementAt(0).StringId);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Included[4].Type.Should().Be("blogPosts");
-            responseDocument.Included[4].Id.Should().Be(blogs[1].Owner!.Posts[0].StringId);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-        [Fact]
-        public async Task Cannot_sort_in_unknown_scope()
-        {
-            // Arrange
-            string route = $"/webAccounts?sort[{Unknown.Relationship}]=id";
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified sort is invalid.");
+        error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'webAccounts'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be($"sort[{Unknown.Relationship}]");
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+    [Fact]
+    public async Task Cannot_sort_in_unknown_nested_scope()
+    {
+        // Arrange
+        const string route = $"/webAccounts?sort[posts.{Unknown.Relationship}]=id";
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified sort is invalid.");
-            error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' does not exist on resource type 'webAccounts'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be($"sort[{Unknown.Relationship}]");
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-        [Fact]
-        public async Task Cannot_sort_in_unknown_nested_scope()
-        {
-            // Arrange
-            string route = $"/webAccounts?sort[posts.{Unknown.Relationship}]=id";
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified sort is invalid.");
+        error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' in 'posts.{Unknown.Relationship}' does not exist on resource type 'blogPosts'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be($"sort[posts.{Unknown.Relationship}]");
+    }
+
+    [Fact]
+    public async Task Cannot_sort_on_attribute_with_blocked_capability()
+    {
+        // Arrange
+        const string route = "/webAccounts?sort=dateOfBirth";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Sorting on the requested attribute is not allowed.");
+        error.Detail.Should().Be("Sorting on attribute 'dateOfBirth' is not allowed.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("sort");
+    }
+
+    [Fact]
+    public async Task Can_sort_descending_by_ID()
+    {
+        // Arrange
+        List<WebAccount> accounts = _fakers.WebAccount.Generate(3);
+        accounts[0].Id = 3000;
+        accounts[1].Id = 2000;
+        accounts[2].Id = 1000;
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified sort is invalid.");
-            error.Detail.Should().Be($"Relationship '{Unknown.Relationship}' in 'posts.{Unknown.Relationship}' does not exist on resource type 'blogPosts'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be($"sort[posts.{Unknown.Relationship}]");
-        }
+        accounts[0].DisplayName = "B";
+        accounts[1].DisplayName = "A";
+        accounts[2].DisplayName = "A";
 
-        [Fact]
-        public async Task Cannot_sort_on_attribute_with_blocked_capability()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            const string route = "/webAccounts?sort=dateOfBirth";
+            await dbContext.ClearTableAsync<WebAccount>();
+            dbContext.Accounts.AddRange(accounts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        const string route = "/webAccounts?sort=displayName,-id";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Sorting on the requested attribute is not allowed.");
-            error.Detail.Should().Be("Sorting on attribute 'dateOfBirth' is not allowed.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("sort");
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(3);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(accounts[1].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(accounts[2].StringId);
+        responseDocument.Data.ManyValue[2].Id.Should().Be(accounts[0].StringId);
+    }
 
-        [Fact]
-        public async Task Can_sort_descending_by_ID()
-        {
-            // Arrange
-            List<WebAccount> accounts = _fakers.WebAccount.Generate(3);
-            accounts[0].Id = 3000;
-            accounts[1].Id = 2000;
-            accounts[2].Id = 1000;
-
-            accounts[0].DisplayName = "B";
-            accounts[1].DisplayName = "A";
-            accounts[2].DisplayName = "A";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<WebAccount>();
-                dbContext.Accounts.AddRange(accounts);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/webAccounts?sort=displayName,-id";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(3);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(accounts[1].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(accounts[2].StringId);
-            responseDocument.Data.ManyValue[2].Id.Should().Be(accounts[0].StringId);
-        }
-
-        [Fact]
-        public async Task Sorts_by_ID_if_none_specified()
+    [Fact]
+    public async Task Sorts_by_ID_if_none_specified()
+    {
+        // Arrange
+        List<WebAccount> accounts = _fakers.WebAccount.Generate(4);
+        accounts[0].Id = 300;
+        accounts[1].Id = 200;
+        accounts[2].Id = 100;
+        accounts[3].Id = 400;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<WebAccount> accounts = _fakers.WebAccount.Generate(4);
-            accounts[0].Id = 300;
-            accounts[1].Id = 200;
-            accounts[2].Id = 100;
-            accounts[3].Id = 400;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<WebAccount>();
-                dbContext.Accounts.AddRange(accounts);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/webAccounts";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(4);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(accounts[2].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(accounts[1].StringId);
-            responseDocument.Data.ManyValue[2].Id.Should().Be(accounts[0].StringId);
-            responseDocument.Data.ManyValue[3].Id.Should().Be(accounts[3].StringId);
-        }
+            await dbContext.ClearTableAsync<WebAccount>();
+            dbContext.Accounts.AddRange(accounts);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/webAccounts";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(4);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(accounts[2].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(accounts[1].StringId);
+        responseDocument.Data.ManyValue[2].Id.Should().Be(accounts[0].StringId);
+        responseDocument.Data.ManyValue[3].Id.Should().Be(accounts[3].StringId);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResourceCaptureStore.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResourceCaptureStore.cs
index 8a94831480..e2ef670d71 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResourceCaptureStore.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResourceCaptureStore.cs
@@ -1,20 +1,18 @@
-using System.Collections.Generic;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.SparseFieldSets
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.SparseFieldSets;
+
+public sealed class ResourceCaptureStore
 {
-    public sealed class ResourceCaptureStore
-    {
-        internal List<IIdentifiable> Resources { get; } = new();
+    internal List<IIdentifiable> Resources { get; } = new();
 
-        internal void Add(IEnumerable<IIdentifiable> resources)
-        {
-            Resources.AddRange(resources);
-        }
+    internal void Add(IEnumerable<IIdentifiable> resources)
+    {
+        Resources.AddRange(resources);
+    }
 
-        internal void Clear()
-        {
-            Resources.Clear();
-        }
+    internal void Clear()
+    {
+        Resources.Clear();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResultCapturingRepository.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResultCapturingRepository.cs
index 816b105ff4..d900e5809d 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResultCapturingRepository.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/ResultCapturingRepository.cs
@@ -1,6 +1,3 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries;
@@ -8,32 +5,31 @@
 using JsonApiDotNetCore.Resources;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.SparseFieldSets
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.SparseFieldSets;
+
+/// <summary>
+/// Enables sparse fieldset tests to verify which fields were (not) retrieved from the database.
+/// </summary>
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class ResultCapturingRepository<TResource, TId> : EntityFrameworkCoreRepository<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    /// <summary>
-    /// Enables sparse fieldset tests to verify which fields were (not) retrieved from the database.
-    /// </summary>
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class ResultCapturingRepository<TResource, TId> : EntityFrameworkCoreRepository<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
-    {
-        private readonly ResourceCaptureStore _captureStore;
+    private readonly ResourceCaptureStore _captureStore;
 
-        public ResultCapturingRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
-            IResourceDefinitionAccessor resourceDefinitionAccessor, ResourceCaptureStore captureStore)
-            : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
-        {
-            _captureStore = captureStore;
-        }
+    public ResultCapturingRepository(ITargetedFields targetedFields, IDbContextResolver dbContextResolver, IResourceGraph resourceGraph,
+        IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, ILoggerFactory loggerFactory,
+        IResourceDefinitionAccessor resourceDefinitionAccessor, ResourceCaptureStore captureStore)
+        : base(targetedFields, dbContextResolver, resourceGraph, resourceFactory, constraintProviders, loggerFactory, resourceDefinitionAccessor)
+    {
+        _captureStore = captureStore;
+    }
 
-        public override async Task<IReadOnlyCollection<TResource>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
-        {
-            IReadOnlyCollection<TResource> resources = await base.GetAsync(queryLayer, cancellationToken);
+    public override async Task<IReadOnlyCollection<TResource>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
+    {
+        IReadOnlyCollection<TResource> resources = await base.GetAsync(queryLayer, cancellationToken);
 
-            _captureStore.Add(resources);
+        _captureStore.Add(resources);
 
-            return resources;
-        }
+        return resources;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
index a6da424bee..141c0addb4 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/SparseFieldSets/SparseFieldSetTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -10,849 +6,846 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.SparseFieldSets
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings.SparseFieldSets;
+
+public sealed class SparseFieldSetTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
 {
-    public sealed class SparseFieldSetTests : IClassFixture<IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
+    private readonly QueryStringFakers _fakers = new();
+
+    public SparseFieldSetTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> _testContext;
-        private readonly QueryStringFakers _fakers = new();
+        _testContext = testContext;
+
+        testContext.UseController<BlogPostsController>();
+        testContext.UseController<WebAccountsController>();
+        testContext.UseController<BlogsController>();
 
-        public SparseFieldSetTests(IntegrationTestContext<TestableStartup<QueryStringDbContext>, QueryStringDbContext> testContext)
+        testContext.ConfigureServicesAfterStartup(services =>
         {
-            _testContext = testContext;
+            services.AddSingleton<ResourceCaptureStore>();
 
-            testContext.UseController<BlogPostsController>();
-            testContext.UseController<WebAccountsController>();
-            testContext.UseController<BlogsController>();
+            services.AddResourceRepository<ResultCapturingRepository<Blog, int>>();
+            services.AddResourceRepository<ResultCapturingRepository<BlogPost, int>>();
+            services.AddResourceRepository<ResultCapturingRepository<WebAccount, int>>();
+        });
+    }
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddSingleton<ResourceCaptureStore>();
+    [Fact]
+    public async Task Can_select_fields_in_primary_resources()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
 
-                services.AddResourceRepository<ResultCapturingRepository<Blog, int>>();
-                services.AddResourceRepository<ResultCapturingRepository<BlogPost, int>>();
-                services.AddResourceRepository<ResultCapturingRepository<WebAccount, int>>();
-            });
-        }
+        BlogPost post = _fakers.BlogPost.Generate();
 
-        [Fact]
-        public async Task Can_select_fields_in_primary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            BlogPost post = _fakers.BlogPost.Generate();
+        const string route = "/blogPosts?fields[blogPosts]=caption,author";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/blogPosts?fields[blogPosts]=caption,author";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(post.StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
+        responseDocument.Data.ManyValue[0].Relationships.ShouldHaveCount(1);
+
+        responseDocument.Data.ManyValue[0].Relationships.ShouldContainKey("author").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
+        postCaptured.Caption.Should().Be(post.Caption);
+        postCaptured.Url.Should().BeNull();
+    }
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(post.StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
-            responseDocument.Data.ManyValue[0].Relationships.ShouldHaveCount(1);
+    [Fact]
+    public async Task Can_select_attribute_in_primary_resources()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
 
-            responseDocument.Data.ManyValue[0].Relationships.ShouldContainKey("author").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
-            postCaptured.Caption.Should().Be(post.Caption);
-            postCaptured.Url.Should().BeNull();
-        }
+        BlogPost post = _fakers.BlogPost.Generate();
 
-        [Fact]
-        public async Task Can_select_attribute_in_primary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
-
-            BlogPost post = _fakers.BlogPost.Generate();
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/blogPosts?fields[blogPosts]=caption";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(post.StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
+        responseDocument.Data.ManyValue[0].Relationships.Should().BeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/blogPosts?fields[blogPosts]=caption";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(post.StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
-            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();
-            postCaptured.Caption.Should().Be(post.Caption);
-            postCaptured.Url.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Can_select_relationship_in_primary_resources()
-        {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
-
-            BlogPost post = _fakers.BlogPost.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/blogPosts?fields[blogPosts]=author";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(post.StringId);
-            responseDocument.Data.ManyValue[0].Attributes.Should().BeNull();
-            responseDocument.Data.ManyValue[0].Relationships.ShouldHaveCount(1);
-
-            responseDocument.Data.ManyValue[0].Relationships.ShouldContainKey("author").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
-            postCaptured.Caption.Should().BeNull();
-            postCaptured.Url.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Can_select_fields_in_secondary_resources()
-        {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
-
-            Blog blog = _fakers.Blog.Generate();
-            blog.Posts = _fakers.BlogPost.Generate(1);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogs/{blog.StringId}/posts?fields[blogPosts]=caption,labels";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Posts[0].Caption));
-            responseDocument.Data.ManyValue[0].Relationships.ShouldHaveCount(1);
-
-            responseDocument.Data.ManyValue[0].Relationships.ShouldContainKey("labels").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
-            blogCaptured.Id.Should().Be(blog.Id);
-            blogCaptured.Title.Should().BeNull();
-
-            blogCaptured.Posts.ShouldHaveCount(1);
-            blogCaptured.Posts[0].Caption.Should().Be(blog.Posts[0].Caption);
-            blogCaptured.Posts[0].Url.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Can_select_fields_in_primary_resource_by_ID()
-        {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
-
-            BlogPost post = _fakers.BlogPost.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogPosts/{post.StringId}?fields[blogPosts]=url,author";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("url").With(value => value.Should().Be(post.Url));
-            responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
-
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("author").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
-            postCaptured.Url.Should().Be(post.Url);
-            postCaptured.Caption.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Can_select_fields_of_ManyToOne_relationship()
-        {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
-
-            BlogPost post = _fakers.BlogPost.Generate();
-            post.Author = _fakers.WebAccount.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogPosts/{post.StringId}?include=author&fields[webAccounts]=displayName,emailAddress,preferences";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
-
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("author").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Id.Should().Be(post.Author.StringId);
-                value.ShouldNotBeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Attributes.ShouldHaveCount(2);
-            responseDocument.Included[0].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(post.Author.DisplayName));
-            responseDocument.Included[0].Attributes.ShouldContainKey("emailAddress").With(value => value.Should().Be(post.Author.EmailAddress));
-            responseDocument.Included[0].Relationships.ShouldHaveCount(1);
-
-            responseDocument.Included[0].Relationships.ShouldContainKey("preferences").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
-            postCaptured.Id.Should().Be(post.Id);
-            postCaptured.Caption.Should().Be(post.Caption);
-
-            postCaptured.Author.ShouldNotBeNull();
-            postCaptured.Author.DisplayName.Should().Be(post.Author.DisplayName);
-            postCaptured.Author.EmailAddress.Should().Be(post.Author.EmailAddress);
-            postCaptured.Author.UserName.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Can_select_fields_of_OneToMany_relationship()
-        {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
-
-            WebAccount account = _fakers.WebAccount.Generate();
-            account.Posts = _fakers.BlogPost.Generate(1);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Accounts.Add(account);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/webAccounts/{account.StringId}?include=posts&fields[blogPosts]=caption,labels";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(account.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(account.DisplayName));
-
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("posts").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldHaveCount(1);
-                value.Data.ManyValue[0].Id.Should().Be(account.Posts[0].StringId);
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Attributes.ShouldHaveCount(1);
-            responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(account.Posts[0].Caption));
-            responseDocument.Included[0].Relationships.ShouldHaveCount(1);
-
-            responseDocument.Included[0].Relationships.ShouldContainKey("labels").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            var accountCaptured = (WebAccount)store.Resources.Should().ContainSingle(resource => resource is WebAccount).And.Subject.Single();
-            accountCaptured.Id.Should().Be(account.Id);
-            accountCaptured.DisplayName.Should().Be(account.DisplayName);
-
-            accountCaptured.Posts.ShouldHaveCount(1);
-            accountCaptured.Posts[0].Caption.Should().Be(account.Posts[0].Caption);
-            accountCaptured.Posts[0].Url.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Can_select_fields_of_OneToMany_relationship_on_secondary_endpoint()
-        {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
-
-            Blog blog = _fakers.Blog.Generate();
-            blog.Owner = _fakers.WebAccount.Generate();
-            blog.Owner.Posts = _fakers.BlogPost.Generate(1);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogs/{blog.StringId}/owner?include=posts&fields[blogPosts]=caption,comments";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(blog.Owner.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(blog.Owner.DisplayName));
-
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("posts").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldHaveCount(1);
-                value.Data.ManyValue[0].Id.Should().Be(blog.Owner.Posts[0].StringId);
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Attributes.ShouldHaveCount(1);
-            responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Owner.Posts[0].Caption));
-            responseDocument.Included[0].Relationships.ShouldHaveCount(1);
-
-            responseDocument.Included[0].Relationships.ShouldContainKey("comments").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
-            blogCaptured.Id.Should().Be(blog.Id);
-            blogCaptured.Owner.ShouldNotBeNull();
-            blogCaptured.Owner.DisplayName.Should().Be(blog.Owner.DisplayName);
-
-            blogCaptured.Owner.Posts.ShouldHaveCount(1);
-            blogCaptured.Owner.Posts[0].Caption.Should().Be(blog.Owner.Posts[0].Caption);
-            blogCaptured.Owner.Posts[0].Url.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Can_select_fields_of_ManyToMany_relationship()
-        {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
-
-            BlogPost post = _fakers.BlogPost.Generate();
-            post.Labels = _fakers.Label.Generate(1).ToHashSet();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogPosts/{post.StringId}?include=labels&fields[labels]=color";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
-
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("labels").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldHaveCount(1);
-                value.Data.ManyValue[0].Id.Should().Be(post.Labels.ElementAt(0).StringId);
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Attributes.ShouldHaveCount(1);
-            responseDocument.Included[0].Attributes.ShouldContainKey("color").With(value => value.Should().Be(post.Labels.Single().Color));
-            responseDocument.Included[0].Relationships.Should().BeNull();
-
-            var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
-            postCaptured.Id.Should().Be(post.Id);
-            postCaptured.Caption.Should().Be(post.Caption);
-
-            postCaptured.Labels.ShouldHaveCount(1);
-            postCaptured.Labels.Single().Color.Should().Be(post.Labels.Single().Color);
-            postCaptured.Labels.Single().Name.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Can_select_attributes_in_multiple_resource_types()
-        {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
-
-            Blog blog = _fakers.Blog.Generate();
-            blog.Owner = _fakers.WebAccount.Generate();
-            blog.Owner.Posts = _fakers.BlogPost.Generate(1);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogs/{blog.StringId}?include=owner.posts&fields[blogs]=title&fields[webAccounts]=userName,displayName&fields[blogPosts]=caption";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("blogs");
-            responseDocument.Data.SingleValue.Id.Should().Be(blog.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(blog.Title));
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
-
-            responseDocument.Included.ShouldHaveCount(2);
-
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(blog.Owner.StringId);
-            responseDocument.Included[0].Attributes.ShouldHaveCount(2);
-            responseDocument.Included[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(blog.Owner.UserName));
-            responseDocument.Included[0].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(blog.Owner.DisplayName));
-            responseDocument.Included[0].Relationships.Should().BeNull();
-
-            responseDocument.Included[1].Type.Should().Be("blogPosts");
-            responseDocument.Included[1].Id.Should().Be(blog.Owner.Posts[0].StringId);
-            responseDocument.Included[1].Attributes.ShouldHaveCount(1);
-            responseDocument.Included[1].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Owner.Posts[0].Caption));
-            responseDocument.Included[1].Relationships.Should().BeNull();
-
-            var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
-            blogCaptured.Id.Should().Be(blog.Id);
-            blogCaptured.Title.Should().Be(blog.Title);
-            blogCaptured.PlatformName.Should().BeNull();
-
-            blogCaptured.Owner!.UserName.Should().Be(blog.Owner.UserName);
-            blogCaptured.Owner.DisplayName.Should().Be(blog.Owner.DisplayName);
-            blogCaptured.Owner.DateOfBirth.Should().BeNull();
-
-            blogCaptured.Owner.Posts.ShouldHaveCount(1);
-            blogCaptured.Owner.Posts[0].Caption.Should().Be(blog.Owner.Posts[0].Caption);
-            blogCaptured.Owner.Posts[0].Url.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Can_select_only_top_level_fields_with_multiple_includes()
-        {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
-
-            Blog blog = _fakers.Blog.Generate();
-            blog.Owner = _fakers.WebAccount.Generate();
-            blog.Owner.Posts = _fakers.BlogPost.Generate(1);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/blogs/{blog.StringId}?include=owner.posts&fields[blogs]=title,owner";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("blogs");
-            responseDocument.Data.SingleValue.Id.Should().Be(blog.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(blog.Title));
-            responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
-
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("owner").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Id.Should().Be(blog.Owner.StringId);
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            responseDocument.Included.ShouldHaveCount(2);
-
-            DateTime dateOfBirth = blog.Owner.DateOfBirth!.Value;
-
-            responseDocument.Included[0].Type.Should().Be("webAccounts");
-            responseDocument.Included[0].Id.Should().Be(blog.Owner.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(blog.Owner.UserName));
-            responseDocument.Included[0].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(blog.Owner.DisplayName));
-            responseDocument.Included[0].Attributes.ShouldContainKey("dateOfBirth").With(value => value.As<DateTime?>().Should().BeCloseTo(dateOfBirth));
-
-            responseDocument.Included[0].Relationships.ShouldContainKey("posts").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldHaveCount(1);
-                value.Data.ManyValue[0].Id.Should().Be(blog.Owner.Posts[0].StringId);
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            responseDocument.Included[1].Type.Should().Be("blogPosts");
-            responseDocument.Included[1].Id.Should().Be(blog.Owner.Posts[0].StringId);
-            responseDocument.Included[1].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Owner.Posts[0].Caption));
-            responseDocument.Included[1].Attributes.ShouldContainKey("url").With(value => value.Should().Be(blog.Owner.Posts[0].Url));
-
-            responseDocument.Included[1].Relationships.ShouldContainKey("labels").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
-
-            var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
-            blogCaptured.Id.Should().Be(blog.Id);
-            blogCaptured.Title.Should().Be(blog.Title);
-            blogCaptured.PlatformName.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Can_select_ID()
-        {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
-
-            BlogPost post = _fakers.BlogPost.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/blogPosts?fields[blogPosts]=id,caption";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(post.StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
-            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();
-            postCaptured.Id.Should().Be(post.Id);
-            postCaptured.Caption.Should().Be(post.Caption);
-            postCaptured.Url.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Can_select_empty_fieldset()
-        {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
-
-            BlogPost post = _fakers.BlogPost.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<BlogPost>();
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/blogPosts?fields[blogPosts]=";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
+        postCaptured.Caption.Should().Be(post.Caption);
+        postCaptured.Url.Should().BeNull();
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    [Fact]
+    public async Task Can_select_relationship_in_primary_resources()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(post.StringId);
-            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();
-            postCaptured.Id.Should().Be(post.Id);
-            postCaptured.Url.Should().BeNull();
-        }
+        BlogPost post = _fakers.BlogPost.Generate();
 
-        [Fact]
-        public async Task Cannot_select_on_unknown_resource_type()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            string route = $"/webAccounts?fields[{Unknown.ResourceType}]=id";
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        const string route = "/blogPosts?fields[blogPosts]=author";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified fieldset is invalid.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be($"fields[{Unknown.ResourceType}]");
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(post.StringId);
+        responseDocument.Data.ManyValue[0].Attributes.Should().BeNull();
+        responseDocument.Data.ManyValue[0].Relationships.ShouldHaveCount(1);
 
-        [Fact]
-        public async Task Cannot_select_attribute_with_blocked_capability()
+        responseDocument.Data.ManyValue[0].Relationships.ShouldContainKey("author").With(value =>
         {
-            // Arrange
-            WebAccount account = _fakers.WebAccount.Generate();
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
+        postCaptured.Caption.Should().BeNull();
+        postCaptured.Url.Should().BeNull();
+    }
 
-            string route = $"/webAccounts/{account.Id}?fields[webAccounts]=password";
+    [Fact]
+    public async Task Can_select_fields_in_secondary_resources()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        Blog blog = _fakers.Blog.Generate();
+        blog.Posts = _fakers.BlogPost.Generate(1);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        string route = $"/blogs/{blog.StringId}/posts?fields[blogPosts]=caption,labels";
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Retrieving the requested attribute is not allowed.");
-            error.Detail.Should().Be("Retrieving the attribute 'password' is not allowed.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("fields[webAccounts]");
-        }
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-        [Fact]
-        public async Task Retrieves_all_properties_when_fieldset_contains_readonly_attribute()
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(blog.Posts[0].StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Posts[0].Caption));
+        responseDocument.Data.ManyValue[0].Relationships.ShouldHaveCount(1);
+
+        responseDocument.Data.ManyValue[0].Relationships.ShouldContainKey("labels").With(value =>
         {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
+        blogCaptured.Id.Should().Be(blog.Id);
+        blogCaptured.Title.Should().BeNull();
+
+        blogCaptured.Posts.ShouldHaveCount(1);
+        blogCaptured.Posts[0].Caption.Should().Be(blog.Posts[0].Caption);
+        blogCaptured.Posts[0].Url.Should().BeNull();
+    }
 
-            Blog blog = _fakers.Blog.Generate();
+    [Fact]
+    public async Task Can_select_fields_in_primary_resource_by_ID()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Blogs.Add(blog);
-                await dbContext.SaveChangesAsync();
-            });
+        BlogPost post = _fakers.BlogPost.Generate();
 
-            string route = $"/blogs/{blog.StringId}?fields[blogs]=showAdvertisements";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        string route = $"/blogPosts/{post.StringId}?fields[blogPosts]=url,author";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(blog.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("showAdvertisements").With(value => value.Should().Be(blog.ShowAdvertisements));
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
-            blogCaptured.ShowAdvertisements.Should().Be(blogCaptured.ShowAdvertisements);
-            blogCaptured.Title.Should().Be(blog.Title);
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("url").With(value => value.Should().Be(post.Url));
+        responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
 
-        [Fact]
-        public async Task Can_select_fields_on_resource_type_multiple_times()
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("author").With(value =>
         {
-            // Arrange
-            var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
-            store.Clear();
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
+        postCaptured.Url.Should().Be(post.Url);
+        postCaptured.Caption.Should().BeNull();
+    }
 
-            BlogPost post = _fakers.BlogPost.Generate();
+    [Fact]
+    public async Task Can_select_fields_of_ManyToOne_relationship()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Posts.Add(post);
-                await dbContext.SaveChangesAsync();
-            });
+        BlogPost post = _fakers.BlogPost.Generate();
+        post.Author = _fakers.WebAccount.Generate();
 
-            string route = $"/blogPosts/{post.StringId}?fields[blogPosts]=url&fields[blogPosts]=caption,url&fields[blogPosts]=caption,author";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        string route = $"/blogPosts/{post.StringId}?include=author&fields[webAccounts]=displayName,emailAddress,preferences";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(2);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("url").With(value => value.Should().Be(post.Url));
-            responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("author").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.Value.Should().BeNull();
-                value.Links.ShouldNotBeNull();
-                value.Links.Self.ShouldNotBeNull();
-                value.Links.Related.ShouldNotBeNull();
-            });
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
 
-            var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
-            postCaptured.Id.Should().Be(post.Id);
-            postCaptured.Caption.Should().Be(post.Caption);
-            postCaptured.Url.Should().Be(postCaptured.Url);
-        }
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("author").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Id.Should().Be(post.Author.StringId);
+            value.ShouldNotBeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Attributes.ShouldHaveCount(2);
+        responseDocument.Included[0].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(post.Author.DisplayName));
+        responseDocument.Included[0].Attributes.ShouldContainKey("emailAddress").With(value => value.Should().Be(post.Author.EmailAddress));
+        responseDocument.Included[0].Relationships.ShouldHaveCount(1);
+
+        responseDocument.Included[0].Relationships.ShouldContainKey("preferences").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
+        postCaptured.Id.Should().Be(post.Id);
+        postCaptured.Caption.Should().Be(post.Caption);
+
+        postCaptured.Author.ShouldNotBeNull();
+        postCaptured.Author.DisplayName.Should().Be(post.Author.DisplayName);
+        postCaptured.Author.EmailAddress.Should().Be(post.Author.EmailAddress);
+        postCaptured.Author.UserName.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Can_select_fields_of_OneToMany_relationship()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
 
-        [Fact]
-        public async Task Returns_related_resources_on_broken_resource_linkage()
+        WebAccount account = _fakers.WebAccount.Generate();
+        account.Posts = _fakers.BlogPost.Generate(1);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WebAccount account = _fakers.WebAccount.Generate();
-            account.Posts = _fakers.BlogPost.Generate(2);
+            dbContext.Accounts.Add(account);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/webAccounts/{account.StringId}?include=posts&fields[blogPosts]=caption,labels";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(account.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(account.DisplayName));
+
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("posts").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldHaveCount(1);
+            value.Data.ManyValue[0].Id.Should().Be(account.Posts[0].StringId);
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Attributes.ShouldHaveCount(1);
+        responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(account.Posts[0].Caption));
+        responseDocument.Included[0].Relationships.ShouldHaveCount(1);
+
+        responseDocument.Included[0].Relationships.ShouldContainKey("labels").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        var accountCaptured = (WebAccount)store.Resources.Should().ContainSingle(resource => resource is WebAccount).And.Subject.Single();
+        accountCaptured.Id.Should().Be(account.Id);
+        accountCaptured.DisplayName.Should().Be(account.DisplayName);
+
+        accountCaptured.Posts.ShouldHaveCount(1);
+        accountCaptured.Posts[0].Caption.Should().Be(account.Posts[0].Caption);
+        accountCaptured.Posts[0].Url.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Can_select_fields_of_OneToMany_relationship_on_secondary_endpoint()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
+
+        Blog blog = _fakers.Blog.Generate();
+        blog.Owner = _fakers.WebAccount.Generate();
+        blog.Owner.Posts = _fakers.BlogPost.Generate(1);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/blogs/{blog.StringId}/owner?include=posts&fields[blogPosts]=caption,comments";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(blog.Owner.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(blog.Owner.DisplayName));
+
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("posts").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldHaveCount(1);
+            value.Data.ManyValue[0].Id.Should().Be(blog.Owner.Posts[0].StringId);
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Attributes.ShouldHaveCount(1);
+        responseDocument.Included[0].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Owner.Posts[0].Caption));
+        responseDocument.Included[0].Relationships.ShouldHaveCount(1);
+
+        responseDocument.Included[0].Relationships.ShouldContainKey("comments").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
+        blogCaptured.Id.Should().Be(blog.Id);
+        blogCaptured.Owner.ShouldNotBeNull();
+        blogCaptured.Owner.DisplayName.Should().Be(blog.Owner.DisplayName);
+
+        blogCaptured.Owner.Posts.ShouldHaveCount(1);
+        blogCaptured.Owner.Posts[0].Caption.Should().Be(blog.Owner.Posts[0].Caption);
+        blogCaptured.Owner.Posts[0].Url.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Can_select_fields_of_ManyToMany_relationship()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
+
+        BlogPost post = _fakers.BlogPost.Generate();
+        post.Labels = _fakers.Label.Generate(1).ToHashSet();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/blogPosts/{post.StringId}?include=labels&fields[labels]=color";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
+
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("labels").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldHaveCount(1);
+            value.Data.ManyValue[0].Id.Should().Be(post.Labels.ElementAt(0).StringId);
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Attributes.ShouldHaveCount(1);
+        responseDocument.Included[0].Attributes.ShouldContainKey("color").With(value => value.Should().Be(post.Labels.Single().Color));
+        responseDocument.Included[0].Relationships.Should().BeNull();
+
+        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
+        postCaptured.Id.Should().Be(post.Id);
+        postCaptured.Caption.Should().Be(post.Caption);
+
+        postCaptured.Labels.ShouldHaveCount(1);
+        postCaptured.Labels.Single().Color.Should().Be(post.Labels.Single().Color);
+        postCaptured.Labels.Single().Name.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Can_select_attributes_in_multiple_resource_types()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
+
+        Blog blog = _fakers.Blog.Generate();
+        blog.Owner = _fakers.WebAccount.Generate();
+        blog.Owner.Posts = _fakers.BlogPost.Generate(1);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/blogs/{blog.StringId}?include=owner.posts&fields[blogs]=title&fields[webAccounts]=userName,displayName&fields[blogPosts]=caption";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("blogs");
+        responseDocument.Data.SingleValue.Id.Should().Be(blog.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(blog.Title));
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+
+        responseDocument.Included.ShouldHaveCount(2);
+
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(blog.Owner.StringId);
+        responseDocument.Included[0].Attributes.ShouldHaveCount(2);
+        responseDocument.Included[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(blog.Owner.UserName));
+        responseDocument.Included[0].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(blog.Owner.DisplayName));
+        responseDocument.Included[0].Relationships.Should().BeNull();
+
+        responseDocument.Included[1].Type.Should().Be("blogPosts");
+        responseDocument.Included[1].Id.Should().Be(blog.Owner.Posts[0].StringId);
+        responseDocument.Included[1].Attributes.ShouldHaveCount(1);
+        responseDocument.Included[1].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Owner.Posts[0].Caption));
+        responseDocument.Included[1].Relationships.Should().BeNull();
+
+        var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
+        blogCaptured.Id.Should().Be(blog.Id);
+        blogCaptured.Title.Should().Be(blog.Title);
+        blogCaptured.PlatformName.Should().BeNull();
+
+        blogCaptured.Owner!.UserName.Should().Be(blog.Owner.UserName);
+        blogCaptured.Owner.DisplayName.Should().Be(blog.Owner.DisplayName);
+        blogCaptured.Owner.DateOfBirth.Should().BeNull();
+
+        blogCaptured.Owner.Posts.ShouldHaveCount(1);
+        blogCaptured.Owner.Posts[0].Caption.Should().Be(blog.Owner.Posts[0].Caption);
+        blogCaptured.Owner.Posts[0].Url.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Can_select_only_top_level_fields_with_multiple_includes()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
+
+        Blog blog = _fakers.Blog.Generate();
+        blog.Owner = _fakers.WebAccount.Generate();
+        blog.Owner.Posts = _fakers.BlogPost.Generate(1);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/blogs/{blog.StringId}?include=owner.posts&fields[blogs]=title,owner";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("blogs");
+        responseDocument.Data.SingleValue.Id.Should().Be(blog.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(blog.Title));
+        responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
+
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("owner").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Id.Should().Be(blog.Owner.StringId);
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        responseDocument.Included.ShouldHaveCount(2);
+
+        responseDocument.Included[0].Type.Should().Be("webAccounts");
+        responseDocument.Included[0].Id.Should().Be(blog.Owner.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("userName").With(value => value.Should().Be(blog.Owner.UserName));
+        responseDocument.Included[0].Attributes.ShouldContainKey("displayName").With(value => value.Should().Be(blog.Owner.DisplayName));
+        responseDocument.Included[0].Attributes.ShouldContainKey("dateOfBirth").With(value => value.Should().Be(blog.Owner.DateOfBirth));
+
+        responseDocument.Included[0].Relationships.ShouldContainKey("posts").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldHaveCount(1);
+            value.Data.ManyValue[0].Id.Should().Be(blog.Owner.Posts[0].StringId);
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        responseDocument.Included[1].Type.Should().Be("blogPosts");
+        responseDocument.Included[1].Id.Should().Be(blog.Owner.Posts[0].StringId);
+        responseDocument.Included[1].Attributes.ShouldContainKey("caption").With(value => value.Should().Be(blog.Owner.Posts[0].Caption));
+        responseDocument.Included[1].Attributes.ShouldContainKey("url").With(value => value.Should().Be(blog.Owner.Posts[0].Url));
+
+        responseDocument.Included[1].Relationships.ShouldContainKey("labels").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        var blogCaptured = (Blog)store.Resources.Should().ContainSingle(resource => resource is Blog).And.Subject.Single();
+        blogCaptured.Id.Should().Be(blog.Id);
+        blogCaptured.Title.Should().Be(blog.Title);
+        blogCaptured.PlatformName.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Can_select_ID()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
+
+        BlogPost post = _fakers.BlogPost.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/blogPosts?fields[blogPosts]=id,caption";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(post.StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldHaveCount(1);
+        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();
+        postCaptured.Id.Should().Be(post.Id);
+        postCaptured.Caption.Should().Be(post.Caption);
+        postCaptured.Url.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Can_select_empty_fieldset()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
+
+        BlogPost post = _fakers.BlogPost.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<BlogPost>();
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/blogPosts?fields[blogPosts]=";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(post.StringId);
+        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();
+        postCaptured.Id.Should().Be(post.Id);
+        postCaptured.Url.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Cannot_select_on_unknown_resource_type()
+    {
+        // Arrange
+        const string route = $"/webAccounts?fields[{Unknown.ResourceType}]=id";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified fieldset is invalid.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be($"fields[{Unknown.ResourceType}]");
+    }
+
+    [Fact]
+    public async Task Cannot_select_attribute_with_blocked_capability()
+    {
+        // Arrange
+        WebAccount account = _fakers.WebAccount.Generate();
+
+        string route = $"/webAccounts/{account.Id}?fields[webAccounts]=password";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Retrieving the requested attribute is not allowed.");
+        error.Detail.Should().Be("Retrieving the attribute 'password' is not allowed.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("fields[webAccounts]");
+    }
+
+    [Fact]
+    public async Task Retrieves_all_properties_when_fieldset_contains_readonly_attribute()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
+
+        Blog blog = _fakers.Blog.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Blogs.Add(blog);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/blogs/{blog.StringId}?fields[blogs]=showAdvertisements";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(blog.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
+        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();
+        blogCaptured.ShowAdvertisements.Should().Be(blogCaptured.ShowAdvertisements);
+        blogCaptured.Title.Should().Be(blog.Title);
+    }
+
+    [Fact]
+    public async Task Can_select_fields_on_resource_type_multiple_times()
+    {
+        // Arrange
+        var store = _testContext.Factory.Services.GetRequiredService<ResourceCaptureStore>();
+        store.Clear();
+
+        BlogPost post = _fakers.BlogPost.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Posts.Add(post);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/blogPosts/{post.StringId}?fields[blogPosts]=url&fields[blogPosts]=caption,url&fields[blogPosts]=caption,author";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(post.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(2);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("caption").With(value => value.Should().Be(post.Caption));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("url").With(value => value.Should().Be(post.Url));
+        responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
+
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("author").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.Value.Should().BeNull();
+            value.Links.ShouldNotBeNull();
+            value.Links.Self.ShouldNotBeNull();
+            value.Links.Related.ShouldNotBeNull();
+        });
+
+        var postCaptured = (BlogPost)store.Resources.Should().ContainSingle(resource => resource is BlogPost).And.Subject.Single();
+        postCaptured.Id.Should().Be(post.Id);
+        postCaptured.Caption.Should().Be(post.Caption);
+        postCaptured.Url.Should().Be(postCaptured.Url);
+    }
+
+    [Fact]
+    public async Task Returns_related_resources_on_broken_resource_linkage()
+    {
+        // Arrange
+        WebAccount account = _fakers.WebAccount.Generate();
+        account.Posts = _fakers.BlogPost.Generate(2);
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Accounts.Add(account);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/webAccounts/{account.StringId}?include=posts&fields[webAccounts]=displayName";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Accounts.Add(account);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/webAccounts/{account.StringId}?include=posts&fields[webAccounts]=displayName";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(account.StringId);
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(account.StringId);
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
-
-            responseDocument.Included.ShouldHaveCount(2);
-            responseDocument.Included.Should().OnlyContain(resourceObject => resourceObject.Type == "blogPosts");
-        }
+        responseDocument.Included.ShouldHaveCount(2);
+        responseDocument.Included.Should().OnlyContain(resourceObject => resourceObject.Type == "blogPosts");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccount.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccount.cs
index 21060d0eef..785df7c85f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccount.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccount.cs
@@ -1,36 +1,34 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
+namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.QueryStrings")]
+public sealed class WebAccount : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class WebAccount : Identifiable<int>
-    {
-        [Attr]
-        public string UserName { get; set; } = null!;
+    [Attr]
+    public string UserName { get; set; } = null!;
 
-        [Attr(Capabilities = ~AttrCapabilities.AllowView)]
-        public string Password { get; set; } = null!;
+    [Attr(Capabilities = ~AttrCapabilities.AllowView)]
+    public string Password { get; set; } = null!;
 
-        [Attr]
-        public string DisplayName { get; set; } = null!;
+    [Attr]
+    public string DisplayName { get; set; } = null!;
 
-        [Attr(Capabilities = AttrCapabilities.All & ~(AttrCapabilities.AllowFilter | AttrCapabilities.AllowSort))]
-        public DateTime? DateOfBirth { get; set; }
+    [Attr(Capabilities = AttrCapabilities.All & ~(AttrCapabilities.AllowFilter | AttrCapabilities.AllowSort))]
+    public DateTime? DateOfBirth { get; set; }
 
-        [Attr]
-        public string EmailAddress { get; set; } = null!;
+    [Attr]
+    public string EmailAddress { get; set; } = null!;
 
-        [HasMany]
-        public IList<BlogPost> Posts { get; set; } = new List<BlogPost>();
+    [HasMany]
+    public IList<BlogPost> Posts { get; set; } = new List<BlogPost>();
 
-        [HasOne]
-        public AccountPreferences? Preferences { get; set; }
+    [HasOne]
+    public AccountPreferences? Preferences { get; set; }
 
-        [HasMany]
-        public IList<LoginAttempt> LoginAttempts { get; set; } = new List<LoginAttempt>();
-    }
+    [HasMany]
+    public IList<LoginAttempt> LoginAttempts { get; set; } = new List<LoginAttempt>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccountsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccountsController.cs
deleted file mode 100644
index 52b54e19b3..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/WebAccountsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings
-{
-    public sealed class WebAccountsController : JsonApiController<WebAccount, int>
-    {
-        public WebAccountsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<WebAccount, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs
index fe04f5dca5..168a8d0e90 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceTests.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Reflection;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
@@ -14,954 +9,953 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Creating
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Creating;
+
+public sealed class CreateResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class CreateResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public CreateResourceTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public CreateResourceTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemsController>();
+        testContext.UseController<WorkItemGroupsController>();
+        testContext.UseController<UserAccountsController>();
+        testContext.UseController<RgbColorsController>();
 
-            testContext.UseController<WorkItemsController>();
-            testContext.UseController<WorkItemGroupsController>();
-            testContext.UseController<UserAccountsController>();
-            testContext.UseController<RgbColorsController>();
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.UseRelativeLinks = false;
+        options.AllowClientGeneratedIds = false;
+        options.AllowUnknownFieldsInRequestBody = false;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.UseRelativeLinks = false;
-            options.AllowClientGeneratedIds = false;
-            options.AllowUnknownFieldsInRequestBody = false;
-        }
+    [Fact]
+    public async Task Sets_location_header_for_created_resource()
+    {
+        // Arrange
+        WorkItem newWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Sets_location_header_for_created_resource()
+        var requestBody = new
         {
-            // Arrange
-            WorkItem newWorkItem = _fakers.WorkItem.Generate();
-
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                attributes = new
                 {
-                    type = "workItems",
-                    attributes = new
-                    {
-                        description = newWorkItem.Description
-                    }
+                    description = newWorkItem.Description
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            string newWorkItemId = responseDocument.Data.SingleValue.ShouldNotBeNull().Id.ShouldNotBeNull();
-            httpResponse.Headers.Location.Should().Be($"/workItems/{newWorkItemId}");
+        string newWorkItemId = responseDocument.Data.SingleValue.ShouldNotBeNull().Id.ShouldNotBeNull();
+        httpResponse.Headers.Location.Should().Be($"/workItems/{newWorkItemId}");
 
-            responseDocument.Links.ShouldNotBeNull();
-            responseDocument.Links.Self.Should().Be("http://localhost/workItems");
-            responseDocument.Links.First.Should().BeNull();
+        responseDocument.Links.ShouldNotBeNull();
+        responseDocument.Links.Self.Should().Be("http://localhost/workItems");
+        responseDocument.Links.First.Should().BeNull();
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be($"http://localhost{httpResponse.Headers.Location}");
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be($"http://localhost{httpResponse.Headers.Location}");
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_int_ID()
-        {
-            // Arrange
-            WorkItem newWorkItem = _fakers.WorkItem.Generate();
-            newWorkItem.DueAt = null;
+    [Fact]
+    public async Task Can_create_resource_with_int_ID()
+    {
+        // Arrange
+        WorkItem newWorkItem = _fakers.WorkItem.Generate();
+        newWorkItem.DueAt = null;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                attributes = new
                 {
-                    type = "workItems",
-                    attributes = new
-                    {
-                        description = newWorkItem.Description
-                    }
+                    description = newWorkItem.Description
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItems");
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(newWorkItem.Description));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("dueAt").With(value => value.Should().Be(newWorkItem.DueAt));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItems");
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(newWorkItem.Description));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("dueAt").With(value => value.Should().Be(newWorkItem.DueAt));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.FirstWithIdAsync(newWorkItemId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.FirstWithIdAsync(newWorkItemId);
+
+            workItemInDatabase.Description.Should().Be(newWorkItem.Description);
+            workItemInDatabase.DueAt.Should().Be(newWorkItem.DueAt);
+        });
 
-                workItemInDatabase.Description.Should().Be(newWorkItem.Description);
-                workItemInDatabase.DueAt.Should().Be(newWorkItem.DueAt);
-            });
+        PropertyInfo? property = typeof(WorkItem).GetProperty(nameof(Identifiable<object>.Id));
+        property.ShouldNotBeNull();
+        property.PropertyType.Should().Be(typeof(int));
+    }
 
-            PropertyInfo? property = typeof(WorkItem).GetProperty(nameof(Identifiable<object>.Id));
-            property.ShouldNotBeNull();
-            property.PropertyType.Should().Be(typeof(int));
-        }
+    [Fact]
+    public async Task Can_create_resource_with_long_ID()
+    {
+        // Arrange
+        UserAccount newUserAccount = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Can_create_resource_with_long_ID()
+        var requestBody = new
         {
-            // Arrange
-            UserAccount newUserAccount = _fakers.UserAccount.Generate();
-
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "userAccounts",
+                attributes = new
                 {
-                    type = "userAccounts",
-                    attributes = new
-                    {
-                        firstName = newUserAccount.FirstName,
-                        lastName = newUserAccount.LastName
-                    }
+                    firstName = newUserAccount.FirstName,
+                    lastName = newUserAccount.LastName
                 }
-            };
+            }
+        };
 
-            const string route = "/userAccounts";
+        const string route = "/userAccounts";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("userAccounts");
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(newUserAccount.FirstName));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(newUserAccount.LastName));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("userAccounts");
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(newUserAccount.FirstName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(newUserAccount.LastName));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            long newUserAccountId = long.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        long newUserAccountId = long.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                UserAccount userAccountInDatabase = await dbContext.UserAccounts.FirstWithIdAsync(newUserAccountId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            UserAccount userAccountInDatabase = await dbContext.UserAccounts.FirstWithIdAsync(newUserAccountId);
 
-                userAccountInDatabase.FirstName.Should().Be(newUserAccount.FirstName);
-                userAccountInDatabase.LastName.Should().Be(newUserAccount.LastName);
-            });
+            userAccountInDatabase.FirstName.Should().Be(newUserAccount.FirstName);
+            userAccountInDatabase.LastName.Should().Be(newUserAccount.LastName);
+        });
 
-            PropertyInfo? property = typeof(UserAccount).GetProperty(nameof(Identifiable<object>.Id));
-            property.ShouldNotBeNull();
-            property.PropertyType.Should().Be(typeof(long));
-        }
+        PropertyInfo? property = typeof(UserAccount).GetProperty(nameof(Identifiable<object>.Id));
+        property.ShouldNotBeNull();
+        property.PropertyType.Should().Be(typeof(long));
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_guid_ID()
-        {
-            // Arrange
-            WorkItemGroup newGroup = _fakers.WorkItemGroup.Generate();
+    [Fact]
+    public async Task Can_create_resource_with_guid_ID()
+    {
+        // Arrange
+        WorkItemGroup newGroup = _fakers.WorkItemGroup.Generate();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItemGroups",
+                attributes = new
                 {
-                    type = "workItemGroups",
-                    attributes = new
-                    {
-                        name = newGroup.Name
-                    }
+                    name = newGroup.Name
                 }
-            };
+            }
+        };
 
-            const string route = "/workItemGroups";
+        const string route = "/workItemGroups";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItemGroups");
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newGroup.Name));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItemGroups");
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(newGroup.Name));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            Guid newGroupId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        Guid newGroupId = Guid.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItemGroup groupInDatabase = await dbContext.Groups.FirstWithIdAsync(newGroupId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItemGroup groupInDatabase = await dbContext.Groups.FirstWithIdAsync(newGroupId);
 
-                groupInDatabase.Name.Should().Be(newGroup.Name);
-            });
+            groupInDatabase.Name.Should().Be(newGroup.Name);
+        });
 
-            PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
-            property.ShouldNotBeNull();
-            property.PropertyType.Should().Be(typeof(Guid));
-        }
+        PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
+        property.ShouldNotBeNull();
+        property.PropertyType.Should().Be(typeof(Guid));
+    }
 
-        [Fact]
-        public async Task Can_create_resource_without_attributes_or_relationships()
+    [Fact]
+    public async Task Can_create_resource_without_attributes_or_relationships()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                attributes = new
+                {
+                },
+                relationship = new
                 {
-                    type = "workItems",
-                    attributes = new
-                    {
-                    },
-                    relationship = new
-                    {
-                    }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItems");
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().BeNull());
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("dueAt").With(value => value.Should().BeNull());
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItems");
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().BeNull());
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("dueAt").With(value => value.Should().BeNull());
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.FirstWithIdAsync(newWorkItemId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.FirstWithIdAsync(newWorkItemId);
 
-                workItemInDatabase.Description.Should().BeNull();
-                workItemInDatabase.DueAt.Should().BeNull();
-            });
-        }
+            workItemInDatabase.Description.Should().BeNull();
+            workItemInDatabase.DueAt.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_unknown_attribute()
-        {
-            // Arrange
-            WorkItem newWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_create_resource_with_unknown_attribute()
+    {
+        // Arrange
+        WorkItem newWorkItem = _fakers.WorkItem.Generate();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                attributes = new
                 {
-                    type = "workItems",
-                    attributes = new
-                    {
-                        doesNotExist = "ignored",
-                        description = newWorkItem.Description
-                    }
+                    doesNotExist = "ignored",
+                    description = newWorkItem.Description
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown attribute found.");
-            error.Detail.Should().Be("Attribute 'doesNotExist' does not exist on resource type 'workItems'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/doesNotExist");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown attribute found.");
+        error.Detail.Should().Be("Attribute 'doesNotExist' does not exist on resource type 'workItems'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/doesNotExist");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_unknown_attribute()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownFieldsInRequestBody = true;
+    [Fact]
+    public async Task Can_create_resource_with_unknown_attribute()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownFieldsInRequestBody = true;
 
-            WorkItem newWorkItem = _fakers.WorkItem.Generate();
+        WorkItem newWorkItem = _fakers.WorkItem.Generate();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                attributes = new
                 {
-                    type = "workItems",
-                    attributes = new
-                    {
-                        doesNotExist = "ignored",
-                        description = newWorkItem.Description
-                    }
+                    doesNotExist = "ignored",
+                    description = newWorkItem.Description
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItems");
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(newWorkItem.Description));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItems");
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(newWorkItem.Description));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.FirstWithIdAsync(newWorkItemId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.FirstWithIdAsync(newWorkItemId);
 
-                workItemInDatabase.Description.Should().Be(newWorkItem.Description);
-            });
-        }
+            workItemInDatabase.Description.Should().Be(newWorkItem.Description);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_unknown_relationship()
+    [Fact]
+    public async Task Cannot_create_resource_with_unknown_relationship()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    doesNotExist = new
                     {
-                        doesNotExist = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = Unknown.ResourceType,
-                                id = Unknown.StringId.Int32
-                            }
+                            type = Unknown.ResourceType,
+                            id = Unknown.StringId.Int32
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
-            error.Detail.Should().Be("Relationship 'doesNotExist' does not exist on resource type 'workItems'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/doesNotExist");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
+        error.Detail.Should().Be("Relationship 'doesNotExist' does not exist on resource type 'workItems'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/doesNotExist");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_unknown_relationship()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownFieldsInRequestBody = true;
+    [Fact]
+    public async Task Can_create_resource_with_unknown_relationship()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownFieldsInRequestBody = true;
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    doesNotExist = new
                     {
-                        doesNotExist = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = Unknown.ResourceType,
-                                id = Unknown.StringId.Int32
-                            }
+                            type = Unknown.ResourceType,
+                            id = Unknown.StringId.Int32
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItems");
-            responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItems");
+        responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem? workItemInDatabase = await dbContext.WorkItems.FirstWithIdOrDefaultAsync(newWorkItemId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem? workItemInDatabase = await dbContext.WorkItems.FirstWithIdOrDefaultAsync(newWorkItemId);
 
-                workItemInDatabase.ShouldNotBeNull();
-            });
-        }
+            workItemInDatabase.ShouldNotBeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_client_generated_ID()
+    [Fact]
+    public async Task Cannot_create_resource_with_client_generated_ID()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "rgbColors",
+                id = "0A0B0C",
+                attributes = new
                 {
-                    type = "rgbColors",
-                    id = "0A0B0C",
-                    attributes = new
-                    {
-                        displayName = "Black"
-                    }
+                    displayName = "Black"
                 }
-            };
+            }
+        };
 
-            const string route = "/rgbColors";
+        const string route = "/rgbColors";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("Failed to deserialize request body: The use of client-generated IDs is disabled.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("Failed to deserialize request body: The use of client-generated IDs is disabled.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_missing_request_body()
-        {
-            // Arrange
-            string requestBody = string.Empty;
+    [Fact]
+    public async Task Cannot_create_resource_for_missing_request_body()
+    {
+        // Arrange
+        string requestBody = string.Empty;
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_null_request_body()
-        {
-            // Arrange
-            const string requestBody = "null";
+    [Fact]
+    public async Task Cannot_create_resource_for_null_request_body()
+    {
+        // Arrange
+        const string requestBody = "null";
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_missing_data()
+    [Fact]
+    public async Task Cannot_create_resource_for_missing_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            meta = new
             {
-                meta = new
-                {
-                    key = "value"
-                }
-            };
+                key = "value"
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_null_data()
+    [Fact]
+    public async Task Cannot_create_resource_for_null_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+            data = (object?)null
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_array_data()
+    [Fact]
+    public async Task Cannot_create_resource_for_array_data()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "workItems"
-                    }
+                    type = "workItems"
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of an array.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of an array.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_missing_type()
+    [Fact]
+    public async Task Cannot_create_resource_for_missing_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                attributes = new
                 {
-                    attributes = new
-                    {
-                    }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_unknown_type()
+    [Fact]
+    public async Task Cannot_create_resource_for_unknown_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = Unknown.ResourceType,
+                attributes = new
                 {
-                    type = Unknown.ResourceType,
-                    attributes = new
-                    {
-                    }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_on_unknown_resource_type_in_url()
+    [Fact]
+    public async Task Cannot_create_resource_on_unknown_resource_type_in_url()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                attributes = new
                 {
-                    type = "workItems",
-                    attributes = new
-                    {
-                    }
                 }
-            };
+            }
+        };
 
-            const string route = "/" + Unknown.ResourceType;
+        const string route = "/" + Unknown.ResourceType;
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Cannot_create_on_resource_type_mismatch_between_url_and_body()
+    [Fact]
+    public async Task Cannot_create_on_resource_type_mismatch_between_url_and_body()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
-                {
-                    type = "rgbColors",
-                    id = "0A0B0C"
-                }
-            };
+                type = "rgbColors",
+                id = "0A0B0C"
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'workItems'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'workItems'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_attribute_with_blocked_capability()
+    [Fact]
+    public async Task Cannot_create_resource_attribute_with_blocked_capability()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                attributes = new
                 {
-                    type = "workItems",
-                    attributes = new
-                    {
-                        isImportant = true
-                    }
+                    isImportant = true
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Attribute value cannot be assigned when creating resource.");
-            error.Detail.Should().Be("The attribute 'isImportant' on resource type 'workItems' cannot be assigned to.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/isImportant");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Attribute value cannot be assigned when creating resource.");
+        error.Detail.Should().Be("The attribute 'isImportant' on resource type 'workItems' cannot be assigned to.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/isImportant");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_readonly_attribute()
+    [Fact]
+    public async Task Cannot_create_resource_with_readonly_attribute()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItemGroups",
+                attributes = new
                 {
-                    type = "workItemGroups",
-                    attributes = new
-                    {
-                        isDeprecated = false
-                    }
+                    isDeprecated = false
                 }
-            };
+            }
+        };
 
-            const string route = "/workItemGroups";
+        const string route = "/workItemGroups";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Attribute is read-only.");
-            error.Detail.Should().Be("Attribute 'isDeprecated' on resource type 'workItemGroups' is read-only.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/isDeprecated");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Attribute is read-only.");
+        error.Detail.Should().Be("Attribute 'isDeprecated' on resource type 'workItemGroups' is read-only.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/isDeprecated");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_broken_JSON_request_body()
-        {
-            // Arrange
-            const string requestBody = "{ \"data\" {";
+    [Fact]
+    public async Task Cannot_create_resource_for_broken_JSON_request_body()
+    {
+        // Arrange
+        const string requestBody = "{ \"data\" {";
 
-            const string route = "/workItemGroups";
+        const string route = "/workItemGroups";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body.");
-            error.Detail.Should().StartWith("'{' is invalid after a property name.");
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body.");
+        error.Detail.Should().StartWith("'{' is invalid after a property name.");
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_incompatible_attribute_value()
+    [Fact]
+    public async Task Cannot_create_resource_with_incompatible_attribute_value()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                attributes = new
                 {
-                    type = "workItems",
-                    attributes = new
-                    {
-                        dueAt = "not-a-valid-time"
-                    }
+                    dueAt = "not-a-valid-time"
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible attribute value found.");
-            error.Detail.Should().Be("Failed to convert attribute 'dueAt' with value 'not-a-valid-time' of type 'String' to type 'Nullable<DateTimeOffset>'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/dueAt");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible attribute value found.");
+        error.Detail.Should().Be("Failed to convert attribute 'dueAt' with value 'not-a-valid-time' of type 'String' to type 'Nullable<DateTimeOffset>'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/dueAt");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_attributes_and_multiple_relationship_types()
-        {
-            // Arrange
-            List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
-            WorkTag existingTag = _fakers.WorkTag.Generate();
+    [Fact]
+    public async Task Can_create_resource_with_attributes_and_multiple_relationship_types()
+    {
+        // Arrange
+        List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
+        WorkTag existingTag = _fakers.WorkTag.Generate();
 
-            string newDescription = _fakers.WorkItem.Generate().Description!;
+        string newDescription = _fakers.WorkItem.Generate().Description!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.AddRange(existingUserAccounts);
-                dbContext.WorkTags.Add(existingTag);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.AddRange(existingUserAccounts);
+            dbContext.WorkTags.Add(existingTag);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                attributes = new
+                {
+                    description = newDescription
+                },
+                relationships = new
                 {
-                    type = "workItems",
-                    attributes = new
+                    assignee = new
                     {
-                        description = newDescription
+                        data = new
+                        {
+                            type = "userAccounts",
+                            id = existingUserAccounts[0].StringId
+                        }
                     },
-                    relationships = new
+                    subscribers = new
                     {
-                        assignee = new
+                        data = new[]
                         {
-                            data = new
+                            new
                             {
                                 type = "userAccounts",
-                                id = existingUserAccounts[0].StringId
+                                id = existingUserAccounts[1].StringId
                             }
-                        },
-                        subscribers = new
-                        {
-                            data = new[]
-                            {
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccounts[1].StringId
-                                }
-                            }
-                        },
-                        tags = new
+                        }
+                    },
+                    tags = new
+                    {
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "workTags",
-                                    id = existingTag.StringId
-                                }
+                                type = "workTags",
+                                id = existingTag.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(newDescription));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(newDescription));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                WorkItem workItemInDatabase = await dbContext.WorkItems
-                    .Include(workItem => workItem.Assignee)
-                    .Include(workItem => workItem.Subscribers)
-                    .Include(workItem => workItem.Tags)
-                    .FirstWithIdAsync(newWorkItemId);
+            WorkItem workItemInDatabase = await dbContext.WorkItems
+                .Include(workItem => workItem.Assignee)
+                .Include(workItem => workItem.Subscribers)
+                .Include(workItem => workItem.Tags)
+                .FirstWithIdAsync(newWorkItemId);
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                workItemInDatabase.Description.Should().Be(newDescription);
+            workItemInDatabase.Description.Should().Be(newDescription);
 
-                workItemInDatabase.Assignee.ShouldNotBeNull();
-                workItemInDatabase.Assignee.Id.Should().Be(existingUserAccounts[0].Id);
+            workItemInDatabase.Assignee.ShouldNotBeNull();
+            workItemInDatabase.Assignee.Id.Should().Be(existingUserAccounts[0].Id);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(1);
-                workItemInDatabase.Subscribers.Single().Id.Should().Be(existingUserAccounts[1].Id);
+            workItemInDatabase.Subscribers.ShouldHaveCount(1);
+            workItemInDatabase.Subscribers.Single().Id.Should().Be(existingUserAccounts[1].Id);
 
-                workItemInDatabase.Tags.ShouldHaveCount(1);
-                workItemInDatabase.Tags.Single().Id.Should().Be(existingTag.Id);
-            });
-        }
+            workItemInDatabase.Tags.ShouldHaveCount(1);
+            workItemInDatabase.Tags.Single().Id.Should().Be(existingTag.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
index 781f72962f..0606bea1b8 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithClientGeneratedIdTests.cs
@@ -1,8 +1,5 @@
-using System;
 using System.Net;
-using System.Net.Http;
 using System.Reflection;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
@@ -11,253 +8,251 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Creating
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Creating;
+
+public sealed class CreateResourceWithClientGeneratedIdTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class CreateResourceWithClientGeneratedIdTests
-        : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public CreateResourceWithClientGeneratedIdTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public CreateResourceWithClientGeneratedIdTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemGroupsController>();
+        testContext.UseController<RgbColorsController>();
 
-            testContext.UseController<WorkItemGroupsController>();
-            testContext.UseController<RgbColorsController>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>();
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>();
-            });
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowClientGeneratedIds = true;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowClientGeneratedIds = true;
-        }
+    [Fact]
+    public async Task Can_create_resource_with_client_generated_guid_ID_having_side_effects()
+    {
+        // Arrange
+        WorkItemGroup newGroup = _fakers.WorkItemGroup.Generate();
+        newGroup.Id = Guid.NewGuid();
 
-        [Fact]
-        public async Task Can_create_resource_with_client_generated_guid_ID_having_side_effects()
+        var requestBody = new
         {
-            // Arrange
-            WorkItemGroup newGroup = _fakers.WorkItemGroup.Generate();
-            newGroup.Id = Guid.NewGuid();
-
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItemGroups",
+                id = newGroup.StringId,
+                attributes = new
                 {
-                    type = "workItemGroups",
-                    id = newGroup.StringId,
-                    attributes = new
-                    {
-                        name = newGroup.Name
-                    }
+                    name = newGroup.Name
                 }
-            };
+            }
+        };
 
-            const string route = "/workItemGroups";
+        const string route = "/workItemGroups";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            string groupName = $"{newGroup.Name}{ImplicitlyChangingWorkItemGroupDefinition.Suffix}";
+        string groupName = $"{newGroup.Name}{ImplicitlyChangingWorkItemGroupDefinition.Suffix}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItemGroups");
-            responseDocument.Data.SingleValue.Id.Should().Be(newGroup.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(groupName));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItemGroups");
+        responseDocument.Data.SingleValue.Id.Should().Be(newGroup.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(groupName));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItemGroup groupInDatabase = await dbContext.Groups.FirstWithIdAsync(newGroup.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItemGroup groupInDatabase = await dbContext.Groups.FirstWithIdAsync(newGroup.Id);
 
-                groupInDatabase.Name.Should().Be(groupName);
-            });
+            groupInDatabase.Name.Should().Be(groupName);
+        });
 
-            PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
-            property.ShouldNotBeNull();
-            property.PropertyType.Should().Be(typeof(Guid));
-        }
+        PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
+        property.ShouldNotBeNull();
+        property.PropertyType.Should().Be(typeof(Guid));
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_client_generated_guid_ID_having_side_effects_with_fieldset()
-        {
-            // Arrange
-            WorkItemGroup newGroup = _fakers.WorkItemGroup.Generate();
-            newGroup.Id = Guid.NewGuid();
+    [Fact]
+    public async Task Can_create_resource_with_client_generated_guid_ID_having_side_effects_with_fieldset()
+    {
+        // Arrange
+        WorkItemGroup newGroup = _fakers.WorkItemGroup.Generate();
+        newGroup.Id = Guid.NewGuid();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItemGroups",
+                id = newGroup.StringId,
+                attributes = new
                 {
-                    type = "workItemGroups",
-                    id = newGroup.StringId,
-                    attributes = new
-                    {
-                        name = newGroup.Name
-                    }
+                    name = newGroup.Name
                 }
-            };
+            }
+        };
 
-            const string route = "/workItemGroups?fields[workItemGroups]=name";
+        const string route = "/workItemGroups?fields[workItemGroups]=name";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            string groupName = $"{newGroup.Name}{ImplicitlyChangingWorkItemGroupDefinition.Suffix}";
+        string groupName = $"{newGroup.Name}{ImplicitlyChangingWorkItemGroupDefinition.Suffix}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItemGroups");
-            responseDocument.Data.SingleValue.Id.Should().Be(newGroup.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(groupName));
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItemGroups");
+        responseDocument.Data.SingleValue.Id.Should().Be(newGroup.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(groupName));
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItemGroup groupInDatabase = await dbContext.Groups.FirstWithIdAsync(newGroup.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItemGroup groupInDatabase = await dbContext.Groups.FirstWithIdAsync(newGroup.Id);
+
+            groupInDatabase.Name.Should().Be(groupName);
+        });
 
-                groupInDatabase.Name.Should().Be(groupName);
-            });
+        PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
+        property.ShouldNotBeNull();
+        property.PropertyType.Should().Be(typeof(Guid));
+    }
 
-            PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
-            property.ShouldNotBeNull();
-            property.PropertyType.Should().Be(typeof(Guid));
-        }
+    [Fact]
+    public async Task Can_create_resource_with_client_generated_string_ID_having_no_side_effects()
+    {
+        // Arrange
+        RgbColor newColor = _fakers.RgbColor.Generate();
 
-        [Fact]
-        public async Task Can_create_resource_with_client_generated_string_ID_having_no_side_effects()
+        var requestBody = new
         {
-            // Arrange
-            RgbColor newColor = _fakers.RgbColor.Generate();
-
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "rgbColors",
+                id = newColor.StringId,
+                attributes = new
                 {
-                    type = "rgbColors",
-                    id = newColor.StringId,
-                    attributes = new
-                    {
-                        displayName = newColor.DisplayName
-                    }
+                    displayName = newColor.DisplayName
                 }
-            };
+            }
+        };
 
-            const string route = "/rgbColors";
+        const string route = "/rgbColors";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                RgbColor colorInDatabase = await dbContext.RgbColors.FirstWithIdAsync(newColor.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            RgbColor colorInDatabase = await dbContext.RgbColors.FirstWithIdAsync(newColor.Id);
 
-                colorInDatabase.DisplayName.Should().Be(newColor.DisplayName);
-            });
+            colorInDatabase.DisplayName.Should().Be(newColor.DisplayName);
+        });
 
-            PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
-            property.ShouldNotBeNull();
-            property.PropertyType.Should().Be(typeof(string));
-        }
+        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
+        property.ShouldNotBeNull();
+        property.PropertyType.Should().Be(typeof(string));
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_client_generated_string_ID_having_no_side_effects_with_fieldset()
-        {
-            // Arrange
-            RgbColor newColor = _fakers.RgbColor.Generate();
+    [Fact]
+    public async Task Can_create_resource_with_client_generated_string_ID_having_no_side_effects_with_fieldset()
+    {
+        // Arrange
+        RgbColor newColor = _fakers.RgbColor.Generate();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "rgbColors",
+                id = newColor.StringId,
+                attributes = new
                 {
-                    type = "rgbColors",
-                    id = newColor.StringId,
-                    attributes = new
-                    {
-                        displayName = newColor.DisplayName
-                    }
+                    displayName = newColor.DisplayName
                 }
-            };
+            }
+        };
 
-            const string route = "/rgbColors?fields[rgbColors]=id";
+        const string route = "/rgbColors?fields[rgbColors]=id";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                RgbColor colorInDatabase = await dbContext.RgbColors.FirstWithIdAsync(newColor.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            RgbColor colorInDatabase = await dbContext.RgbColors.FirstWithIdAsync(newColor.Id);
 
-                colorInDatabase.DisplayName.Should().Be(newColor.DisplayName);
-            });
+            colorInDatabase.DisplayName.Should().Be(newColor.DisplayName);
+        });
 
-            PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
-            property.ShouldNotBeNull();
-            property.PropertyType.Should().Be(typeof(string));
-        }
+        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
+        property.ShouldNotBeNull();
+        property.PropertyType.Should().Be(typeof(string));
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_for_existing_client_generated_ID()
-        {
-            // Arrange
-            RgbColor existingColor = _fakers.RgbColor.Generate();
+    [Fact]
+    public async Task Cannot_create_resource_for_existing_client_generated_ID()
+    {
+        // Arrange
+        RgbColor existingColor = _fakers.RgbColor.Generate();
 
-            RgbColor colorToCreate = _fakers.RgbColor.Generate();
-            colorToCreate.Id = existingColor.Id;
+        RgbColor colorToCreate = _fakers.RgbColor.Generate();
+        colorToCreate.Id = existingColor.Id;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RgbColors.Add(existingColor);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RgbColors.Add(existingColor);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "rgbColors",
+                id = colorToCreate.StringId,
+                attributes = new
                 {
-                    type = "rgbColors",
-                    id = colorToCreate.StringId,
-                    attributes = new
-                    {
-                        displayName = colorToCreate.DisplayName
-                    }
+                    displayName = colorToCreate.DisplayName
                 }
-            };
+            }
+        };
 
-            const string route = "/rgbColors";
+        const string route = "/rgbColors";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Another resource with the specified ID already exists.");
-            error.Detail.Should().Be($"Another resource of type 'rgbColors' with ID '{existingColor.StringId}' already exists.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Another resource with the specified ID already exists.");
+        error.Detail.Should().Be($"Another resource of type 'rgbColors' with ID '{existingColor.StringId}' already exists.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs
index af581dc3cc..b7075a346b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToManyRelationshipTests.cs
@@ -1,799 +1,793 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Creating
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Creating;
+
+public sealed class CreateResourceWithToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class CreateResourceWithToManyRelationshipTests
-        : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public CreateResourceWithToManyRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public CreateResourceWithToManyRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemsController>();
+        testContext.UseController<UserAccountsController>();
+    }
 
-            testContext.UseController<WorkItemsController>();
-            testContext.UseController<UserAccountsController>();
-        }
+    [Fact]
+    public async Task Can_create_OneToMany_relationship()
+    {
+        // Arrange
+        List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
 
-        [Fact]
-        public async Task Can_create_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
+            dbContext.UserAccounts.AddRange(existingUserAccounts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.AddRange(existingUserAccounts);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
+                            {
+                                type = "userAccounts",
+                                id = existingUserAccounts[0].StringId
+                            },
+                            new
                             {
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccounts[0].StringId
-                                },
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccounts[1].StringId
-                                }
+                                type = "userAccounts",
+                                id = existingUserAccounts[1].StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
-            responseDocument.Included.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Included.Should().BeNull();
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(newWorkItemId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(newWorkItemId);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(2);
-                workItemInDatabase.Subscribers.Should().ContainSingle(subscriber => subscriber.Id == existingUserAccounts[0].Id);
-                workItemInDatabase.Subscribers.Should().ContainSingle(subscriber => subscriber.Id == existingUserAccounts[1].Id);
-            });
-        }
+            workItemInDatabase.Subscribers.ShouldHaveCount(2);
+            workItemInDatabase.Subscribers.Should().ContainSingle(subscriber => subscriber.Id == existingUserAccounts[0].Id);
+            workItemInDatabase.Subscribers.Should().ContainSingle(subscriber => subscriber.Id == existingUserAccounts[1].Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_OneToMany_relationship_with_include()
-        {
-            // Arrange
-            List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
+    [Fact]
+    public async Task Can_create_OneToMany_relationship_with_include()
+    {
+        // Arrange
+        List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.AddRange(existingUserAccounts);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.AddRange(existingUserAccounts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
+                            {
+                                type = "userAccounts",
+                                id = existingUserAccounts[0].StringId
+                            },
+                            new
                             {
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccounts[0].StringId
-                                },
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccounts[1].StringId
-                                }
+                                type = "userAccounts",
+                                id = existingUserAccounts[1].StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems?include=subscribers";
+        const string route = "/workItems?include=subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            responseDocument.Included.ShouldHaveCount(2);
-            responseDocument.Included.Should().OnlyContain(resource => resource.Type == "userAccounts");
-            responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingUserAccounts[0].StringId);
-            responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingUserAccounts[1].StringId);
-            responseDocument.Included.Should().OnlyContain(resource => resource.Attributes.ShouldContainKey("firstName") != null);
-            responseDocument.Included.Should().OnlyContain(resource => resource.Attributes.ShouldContainKey("lastName") != null);
-            responseDocument.Included.Should().OnlyContain(resource => resource.Relationships.ShouldNotBeNull().Count > 0);
+        responseDocument.Included.ShouldHaveCount(2);
+        responseDocument.Included.Should().OnlyContain(resource => resource.Type == "userAccounts");
+        responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingUserAccounts[0].StringId);
+        responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingUserAccounts[1].StringId);
+        responseDocument.Included.Should().OnlyContain(resource => resource.Attributes.ShouldContainKey("firstName") != null);
+        responseDocument.Included.Should().OnlyContain(resource => resource.Attributes.ShouldContainKey("lastName") != null);
+        responseDocument.Included.Should().OnlyContain(resource => resource.Relationships.ShouldNotBeNull().Count > 0);
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(newWorkItemId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(newWorkItemId);
+
+            workItemInDatabase.Subscribers.ShouldHaveCount(2);
+            workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingUserAccounts[0].Id);
+            workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingUserAccounts[1].Id);
+        });
+    }
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(2);
-                workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingUserAccounts[0].Id);
-                workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingUserAccounts[1].Id);
-            });
-        }
+    [Fact]
+    public async Task Can_create_OneToMany_relationship_with_include_and_secondary_fieldset()
+    {
+        // Arrange
+        List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
 
-        [Fact]
-        public async Task Can_create_OneToMany_relationship_with_include_and_secondary_fieldset()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.AddRange(existingUserAccounts);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.UserAccounts.AddRange(existingUserAccounts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
+                            {
+                                type = "userAccounts",
+                                id = existingUserAccounts[0].StringId
+                            },
+                            new
                             {
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccounts[0].StringId
-                                },
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccounts[1].StringId
-                                }
+                                type = "userAccounts",
+                                id = existingUserAccounts[1].StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems?include=subscribers&fields[userAccounts]=firstName";
+        const string route = "/workItems?include=subscribers&fields[userAccounts]=firstName";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            responseDocument.Included.ShouldHaveCount(2);
-            responseDocument.Included.Should().OnlyContain(resource => resource.Type == "userAccounts");
-            responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingUserAccounts[0].StringId);
-            responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingUserAccounts[1].StringId);
-            responseDocument.Included.Should().OnlyContain(resource => resource.Attributes.ShouldNotBeNull().Count == 1);
-            responseDocument.Included.Should().OnlyContain(resource => resource.Attributes.ShouldContainKey("firstName") != null);
-            responseDocument.Included.Should().OnlyContain(resource => resource.Relationships == null);
+        responseDocument.Included.ShouldHaveCount(2);
+        responseDocument.Included.Should().OnlyContain(resource => resource.Type == "userAccounts");
+        responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingUserAccounts[0].StringId);
+        responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingUserAccounts[1].StringId);
+        responseDocument.Included.Should().OnlyContain(resource => resource.Attributes.ShouldNotBeNull().Count == 1);
+        responseDocument.Included.Should().OnlyContain(resource => resource.Attributes.ShouldContainKey("firstName") != null);
+        responseDocument.Included.Should().OnlyContain(resource => resource.Relationships == null);
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(newWorkItemId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(newWorkItemId);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(2);
-                workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingUserAccounts[0].Id);
-                workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingUserAccounts[1].Id);
-            });
-        }
+            workItemInDatabase.Subscribers.ShouldHaveCount(2);
+            workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingUserAccounts[0].Id);
+            workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingUserAccounts[1].Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_ManyToMany_relationship_with_include_and_fieldsets()
-        {
-            // Arrange
-            List<WorkTag> existingTags = _fakers.WorkTag.Generate(3);
-            WorkItem workItemToCreate = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Can_create_ManyToMany_relationship_with_include_and_fieldsets()
+    {
+        // Arrange
+        List<WorkTag> existingTags = _fakers.WorkTag.Generate(3);
+        WorkItem workItemToCreate = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkTags.AddRange(existingTags);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkTags.AddRange(existingTags);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                attributes = new
                 {
-                    type = "workItems",
-                    attributes = new
-                    {
-                        description = workItemToCreate.Description,
-                        priority = workItemToCreate.Priority
-                    },
-                    relationships = new
+                    description = workItemToCreate.Description,
+                    priority = workItemToCreate.Priority
+                },
+                relationships = new
+                {
+                    tags = new
                     {
-                        tags = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "workTags",
-                                    id = existingTags[0].StringId
-                                },
-                                new
-                                {
-                                    type = "workTags",
-                                    id = existingTags[1].StringId
-                                },
-                                new
-                                {
-                                    type = "workTags",
-                                    id = existingTags[2].StringId
-                                }
+                                type = "workTags",
+                                id = existingTags[0].StringId
+                            },
+                            new
+                            {
+                                type = "workTags",
+                                id = existingTags[1].StringId
+                            },
+                            new
+                            {
+                                type = "workTags",
+                                id = existingTags[2].StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems?fields[workItems]=priority,tags&include=tags&fields[workTags]=text";
+        const string route = "/workItems?fields[workItems]=priority,tags&include=tags&fields[workTags]=text";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(workItemToCreate.Priority));
-            responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(workItemToCreate.Priority));
+        responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("tags").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldHaveCount(3);
-                value.Data.ManyValue[0].Id.Should().Be(existingTags[0].StringId);
-                value.Data.ManyValue[1].Id.Should().Be(existingTags[1].StringId);
-                value.Data.ManyValue[2].Id.Should().Be(existingTags[2].StringId);
-            });
-
-            responseDocument.Included.ShouldHaveCount(3);
-            responseDocument.Included.Should().OnlyContain(resource => resource.Type == "workTags");
-            responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingTags[0].StringId);
-            responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingTags[1].StringId);
-            responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingTags[2].StringId);
-            responseDocument.Included.Should().OnlyContain(resource => resource.Attributes.ShouldNotBeNull().Count == 1);
-            responseDocument.Included.Should().OnlyContain(resource => resource.Attributes.ShouldContainKey("text") != null);
-            responseDocument.Included.Should().OnlyContain(resource => resource.Relationships == null);
-
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(newWorkItemId);
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("tags").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldHaveCount(3);
+            value.Data.ManyValue[0].Id.Should().Be(existingTags[0].StringId);
+            value.Data.ManyValue[1].Id.Should().Be(existingTags[1].StringId);
+            value.Data.ManyValue[2].Id.Should().Be(existingTags[2].StringId);
+        });
+
+        responseDocument.Included.ShouldHaveCount(3);
+        responseDocument.Included.Should().OnlyContain(resource => resource.Type == "workTags");
+        responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingTags[0].StringId);
+        responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingTags[1].StringId);
+        responseDocument.Included.Should().ContainSingle(resource => resource.Id == existingTags[2].StringId);
+        responseDocument.Included.Should().OnlyContain(resource => resource.Attributes.ShouldNotBeNull().Count == 1);
+        responseDocument.Included.Should().OnlyContain(resource => resource.Attributes.ShouldContainKey("text") != null);
+        responseDocument.Included.Should().OnlyContain(resource => resource.Relationships == null);
+
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(newWorkItemId);
 
-                workItemInDatabase.Tags.ShouldHaveCount(3);
-                workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[0].Id);
-                workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[1].Id);
-                workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[2].Id);
-            });
-        }
+            workItemInDatabase.Tags.ShouldHaveCount(3);
+            workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[0].Id);
+            workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[1].Id);
+            workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[2].Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_relationship_type()
+    [Fact]
+    public async Task Cannot_create_for_missing_relationship_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    id = Unknown.StringId.For<UserAccount, long>()
-                                }
+                                id = Unknown.StringId.For<UserAccount, long>()
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_relationship_type()
+    [Fact]
+    public async Task Cannot_create_for_unknown_relationship_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = Unknown.ResourceType,
-                                    id = Unknown.StringId.For<UserAccount, long>()
-                                }
+                                type = Unknown.ResourceType,
+                                id = Unknown.StringId.For<UserAccount, long>()
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_relationship_ID()
+    [Fact]
+    public async Task Cannot_create_for_missing_relationship_ID()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "userAccounts"
-                                }
+                                type = "userAccounts"
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_relationship_IDs()
-        {
-            // Arrange
-            string workItemId1 = Unknown.StringId.For<WorkItem, int>();
-            string workItemId2 = Unknown.StringId.AltFor<WorkItem, int>();
+    [Fact]
+    public async Task Cannot_create_for_unknown_relationship_IDs()
+    {
+        // Arrange
+        string workItemId1 = Unknown.StringId.For<WorkItem, int>();
+        string workItemId2 = Unknown.StringId.AltFor<WorkItem, int>();
 
-            UserAccount newUserAccount = _fakers.UserAccount.Generate();
+        UserAccount newUserAccount = _fakers.UserAccount.Generate();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "userAccounts",
+                attributes = new
                 {
-                    type = "userAccounts",
-                    attributes = new
-                    {
-                        firstName = newUserAccount.FirstName,
-                        lastName = newUserAccount.LastName
-                    },
-                    relationships = new
+                    firstName = newUserAccount.FirstName,
+                    lastName = newUserAccount.LastName
+                },
+                relationships = new
+                {
+                    assignedItems = new
                     {
-                        assignedItems = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
+                            {
+                                type = "workItems",
+                                id = workItemId1
+                            },
+                            new
                             {
-                                new
-                                {
-                                    type = "workItems",
-                                    id = workItemId1
-                                },
-                                new
-                                {
-                                    type = "workItems",
-                                    id = workItemId2
-                                }
+                                type = "workItems",
+                                id = workItemId2
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/userAccounts";
+        const string route = "/userAccounts";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'workItems' with ID '{workItemId1}' in relationship 'assignedItems' does not exist.");
-            error1.Meta.Should().NotContainKey("requestBody");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'workItems' with ID '{workItemId1}' in relationship 'assignedItems' does not exist.");
+        error1.Meta.Should().NotContainKey("requestBody");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'workItems' with ID '{workItemId2}' in relationship 'assignedItems' does not exist.");
-            error2.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'workItems' with ID '{workItemId2}' in relationship 'assignedItems' does not exist.");
+        error2.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_create_on_relationship_type_mismatch()
+    [Fact]
+    public async Task Cannot_create_on_relationship_type_mismatch()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "rgbColors",
-                                    id = "0A0B0C"
-                                }
+                                type = "rgbColors",
+                                id = "0A0B0C"
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'userAccounts' of relationship 'subscribers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'userAccounts' of relationship 'subscribers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_create_with_duplicates()
-        {
-            // Arrange
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Can_create_with_duplicates()
+    {
+        // Arrange
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
+                            {
+                                type = "userAccounts",
+                                id = existingUserAccount.StringId
+                            },
+                            new
                             {
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccount.StringId
-                                },
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccount.StringId
-                                }
+                                type = "userAccounts",
+                                id = existingUserAccount.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems?include=subscribers";
+        const string route = "/workItems?include=subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("userAccounts");
-            responseDocument.Included[0].Id.Should().Be(existingUserAccount.StringId);
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("userAccounts");
+        responseDocument.Included[0].Id.Should().Be(existingUserAccount.StringId);
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(newWorkItemId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(newWorkItemId);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(1);
-                workItemInDatabase.Subscribers.Single().Id.Should().Be(existingUserAccount.Id);
-            });
-        }
+            workItemInDatabase.Subscribers.ShouldHaveCount(1);
+            workItemInDatabase.Subscribers.Single().Id.Should().Be(existingUserAccount.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_missing_data_in_OneToMany_relationship()
+    [Fact]
+    public async Task Cannot_create_with_missing_data_in_OneToMany_relationship()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
-                        {
-                        }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/subscribers");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/subscribers");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_null_data_in_ManyToMany_relationship()
+    [Fact]
+    public async Task Cannot_create_with_null_data_in_ManyToMany_relationship()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    tags = new
                     {
-                        tags = new
-                        {
-                            data = (object?)null
-                        }
+                        data = (object?)null
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/tags/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/tags/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_object_data_in_ManyToMany_relationship()
+    [Fact]
+    public async Task Cannot_create_with_object_data_in_ManyToMany_relationship()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    tags = new
                     {
-                        tags = new
+                        data = new
                         {
-                            data = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/tags/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/tags/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_local_ID()
-        {
-            // Arrange
-            const string workItemLocalId = "wo-1";
+    [Fact]
+    public async Task Cannot_create_resource_with_local_ID()
+    {
+        // Arrange
+        const string workItemLocalId = "wo-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                lid = workItemLocalId,
+                relationships = new
                 {
-                    type = "workItems",
-                    lid = workItemLocalId,
-                    relationships = new
+                    children = new
                     {
-                        children = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "workItems",
-                                    lid = workItemLocalId
-                                }
+                                type = "workItems",
+                                lid = workItemLocalId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'lid' element is not supported at this endpoint.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/lid");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'lid' element is not supported at this endpoint.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/lid");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs
index 9346f9860b..377edfc6a3 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Creating/CreateResourceWithToOneRelationshipTests.cs
@@ -1,9 +1,5 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -12,759 +8,757 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Creating
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Creating;
+
+public sealed class CreateResourceWithToOneRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class CreateResourceWithToOneRelationshipTests
-        : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
 
-        public CreateResourceWithToOneRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+    public CreateResourceWithToOneRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<WorkItemGroupsController>();
-            testContext.UseController<WorkItemsController>();
-            testContext.UseController<RgbColorsController>();
+        testContext.UseController<WorkItemGroupsController>();
+        testContext.UseController<WorkItemsController>();
+        testContext.UseController<RgbColorsController>();
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowClientGeneratedIds = true;
-        }
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowClientGeneratedIds = true;
+    }
 
-        [Fact]
-        public async Task Can_create_OneToOne_relationship_from_principal_side()
-        {
-            // Arrange
-            WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
-            existingGroup.Color = _fakers.RgbColor.Generate();
+    [Fact]
+    public async Task Can_create_OneToOne_relationship_from_principal_side()
+    {
+        // Arrange
+        WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
+        existingGroup.Color = _fakers.RgbColor.Generate();
 
-            string newGroupName = _fakers.WorkItemGroup.Generate().Name;
+        string newGroupName = _fakers.WorkItemGroup.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Groups.Add(existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Groups.Add(existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItemGroups",
+                attributes = new
                 {
-                    type = "workItemGroups",
-                    attributes = new
-                    {
-                        name = newGroupName
-                    },
-                    relationships = new
+                    name = newGroupName
+                },
+                relationships = new
+                {
+                    color = new
                     {
-                        color = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "rgbColors",
-                                id = existingGroup.Color.StringId
-                            }
+                            type = "rgbColors",
+                            id = existingGroup.Color.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItemGroups";
+        const string route = "/workItemGroups";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            string newGroupId = responseDocument.Data.SingleValue.Id.ShouldNotBeNull();
+        string newGroupId = responseDocument.Data.SingleValue.Id.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<WorkItemGroup> groupsInDatabase = await dbContext.Groups.Include(group => group.Color).ToListAsync();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<WorkItemGroup> groupsInDatabase = await dbContext.Groups.Include(group => group.Color).ToListAsync();
 
-                WorkItemGroup newGroupInDatabase = groupsInDatabase.Single(group => group.StringId == newGroupId);
-                newGroupInDatabase.Name.Should().Be(newGroupName);
-                newGroupInDatabase.Color.ShouldNotBeNull();
-                newGroupInDatabase.Color.Id.Should().Be(existingGroup.Color.Id);
+            WorkItemGroup newGroupInDatabase = groupsInDatabase.Single(group => group.StringId == newGroupId);
+            newGroupInDatabase.Name.Should().Be(newGroupName);
+            newGroupInDatabase.Color.ShouldNotBeNull();
+            newGroupInDatabase.Color.Id.Should().Be(existingGroup.Color.Id);
 
-                WorkItemGroup existingGroupInDatabase = groupsInDatabase.Single(group => group.Id == existingGroup.Id);
-                existingGroupInDatabase.Color.Should().BeNull();
-            });
-        }
+            WorkItemGroup existingGroupInDatabase = groupsInDatabase.Single(group => group.Id == existingGroup.Id);
+            existingGroupInDatabase.Color.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_OneToOne_relationship_from_dependent_side()
-        {
-            // Arrange
-            RgbColor existingColor = _fakers.RgbColor.Generate();
-            existingColor.Group = _fakers.WorkItemGroup.Generate();
+    [Fact]
+    public async Task Can_create_OneToOne_relationship_from_dependent_side()
+    {
+        // Arrange
+        RgbColor existingColor = _fakers.RgbColor.Generate();
+        existingColor.Group = _fakers.WorkItemGroup.Generate();
 
-            const string newColorId = "0A0B0C";
-            string newDisplayName = _fakers.RgbColor.Generate().DisplayName;
+        const string newColorId = "0A0B0C";
+        string newDisplayName = _fakers.RgbColor.Generate().DisplayName;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RgbColors.Add(existingColor);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RgbColors.Add(existingColor);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "rgbColors",
+                id = newColorId,
+                attributes = new
                 {
-                    type = "rgbColors",
-                    id = newColorId,
-                    attributes = new
-                    {
-                        displayName = newDisplayName
-                    },
-                    relationships = new
+                    displayName = newDisplayName
+                },
+                relationships = new
+                {
+                    group = new
                     {
-                        group = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "workItemGroups",
-                                id = existingColor.Group.StringId
-                            }
+                            type = "workItemGroups",
+                            id = existingColor.Group.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/rgbColors";
+        const string route = "/rgbColors";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<RgbColor> colorsInDatabase = await dbContext.RgbColors.Include(rgbColor => rgbColor.Group).ToListAsync();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<RgbColor> colorsInDatabase = await dbContext.RgbColors.Include(rgbColor => rgbColor.Group).ToListAsync();
 
-                RgbColor newColorInDatabase = colorsInDatabase.Single(color => color.Id == newColorId);
-                newColorInDatabase.DisplayName.Should().Be(newDisplayName);
-                newColorInDatabase.Group.ShouldNotBeNull();
-                newColorInDatabase.Group.Id.Should().Be(existingColor.Group.Id);
+            RgbColor newColorInDatabase = colorsInDatabase.Single(color => color.Id == newColorId);
+            newColorInDatabase.DisplayName.Should().Be(newDisplayName);
+            newColorInDatabase.Group.ShouldNotBeNull();
+            newColorInDatabase.Group.Id.Should().Be(existingColor.Group.Id);
 
-                RgbColor? existingColorInDatabase = colorsInDatabase.SingleOrDefault(color => color.Id == existingColor.Id);
-                existingColorInDatabase.ShouldNotBeNull();
-                existingColorInDatabase.Group.Should().BeNull();
-            });
-        }
+            RgbColor? existingColorInDatabase = colorsInDatabase.SingleOrDefault(color => color.Id == existingColor.Id);
+            existingColorInDatabase.ShouldNotBeNull();
+            existingColorInDatabase.Group.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_relationship_with_include()
-        {
-            // Arrange
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Can_create_relationship_with_include()
+    {
+        // Arrange
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "userAccounts",
-                                id = existingUserAccount.StringId
-                            }
+                            type = "userAccounts",
+                            id = existingUserAccount.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems?include=assignee";
+        const string route = "/workItems?include=assignee";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("userAccounts");
-            responseDocument.Included[0].Id.Should().Be(existingUserAccount.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(existingUserAccount.FirstName));
-            responseDocument.Included[0].Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(existingUserAccount.LastName));
-            responseDocument.Included[0].Relationships.ShouldNotBeEmpty();
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("userAccounts");
+        responseDocument.Included[0].Id.Should().Be(existingUserAccount.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(existingUserAccount.FirstName));
+        responseDocument.Included[0].Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(existingUserAccount.LastName));
+        responseDocument.Included[0].Relationships.ShouldNotBeEmpty();
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(newWorkItemId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(newWorkItemId);
 
-                workItemInDatabase.Assignee.ShouldNotBeNull();
-                workItemInDatabase.Assignee.Id.Should().Be(existingUserAccount.Id);
-            });
-        }
+            workItemInDatabase.Assignee.ShouldNotBeNull();
+            workItemInDatabase.Assignee.Id.Should().Be(existingUserAccount.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_relationship_with_include_and_primary_fieldset()
-        {
-            // Arrange
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
-            WorkItem newWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Can_create_relationship_with_include_and_primary_fieldset()
+    {
+        // Arrange
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+        WorkItem newWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                attributes = new
                 {
-                    type = "workItems",
-                    attributes = new
-                    {
-                        description = newWorkItem.Description,
-                        priority = newWorkItem.Priority
-                    },
-                    relationships = new
+                    description = newWorkItem.Description,
+                    priority = newWorkItem.Priority
+                },
+                relationships = new
+                {
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "userAccounts",
-                                id = existingUserAccount.StringId
-                            }
+                            type = "userAccounts",
+                            id = existingUserAccount.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems?fields[workItems]=description,assignee&include=assignee";
+        const string route = "/workItems?fields[workItems]=description,assignee&include=assignee";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(newWorkItem.Description));
-            responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(newWorkItem.Description));
+        responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("assignee").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Id.Should().Be(existingUserAccount.StringId);
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("assignee").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Id.Should().Be(existingUserAccount.StringId);
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("userAccounts");
-            responseDocument.Included[0].Id.Should().Be(existingUserAccount.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(existingUserAccount.FirstName));
-            responseDocument.Included[0].Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(existingUserAccount.LastName));
-            responseDocument.Included[0].Relationships.ShouldNotBeEmpty();
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("userAccounts");
+        responseDocument.Included[0].Id.Should().Be(existingUserAccount.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(existingUserAccount.FirstName));
+        responseDocument.Included[0].Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(existingUserAccount.LastName));
+        responseDocument.Included[0].Relationships.ShouldNotBeEmpty();
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(newWorkItemId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(newWorkItemId);
 
-                workItemInDatabase.Description.Should().Be(newWorkItem.Description);
-                workItemInDatabase.Priority.Should().Be(newWorkItem.Priority);
-                workItemInDatabase.Assignee.ShouldNotBeNull();
-                workItemInDatabase.Assignee.Id.Should().Be(existingUserAccount.Id);
-            });
-        }
+            workItemInDatabase.Description.Should().Be(newWorkItem.Description);
+            workItemInDatabase.Priority.Should().Be(newWorkItem.Priority);
+            workItemInDatabase.Assignee.ShouldNotBeNull();
+            workItemInDatabase.Assignee.Id.Should().Be(existingUserAccount.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_null_relationship()
-        {
-            // Arrange
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Cannot_create_with_null_relationship()
+    {
+        // Arrange
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
-                    {
-                        assignee = (object?)null
-                    }
+                    assignee = (object?)null
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_missing_data_in_relationship()
-        {
-            // Arrange
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Cannot_create_with_missing_data_in_relationship()
+    {
+        // Arrange
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
-                        {
-                        }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_array_data_in_relationship()
-        {
-            // Arrange
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Cannot_create_with_array_data_in_relationship()
+    {
+        // Arrange
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccount.StringId
-                                }
+                                type = "userAccounts",
+                                id = existingUserAccount.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object or 'null', instead of an array.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object or 'null', instead of an array.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_relationship_type()
+    [Fact]
+    public async Task Cannot_create_for_missing_relationship_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                id = Unknown.StringId.For<UserAccount, long>()
-                            }
+                            id = Unknown.StringId.For<UserAccount, long>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_relationship_type()
+    [Fact]
+    public async Task Cannot_create_for_unknown_relationship_type()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = Unknown.ResourceType,
-                                id = Unknown.StringId.For<UserAccount, long>()
-                            }
+                            type = Unknown.ResourceType,
+                            id = Unknown.StringId.For<UserAccount, long>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_relationship_ID()
+    [Fact]
+    public async Task Cannot_create_for_missing_relationship_ID()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "userAccounts"
-                            }
+                            type = "userAccounts"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_unknown_relationship_ID()
-        {
-            // Arrange
-            string userAccountId = Unknown.StringId.For<UserAccount, long>();
+    [Fact]
+    public async Task Cannot_create_with_unknown_relationship_ID()
+    {
+        // Arrange
+        string userAccountId = Unknown.StringId.For<UserAccount, long>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "userAccounts",
-                                id = userAccountId
-                            }
+                            type = "userAccounts",
+                            id = userAccountId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId}' in relationship 'assignee' does not exist.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId}' in relationship 'assignee' does not exist.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_create_on_relationship_type_mismatch()
+    [Fact]
+    public async Task Cannot_create_on_relationship_type_mismatch()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "rgbColors",
-                                id = "0A0B0C"
-                            }
+                            type = "rgbColors",
+                            id = "0A0B0C"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'userAccounts' of relationship 'assignee'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'userAccounts' of relationship 'assignee'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_duplicate_relationship()
-        {
-            // Arrange
-            List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
+    [Fact]
+    public async Task Can_create_resource_with_duplicate_relationship()
+    {
+        // Arrange
+        List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.AddRange(existingUserAccounts);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.AddRange(existingUserAccounts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                relationships = new
                 {
-                    type = "workItems",
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "userAccounts",
-                                id = existingUserAccounts[0].StringId
-                            }
-                        },
-                        assignee_duplicate = new
+                            type = "userAccounts",
+                            id = existingUserAccounts[0].StringId
+                        }
+                    },
+                    assignee_duplicate = new
+                    {
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "userAccounts",
-                                id = existingUserAccounts[1].StringId
-                            }
+                            type = "userAccounts",
+                            id = existingUserAccounts[1].StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string requestBodyText = JsonSerializer.Serialize(requestBody).Replace("assignee_duplicate", "assignee");
+        string requestBodyText = JsonSerializer.Serialize(requestBody).Replace("assignee_duplicate", "assignee");
 
-            const string route = "/workItems?include=assignee";
+        const string route = "/workItems?include=assignee";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBodyText);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBodyText);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("userAccounts");
-            responseDocument.Included[0].Id.Should().Be(existingUserAccounts[1].StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(existingUserAccounts[1].FirstName));
-            responseDocument.Included[0].Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(existingUserAccounts[1].LastName));
-            responseDocument.Included[0].Relationships.ShouldNotBeEmpty();
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("userAccounts");
+        responseDocument.Included[0].Id.Should().Be(existingUserAccounts[1].StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(existingUserAccounts[1].FirstName));
+        responseDocument.Included[0].Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(existingUserAccounts[1].LastName));
+        responseDocument.Included[0].Relationships.ShouldNotBeEmpty();
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(newWorkItemId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(newWorkItemId);
 
-                workItemInDatabase.Assignee.ShouldNotBeNull();
-                workItemInDatabase.Assignee.Id.Should().Be(existingUserAccounts[1].Id);
-            });
-        }
+            workItemInDatabase.Assignee.ShouldNotBeNull();
+            workItemInDatabase.Assignee.Id.Should().Be(existingUserAccounts[1].Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_local_ID()
-        {
-            // Arrange
-            const string workItemLocalId = "wo-1";
+    [Fact]
+    public async Task Cannot_create_resource_with_local_ID()
+    {
+        // Arrange
+        const string workItemLocalId = "wo-1";
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                lid = workItemLocalId,
+                relationships = new
                 {
-                    type = "workItems",
-                    lid = workItemLocalId,
-                    relationships = new
+                    parent = new
                     {
-                        parent = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "workItems",
-                                lid = workItemLocalId
-                            }
+                            type = "workItems",
+                            lid = workItemLocalId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/workItems";
+        const string route = "/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'lid' element is not supported at this endpoint.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/lid");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'lid' element is not supported at this endpoint.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/lid");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs
index b90d0568b7..b66e381ce9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Deleting/DeleteResourceTests.cs
@@ -1,224 +1,219 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Deleting
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Deleting;
+
+public sealed class DeleteResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class DeleteResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public DeleteResourceTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public DeleteResourceTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemsController>();
+        testContext.UseController<WorkItemGroupsController>();
+        testContext.UseController<RgbColorsController>();
+    }
 
-            testContext.UseController<WorkItemsController>();
-            testContext.UseController<WorkItemGroupsController>();
-            testContext.UseController<RgbColorsController>();
-        }
+    [Fact]
+    public async Task Can_delete_existing_resource()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_delete_existing_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem? workItemsInDatabase = await dbContext.WorkItems.FirstWithIdOrDefaultAsync(existingWorkItem.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem? workItemsInDatabase = await dbContext.WorkItems.FirstWithIdOrDefaultAsync(existingWorkItem.Id);
+            workItemsInDatabase.Should().BeNull();
+        });
+    }
 
-                workItemsInDatabase.Should().BeNull();
-            });
-        }
+    [Fact]
+    public async Task Cannot_delete_unknown_resource()
+    {
+        // Arrange
+        string workItemId = Unknown.StringId.For<WorkItem, int>();
 
-        [Fact]
-        public async Task Cannot_delete_unknown_resource()
-        {
-            // Arrange
-            string workItemId = Unknown.StringId.For<WorkItem, int>();
+        string route = $"/workItems/{workItemId}";
 
-            string route = $"/workItems/{workItemId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+    [Fact]
+    public async Task Can_delete_resource_with_OneToOne_relationship_from_dependent_side()
+    {
+        // Arrange
+        RgbColor existingColor = _fakers.RgbColor.Generate();
+        existingColor.Group = _fakers.WorkItemGroup.Generate();
 
-        [Fact]
-        public async Task Can_delete_resource_with_OneToOne_relationship_from_dependent_side()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            RgbColor existingColor = _fakers.RgbColor.Generate();
-            existingColor.Group = _fakers.WorkItemGroup.Generate();
+            dbContext.RgbColors.Add(existingColor);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RgbColors.Add(existingColor);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/rgbColors/{existingColor.StringId}";
 
-            string route = $"/rgbColors/{existingColor.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            RgbColor? colorsInDatabase = await dbContext.RgbColors.FirstWithIdOrDefaultAsync(existingColor.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                RgbColor? colorsInDatabase = await dbContext.RgbColors.FirstWithIdOrDefaultAsync(existingColor.Id);
+            colorsInDatabase.Should().BeNull();
 
-                colorsInDatabase.Should().BeNull();
+            WorkItemGroup groupInDatabase = await dbContext.Groups.FirstWithIdAsync(existingColor.Group.Id);
 
-                WorkItemGroup groupInDatabase = await dbContext.Groups.FirstWithIdAsync(existingColor.Group.Id);
+            groupInDatabase.Color.Should().BeNull();
+        });
+    }
 
-                groupInDatabase.Color.Should().BeNull();
-            });
-        }
+    [Fact]
+    public async Task Can_delete_existing_resource_with_OneToOne_relationship_from_principal_side()
+    {
+        // Arrange
+        WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
+        existingGroup.Color = _fakers.RgbColor.Generate();
 
-        [Fact]
-        public async Task Can_delete_existing_resource_with_OneToOne_relationship_from_principal_side()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
-            existingGroup.Color = _fakers.RgbColor.Generate();
+            dbContext.Groups.Add(existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Groups.Add(existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/workItemGroups/{existingGroup.StringId}";
 
-            string route = $"/workItemGroups/{existingGroup.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItemGroup? groupsInDatabase = await dbContext.Groups.FirstWithIdOrDefaultAsync(existingGroup.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItemGroup? groupsInDatabase = await dbContext.Groups.FirstWithIdOrDefaultAsync(existingGroup.Id);
+            groupsInDatabase.Should().BeNull();
 
-                groupsInDatabase.Should().BeNull();
+            RgbColor? colorInDatabase = await dbContext.RgbColors.FirstWithIdOrDefaultAsync(existingGroup.Color.Id);
 
-                RgbColor? colorInDatabase = await dbContext.RgbColors.FirstWithIdOrDefaultAsync(existingGroup.Color.Id);
+            colorInDatabase.ShouldNotBeNull();
+            colorInDatabase.Group.Should().BeNull();
+        });
+    }
 
-                colorInDatabase.ShouldNotBeNull();
-                colorInDatabase.Group.Should().BeNull();
-            });
-        }
+    [Fact]
+    public async Task Can_delete_existing_resource_with_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
 
-        [Fact]
-        public async Task Can_delete_existing_resource_with_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem? workItemInDatabase = await dbContext.WorkItems.FirstWithIdOrDefaultAsync(existingWorkItem.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem? workItemInDatabase = await dbContext.WorkItems.FirstWithIdOrDefaultAsync(existingWorkItem.Id);
+            workItemInDatabase.Should().BeNull();
 
-                workItemInDatabase.Should().BeNull();
+            List<UserAccount> userAccountsInDatabase = await dbContext.UserAccounts.ToListAsync();
 
-                List<UserAccount> userAccountsInDatabase = await dbContext.UserAccounts.ToListAsync();
+            userAccountsInDatabase.Should().ContainSingle(userAccount => userAccount.Id == existingWorkItem.Subscribers.ElementAt(0).Id);
+            userAccountsInDatabase.Should().ContainSingle(userAccount => userAccount.Id == existingWorkItem.Subscribers.ElementAt(1).Id);
+        });
+    }
 
-                userAccountsInDatabase.Should().ContainSingle(userAccount => userAccount.Id == existingWorkItem.Subscribers.ElementAt(0).Id);
-                userAccountsInDatabase.Should().ContainSingle(userAccount => userAccount.Id == existingWorkItem.Subscribers.ElementAt(1).Id);
-            });
-        }
+    [Fact]
+    public async Task Can_delete_resource_with_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Tags = _fakers.WorkTag.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Can_delete_resource_with_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Tags = _fakers.WorkTag.Generate(1).ToHashSet();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem? workItemInDatabase = await dbContext.WorkItems.FirstWithIdOrDefaultAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem? workItemInDatabase = await dbContext.WorkItems.FirstWithIdOrDefaultAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Should().BeNull();
+            workItemInDatabase.Should().BeNull();
 
-                WorkTag? tagInDatabase = await dbContext.WorkTags.FirstWithIdOrDefaultAsync(existingWorkItem.Tags.ElementAt(0).Id);
+            WorkTag? tagInDatabase = await dbContext.WorkTags.FirstWithIdOrDefaultAsync(existingWorkItem.Tags.ElementAt(0).Id);
 
-                tagInDatabase.ShouldNotBeNull();
-            });
-        }
+            tagInDatabase.ShouldNotBeNull();
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs
index ef78f1cdcf..c5c713562e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchRelationshipTests.cs
@@ -1,250 +1,246 @@
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Fetching
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Fetching;
+
+public sealed class FetchRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class FetchRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public FetchRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public FetchRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemsController>();
+        testContext.UseController<UserAccountsController>();
+    }
 
-            testContext.UseController<WorkItemsController>();
-            testContext.UseController<UserAccountsController>();
-        }
+    [Fact]
+    public async Task Can_get_ManyToOne_relationship()
+    {
+        WorkItem workItem = _fakers.WorkItem.Generate();
+        workItem.Assignee = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Can_get_ManyToOne_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            WorkItem workItem = _fakers.WorkItem.Generate();
-            workItem.Assignee = _fakers.UserAccount.Generate();
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/workItems/{workItem.StringId}/relationships/assignee";
 
-            string route = $"/workItems/{workItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("userAccounts");
+        responseDocument.Data.SingleValue.Id.Should().Be(workItem.Assignee.StringId);
+        responseDocument.Data.SingleValue.Attributes.Should().BeNull();
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+    }
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("userAccounts");
-            responseDocument.Data.SingleValue.Id.Should().Be(workItem.Assignee.StringId);
-            responseDocument.Data.SingleValue.Attributes.Should().BeNull();
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
-        }
+    [Fact]
+    public async Task Can_get_empty_ManyToOne_relationship()
+    {
+        WorkItem workItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_get_empty_ManyToOne_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            WorkItem workItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/workItems/{workItem.StringId}/relationships/assignee";
 
-            string route = $"/workItems/{workItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.Value.Should().BeNull();
+    }
 
-            responseDocument.Data.Value.Should().BeNull();
-        }
+    [Fact]
+    public async Task Can_get_OneToMany_relationship()
+    {
+        // Arrange
+        UserAccount userAccount = _fakers.UserAccount.Generate();
+        userAccount.AssignedItems = _fakers.WorkItem.Generate(2).ToHashSet();
 
-        [Fact]
-        public async Task Can_get_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            UserAccount userAccount = _fakers.UserAccount.Generate();
-            userAccount.AssignedItems = _fakers.WorkItem.Generate(2).ToHashSet();
+            dbContext.UserAccounts.Add(userAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(userAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/userAccounts/{userAccount.StringId}/relationships/assignedItems";
 
-            string route = $"/userAccounts/{userAccount.StringId}/relationships/assignedItems";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        ResourceObject item1 = responseDocument.Data.ManyValue.Single(resource => resource.Id == userAccount.AssignedItems.ElementAt(0).StringId);
+        item1.Type.Should().Be("workItems");
+        item1.Attributes.Should().BeNull();
+        item1.Relationships.Should().BeNull();
 
-            ResourceObject item1 = responseDocument.Data.ManyValue.Single(resource => resource.Id == userAccount.AssignedItems.ElementAt(0).StringId);
-            item1.Type.Should().Be("workItems");
-            item1.Attributes.Should().BeNull();
-            item1.Relationships.Should().BeNull();
+        ResourceObject item2 = responseDocument.Data.ManyValue.Single(resource => resource.Id == userAccount.AssignedItems.ElementAt(1).StringId);
+        item2.Type.Should().Be("workItems");
+        item2.Attributes.Should().BeNull();
+        item2.Relationships.Should().BeNull();
+    }
 
-            ResourceObject item2 = responseDocument.Data.ManyValue.Single(resource => resource.Id == userAccount.AssignedItems.ElementAt(1).StringId);
-            item2.Type.Should().Be("workItems");
-            item2.Attributes.Should().BeNull();
-            item2.Relationships.Should().BeNull();
-        }
+    [Fact]
+    public async Task Can_get_empty_OneToMany_relationship()
+    {
+        // Arrange
+        UserAccount userAccount = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Can_get_empty_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            UserAccount userAccount = _fakers.UserAccount.Generate();
+            dbContext.UserAccounts.Add(userAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(userAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/userAccounts/{userAccount.StringId}/relationships/assignedItems";
 
-            string route = $"/userAccounts/{userAccount.StringId}/relationships/assignedItems";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.Should().BeEmpty();
+    }
 
-            responseDocument.Data.ManyValue.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Can_get_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem workItem = _fakers.WorkItem.Generate();
+        workItem.Tags = _fakers.WorkTag.Generate(2).ToHashSet();
 
-        [Fact]
-        public async Task Can_get_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem workItem = _fakers.WorkItem.Generate();
-            workItem.Tags = _fakers.WorkTag.Generate(2).ToHashSet();
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/workItems/{workItem.StringId}/relationships/tags";
 
-            string route = $"/workItems/{workItem.StringId}/relationships/tags";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        ResourceObject item1 = responseDocument.Data.ManyValue.Single(resource => resource.Id == workItem.Tags.ElementAt(0).StringId);
+        item1.Type.Should().Be("workTags");
+        item1.Attributes.Should().BeNull();
+        item1.Relationships.Should().BeNull();
 
-            ResourceObject item1 = responseDocument.Data.ManyValue.Single(resource => resource.Id == workItem.Tags.ElementAt(0).StringId);
-            item1.Type.Should().Be("workTags");
-            item1.Attributes.Should().BeNull();
-            item1.Relationships.Should().BeNull();
+        ResourceObject item2 = responseDocument.Data.ManyValue.Single(resource => resource.Id == workItem.Tags.ElementAt(1).StringId);
+        item2.Type.Should().Be("workTags");
+        item2.Attributes.Should().BeNull();
+        item2.Relationships.Should().BeNull();
+    }
 
-            ResourceObject item2 = responseDocument.Data.ManyValue.Single(resource => resource.Id == workItem.Tags.ElementAt(1).StringId);
-            item2.Type.Should().Be("workTags");
-            item2.Attributes.Should().BeNull();
-            item2.Relationships.Should().BeNull();
-        }
+    [Fact]
+    public async Task Can_get_empty_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem workItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_get_empty_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem workItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/workItems/{workItem.StringId}/relationships/tags";
 
-            string route = $"/workItems/{workItem.StringId}/relationships/tags";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.Should().BeEmpty();
+    }
 
-            responseDocument.Data.ManyValue.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Cannot_get_relationship_for_unknown_primary_type()
+    {
+        string route = $"/{Unknown.ResourceType}/{Unknown.StringId.Int32}/relationships/assignee";
 
-        [Fact]
-        public async Task Cannot_get_relationship_for_unknown_primary_type()
-        {
-            string route = $"/{Unknown.ResourceType}/{Unknown.StringId.Int32}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Should().BeEmpty();
+    }
 
-            responseDocument.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Cannot_get_relationship_for_unknown_primary_ID()
+    {
+        string workItemId = Unknown.StringId.For<WorkItem, int>();
 
-        [Fact]
-        public async Task Cannot_get_relationship_for_unknown_primary_ID()
-        {
-            string workItemId = Unknown.StringId.For<WorkItem, int>();
+        string route = $"/workItems/{workItemId}/relationships/assignee";
 
-            string route = $"/workItems/{workItemId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
-        }
+    [Fact]
+    public async Task Cannot_get_relationship_for_unknown_relationship_type()
+    {
+        WorkItem workItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_get_relationship_for_unknown_relationship_type()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            WorkItem workItem = _fakers.WorkItem.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/workItems/{workItem.StringId}/relationships/{Unknown.Relationship}";
+        string route = $"/workItems/{workItem.StringId}/relationships/{Unknown.Relationship}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested relationship does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' does not contain a relationship named '{Unknown.Relationship}'.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested relationship does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' does not contain a relationship named '{Unknown.Relationship}'.");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs
index f6873d64b8..5f2e13d3e4 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Fetching/FetchResourceTests.cs
@@ -1,389 +1,378 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Fetching
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Fetching;
+
+public sealed class FetchResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class FetchResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public FetchResourceTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public FetchResourceTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemsController>();
+        testContext.UseController<UserAccountsController>();
+    }
 
-            testContext.UseController<WorkItemsController>();
-            testContext.UseController<UserAccountsController>();
-        }
+    [Fact]
+    public async Task Can_get_primary_resources()
+    {
+        // Arrange
+        List<WorkItem> workItems = _fakers.WorkItem.Generate(2);
 
-        [Fact]
-        public async Task Can_get_primary_resources()
-        {
-            // Arrange
-            List<WorkItem> workItems = _fakers.WorkItem.Generate(2);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<WorkItem>();
-                dbContext.WorkItems.AddRange(workItems);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/workItems";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-
-            ResourceObject item1 = responseDocument.Data.ManyValue.Single(resource => resource.Id == workItems[0].StringId);
-            item1.Type.Should().Be("workItems");
-            item1.Attributes.ShouldContainKey("description").With(value => value.Should().Be(workItems[0].Description));
-            item1.Attributes.ShouldContainKey("dueAt").With(value => value.As<DateTimeOffset?>().Should().BeCloseTo(workItems[0].DueAt!.Value));
-            item1.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(workItems[0].Priority));
-            item1.Relationships.ShouldNotBeEmpty();
-
-            ResourceObject item2 = responseDocument.Data.ManyValue.Single(resource => resource.Id == workItems[1].StringId);
-            item2.Type.Should().Be("workItems");
-            item2.Attributes.ShouldContainKey("description").With(value => value.Should().Be(workItems[1].Description));
-            item2.Attributes.ShouldContainKey("dueAt").With(value => value.As<DateTimeOffset?>().Should().BeCloseTo(workItems[1].DueAt!.Value));
-            item2.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(workItems[1].Priority));
-            item2.Relationships.ShouldNotBeEmpty();
-        }
-
-        [Fact]
-        public async Task Cannot_get_primary_resources_for_unknown_type()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            const string route = "/" + Unknown.ResourceType;
+            await dbContext.ClearTableAsync<WorkItem>();
+            dbContext.WorkItems.AddRange(workItems);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/workItems";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+
+        ResourceObject item1 = responseDocument.Data.ManyValue.Single(resource => resource.Id == workItems[0].StringId);
+        item1.Type.Should().Be("workItems");
+        item1.Attributes.ShouldContainKey("description").With(value => value.Should().Be(workItems[0].Description));
+        item1.Attributes.ShouldContainKey("dueAt").With(value => value.Should().Be(workItems[0].DueAt));
+        item1.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(workItems[0].Priority));
+        item1.Relationships.ShouldNotBeEmpty();
+
+        ResourceObject item2 = responseDocument.Data.ManyValue.Single(resource => resource.Id == workItems[1].StringId);
+        item2.Type.Should().Be("workItems");
+        item2.Attributes.ShouldContainKey("description").With(value => value.Should().Be(workItems[1].Description));
+        item2.Attributes.ShouldContainKey("dueAt").With(value => value.Should().Be(workItems[1].DueAt));
+        item2.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(workItems[1].Priority));
+        item2.Relationships.ShouldNotBeEmpty();
+    }
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+    [Fact]
+    public async Task Cannot_get_primary_resources_for_unknown_type()
+    {
+        // Arrange
+        const string route = "/" + Unknown.ResourceType;
+
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Should().BeEmpty();
+    }
 
-            responseDocument.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Can_get_primary_resource_by_ID()
+    {
+        // Arrange
+        WorkItem workItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_get_primary_resource_by_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem workItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/workItems/{workItem.StringId}";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/workItems/{workItem.StringId}";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItems");
+        responseDocument.Data.SingleValue.Id.Should().Be(workItem.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(workItem.Description));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("dueAt").With(value => value.Should().Be(workItem.DueAt));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(workItem.Priority));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    [Fact]
+    public async Task Cannot_get_primary_resource_for_unknown_type()
+    {
+        // Arrange
+        string route = $"/{Unknown.ResourceType}/{Unknown.StringId.Int32}";
 
-            DateTimeOffset dueAt = workItem.DueAt!.Value;
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItems");
-            responseDocument.Data.SingleValue.Id.Should().Be(workItem.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(workItem.Description));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("dueAt").With(value => value.As<DateTimeOffset?>().Should().BeCloseTo(dueAt));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(workItem.Priority));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-        [Fact]
-        public async Task Cannot_get_primary_resource_for_unknown_type()
-        {
-            // Arrange
-            string route = $"/{Unknown.ResourceType}/{Unknown.StringId.Int32}";
+        responseDocument.Should().BeEmpty();
+    }
+
+    [Fact]
+    public async Task Cannot_get_primary_resource_for_unknown_ID()
+    {
+        // Arrange
+        string workItemId = Unknown.StringId.For<WorkItem, int>();
+
+        string route = $"/workItems/{workItemId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Errors.ShouldHaveCount(1);
 
-        [Fact]
-        public async Task Cannot_get_primary_resource_for_unknown_ID()
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
+    }
+
+    [Fact]
+    public async Task Can_get_secondary_ManyToOne_resource()
+    {
+        // Arrange
+        WorkItem workItem = _fakers.WorkItem.Generate();
+        workItem.Assignee = _fakers.UserAccount.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            string workItemId = Unknown.StringId.For<WorkItem, int>();
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/workItems/{workItemId}";
+        string route = $"/workItems/{workItem.StringId}/assignee";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("userAccounts");
+        responseDocument.Data.SingleValue.Id.Should().Be(workItem.Assignee.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(workItem.Assignee.FirstName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(workItem.Assignee.LastName));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
-        }
+    [Fact]
+    public async Task Can_get_unknown_secondary_ManyToOne_resource()
+    {
+        // Arrange
+        WorkItem workItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_get_secondary_ManyToOne_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem workItem = _fakers.WorkItem.Generate();
-            workItem.Assignee = _fakers.UserAccount.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/workItems/{workItem.StringId}/assignee";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("userAccounts");
-            responseDocument.Data.SingleValue.Id.Should().Be(workItem.Assignee.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(workItem.Assignee.FirstName));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(workItem.Assignee.LastName));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
-        }
-
-        [Fact]
-        public async Task Can_get_unknown_secondary_ManyToOne_resource()
-        {
-            // Arrange
-            WorkItem workItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/workItems/{workItem.StringId}/assignee";
 
-            string route = $"/workItems/{workItem.StringId}/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.Value.Should().BeNull();
+    }
 
-            responseDocument.Data.Value.Should().BeNull();
-        }
+    [Fact]
+    public async Task Can_get_secondary_OneToMany_resources()
+    {
+        // Arrange
+        UserAccount userAccount = _fakers.UserAccount.Generate();
+        userAccount.AssignedItems = _fakers.WorkItem.Generate(2).ToHashSet();
 
-        [Fact]
-        public async Task Can_get_secondary_OneToMany_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            UserAccount userAccount = _fakers.UserAccount.Generate();
-            userAccount.AssignedItems = _fakers.WorkItem.Generate(2).ToHashSet();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(userAccount);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/userAccounts/{userAccount.StringId}/assignedItems";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-
-            DateTimeOffset dueAt1 = userAccount.AssignedItems.ElementAt(0).DueAt!.Value;
-            DateTimeOffset dueAt2 = userAccount.AssignedItems.ElementAt(1).DueAt!.Value;
-
-            ResourceObject item1 = responseDocument.Data.ManyValue.Single(resource => resource.Id == userAccount.AssignedItems.ElementAt(0).StringId);
-            item1.Type.Should().Be("workItems");
-            item1.Attributes.ShouldContainKey("description").With(value => value.Should().Be(userAccount.AssignedItems.ElementAt(0).Description));
-            item1.Attributes.ShouldContainKey("dueAt").With(value => value.As<DateTimeOffset?>().Should().BeCloseTo(dueAt1));
-            item1.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(userAccount.AssignedItems.ElementAt(0).Priority));
-            item1.Relationships.ShouldNotBeEmpty();
-
-            ResourceObject item2 = responseDocument.Data.ManyValue.Single(resource => resource.Id == userAccount.AssignedItems.ElementAt(1).StringId);
-            item2.Type.Should().Be("workItems");
-            item2.Attributes.ShouldContainKey("description").With(value => value.Should().Be(userAccount.AssignedItems.ElementAt(1).Description));
-            item2.Attributes.ShouldContainKey("dueAt").With(value => value.As<DateTimeOffset?>().Should().BeCloseTo(dueAt2));
-            item2.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(userAccount.AssignedItems.ElementAt(1).Priority));
-            item2.Relationships.ShouldNotBeEmpty();
-        }
-
-        [Fact]
-        public async Task Can_get_unknown_secondary_OneToMany_resource()
+            dbContext.UserAccounts.Add(userAccount);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/userAccounts/{userAccount.StringId}/assignedItems";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+
+        ResourceObject item1 = responseDocument.Data.ManyValue.Single(resource => resource.Id == userAccount.AssignedItems.ElementAt(0).StringId);
+        item1.Type.Should().Be("workItems");
+        item1.Attributes.ShouldContainKey("description").With(value => value.Should().Be(userAccount.AssignedItems.ElementAt(0).Description));
+        item1.Attributes.ShouldContainKey("dueAt").With(value => value.Should().Be(userAccount.AssignedItems.ElementAt(0).DueAt));
+        item1.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(userAccount.AssignedItems.ElementAt(0).Priority));
+        item1.Relationships.ShouldNotBeEmpty();
+
+        ResourceObject item2 = responseDocument.Data.ManyValue.Single(resource => resource.Id == userAccount.AssignedItems.ElementAt(1).StringId);
+        item2.Type.Should().Be("workItems");
+        item2.Attributes.ShouldContainKey("description").With(value => value.Should().Be(userAccount.AssignedItems.ElementAt(1).Description));
+        item2.Attributes.ShouldContainKey("dueAt").With(value => value.Should().Be(userAccount.AssignedItems.ElementAt(1).DueAt));
+        item2.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(userAccount.AssignedItems.ElementAt(1).Priority));
+        item2.Relationships.ShouldNotBeEmpty();
+    }
+
+    [Fact]
+    public async Task Can_get_unknown_secondary_OneToMany_resource()
+    {
+        // Arrange
+        UserAccount userAccount = _fakers.UserAccount.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            UserAccount userAccount = _fakers.UserAccount.Generate();
+            dbContext.UserAccounts.Add(userAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(userAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/userAccounts/{userAccount.StringId}/assignedItems";
 
-            string route = $"/userAccounts/{userAccount.StringId}/assignedItems";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.Should().BeEmpty();
+    }
 
-            responseDocument.Data.ManyValue.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Can_get_secondary_ManyToMany_resources()
+    {
+        // Arrange
+        WorkItem workItem = _fakers.WorkItem.Generate();
+        workItem.Tags = _fakers.WorkTag.Generate(2).ToHashSet();
 
-        [Fact]
-        public async Task Can_get_secondary_ManyToMany_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem workItem = _fakers.WorkItem.Generate();
-            workItem.Tags = _fakers.WorkTag.Generate(2).ToHashSet();
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/workItems/{workItem.StringId}/tags";
 
-            string route = $"/workItems/{workItem.StringId}/tags";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        ResourceObject item1 = responseDocument.Data.ManyValue.Single(resource => resource.Id == workItem.Tags.ElementAt(0).StringId);
+        item1.Type.Should().Be("workTags");
+        item1.Attributes.ShouldContainKey("text").With(value => value.Should().Be(workItem.Tags.ElementAt(0).Text));
+        item1.Attributes.ShouldContainKey("isBuiltIn").With(value => value.Should().Be(workItem.Tags.ElementAt(0).IsBuiltIn));
+        item1.Relationships.ShouldNotBeEmpty();
 
-            ResourceObject item1 = responseDocument.Data.ManyValue.Single(resource => resource.Id == workItem.Tags.ElementAt(0).StringId);
-            item1.Type.Should().Be("workTags");
-            item1.Attributes.ShouldContainKey("text").With(value => value.Should().Be(workItem.Tags.ElementAt(0).Text));
-            item1.Attributes.ShouldContainKey("isBuiltIn").With(value => value.Should().Be(workItem.Tags.ElementAt(0).IsBuiltIn));
-            item1.Relationships.ShouldNotBeEmpty();
+        ResourceObject item2 = responseDocument.Data.ManyValue.Single(resource => resource.Id == workItem.Tags.ElementAt(1).StringId);
+        item2.Type.Should().Be("workTags");
+        item2.Attributes.ShouldContainKey("text").With(value => value.Should().Be(workItem.Tags.ElementAt(1).Text));
+        item2.Attributes.ShouldContainKey("isBuiltIn").With(value => value.Should().Be(workItem.Tags.ElementAt(1).IsBuiltIn));
+        item2.Relationships.ShouldNotBeEmpty();
+    }
 
-            ResourceObject item2 = responseDocument.Data.ManyValue.Single(resource => resource.Id == workItem.Tags.ElementAt(1).StringId);
-            item2.Type.Should().Be("workTags");
-            item2.Attributes.ShouldContainKey("text").With(value => value.Should().Be(workItem.Tags.ElementAt(1).Text));
-            item2.Attributes.ShouldContainKey("isBuiltIn").With(value => value.Should().Be(workItem.Tags.ElementAt(1).IsBuiltIn));
-            item2.Relationships.ShouldNotBeEmpty();
-        }
+    [Fact]
+    public async Task Can_get_unknown_secondary_ManyToMany_resources()
+    {
+        // Arrange
+        WorkItem workItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_get_unknown_secondary_ManyToMany_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem workItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/workItems/{workItem.StringId}/tags";
 
-            string route = $"/workItems/{workItem.StringId}/tags";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.Should().BeEmpty();
+    }
 
-            responseDocument.Data.ManyValue.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Cannot_get_secondary_resource_for_unknown_primary_type()
+    {
+        // Arrange
+        string route = $"/{Unknown.ResourceType}/{Unknown.StringId.Int32}/assignee";
 
-        [Fact]
-        public async Task Cannot_get_secondary_resource_for_unknown_primary_type()
-        {
-            // Arrange
-            string route = $"/{Unknown.ResourceType}/{Unknown.StringId.Int32}/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Should().BeEmpty();
+    }
 
-            responseDocument.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Cannot_get_secondary_resource_for_unknown_primary_ID()
+    {
+        // Arrange
+        string workItemId = Unknown.StringId.For<WorkItem, int>();
 
-        [Fact]
-        public async Task Cannot_get_secondary_resource_for_unknown_primary_ID()
-        {
-            // Arrange
-            string workItemId = Unknown.StringId.For<WorkItem, int>();
+        string route = $"/workItems/{workItemId}/assignee";
 
-            string route = $"/workItems/{workItemId}/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
-        }
+    [Fact]
+    public async Task Cannot_get_secondary_resource_for_unknown_secondary_type()
+    {
+        // Arrange
+        WorkItem workItem = _fakers.WorkItem.Generate();
+        workItem.Assignee = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Cannot_get_secondary_resource_for_unknown_secondary_type()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem workItem = _fakers.WorkItem.Generate();
-            workItem.Assignee = _fakers.UserAccount.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/workItems/{workItem.StringId}/{Unknown.Relationship}";
+        string route = $"/workItems/{workItem.StringId}/{Unknown.Relationship}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested relationship does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' does not contain a relationship named '{Unknown.Relationship}'.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested relationship does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' does not contain a relationship named '{Unknown.Relationship}'.");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs
index 6f8a90b69c..fdf1e2e512 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemDefinition.cs
@@ -1,36 +1,33 @@
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
+
+/// <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, int>
 {
-    /// <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, int>
-    {
-        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)
-            {
-                string statement = $"Update \"WorkItems\" SET \"Description\" = '{resource.Description}{Suffix}' WHERE \"Id\" = '{resource.StringId}'";
-                await _dbContext.Database.ExecuteSqlRawAsync(statement, cancellationToken);
-            }
+            string statement = $"Update \"WorkItems\" SET \"Description\" = '{resource.Description}{Suffix}' WHERE \"Id\" = '{resource.StringId}'";
+            await _dbContext.Database.ExecuteSqlRawAsync(statement, cancellationToken);
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs
index a5762b761c..1fbec1c9df 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ImplicitlyChangingWorkItemGroupDefinition.cs
@@ -1,37 +1,33 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
+
+/// <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, Guid>
 {
-    /// <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, Guid>
-    {
-        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)
-            {
-                string statement = $"Update \"Groups\" SET \"Name\" = '{resource.Name}{Suffix}' WHERE \"Id\" = '{resource.StringId}'";
-                await _dbContext.Database.ExecuteSqlRawAsync(statement, cancellationToken);
-            }
+            string statement = $"Update \"Groups\" SET \"Name\" = '{resource.Name}{Suffix}' WHERE \"Id\" = '{resource.StringId}'";
+            await _dbContext.Database.ExecuteSqlRawAsync(statement, cancellationToken);
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteDbContext.cs
index 727d919ad3..276c3f0a91 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteDbContext.cs
@@ -4,50 +4,49 @@
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class ReadWriteDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ReadWriteDbContext : DbContext
+    public DbSet<WorkItem> WorkItems => Set<WorkItem>();
+    public DbSet<WorkTag> WorkTags => Set<WorkTag>();
+    public DbSet<WorkItemGroup> Groups => Set<WorkItemGroup>();
+    public DbSet<RgbColor> RgbColors => Set<RgbColor>();
+    public DbSet<UserAccount> UserAccounts => Set<UserAccount>();
+
+    public ReadWriteDbContext(DbContextOptions<ReadWriteDbContext> options)
+        : base(options)
+    {
+    }
+
+    protected override void OnModelCreating(ModelBuilder builder)
     {
-        public DbSet<WorkItem> WorkItems => Set<WorkItem>();
-        public DbSet<WorkTag> WorkTags => Set<WorkTag>();
-        public DbSet<WorkItemGroup> Groups => Set<WorkItemGroup>();
-        public DbSet<RgbColor> RgbColors => Set<RgbColor>();
-        public DbSet<UserAccount> UserAccounts => Set<UserAccount>();
-
-        public ReadWriteDbContext(DbContextOptions<ReadWriteDbContext> options)
-            : base(options)
-        {
-        }
-
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<WorkItem>()
-                .HasOne(workItem => workItem.Assignee)
-                .WithMany(userAccount => userAccount!.AssignedItems);
-
-            builder.Entity<WorkItem>()
-                .HasMany(workItem => workItem.Subscribers)
-                .WithOne();
-
-            builder.Entity<WorkItemGroup>()
-                .HasOne(workItemGroup => workItemGroup.Color)
-                .WithOne(color => color!.Group!)
-                .HasForeignKey<RgbColor>("GroupId");
-
-            builder.Entity<WorkItem>()
-                .HasOne(workItem => workItem.Parent)
-                .WithMany(workItem => workItem!.Children);
-
-            builder.Entity<WorkItem>()
-                .HasMany(workItem => workItem.RelatedFrom)
-                .WithMany(workItem => workItem.RelatedTo)
-                .UsingEntity<WorkItemToWorkItem>(right => right
-                        .HasOne(joinEntity => joinEntity.FromItem)
-                        .WithMany(),
-                    left => left
-                        .HasOne(joinEntity => joinEntity.ToItem)
-                        .WithMany());
-        }
+        builder.Entity<WorkItem>()
+            .HasOne(workItem => workItem.Assignee)
+            .WithMany(userAccount => userAccount.AssignedItems);
+
+        builder.Entity<WorkItem>()
+            .HasMany(workItem => workItem.Subscribers)
+            .WithOne();
+
+        builder.Entity<WorkItemGroup>()
+            .HasOne(workItemGroup => workItemGroup.Color)
+            .WithOne(color => color.Group!)
+            .HasForeignKey<RgbColor>("GroupId");
+
+        builder.Entity<WorkItem>()
+            .HasOne(workItem => workItem.Parent)
+            .WithMany(workItem => workItem.Children);
+
+        builder.Entity<WorkItem>()
+            .HasMany(workItem => workItem.RelatedFrom)
+            .WithMany(workItem => workItem.RelatedTo)
+            .UsingEntity<WorkItemToWorkItem>(right => right
+                    .HasOne(joinEntity => joinEntity.FromItem)
+                    .WithMany(),
+                left => left
+                    .HasOne(joinEntity => joinEntity.ToItem)
+                    .WithMany());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteFakers.cs
index 03036f0630..f78adb10e4 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteFakers.cs
@@ -1,50 +1,48 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
+
+internal sealed class ReadWriteFakers : FakerContainer
 {
-    internal sealed class ReadWriteFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<WorkItem>> _lazyWorkItemFaker = new(() =>
-            new Faker<WorkItem>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(workItem => workItem.Description, faker => faker.Lorem.Sentence())
-                .RuleFor(workItem => workItem.DueAt, faker => faker.Date.Future()
-                    .TruncateToWholeMilliseconds())
-                .RuleFor(workItem => workItem.Priority, faker => faker.PickRandom<WorkItemPriority>()));
-
-        private readonly Lazy<Faker<WorkTag>> _lazyWorkTagFaker = new(() =>
-            new Faker<WorkTag>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(workTag => workTag.Text, faker => faker.Lorem.Word())
-                .RuleFor(workTag => workTag.IsBuiltIn, faker => faker.Random.Bool()));
-
-        private readonly Lazy<Faker<UserAccount>> _lazyUserAccountFaker = new(() =>
-            new Faker<UserAccount>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(userAccount => userAccount.FirstName, faker => faker.Name.FirstName())
-                .RuleFor(userAccount => userAccount.LastName, faker => faker.Name.LastName()));
-
-        private readonly Lazy<Faker<WorkItemGroup>> _lazyWorkItemGroupFaker = new(() =>
-            new Faker<WorkItemGroup>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(group => group.Name, faker => faker.Lorem.Word())
-                .RuleFor(group => group.IsPublic, faker => faker.Random.Bool()));
-
-        private readonly Lazy<Faker<RgbColor>> _lazyRgbColorFaker = new(() =>
-            new Faker<RgbColor>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(color => color.Id, faker => faker.Random.Hexadecimal(6))
-                .RuleFor(color => color.DisplayName, faker => faker.Commerce.Color()));
-
-        public Faker<WorkItem> WorkItem => _lazyWorkItemFaker.Value;
-        public Faker<WorkTag> WorkTag => _lazyWorkTagFaker.Value;
-        public Faker<UserAccount> UserAccount => _lazyUserAccountFaker.Value;
-        public Faker<WorkItemGroup> WorkItemGroup => _lazyWorkItemGroupFaker.Value;
-        public Faker<RgbColor> RgbColor => _lazyRgbColorFaker.Value;
-    }
+    private readonly Lazy<Faker<WorkItem>> _lazyWorkItemFaker = new(() =>
+        new Faker<WorkItem>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(workItem => workItem.Description, faker => faker.Lorem.Sentence())
+            .RuleFor(workItem => workItem.DueAt, faker => faker.Date.Future()
+                .TruncateToWholeMilliseconds())
+            .RuleFor(workItem => workItem.Priority, faker => faker.PickRandom<WorkItemPriority>()));
+
+    private readonly Lazy<Faker<WorkTag>> _lazyWorkTagFaker = new(() =>
+        new Faker<WorkTag>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(workTag => workTag.Text, faker => faker.Lorem.Word())
+            .RuleFor(workTag => workTag.IsBuiltIn, faker => faker.Random.Bool()));
+
+    private readonly Lazy<Faker<UserAccount>> _lazyUserAccountFaker = new(() =>
+        new Faker<UserAccount>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(userAccount => userAccount.FirstName, faker => faker.Name.FirstName())
+            .RuleFor(userAccount => userAccount.LastName, faker => faker.Name.LastName()));
+
+    private readonly Lazy<Faker<WorkItemGroup>> _lazyWorkItemGroupFaker = new(() =>
+        new Faker<WorkItemGroup>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(group => group.Name, faker => faker.Lorem.Word())
+            .RuleFor(group => group.IsPublic, faker => faker.Random.Bool()));
+
+    private readonly Lazy<Faker<RgbColor>> _lazyRgbColorFaker = new(() =>
+        new Faker<RgbColor>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(color => color.Id, faker => faker.Random.Hexadecimal(6))
+            .RuleFor(color => color.DisplayName, faker => faker.Commerce.Color()));
+
+    public Faker<WorkItem> WorkItem => _lazyWorkItemFaker.Value;
+    public Faker<WorkTag> WorkTag => _lazyWorkTagFaker.Value;
+    public Faker<UserAccount> UserAccount => _lazyUserAccountFaker.Value;
+    public Faker<WorkItemGroup> WorkItemGroup => _lazyWorkItemGroupFaker.Value;
+    public Faker<RgbColor> RgbColor => _lazyRgbColorFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColor.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColor.cs
index 741a189a9c..05af73148f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColor.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColor.cs
@@ -2,15 +2,15 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ReadWrite")]
+public sealed class RgbColor : Identifiable<string>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class RgbColor : Identifiable<string>
-    {
-        [Attr]
-        public string DisplayName { get; set; } = null!;
+    [Attr]
+    public string DisplayName { get; set; } = null!;
 
-        [HasOne]
-        public WorkItemGroup? Group { get; set; }
-    }
+    [HasOne]
+    public WorkItemGroup? Group { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColorsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColorsController.cs
deleted file mode 100644
index f84fcc75de..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/RgbColorsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
-{
-    public sealed class RgbColorsController : JsonApiController<RgbColor, string>
-    {
-        public RgbColorsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<RgbColor, string> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs
index 3e66a9a0db..f2ec5d10bd 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/AddToToManyRelationshipTests.cs
@@ -1,942 +1,936 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Relationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Relationships;
+
+public sealed class AddToToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class AddToToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public AddToToManyRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public AddToToManyRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemsController>();
+    }
 
-            testContext.UseController<WorkItemsController>();
-        }
+    [Fact]
+    public async Task Cannot_add_to_ManyToOne_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Cannot_add_to_ManyToOne_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+            dbContext.AddInRange(existingWorkItem, existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.AddInRange(existingWorkItem, existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "userAccounts",
+                id = existingUserAccount.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "userAccounts",
-                    id = existingUserAccount.StringId
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
-
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("Failed to deserialize request body: Only to-many relationships can be targeted through this endpoint.");
-            error.Detail.Should().Be("Relationship 'assignee' is not a to-many relationship.");
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("Failed to deserialize request body: Only to-many relationships can be targeted through this endpoint.");
+        error.Detail.Should().Be("Relationship 'assignee' is not a to-many relationship.");
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_add_to_OneToMany_relationship_with_already_assigned_resources()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
+    [Fact]
+    public async Task Can_add_to_OneToMany_relationship_with_already_assigned_resources()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
 
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
+                {
+                    type = "userAccounts",
+                    id = existingWorkItem.Subscribers.ElementAt(1).StringId
+                },
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingWorkItem.Subscribers.ElementAt(1).StringId
-                    },
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    }
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(3);
-                workItemInDatabase.Subscribers.Should().ContainSingle(subscriber => subscriber.Id == existingWorkItem.Subscribers.ElementAt(0).Id);
-                workItemInDatabase.Subscribers.Should().ContainSingle(subscriber => subscriber.Id == existingWorkItem.Subscribers.ElementAt(1).Id);
-                workItemInDatabase.Subscribers.Should().ContainSingle(subscriber => subscriber.Id == existingSubscriber.Id);
-            });
-        }
+            workItemInDatabase.Subscribers.ShouldHaveCount(3);
+            workItemInDatabase.Subscribers.Should().ContainSingle(subscriber => subscriber.Id == existingWorkItem.Subscribers.ElementAt(0).Id);
+            workItemInDatabase.Subscribers.Should().ContainSingle(subscriber => subscriber.Id == existingWorkItem.Subscribers.ElementAt(1).Id);
+            workItemInDatabase.Subscribers.Should().ContainSingle(subscriber => subscriber.Id == existingSubscriber.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_add_to_ManyToMany_relationship_with_already_assigned_resources()
-        {
-            // Arrange
-            List<WorkItem> existingWorkItems = _fakers.WorkItem.Generate(2);
-            existingWorkItems[0].Tags = _fakers.WorkTag.Generate(1).ToHashSet();
-            existingWorkItems[1].Tags = _fakers.WorkTag.Generate(1).ToHashSet();
+    [Fact]
+    public async Task Can_add_to_ManyToMany_relationship_with_already_assigned_resources()
+    {
+        // Arrange
+        List<WorkItem> existingWorkItems = _fakers.WorkItem.Generate(2);
+        existingWorkItems[0].Tags = _fakers.WorkTag.Generate(1).ToHashSet();
+        existingWorkItems[1].Tags = _fakers.WorkTag.Generate(1).ToHashSet();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.AddRange(existingWorkItems);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.AddRange(existingWorkItems);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
+                {
+                    type = "workTags",
+                    id = existingWorkItems[0].Tags.ElementAt(0).StringId
+                },
+                new
                 {
-                    new
-                    {
-                        type = "workTags",
-                        id = existingWorkItems[0].Tags.ElementAt(0).StringId
-                    },
-                    new
-                    {
-                        type = "workTags",
-                        id = existingWorkItems[1].Tags.ElementAt(0).StringId
-                    }
+                    type = "workTags",
+                    id = existingWorkItems[1].Tags.ElementAt(0).StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItems[0].StringId}/relationships/tags";
+        string route = $"/workItems/{existingWorkItems[0].StringId}/relationships/tags";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<WorkItem> workItemsInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).ToListAsync();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<WorkItem> workItemsInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).ToListAsync();
 
-                WorkItem workItemInDatabase1 = workItemsInDatabase.Single(workItem => workItem.Id == existingWorkItems[0].Id);
+            WorkItem workItemInDatabase1 = workItemsInDatabase.Single(workItem => workItem.Id == existingWorkItems[0].Id);
 
-                int tagId1 = existingWorkItems[0].Tags.ElementAt(0).Id;
-                int tagId2 = existingWorkItems[1].Tags.ElementAt(0).Id;
+            int tagId1 = existingWorkItems[0].Tags.ElementAt(0).Id;
+            int tagId2 = existingWorkItems[1].Tags.ElementAt(0).Id;
 
-                workItemInDatabase1.Tags.ShouldHaveCount(2);
-                workItemInDatabase1.Tags.Should().ContainSingle(workTag => workTag.Id == tagId1);
-                workItemInDatabase1.Tags.Should().ContainSingle(workTag => workTag.Id == tagId2);
+            workItemInDatabase1.Tags.ShouldHaveCount(2);
+            workItemInDatabase1.Tags.Should().ContainSingle(workTag => workTag.Id == tagId1);
+            workItemInDatabase1.Tags.Should().ContainSingle(workTag => workTag.Id == tagId2);
 
-                WorkItem workItemInDatabase2 = workItemsInDatabase.Single(workItem => workItem.Id == existingWorkItems[1].Id);
+            WorkItem workItemInDatabase2 = workItemsInDatabase.Single(workItem => workItem.Id == existingWorkItems[1].Id);
 
-                workItemInDatabase2.Tags.ShouldHaveCount(1);
-                workItemInDatabase2.Tags.ElementAt(0).Id.Should().Be(tagId2);
-            });
-        }
+            workItemInDatabase2.Tags.ShouldHaveCount(1);
+            workItemInDatabase2.Tags.ElementAt(0).Id.Should().Be(tagId2);
+        });
+    }
+
+    [Fact]
+    public async Task Cannot_add_for_missing_request_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_add_for_missing_request_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string requestBody = string.Empty;
 
-            string requestBody = string.Empty;
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+    [Fact]
+    public async Task Cannot_add_for_null_request_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_add_for_null_request_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        const string requestBody = "null";
 
-            const string requestBody = "null";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_add_for_missing_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_add_for_missing_type()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        id = Unknown.StringId.For<UserAccount, long>()
-                    }
+                    id = Unknown.StringId.For<UserAccount, long>()
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_unknown_type()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_add_for_unknown_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = Unknown.ResourceType,
-                        id = Unknown.StringId.For<UserAccount, long>()
-                    }
+                    type = Unknown.ResourceType,
+                    id = Unknown.StringId.For<UserAccount, long>()
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_missing_ID()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_add_for_missing_ID()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts"
-                    }
+                    type = "userAccounts"
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_add_unknown_IDs_to_OneToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_add_unknown_IDs_to_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string userAccountId1 = Unknown.StringId.For<UserAccount, long>();
-            string userAccountId2 = Unknown.StringId.AltFor<UserAccount, long>();
+        string userAccountId1 = Unknown.StringId.For<UserAccount, long>();
+        string userAccountId2 = Unknown.StringId.AltFor<UserAccount, long>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = userAccountId1
-                    },
-                    new
-                    {
-                        type = "userAccounts",
-                        id = userAccountId2
-                    }
+                    type = "userAccounts",
+                    id = userAccountId1
+                },
+                new
+                {
+                    type = "userAccounts",
+                    id = userAccountId2
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId1}' in relationship 'subscribers' does not exist.");
-            error1.Meta.Should().NotContainKey("requestBody");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId1}' in relationship 'subscribers' does not exist.");
+        error1.Meta.Should().NotContainKey("requestBody");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId2}' in relationship 'subscribers' does not exist.");
-            error2.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId2}' in relationship 'subscribers' does not exist.");
+        error2.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_add_unknown_IDs_to_ManyToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_add_unknown_IDs_to_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string tagId1 = Unknown.StringId.For<WorkTag, int>();
-            string tagId2 = Unknown.StringId.AltFor<WorkTag, int>();
+        string tagId1 = Unknown.StringId.For<WorkTag, int>();
+        string tagId2 = Unknown.StringId.AltFor<WorkTag, int>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
+                {
+                    type = "workTags",
+                    id = tagId1
+                },
+                new
                 {
-                    new
-                    {
-                        type = "workTags",
-                        id = tagId1
-                    },
-                    new
-                    {
-                        type = "workTags",
-                        id = tagId2
-                    }
+                    type = "workTags",
+                    id = tagId2
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId1}' in relationship 'tags' does not exist.");
-            error1.Meta.Should().NotContainKey("requestBody");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId1}' in relationship 'tags' does not exist.");
+        error1.Meta.Should().NotContainKey("requestBody");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId2}' in relationship 'tags' does not exist.");
-            error2.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId2}' in relationship 'tags' does not exist.");
+        error2.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_add_to_unknown_resource_type_in_url()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Cannot_add_to_unknown_resource_type_in_url()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    }
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/{Unknown.ResourceType}/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/{Unknown.ResourceType}/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Cannot_add_to_unknown_resource_ID_in_url()
-        {
-            // Arrange
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Cannot_add_to_unknown_resource_ID_in_url()
+    {
+        // Arrange
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.Add(existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    }
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
                 }
-            };
+            }
+        };
 
-            string workItemId = Unknown.StringId.For<WorkItem, int>();
+        string workItemId = Unknown.StringId.For<WorkItem, int>();
 
-            string route = $"/workItems/{workItemId}/relationships/subscribers";
+        string route = $"/workItems/{workItemId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_add_to_unknown_relationship_in_url()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_add_to_unknown_relationship_in_url()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = Unknown.StringId.For<UserAccount, long>()
-                    }
+                    type = "userAccounts",
+                    id = Unknown.StringId.For<UserAccount, long>()
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/{Unknown.Relationship}";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/{Unknown.Relationship}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested relationship does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' does not contain a relationship named '{Unknown.Relationship}'.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested relationship does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' does not contain a relationship named '{Unknown.Relationship}'.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_add_for_relationship_mismatch_between_url_and_body()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Cannot_add_for_relationship_mismatch_between_url_and_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    }
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'userAccounts' is incompatible with type 'workTags' of relationship 'tags'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'userAccounts' is incompatible with type 'workTags' of relationship 'tags'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_add_with_duplicates()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Can_add_with_duplicates()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    },
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    }
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
+                },
+                new
+                {
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+
+            workItemInDatabase.Subscribers.ShouldHaveCount(1);
+            workItemInDatabase.Subscribers.Single().Id.Should().Be(existingSubscriber.Id);
+        });
+    }
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(1);
-                workItemInDatabase.Subscribers.Single().Id.Should().Be(existingSubscriber.Id);
-            });
-        }
+    [Fact]
+    public async Task Can_add_with_empty_list()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_add_with_empty_list()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+            workItemInDatabase.Subscribers.ShouldHaveCount(0);
+        });
+    }
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(0);
-            });
-        }
+    [Fact]
+    public async Task Cannot_add_with_missing_data_in_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_add_with_missing_data_in_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+        };
 
-            var requestBody = new
-            {
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_add_with_null_data_in_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_add_with_null_data_in_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_add_with_object_data_in_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_add_with_object_data_in_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Can_add_self_to_cyclic_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Children = _fakers.WorkItem.Generate(1);
 
-        [Fact]
-        public async Task Can_add_self_to_cyclic_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Children = _fakers.WorkItem.Generate(1);
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "workItems",
-                        id = existingWorkItem.StringId
-                    }
+                    type = "workItems",
+                    id = existingWorkItem.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/children";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/children";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Children).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Children).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Children.ShouldHaveCount(2);
-                workItemInDatabase.Children.Should().ContainSingle(workItem => workItem.Id == existingWorkItem.Children[0].Id);
-                workItemInDatabase.Children.Should().ContainSingle(workItem => workItem.Id == existingWorkItem.Id);
-            });
-        }
+            workItemInDatabase.Children.ShouldHaveCount(2);
+            workItemInDatabase.Children.Should().ContainSingle(workItem => workItem.Id == existingWorkItem.Children[0].Id);
+            workItemInDatabase.Children.Should().ContainSingle(workItem => workItem.Id == existingWorkItem.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_add_self_to_cyclic_ManyToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.RelatedTo = _fakers.WorkItem.Generate(1);
+    [Fact]
+    public async Task Can_add_self_to_cyclic_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.RelatedTo = _fakers.WorkItem.Generate(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "workItems",
-                        id = existingWorkItem.StringId
-                    }
+                    type = "workItems",
+                    id = existingWorkItem.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/relatedTo";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/relatedTo";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                WorkItem workItemInDatabase = await dbContext.WorkItems
-                    .Include(workItem => workItem.RelatedFrom)
-                    .Include(workItem => workItem.RelatedTo)
-                    .FirstWithIdAsync(existingWorkItem.Id);
+            WorkItem workItemInDatabase = await dbContext.WorkItems
+                .Include(workItem => workItem.RelatedFrom)
+                .Include(workItem => workItem.RelatedTo)
+                .FirstWithIdAsync(existingWorkItem.Id);
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                workItemInDatabase.RelatedFrom.ShouldHaveCount(1);
-                workItemInDatabase.RelatedFrom.Should().OnlyContain(workItem => workItem.Id == existingWorkItem.Id);
+            workItemInDatabase.RelatedFrom.ShouldHaveCount(1);
+            workItemInDatabase.RelatedFrom.Should().OnlyContain(workItem => workItem.Id == existingWorkItem.Id);
 
-                workItemInDatabase.RelatedTo.ShouldHaveCount(2);
-                workItemInDatabase.RelatedTo.Should().ContainSingle(workItem => workItem.Id == existingWorkItem.Id);
-                workItemInDatabase.RelatedTo.Should().ContainSingle(workItem => workItem.Id == existingWorkItem.RelatedTo[0].Id);
-            });
-        }
+            workItemInDatabase.RelatedTo.ShouldHaveCount(2);
+            workItemInDatabase.RelatedTo.Should().ContainSingle(workItem => workItem.Id == existingWorkItem.Id);
+            workItemInDatabase.RelatedTo.Should().ContainSingle(workItem => workItem.Id == existingWorkItem.RelatedTo[0].Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs
index fccf76b4d8..8d0b99a062 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/RemoveFromToManyRelationshipTests.cs
@@ -1,10 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JetBrains.Annotations;
 using JsonApiDotNetCore;
@@ -17,1120 +11,1119 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Relationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Relationships;
+
+public sealed class RemoveFromToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class RemoveFromToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public RemoveFromToManyRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public RemoveFromToManyRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemsController>();
 
-            testContext.UseController<WorkItemsController>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddSingleton<IResourceDefinition<WorkItem, int>, RemoveExtraFromWorkItemDefinition>();
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddSingleton<IResourceDefinition<WorkItem, int>, RemoveExtraFromWorkItemDefinition>();
-            });
+        var workItemDefinition = (RemoveExtraFromWorkItemDefinition)testContext.Factory.Services.GetRequiredService<IResourceDefinition<WorkItem, int>>();
+        workItemDefinition.Reset();
+    }
 
-            var workItemDefinition = (RemoveExtraFromWorkItemDefinition)testContext.Factory.Services.GetRequiredService<IResourceDefinition<WorkItem, int>>();
-            workItemDefinition.Reset();
-        }
+    [Fact]
+    public async Task Cannot_remove_from_ManyToOne_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Assignee = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Cannot_remove_from_ManyToOne_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Assignee = _fakers.UserAccount.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "userAccounts",
+                id = existingWorkItem.Assignee.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "userAccounts",
-                    id = existingWorkItem.Assignee.StringId
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("Failed to deserialize request body: Only to-many relationships can be targeted through this endpoint.");
+        error.Detail.Should().Be("Relationship 'assignee' is not a to-many relationship.");
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("Failed to deserialize request body: Only to-many relationships can be targeted through this endpoint.");
-            error.Detail.Should().Be("Relationship 'assignee' is not a to-many relationship.");
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Can_remove_from_OneToMany_relationship_with_unassigned_existing_resource()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Can_remove_from_OneToMany_relationship_with_unassigned_existing_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<UserAccount>();
-                dbContext.AddInRange(existingWorkItem, existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+            await dbContext.ClearTableAsync<UserAccount>();
+            dbContext.AddInRange(existingWorkItem, existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
+                {
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
+                },
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    },
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingWorkItem.Subscribers.ElementAt(0).StringId
-                    }
+                    type = "userAccounts",
+                    id = existingWorkItem.Subscribers.ElementAt(0).StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(1);
-                workItemInDatabase.Subscribers.Single().Id.Should().Be(existingWorkItem.Subscribers.ElementAt(1).Id);
+            workItemInDatabase.Subscribers.ShouldHaveCount(1);
+            workItemInDatabase.Subscribers.Single().Id.Should().Be(existingWorkItem.Subscribers.ElementAt(1).Id);
 
-                List<UserAccount> userAccountsInDatabase = await dbContext.UserAccounts.ToListAsync();
-                userAccountsInDatabase.ShouldHaveCount(3);
-            });
-        }
+            List<UserAccount> userAccountsInDatabase = await dbContext.UserAccounts.ToListAsync();
+            userAccountsInDatabase.ShouldHaveCount(3);
+        });
+    }
 
-        [Fact]
-        public async Task Can_remove_from_OneToMany_relationship_with_extra_removals_from_resource_definition()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(3).ToHashSet();
+    [Fact]
+    public async Task Can_remove_from_OneToMany_relationship_with_extra_removals_from_resource_definition()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(3).ToHashSet();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<UserAccount>();
-                dbContext.AddInRange(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<UserAccount>();
+            dbContext.AddInRange(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var workItemDefinition = (RemoveExtraFromWorkItemDefinition)_testContext.Factory.Services.GetRequiredService<IResourceDefinition<WorkItem, int>>();
-            workItemDefinition.ExtraSubscribersIdsToRemove.Add(existingWorkItem.Subscribers.ElementAt(2).Id);
+        var workItemDefinition = (RemoveExtraFromWorkItemDefinition)_testContext.Factory.Services.GetRequiredService<IResourceDefinition<WorkItem, int>>();
+        workItemDefinition.ExtraSubscribersIdsToRemove.Add(existingWorkItem.Subscribers.ElementAt(2).Id);
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingWorkItem.Subscribers.ElementAt(0).StringId
-                    }
+                    type = "userAccounts",
+                    id = existingWorkItem.Subscribers.ElementAt(0).StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            workItemDefinition.PreloadedSubscribers.ShouldHaveCount(1);
+        workItemDefinition.PreloadedSubscribers.ShouldHaveCount(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(1);
-                workItemInDatabase.Subscribers.Single().Id.Should().Be(existingWorkItem.Subscribers.ElementAt(1).Id);
+            workItemInDatabase.Subscribers.ShouldHaveCount(1);
+            workItemInDatabase.Subscribers.Single().Id.Should().Be(existingWorkItem.Subscribers.ElementAt(1).Id);
 
-                List<UserAccount> userAccountsInDatabase = await dbContext.UserAccounts.ToListAsync();
-                userAccountsInDatabase.ShouldHaveCount(3);
-            });
-        }
+            List<UserAccount> userAccountsInDatabase = await dbContext.UserAccounts.ToListAsync();
+            userAccountsInDatabase.ShouldHaveCount(3);
+        });
+    }
 
-        [Fact]
-        public async Task Can_remove_from_ManyToMany_relationship_with_unassigned_existing_resource()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Tags = _fakers.WorkTag.Generate(2).ToHashSet();
+    [Fact]
+    public async Task Can_remove_from_ManyToMany_relationship_with_unassigned_existing_resource()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Tags = _fakers.WorkTag.Generate(2).ToHashSet();
 
-            WorkTag existingTag = _fakers.WorkTag.Generate();
+        WorkTag existingTag = _fakers.WorkTag.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<WorkTag>();
-                dbContext.AddInRange(existingWorkItem, existingTag);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<WorkTag>();
+            dbContext.AddInRange(existingWorkItem, existingTag);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
+                {
+                    type = "workTags",
+                    id = existingWorkItem.Tags.ElementAt(1).StringId
+                },
+                new
                 {
-                    new
-                    {
-                        type = "workTags",
-                        id = existingWorkItem.Tags.ElementAt(1).StringId
-                    },
-                    new
-                    {
-                        type = "workTags",
-                        id = existingTag.StringId
-                    }
+                    type = "workTags",
+                    id = existingTag.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Tags.ShouldHaveCount(1);
-                workItemInDatabase.Tags.Single().Id.Should().Be(existingWorkItem.Tags.ElementAt(0).Id);
+            workItemInDatabase.Tags.ShouldHaveCount(1);
+            workItemInDatabase.Tags.Single().Id.Should().Be(existingWorkItem.Tags.ElementAt(0).Id);
 
-                List<WorkTag> tagsInDatabase = await dbContext.WorkTags.ToListAsync();
-                tagsInDatabase.ShouldHaveCount(3);
-            });
-        }
+            List<WorkTag> tagsInDatabase = await dbContext.WorkTags.ToListAsync();
+            tagsInDatabase.ShouldHaveCount(3);
+        });
+    }
 
-        [Fact]
-        public async Task Can_remove_from_ManyToMany_relationship_with_extra_removals_from_resource_definition()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Tags = _fakers.WorkTag.Generate(3).ToHashSet();
+    [Fact]
+    public async Task Can_remove_from_ManyToMany_relationship_with_extra_removals_from_resource_definition()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Tags = _fakers.WorkTag.Generate(3).ToHashSet();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<WorkTag>();
-                dbContext.AddInRange(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<WorkTag>();
+            dbContext.AddInRange(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var workItemDefinition = (RemoveExtraFromWorkItemDefinition)_testContext.Factory.Services.GetRequiredService<IResourceDefinition<WorkItem, int>>();
-            workItemDefinition.ExtraTagIdsToRemove.Add(existingWorkItem.Tags.ElementAt(2).Id);
+        var workItemDefinition = (RemoveExtraFromWorkItemDefinition)_testContext.Factory.Services.GetRequiredService<IResourceDefinition<WorkItem, int>>();
+        workItemDefinition.ExtraTagIdsToRemove.Add(existingWorkItem.Tags.ElementAt(2).Id);
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "workTags",
-                        id = existingWorkItem.Tags.ElementAt(1).StringId
-                    }
+                    type = "workTags",
+                    id = existingWorkItem.Tags.ElementAt(1).StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            workItemDefinition.PreloadedTags.ShouldHaveCount(1);
+        workItemDefinition.PreloadedTags.ShouldHaveCount(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Tags.ShouldHaveCount(1);
-                workItemInDatabase.Tags.Single().Id.Should().Be(existingWorkItem.Tags.ElementAt(0).Id);
+            workItemInDatabase.Tags.ShouldHaveCount(1);
+            workItemInDatabase.Tags.Single().Id.Should().Be(existingWorkItem.Tags.ElementAt(0).Id);
 
-                List<WorkTag> tagsInDatabase = await dbContext.WorkTags.ToListAsync();
-                tagsInDatabase.ShouldHaveCount(3);
-            });
-        }
+            List<WorkTag> tagsInDatabase = await dbContext.WorkTags.ToListAsync();
+            tagsInDatabase.ShouldHaveCount(3);
+        });
+    }
+
+    [Fact]
+    public async Task Cannot_remove_for_missing_request_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_remove_for_missing_request_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string requestBody = string.Empty;
 
-            string requestBody = string.Empty;
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+    [Fact]
+    public async Task Cannot_remove_for_null_request_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_remove_for_null_request_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        const string requestBody = "null";
 
-            const string requestBody = "null";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_remove_for_missing_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Cannot_remove_for_missing_type()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        id = existingWorkItem.Subscribers.ElementAt(0).StringId
-                    }
+                    id = existingWorkItem.Subscribers.ElementAt(0).StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_unknown_type()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_remove_for_unknown_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = Unknown.ResourceType,
-                        id = Unknown.StringId.For<UserAccount, long>()
-                    }
+                    type = Unknown.ResourceType,
+                    id = Unknown.StringId.For<UserAccount, long>()
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_missing_ID()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_remove_for_missing_ID()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts"
-                    }
+                    type = "userAccounts"
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_remove_unknown_IDs_from_OneToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_remove_unknown_IDs_from_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string userAccountId1 = Unknown.StringId.For<UserAccount, long>();
-            string userAccountId2 = Unknown.StringId.AltFor<UserAccount, long>();
+        string userAccountId1 = Unknown.StringId.For<UserAccount, long>();
+        string userAccountId2 = Unknown.StringId.AltFor<UserAccount, long>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = userAccountId1
-                    },
-                    new
-                    {
-                        type = "userAccounts",
-                        id = userAccountId2
-                    }
+                    type = "userAccounts",
+                    id = userAccountId1
+                },
+                new
+                {
+                    type = "userAccounts",
+                    id = userAccountId2
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId1}' in relationship 'subscribers' does not exist.");
-            error1.Meta.Should().NotContainKey("requestBody");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId1}' in relationship 'subscribers' does not exist.");
+        error1.Meta.Should().NotContainKey("requestBody");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId2}' in relationship 'subscribers' does not exist.");
-            error2.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId2}' in relationship 'subscribers' does not exist.");
+        error2.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_remove_unknown_IDs_from_ManyToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_remove_unknown_IDs_from_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string tagId1 = Unknown.StringId.For<WorkTag, int>();
-            string tagId2 = Unknown.StringId.AltFor<WorkTag, int>();
+        string tagId1 = Unknown.StringId.For<WorkTag, int>();
+        string tagId2 = Unknown.StringId.AltFor<WorkTag, int>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "workTags",
-                        id = tagId1
-                    },
-                    new
-                    {
-                        type = "workTags",
-                        id = tagId2
-                    }
+                    type = "workTags",
+                    id = tagId1
+                },
+                new
+                {
+                    type = "workTags",
+                    id = tagId2
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId1}' in relationship 'tags' does not exist.");
-            error1.Meta.Should().NotContainKey("requestBody");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId1}' in relationship 'tags' does not exist.");
+        error1.Meta.Should().NotContainKey("requestBody");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId2}' in relationship 'tags' does not exist.");
-            error2.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId2}' in relationship 'tags' does not exist.");
+        error2.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_remove_from_unknown_resource_type_in_url()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
+    [Fact]
+    public async Task Cannot_remove_from_unknown_resource_type_in_url()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingWorkItem.Subscribers.ElementAt(0).StringId
-                    }
+                    type = "userAccounts",
+                    id = existingWorkItem.Subscribers.ElementAt(0).StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/{Unknown.ResourceType}/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/{Unknown.ResourceType}/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Cannot_remove_from_unknown_resource_ID_in_url()
-        {
-            // Arrange
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Cannot_remove_from_unknown_resource_ID_in_url()
+    {
+        // Arrange
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.Add(existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    }
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
                 }
-            };
+            }
+        };
 
-            string workItemId = Unknown.StringId.For<WorkItem, int>();
+        string workItemId = Unknown.StringId.For<WorkItem, int>();
 
-            string route = $"/workItems/{workItemId}/relationships/subscribers";
+        string route = $"/workItems/{workItemId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_remove_from_unknown_relationship_in_url()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_remove_from_unknown_relationship_in_url()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = Unknown.StringId.For<UserAccount, long>()
-                    }
+                    type = "userAccounts",
+                    id = Unknown.StringId.For<UserAccount, long>()
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/{Unknown.Relationship}";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/{Unknown.Relationship}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested relationship does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' does not contain a relationship named '{Unknown.Relationship}'.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested relationship does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' does not contain a relationship named '{Unknown.Relationship}'.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_remove_for_relationship_mismatch_between_url_and_body()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
+    [Fact]
+    public async Task Cannot_remove_for_relationship_mismatch_between_url_and_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingWorkItem.Subscribers.ElementAt(0).StringId
-                    }
+                    type = "userAccounts",
+                    id = existingWorkItem.Subscribers.ElementAt(0).StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'userAccounts' is incompatible with type 'workTags' of relationship 'tags'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'userAccounts' is incompatible with type 'workTags' of relationship 'tags'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_remove_with_duplicates()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
+    [Fact]
+    public async Task Can_remove_with_duplicates()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
+                {
+                    type = "userAccounts",
+                    id = existingWorkItem.Subscribers.ElementAt(0).StringId
+                },
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingWorkItem.Subscribers.ElementAt(0).StringId
-                    },
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingWorkItem.Subscribers.ElementAt(0).StringId
-                    }
+                    type = "userAccounts",
+                    id = existingWorkItem.Subscribers.ElementAt(0).StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(1);
-                workItemInDatabase.Subscribers.Single().Id.Should().Be(existingWorkItem.Subscribers.ElementAt(1).Id);
-            });
-        }
+            workItemInDatabase.Subscribers.ShouldHaveCount(1);
+            workItemInDatabase.Subscribers.Single().Id.Should().Be(existingWorkItem.Subscribers.ElementAt(1).Id);
+        });
+    }
+
+    [Fact]
+    public async Task Can_remove_with_empty_list()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Can_remove_with_empty_list()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+            workItemInDatabase.Subscribers.ShouldHaveCount(1);
+            workItemInDatabase.Subscribers.Single().Id.Should().Be(existingWorkItem.Subscribers.ElementAt(0).Id);
+        });
+    }
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(1);
-                workItemInDatabase.Subscribers.Single().Id.Should().Be(existingWorkItem.Subscribers.ElementAt(0).Id);
-            });
-        }
+    [Fact]
+    public async Task Cannot_remove_with_missing_data_in_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_remove_with_missing_data_in_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+        };
 
-            var requestBody = new
-            {
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_remove_with_null_data_in_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_remove_with_null_data_in_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_remove_with_object_data_in_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_remove_with_object_data_in_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Can_remove_self_from_cyclic_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Children = _fakers.WorkItem.Generate(1);
 
-        [Fact]
-        public async Task Can_remove_self_from_cyclic_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Children = _fakers.WorkItem.Generate(1);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
 
-                existingWorkItem.Children.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            existingWorkItem.Children.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "workItems",
-                        id = existingWorkItem.StringId
-                    }
+                    type = "workItems",
+                    id = existingWorkItem.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/children";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/children";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Children).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Children).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Children.ShouldHaveCount(1);
-                workItemInDatabase.Children[0].Id.Should().Be(existingWorkItem.Children[0].Id);
-            });
-        }
+            workItemInDatabase.Children.ShouldHaveCount(1);
+            workItemInDatabase.Children[0].Id.Should().Be(existingWorkItem.Children[0].Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_remove_self_from_cyclic_ManyToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.RelatedFrom = _fakers.WorkItem.Generate(1);
+    [Fact]
+    public async Task Can_remove_self_from_cyclic_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.RelatedFrom = _fakers.WorkItem.Generate(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
 
-                existingWorkItem.RelatedFrom.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            existingWorkItem.RelatedFrom.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "workItems",
-                        id = existingWorkItem.StringId
-                    }
+                    type = "workItems",
+                    id = existingWorkItem.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/relatedFrom";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/relatedFrom";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                WorkItem workItemInDatabase = await dbContext.WorkItems
-                    .Include(workItem => workItem.RelatedFrom)
-                    .Include(workItem => workItem.RelatedTo)
-                    .FirstWithIdAsync(existingWorkItem.Id);
+            WorkItem workItemInDatabase = await dbContext.WorkItems
+                .Include(workItem => workItem.RelatedFrom)
+                .Include(workItem => workItem.RelatedTo)
+                .FirstWithIdAsync(existingWorkItem.Id);
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                workItemInDatabase.RelatedFrom.ShouldHaveCount(1);
-                workItemInDatabase.RelatedFrom[0].Id.Should().Be(existingWorkItem.RelatedFrom[0].Id);
+            workItemInDatabase.RelatedFrom.ShouldHaveCount(1);
+            workItemInDatabase.RelatedFrom[0].Id.Should().Be(existingWorkItem.RelatedFrom[0].Id);
 
-                workItemInDatabase.RelatedTo.Should().BeEmpty();
-            });
+            workItemInDatabase.RelatedTo.Should().BeEmpty();
+        });
+    }
+
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class RemoveExtraFromWorkItemDefinition : JsonApiResourceDefinition<WorkItem, int>
+    {
+        // Enables to verify that not the full relationship was loaded upfront.
+        public ISet<UserAccount> PreloadedSubscribers { get; } = new HashSet<UserAccount>(IdentifiableComparer.Instance);
+        public ISet<WorkTag> PreloadedTags { get; } = new HashSet<WorkTag>(IdentifiableComparer.Instance);
+
+        // Enables to verify that adding extra IDs for removal from ResourceDefinition works correctly.
+        public ISet<long> ExtraSubscribersIdsToRemove { get; } = new HashSet<long>();
+        public ISet<int> ExtraTagIdsToRemove { get; } = new HashSet<int>();
+
+        public RemoveExtraFromWorkItemDefinition(IResourceGraph resourceGraph)
+            : base(resourceGraph)
+        {
         }
 
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class RemoveExtraFromWorkItemDefinition : JsonApiResourceDefinition<WorkItem, int>
+        public void Reset()
         {
-            // Enables to verify that not the full relationship was loaded upfront.
-            public ISet<UserAccount> PreloadedSubscribers { get; } = new HashSet<UserAccount>(IdentifiableComparer.Instance);
-            public ISet<WorkTag> PreloadedTags { get; } = new HashSet<WorkTag>(IdentifiableComparer.Instance);
+            PreloadedSubscribers.Clear();
+            PreloadedTags.Clear();
 
-            // Enables to verify that adding extra IDs for removal from ResourceDefinition works correctly.
-            public ISet<long> ExtraSubscribersIdsToRemove { get; } = new HashSet<long>();
-            public ISet<int> ExtraTagIdsToRemove { get; } = new HashSet<int>();
+            ExtraSubscribersIdsToRemove.Clear();
+            ExtraTagIdsToRemove.Clear();
+        }
 
-            public RemoveExtraFromWorkItemDefinition(IResourceGraph resourceGraph)
-                : base(resourceGraph)
+        public override Task OnRemoveFromRelationshipAsync(WorkItem workItem, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            CancellationToken cancellationToken)
+        {
+            if (hasManyRelationship.Property.Name == nameof(WorkItem.Subscribers))
             {
+                RemoveFromSubscribers(workItem, rightResourceIds);
             }
-
-            public void Reset()
+            else if (hasManyRelationship.Property.Name == nameof(WorkItem.Tags))
             {
-                PreloadedSubscribers.Clear();
-                PreloadedTags.Clear();
-
-                ExtraSubscribersIdsToRemove.Clear();
-                ExtraTagIdsToRemove.Clear();
+                RemoveFromTags(workItem, rightResourceIds);
             }
 
-            public override Task OnRemoveFromRelationshipAsync(WorkItem workItem, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-            {
-                if (hasManyRelationship.Property.Name == nameof(WorkItem.Subscribers))
-                {
-                    RemoveFromSubscribers(workItem, rightResourceIds);
-                }
-                else if (hasManyRelationship.Property.Name == nameof(WorkItem.Tags))
-                {
-                    RemoveFromTags(workItem, rightResourceIds);
-                }
+            return Task.CompletedTask;
+        }
 
-                return Task.CompletedTask;
+        private void RemoveFromSubscribers(WorkItem workItem, ISet<IIdentifiable> rightResourceIds)
+        {
+            if (!workItem.Subscribers.IsNullOrEmpty())
+            {
+                PreloadedSubscribers.AddRange(workItem.Subscribers);
             }
 
-            private void RemoveFromSubscribers(WorkItem workItem, ISet<IIdentifiable> rightResourceIds)
+            foreach (long subscriberId in ExtraSubscribersIdsToRemove)
             {
-                if (!workItem.Subscribers.IsNullOrEmpty())
+                rightResourceIds.Add(new UserAccount
                 {
-                    PreloadedSubscribers.AddRange(workItem.Subscribers);
-                }
-
-                foreach (long subscriberId in ExtraSubscribersIdsToRemove)
-                {
-                    rightResourceIds.Add(new UserAccount
-                    {
-                        Id = subscriberId
-                    });
-                }
+                    Id = subscriberId
+                });
             }
+        }
 
-            private void RemoveFromTags(WorkItem workItem, ISet<IIdentifiable> rightResourceIds)
+        private void RemoveFromTags(WorkItem workItem, ISet<IIdentifiable> rightResourceIds)
+        {
+            if (!workItem.Tags.IsNullOrEmpty())
             {
-                if (!workItem.Tags.IsNullOrEmpty())
-                {
-                    PreloadedTags.AddRange(workItem.Tags);
-                }
+                PreloadedTags.AddRange(workItem.Tags);
+            }
 
-                foreach (int tagId in ExtraTagIdsToRemove)
+            foreach (int tagId in ExtraTagIdsToRemove)
+            {
+                rightResourceIds.Add(new WorkTag
                 {
-                    rightResourceIds.Add(new WorkTag
-                    {
-                        Id = tagId
-                    });
-                }
+                    Id = tagId
+                });
             }
         }
     }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs
index 4477344f53..84052132f9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/ReplaceToManyRelationshipTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -11,1012 +6,1011 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Relationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Relationships;
+
+public sealed class ReplaceToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class ReplaceToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public ReplaceToManyRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public ReplaceToManyRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemsController>();
+    }
 
-            testContext.UseController<WorkItemsController>();
-        }
+    [Fact]
+    public async Task Can_clear_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
 
-        [Fact]
-        public async Task Can_clear_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+            workItemInDatabase.Subscribers.Should().BeEmpty();
+        });
+    }
 
-                workItemInDatabase.Subscribers.Should().BeEmpty();
-            });
-        }
+    [Fact]
+    public async Task Can_clear_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Tags = _fakers.WorkTag.Generate(1).ToHashSet();
 
-        [Fact]
-        public async Task Can_clear_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Tags = _fakers.WorkTag.Generate(1).ToHashSet();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Tags.Should().BeEmpty();
-            });
-        }
+            workItemInDatabase.Tags.Should().BeEmpty();
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_OneToMany_relationship_with_already_assigned_resources()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
+    [Fact]
+    public async Task Can_replace_OneToMany_relationship_with_already_assigned_resources()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
 
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
+                {
+                    type = "userAccounts",
+                    id = existingWorkItem.Subscribers.ElementAt(1).StringId
+                },
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingWorkItem.Subscribers.ElementAt(1).StringId
-                    },
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    }
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(2);
-                workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingWorkItem.Subscribers.ElementAt(1).Id);
-                workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingSubscriber.Id);
-            });
-        }
+            workItemInDatabase.Subscribers.ShouldHaveCount(2);
+            workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingWorkItem.Subscribers.ElementAt(1).Id);
+            workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingSubscriber.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_ManyToMany_relationship_with_already_assigned_resources()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Tags = _fakers.WorkTag.Generate(2).ToHashSet();
+    [Fact]
+    public async Task Can_replace_ManyToMany_relationship_with_already_assigned_resources()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Tags = _fakers.WorkTag.Generate(2).ToHashSet();
 
-            List<WorkTag> existingTags = _fakers.WorkTag.Generate(2);
+        List<WorkTag> existingTags = _fakers.WorkTag.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                dbContext.WorkTags.AddRange(existingTags);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            dbContext.WorkTags.AddRange(existingTags);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "workTags",
-                        id = existingWorkItem.Tags.ElementAt(0).StringId
-                    },
-                    new
-                    {
-                        type = "workTags",
-                        id = existingTags[0].StringId
-                    },
-                    new
-                    {
-                        type = "workTags",
-                        id = existingTags[1].StringId
-                    }
+                    type = "workTags",
+                    id = existingWorkItem.Tags.ElementAt(0).StringId
+                },
+                new
+                {
+                    type = "workTags",
+                    id = existingTags[0].StringId
+                },
+                new
+                {
+                    type = "workTags",
+                    id = existingTags[1].StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Tags.ShouldHaveCount(3);
-                workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingWorkItem.Tags.ElementAt(0).Id);
-                workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[0].Id);
-                workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[1].Id);
-            });
-        }
+            workItemInDatabase.Tags.ShouldHaveCount(3);
+            workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingWorkItem.Tags.ElementAt(0).Id);
+            workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[0].Id);
+            workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[1].Id);
+        });
+    }
+
+    [Fact]
+    public async Task Cannot_replace_for_missing_request_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_request_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string requestBody = string.Empty;
 
-            string requestBody = string.Empty;
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+    [Fact]
+    public async Task Cannot_replace_for_null_request_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_for_null_request_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        const string requestBody = "null";
 
-            const string requestBody = "null";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_replace_for_missing_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_type()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        id = Unknown.StringId.For<UserAccount, long>()
-                    }
+                    id = Unknown.StringId.For<UserAccount, long>()
                 }
-            };
+            }
+        };
+
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_replace_for_unknown_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_for_unknown_type()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = Unknown.ResourceType,
-                        id = Unknown.StringId.For<UserAccount, long>()
-                    }
+                    type = Unknown.ResourceType,
+                    id = Unknown.StringId.For<UserAccount, long>()
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_ID()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_missing_ID()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts"
-                    }
+                    type = "userAccounts"
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_with_unknown_IDs_in_OneToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_replace_with_unknown_IDs_in_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string userAccountId1 = Unknown.StringId.For<UserAccount, long>();
-            string userAccountId2 = Unknown.StringId.AltFor<UserAccount, long>();
+        string userAccountId1 = Unknown.StringId.For<UserAccount, long>();
+        string userAccountId2 = Unknown.StringId.AltFor<UserAccount, long>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
+                {
+                    type = "userAccounts",
+                    id = userAccountId1
+                },
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = userAccountId1
-                    },
-                    new
-                    {
-                        type = "userAccounts",
-                        id = userAccountId2
-                    }
+                    type = "userAccounts",
+                    id = userAccountId2
                 }
-            };
+            }
+        };
+
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId1}' in relationship 'subscribers' does not exist.");
+        error1.Source.Should().BeNull();
+        error1.Meta.Should().NotContainKey("requestBody");
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId1}' in relationship 'subscribers' does not exist.");
-            error1.Source.Should().BeNull();
-            error1.Meta.Should().NotContainKey("requestBody");
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId2}' in relationship 'subscribers' does not exist.");
+        error2.Source.Should().BeNull();
+        error2.Meta.Should().NotContainKey("requestBody");
+    }
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId2}' in relationship 'subscribers' does not exist.");
-            error2.Source.Should().BeNull();
-            error2.Meta.Should().NotContainKey("requestBody");
-        }
+    [Fact]
+    public async Task Cannot_replace_with_unknown_IDs_in_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_with_unknown_IDs_in_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string tagId1 = Unknown.StringId.For<WorkTag, int>();
-            string tagId2 = Unknown.StringId.AltFor<WorkTag, int>();
+        string tagId1 = Unknown.StringId.For<WorkTag, int>();
+        string tagId2 = Unknown.StringId.AltFor<WorkTag, int>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
+                {
+                    type = "workTags",
+                    id = tagId1
+                },
+                new
                 {
-                    new
-                    {
-                        type = "workTags",
-                        id = tagId1
-                    },
-                    new
-                    {
-                        type = "workTags",
-                        id = tagId2
-                    }
+                    type = "workTags",
+                    id = tagId2
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId1}' in relationship 'tags' does not exist.");
-            error1.Source.Should().BeNull();
-            error1.Meta.Should().NotContainKey("requestBody");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId1}' in relationship 'tags' does not exist.");
+        error1.Source.Should().BeNull();
+        error1.Meta.Should().NotContainKey("requestBody");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId2}' in relationship 'tags' does not exist.");
-            error2.Source.Should().BeNull();
-            error2.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId2}' in relationship 'tags' does not exist.");
+        error2.Source.Should().BeNull();
+        error2.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_replace_on_unknown_resource_type_in_url()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Cannot_replace_on_unknown_resource_type_in_url()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    }
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/{Unknown.ResourceType}/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/{Unknown.ResourceType}/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
+
+    [Fact]
+    public async Task Cannot_replace_on_unknown_resource_ID_in_url()
+    {
+        // Arrange
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_on_unknown_resource_ID_in_url()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+            dbContext.UserAccounts.Add(existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        string workItemId = Unknown.StringId.For<WorkItem, int>();
 
-            string workItemId = Unknown.StringId.For<WorkItem, int>();
+        string route = $"/workItems/{workItemId}/relationships/subscribers";
 
-            string route = $"/workItems/{workItemId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+    [Fact]
+    public async Task Cannot_replace_on_unknown_relationship_in_url()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_on_unknown_relationship_in_url()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = Unknown.StringId.For<UserAccount, long>()
-                    }
+                    type = "userAccounts",
+                    id = Unknown.StringId.For<UserAccount, long>()
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/{Unknown.Relationship}";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/{Unknown.Relationship}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested relationship does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' does not contain a relationship named '{Unknown.Relationship}'.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested relationship does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' does not contain a relationship named '{Unknown.Relationship}'.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_replace_on_relationship_mismatch_between_url_and_body()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Cannot_replace_on_relationship_mismatch_between_url_and_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    }
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'userAccounts' is incompatible with type 'workTags' of relationship 'tags'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'userAccounts' is incompatible with type 'workTags' of relationship 'tags'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_replace_with_duplicates()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
+    [Fact]
+    public async Task Can_replace_with_duplicates()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
 
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
+                {
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
+                },
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    },
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingSubscriber.StringId
-                    }
+                    type = "userAccounts",
+                    id = existingSubscriber.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(1);
-                workItemInDatabase.Subscribers.Single().Id.Should().Be(existingSubscriber.Id);
-            });
-        }
+            workItemInDatabase.Subscribers.ShouldHaveCount(1);
+            workItemInDatabase.Subscribers.Single().Id.Should().Be(existingSubscriber.Id);
+        });
+    }
+
+    [Fact]
+    public async Task Cannot_replace_with_missing_data_in_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_with_missing_data_in_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+        };
 
-            var requestBody = new
-            {
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/subscribers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_replace_with_null_data_in_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_with_null_data_in_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_replace_with_object_data_in_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_with_object_data_in_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/tags";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Can_clear_cyclic_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_clear_cyclic_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+            existingWorkItem.Children = new List<WorkItem>
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
+                existingWorkItem
+            };
 
-                existingWorkItem.Children = new List<WorkItem>
-                {
-                    existingWorkItem
-                };
+            await dbContext.SaveChangesAsync();
+        });
 
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/children";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/children";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Children).FirstWithIdAsync(existingWorkItem.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Children).FirstWithIdAsync(existingWorkItem.Id);
+            workItemInDatabase.Children.Should().BeEmpty();
+        });
+    }
 
-                workItemInDatabase.Children.Should().BeEmpty();
-            });
-        }
+    [Fact]
+    public async Task Can_clear_cyclic_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_clear_cyclic_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
+            existingWorkItem.RelatedFrom = ArrayFactory.Create(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-                existingWorkItem.RelatedFrom = ArrayFactory.Create(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/relatedFrom";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/relatedFrom";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+            WorkItem workItemInDatabase = await dbContext.WorkItems
+                .Include(workItem => workItem.RelatedFrom)
+                .Include(workItem => workItem.RelatedTo)
+                .FirstWithIdAsync(existingWorkItem.Id);
 
-                WorkItem workItemInDatabase = await dbContext.WorkItems
-                    .Include(workItem => workItem.RelatedFrom)
-                    .Include(workItem => workItem.RelatedTo)
-                    .FirstWithIdAsync(existingWorkItem.Id);
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            workItemInDatabase.RelatedFrom.Should().BeEmpty();
+            workItemInDatabase.RelatedTo.Should().BeEmpty();
+        });
+    }
 
-                workItemInDatabase.RelatedFrom.Should().BeEmpty();
-                workItemInDatabase.RelatedTo.Should().BeEmpty();
-            });
-        }
+    [Fact]
+    public async Task Can_assign_cyclic_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_assign_cyclic_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "workItems",
-                        id = existingWorkItem.StringId
-                    }
+                    type = "workItems",
+                    id = existingWorkItem.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/children";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/children";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Children).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Children).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Children.ShouldHaveCount(1);
-                workItemInDatabase.Children[0].Id.Should().Be(existingWorkItem.Id);
-            });
-        }
+            workItemInDatabase.Children.ShouldHaveCount(1);
+            workItemInDatabase.Children[0].Id.Should().Be(existingWorkItem.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_assign_cyclic_ManyToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Can_assign_cyclic_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "workItems",
-                        id = existingWorkItem.StringId
-                    }
+                    type = "workItems",
+                    id = existingWorkItem.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/relatedTo";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/relatedTo";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                WorkItem workItemInDatabase = await dbContext.WorkItems
-                    .Include(workItem => workItem.RelatedFrom)
-                    .Include(workItem => workItem.RelatedTo)
-                    .FirstWithIdAsync(existingWorkItem.Id);
+            WorkItem workItemInDatabase = await dbContext.WorkItems
+                .Include(workItem => workItem.RelatedFrom)
+                .Include(workItem => workItem.RelatedTo)
+                .FirstWithIdAsync(existingWorkItem.Id);
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                workItemInDatabase.RelatedFrom.ShouldHaveCount(1);
-                workItemInDatabase.RelatedFrom[0].Id.Should().Be(existingWorkItem.Id);
+            workItemInDatabase.RelatedFrom.ShouldHaveCount(1);
+            workItemInDatabase.RelatedFrom[0].Id.Should().Be(existingWorkItem.Id);
 
-                workItemInDatabase.RelatedTo.ShouldHaveCount(1);
-                workItemInDatabase.RelatedTo[0].Id.Should().Be(existingWorkItem.Id);
-            });
-        }
+            workItemInDatabase.RelatedTo.ShouldHaveCount(1);
+            workItemInDatabase.RelatedTo[0].Id.Should().Be(existingWorkItem.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs
index 7c27a33a45..67ca5070e7 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Relationships/UpdateToOneRelationshipTests.cs
@@ -1,778 +1,773 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Relationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Relationships;
+
+public sealed class UpdateToOneRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class UpdateToOneRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public UpdateToOneRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public UpdateToOneRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemsController>();
+        testContext.UseController<WorkItemGroupsController>();
+        testContext.UseController<RgbColorsController>();
+    }
 
-            testContext.UseController<WorkItemsController>();
-            testContext.UseController<WorkItemGroupsController>();
-            testContext.UseController<RgbColorsController>();
-        }
+    [Fact]
+    public async Task Can_clear_ManyToOne_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Assignee = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Can_clear_ManyToOne_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Assignee = _fakers.UserAccount.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(existingWorkItem.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(existingWorkItem.Id);
+            workItemInDatabase.Assignee.Should().BeNull();
+        });
+    }
 
-                workItemInDatabase.Assignee.Should().BeNull();
-            });
-        }
+    [Fact]
+    public async Task Can_clear_OneToOne_relationship()
+    {
+        // Arrange
+        WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
+        existingGroup.Color = _fakers.RgbColor.Generate();
 
-        [Fact]
-        public async Task Can_clear_OneToOne_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
-            existingGroup.Color = _fakers.RgbColor.Generate();
+            dbContext.Groups.AddRange(existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Groups.AddRange(existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        string route = $"/workItemGroups/{existingGroup.StringId}/relationships/color";
 
-            string route = $"/workItemGroups/{existingGroup.StringId}/relationships/color";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItemGroup groupInDatabase = await dbContext.Groups.Include(group => group.Color).FirstWithIdAsync(existingGroup.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItemGroup groupInDatabase = await dbContext.Groups.Include(group => group.Color).FirstWithIdAsync(existingGroup.Id);
+            groupInDatabase.Color.Should().BeNull();
+        });
+    }
 
-                groupInDatabase.Color.Should().BeNull();
-            });
-        }
+    [Fact]
+    public async Task Can_create_OneToOne_relationship_from_dependent_side()
+    {
+        // Arrange
+        WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
+        existingGroup.Color = _fakers.RgbColor.Generate();
 
-        [Fact]
-        public async Task Can_create_OneToOne_relationship_from_dependent_side()
-        {
-            // Arrange
-            WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
-            existingGroup.Color = _fakers.RgbColor.Generate();
+        RgbColor existingColor = _fakers.RgbColor.Generate();
 
-            RgbColor existingColor = _fakers.RgbColor.Generate();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingGroup, existingColor);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.AddInRange(existingGroup, existingColor);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "workItemGroups",
+                id = existingGroup.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "workItemGroups",
-                    id = existingGroup.StringId
-                }
-            };
+        string route = $"/rgbColors/{existingColor.StringId}/relationships/group";
 
-            string route = $"/rgbColors/{existingColor.StringId}/relationships/group";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<RgbColor> colorsInDatabase = await dbContext.RgbColors.Include(rgbColor => rgbColor.Group).ToListAsync();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<RgbColor> colorsInDatabase = await dbContext.RgbColors.Include(rgbColor => rgbColor.Group).ToListAsync();
+            RgbColor colorInDatabase1 = colorsInDatabase.Single(color => color.Id == existingGroup.Color.Id);
+            colorInDatabase1.Group.Should().BeNull();
 
-                RgbColor colorInDatabase1 = colorsInDatabase.Single(color => color.Id == existingGroup.Color.Id);
-                colorInDatabase1.Group.Should().BeNull();
+            RgbColor colorInDatabase2 = colorsInDatabase.Single(color => color.Id == existingColor.Id);
+            colorInDatabase2.Group.ShouldNotBeNull();
+            colorInDatabase2.Group.Id.Should().Be(existingGroup.Id);
+        });
+    }
 
-                RgbColor colorInDatabase2 = colorsInDatabase.Single(color => color.Id == existingColor.Id);
-                colorInDatabase2.Group.ShouldNotBeNull();
-                colorInDatabase2.Group.Id.Should().Be(existingGroup.Id);
-            });
-        }
+    [Fact]
+    public async Task Can_replace_OneToOne_relationship_from_principal_side()
+    {
+        // Arrange
+        List<WorkItemGroup> existingGroups = _fakers.WorkItemGroup.Generate(2);
+        existingGroups[0].Color = _fakers.RgbColor.Generate();
+        existingGroups[1].Color = _fakers.RgbColor.Generate();
 
-        [Fact]
-        public async Task Can_replace_OneToOne_relationship_from_principal_side()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<WorkItemGroup> existingGroups = _fakers.WorkItemGroup.Generate(2);
-            existingGroups[0].Color = _fakers.RgbColor.Generate();
-            existingGroups[1].Color = _fakers.RgbColor.Generate();
+            dbContext.Groups.AddRange(existingGroups);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.Groups.AddRange(existingGroups);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "rgbColors",
+                id = existingGroups[0].Color!.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "rgbColors",
-                    id = existingGroups[0].Color!.StringId
-                }
-            };
+        string route = $"/workItemGroups/{existingGroups[1].StringId}/relationships/color";
 
-            string route = $"/workItemGroups/{existingGroups[1].StringId}/relationships/color";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<WorkItemGroup> groupsInDatabase = await dbContext.Groups.Include(group => group.Color).ToListAsync();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<WorkItemGroup> groupsInDatabase = await dbContext.Groups.Include(group => group.Color).ToListAsync();
+            WorkItemGroup groupInDatabase1 = groupsInDatabase.Single(group => group.Id == existingGroups[0].Id);
+            groupInDatabase1.Color.Should().BeNull();
 
-                WorkItemGroup groupInDatabase1 = groupsInDatabase.Single(group => group.Id == existingGroups[0].Id);
-                groupInDatabase1.Color.Should().BeNull();
+            WorkItemGroup groupInDatabase2 = groupsInDatabase.Single(group => group.Id == existingGroups[1].Id);
+            groupInDatabase2.Color.ShouldNotBeNull();
+            groupInDatabase2.Color.Id.Should().Be(existingGroups[0].Color!.Id);
 
-                WorkItemGroup groupInDatabase2 = groupsInDatabase.Single(group => group.Id == existingGroups[1].Id);
-                groupInDatabase2.Color.ShouldNotBeNull();
-                groupInDatabase2.Color.Id.Should().Be(existingGroups[0].Color!.Id);
+            List<RgbColor> colorsInDatabase = await dbContext.RgbColors.Include(color => color.Group).ToListAsync();
 
-                List<RgbColor> colorsInDatabase = await dbContext.RgbColors.Include(color => color.Group).ToListAsync();
+            RgbColor colorInDatabase1 = colorsInDatabase.Single(color => color.Id == existingGroups[0].Color!.Id);
+            colorInDatabase1.Group.ShouldNotBeNull();
+            colorInDatabase1.Group.Id.Should().Be(existingGroups[1].Id);
 
-                RgbColor colorInDatabase1 = colorsInDatabase.Single(color => color.Id == existingGroups[0].Color!.Id);
-                colorInDatabase1.Group.ShouldNotBeNull();
-                colorInDatabase1.Group.Id.Should().Be(existingGroups[1].Id);
+            RgbColor? colorInDatabase2 = colorsInDatabase.SingleOrDefault(color => color.Id == existingGroups[1].Color!.Id);
+            colorInDatabase2.ShouldNotBeNull();
+            colorInDatabase2.Group.Should().BeNull();
+        });
+    }
 
-                RgbColor? colorInDatabase2 = colorsInDatabase.SingleOrDefault(color => color.Id == existingGroups[1].Color!.Id);
-                colorInDatabase2.ShouldNotBeNull();
-                colorInDatabase2.Group.Should().BeNull();
-            });
-        }
+    [Fact]
+    public async Task Can_replace_ManyToOne_relationship()
+    {
+        // Arrange
+        List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
+        existingUserAccounts[0].AssignedItems = _fakers.WorkItem.Generate(2).ToHashSet();
 
-        [Fact]
-        public async Task Can_replace_ManyToOne_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
-            existingUserAccounts[0].AssignedItems = _fakers.WorkItem.Generate(2).ToHashSet();
+            dbContext.UserAccounts.AddRange(existingUserAccounts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.UserAccounts.AddRange(existingUserAccounts);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "userAccounts",
+                id = existingUserAccounts[1].StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "userAccounts",
-                    id = existingUserAccounts[1].StringId
-                }
-            };
+        string route = $"/workItems/{existingUserAccounts[0].AssignedItems.ElementAt(1).StringId}/relationships/assignee";
 
-            string route = $"/workItems/{existingUserAccounts[0].AssignedItems.ElementAt(1).StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            int workItemId = existingUserAccounts[0].AssignedItems.ElementAt(1).Id;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                int workItemId = existingUserAccounts[0].AssignedItems.ElementAt(1).Id;
+            WorkItem workItemInDatabase2 = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(workItemId);
 
-                WorkItem workItemInDatabase2 = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(workItemId);
+            workItemInDatabase2.Assignee.ShouldNotBeNull();
+            workItemInDatabase2.Assignee.Id.Should().Be(existingUserAccounts[1].Id);
+        });
+    }
 
-                workItemInDatabase2.Assignee.ShouldNotBeNull();
-                workItemInDatabase2.Assignee.Id.Should().Be(existingUserAccounts[1].Id);
-            });
-        }
+    [Fact]
+    public async Task Cannot_replace_for_missing_request_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_request_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string requestBody = string.Empty;
 
-            string requestBody = string.Empty;
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+    [Fact]
+    public async Task Cannot_replace_for_null_request_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_for_null_request_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        const string requestBody = "null";
 
-            const string requestBody = "null";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_create_for_missing_data()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Cannot_create_for_missing_data()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+            dbContext.AddInRange(existingWorkItem, existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+        };
 
-            var requestBody = new
-            {
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_create_for_array_data()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Cannot_create_for_array_data()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.AddInRange(existingWorkItem, existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "userAccounts",
-                        id = existingUserAccount.StringId
-                    }
+                    type = "userAccounts",
+                    id = existingUserAccount.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object or 'null', instead of an array.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object or 'null', instead of an array.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_create_for_missing_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_create_for_missing_type()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+                id = Unknown.StringId.For<UserAccount, long>()
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    id = Unknown.StringId.For<UserAccount, long>()
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_create_for_unknown_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_type()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+                type = Unknown.ResourceType,
+                id = Unknown.StringId.For<UserAccount, long>()
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = Unknown.ResourceType,
-                    id = Unknown.StringId.For<UserAccount, long>()
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_create_for_missing_ID()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_create_for_missing_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "userAccounts"
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "userAccounts"
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_create_with_unknown_ID()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_create_with_unknown_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string userAccountId = Unknown.StringId.For<UserAccount, long>();
+        string userAccountId = Unknown.StringId.For<UserAccount, long>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
-                {
-                    type = "userAccounts",
-                    id = userAccountId
-                }
-            };
+                type = "userAccounts",
+                id = userAccountId
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId}' in relationship 'assignee' does not exist.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId}' in relationship 'assignee' does not exist.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_create_on_unknown_resource_type_in_url()
+    [Fact]
+    public async Task Cannot_create_on_unknown_resource_type_in_url()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+            dbContext.AddInRange(existingWorkItem, existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.AddInRange(existingWorkItem, existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "userAccounts",
+                id = existingUserAccount.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "userAccounts",
-                    id = existingUserAccount.StringId
-                }
-            };
+        string route = $"/{Unknown.ResourceType}/{existingWorkItem.StringId}/relationships/assignee";
 
-            string route = $"/{Unknown.ResourceType}/{existingWorkItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Should().BeEmpty();
+    }
 
-            responseDocument.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Cannot_create_on_unknown_resource_ID_in_url()
+    {
+        // Arrange
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Cannot_create_on_unknown_resource_ID_in_url()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "userAccounts",
+                id = existingUserAccount.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "userAccounts",
-                    id = existingUserAccount.StringId
-                }
-            };
+        string workItemId = Unknown.StringId.For<WorkItem, int>();
 
-            string workItemId = Unknown.StringId.For<WorkItem, int>();
+        string route = $"/workItems/{workItemId}/relationships/assignee";
 
-            string route = $"/workItems/{workItemId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+    [Fact]
+    public async Task Cannot_create_on_unknown_relationship_in_url()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_create_on_unknown_relationship_in_url()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "userAccounts",
+                id = Unknown.StringId.For<UserAccount, long>()
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "userAccounts",
-                    id = Unknown.StringId.For<UserAccount, long>()
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/{Unknown.Relationship}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/{Unknown.Relationship}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested relationship does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' does not contain a relationship named '{Unknown.Relationship}'.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested relationship does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' does not contain a relationship named '{Unknown.Relationship}'.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+    [Fact]
+    public async Task Cannot_create_on_relationship_mismatch_between_url_and_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        RgbColor existingColor = _fakers.RgbColor.Generate();
 
-        [Fact]
-        public async Task Cannot_create_on_relationship_mismatch_between_url_and_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            RgbColor existingColor = _fakers.RgbColor.Generate();
+            dbContext.AddInRange(existingWorkItem, existingColor);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.AddInRange(existingWorkItem, existingColor);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "rgbColors",
+                id = existingColor.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "rgbColors",
-                    id = existingColor.StringId
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/assignee";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'userAccounts' of relationship 'assignee'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'userAccounts' of relationship 'assignee'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Can_clear_cyclic_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_clear_cyclic_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
+            existingWorkItem.Parent = existingWorkItem;
+            await dbContext.SaveChangesAsync();
+        });
 
-                existingWorkItem.Parent = existingWorkItem;
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/parent";
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/parent";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Parent).FirstWithIdAsync(existingWorkItem.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Parent).FirstWithIdAsync(existingWorkItem.Id);
+            workItemInDatabase.Parent.Should().BeNull();
+        });
+    }
 
-                workItemInDatabase.Parent.Should().BeNull();
-            });
-        }
+    [Fact]
+    public async Task Can_assign_cyclic_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_assign_cyclic_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
-                {
-                    type = "workItems",
-                    id = existingWorkItem.StringId
-                }
-            };
+                type = "workItems",
+                id = existingWorkItem.StringId
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}/relationships/parent";
+        string route = $"/workItems/{existingWorkItem.StringId}/relationships/parent";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Parent).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Parent).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Parent.ShouldNotBeNull();
-                workItemInDatabase.Parent.Id.Should().Be(existingWorkItem.Id);
-            });
-        }
+            workItemInDatabase.Parent.ShouldNotBeNull();
+            workItemInDatabase.Parent.Id.Should().Be(existingWorkItem.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs
index 71cc32dadd..158ad4cc10 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/ReplaceToManyRelationshipTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore;
 using JsonApiDotNetCore.Configuration;
@@ -12,1131 +7,1130 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Resources
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Resources;
+
+public sealed class ReplaceToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class ReplaceToManyRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public ReplaceToManyRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public ReplaceToManyRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemsController>();
 
-            testContext.UseController<WorkItemsController>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<ImplicitlyChangingWorkItemDefinition>();
+        });
+    }
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<ImplicitlyChangingWorkItemDefinition>();
-            });
-        }
+    [Fact]
+    public async Task Can_clear_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
 
-        [Fact]
-        public async Task Can_clear_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
-                        {
-                            data = Array.Empty<object>()
-                        }
+                        data = Array.Empty<object>()
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Subscribers.Should().BeEmpty();
-            });
-        }
+            workItemInDatabase.Subscribers.Should().BeEmpty();
+        });
+    }
 
-        [Fact]
-        public async Task Can_clear_ManyToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Tags = _fakers.WorkTag.Generate(1).ToHashSet();
+    [Fact]
+    public async Task Can_clear_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Tags = _fakers.WorkTag.Generate(1).ToHashSet();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    tags = new
                     {
-                        tags = new
-                        {
-                            data = Array.Empty<object>()
-                        }
+                        data = Array.Empty<object>()
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Tags.Should().BeEmpty();
-            });
-        }
+            workItemInDatabase.Tags.Should().BeEmpty();
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_OneToMany_relationship_with_already_assigned_resources()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
+    [Fact]
+    public async Task Can_replace_OneToMany_relationship_with_already_assigned_resources()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(2).ToHashSet();
 
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
+                            {
+                                type = "userAccounts",
+                                id = existingWorkItem.Subscribers.ElementAt(1).StringId
+                            },
+                            new
                             {
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingWorkItem.Subscribers.ElementAt(1).StringId
-                                },
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingSubscriber.StringId
-                                }
+                                type = "userAccounts",
+                                id = existingSubscriber.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(2);
-                workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingWorkItem.Subscribers.ElementAt(1).Id);
-                workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingSubscriber.Id);
-            });
-        }
+            workItemInDatabase.Subscribers.ShouldHaveCount(2);
+            workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingWorkItem.Subscribers.ElementAt(1).Id);
+            workItemInDatabase.Subscribers.Should().ContainSingle(userAccount => userAccount.Id == existingSubscriber.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_ManyToMany_relationship_with_already_assigned_resources()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Tags = _fakers.WorkTag.Generate(2).ToHashSet();
+    [Fact]
+    public async Task Can_replace_ManyToMany_relationship_with_already_assigned_resources()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Tags = _fakers.WorkTag.Generate(2).ToHashSet();
 
-            List<WorkTag> existingTags = _fakers.WorkTag.Generate(2);
+        List<WorkTag> existingTags = _fakers.WorkTag.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                dbContext.WorkTags.AddRange(existingTags);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            dbContext.WorkTags.AddRange(existingTags);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    tags = new
                     {
-                        tags = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
+                            {
+                                type = "workTags",
+                                id = existingWorkItem.Tags.ElementAt(0).StringId
+                            },
+                            new
+                            {
+                                type = "workTags",
+                                id = existingTags[0].StringId
+                            },
+                            new
                             {
-                                new
-                                {
-                                    type = "workTags",
-                                    id = existingWorkItem.Tags.ElementAt(0).StringId
-                                },
-                                new
-                                {
-                                    type = "workTags",
-                                    id = existingTags[0].StringId
-                                },
-                                new
-                                {
-                                    type = "workTags",
-                                    id = existingTags[1].StringId
-                                }
+                                type = "workTags",
+                                id = existingTags[1].StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Tags.ShouldHaveCount(3);
-                workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingWorkItem.Tags.ElementAt(0).Id);
-                workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[0].Id);
-                workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[1].Id);
-            });
-        }
+            workItemInDatabase.Tags.ShouldHaveCount(3);
+            workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingWorkItem.Tags.ElementAt(0).Id);
+            workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[0].Id);
+            workItemInDatabase.Tags.Should().ContainSingle(workTag => workTag.Id == existingTags[1].Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_OneToMany_relationship_with_include()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Can_replace_OneToMany_relationship_with_include()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccount.StringId
-                                }
+                                type = "userAccounts",
+                                id = existingUserAccount.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}?include=subscribers";
+        string route = $"/workItems/{existingWorkItem.StringId}?include=subscribers";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItems");
-            responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(existingWorkItem.Priority));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItems");
+        responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(existingWorkItem.Priority));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("userAccounts");
-            responseDocument.Included[0].Id.Should().Be(existingUserAccount.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(existingUserAccount.FirstName));
-            responseDocument.Included[0].Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(existingUserAccount.LastName));
-            responseDocument.Included[0].Relationships.ShouldNotBeEmpty();
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("userAccounts");
+        responseDocument.Included[0].Id.Should().Be(existingUserAccount.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(existingUserAccount.FirstName));
+        responseDocument.Included[0].Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(existingUserAccount.LastName));
+        responseDocument.Included[0].Relationships.ShouldNotBeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(1);
-                workItemInDatabase.Subscribers.Single().Id.Should().Be(existingUserAccount.Id);
-            });
-        }
+            workItemInDatabase.Subscribers.ShouldHaveCount(1);
+            workItemInDatabase.Subscribers.Single().Id.Should().Be(existingUserAccount.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_ManyToMany_relationship_with_include_and_fieldsets()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            WorkTag existingTag = _fakers.WorkTag.Generate();
+    [Fact]
+    public async Task Can_replace_ManyToMany_relationship_with_include_and_fieldsets()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        WorkTag existingTag = _fakers.WorkTag.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingTag);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingTag);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    tags = new
                     {
-                        tags = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "workTags",
-                                    id = existingTag.StringId
-                                }
+                                type = "workTags",
+                                id = existingTag.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}?fields[workItems]=priority,tags&include=tags&fields[workTags]=text";
+        string route = $"/workItems/{existingWorkItem.StringId}?fields[workItems]=priority,tags&include=tags&fields[workTags]=text";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItems");
-            responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(existingWorkItem.Priority));
-            responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItems");
+        responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(existingWorkItem.Priority));
+        responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("tags").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldHaveCount(1);
-                value.Data.ManyValue[0].Id.Should().Be(existingTag.StringId);
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("tags").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldHaveCount(1);
+            value.Data.ManyValue[0].Id.Should().Be(existingTag.StringId);
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("workTags");
-            responseDocument.Included[0].Id.Should().Be(existingTag.StringId);
-            responseDocument.Included[0].Attributes.ShouldHaveCount(1);
-            responseDocument.Included[0].Attributes.ShouldContainKey("text").With(value => value.Should().Be(existingTag.Text));
-            responseDocument.Included[0].Relationships.Should().BeNull();
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("workTags");
+        responseDocument.Included[0].Id.Should().Be(existingTag.StringId);
+        responseDocument.Included[0].Attributes.ShouldHaveCount(1);
+        responseDocument.Included[0].Attributes.ShouldContainKey("text").With(value => value.Should().Be(existingTag.Text));
+        responseDocument.Included[0].Relationships.Should().BeNull();
 
-            int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newWorkItemId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(newWorkItemId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Tags).FirstWithIdAsync(newWorkItemId);
 
-                workItemInDatabase.Tags.ShouldHaveCount(1);
-                workItemInDatabase.Tags.Single().Id.Should().Be(existingTag.Id);
-            });
-        }
+            workItemInDatabase.Tags.ShouldHaveCount(1);
+            workItemInDatabase.Tags.Single().Id.Should().Be(existingTag.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_relationship_type()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_missing_relationship_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    id = Unknown.StringId.For<UserAccount, long>()
-                                }
+                                id = Unknown.StringId.For<UserAccount, long>()
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_unknown_relationship_type()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_unknown_relationship_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = Unknown.ResourceType,
-                                    id = Unknown.StringId.For<UserAccount, long>()
-                                }
+                                type = Unknown.ResourceType,
+                                id = Unknown.StringId.For<UserAccount, long>()
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_for_missing_relationship_ID()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_replace_for_missing_relationship_ID()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "userAccounts"
-                                }
+                                type = "userAccounts"
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_with_unknown_relationship_IDs()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_replace_with_unknown_relationship_IDs()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string userAccountId1 = Unknown.StringId.For<UserAccount, long>();
-            string userAccountId2 = Unknown.StringId.AltFor<UserAccount, long>();
+        string userAccountId1 = Unknown.StringId.For<UserAccount, long>();
+        string userAccountId2 = Unknown.StringId.AltFor<UserAccount, long>();
 
-            string tagId1 = Unknown.StringId.For<WorkTag, int>();
-            string tagId2 = Unknown.StringId.AltFor<WorkTag, int>();
+        string tagId1 = Unknown.StringId.For<WorkTag, int>();
+        string tagId2 = Unknown.StringId.AltFor<WorkTag, int>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = userAccountId1
-                                },
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = userAccountId2
-                                }
+                                type = "userAccounts",
+                                id = userAccountId1
+                            },
+                            new
+                            {
+                                type = "userAccounts",
+                                id = userAccountId2
                             }
-                        },
-                        tags = new
+                        }
+                    },
+                    tags = new
+                    {
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "workTags",
-                                    id = tagId1
-                                },
-                                new
-                                {
-                                    type = "workTags",
-                                    id = tagId2
-                                }
+                                type = "workTags",
+                                id = tagId1
+                            },
+                            new
+                            {
+                                type = "workTags",
+                                id = tagId2
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(4);
+        responseDocument.Errors.ShouldHaveCount(4);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error1.Title.Should().Be("A related resource does not exist.");
-            error1.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId1}' in relationship 'subscribers' does not exist.");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error1.Title.Should().Be("A related resource does not exist.");
+        error1.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId1}' in relationship 'subscribers' does not exist.");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error2.Title.Should().Be("A related resource does not exist.");
-            error2.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId2}' in relationship 'subscribers' does not exist.");
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error2.Title.Should().Be("A related resource does not exist.");
+        error2.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId2}' in relationship 'subscribers' does not exist.");
 
-            ErrorObject error3 = responseDocument.Errors[2];
-            error3.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error3.Title.Should().Be("A related resource does not exist.");
-            error3.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId1}' in relationship 'tags' does not exist.");
+        ErrorObject error3 = responseDocument.Errors[2];
+        error3.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error3.Title.Should().Be("A related resource does not exist.");
+        error3.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId1}' in relationship 'tags' does not exist.");
 
-            ErrorObject error4 = responseDocument.Errors[3];
-            error4.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error4.Title.Should().Be("A related resource does not exist.");
-            error4.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId2}' in relationship 'tags' does not exist.");
-        }
+        ErrorObject error4 = responseDocument.Errors[3];
+        error4.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error4.Title.Should().Be("A related resource does not exist.");
+        error4.Detail.Should().Be($"Related resource of type 'workTags' with ID '{tagId2}' in relationship 'tags' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_replace_on_relationship_type_mismatch()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_replace_on_relationship_type_mismatch()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "rgbColors",
-                                    id = "0A0B0C"
-                                }
+                                type = "rgbColors",
+                                id = "0A0B0C"
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'userAccounts' of relationship 'subscribers'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'userAccounts' of relationship 'subscribers'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/subscribers/data[0]/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_replace_with_duplicates()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
+    [Fact]
+    public async Task Can_replace_with_duplicates()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
 
-            UserAccount existingSubscriber = _fakers.UserAccount.Generate();
+        UserAccount existingSubscriber = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingSubscriber);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingSubscriber);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingSubscriber.StringId
-                                },
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingSubscriber.StringId
-                                }
+                                type = "userAccounts",
+                                id = existingSubscriber.StringId
+                            },
+                            new
+                            {
+                                type = "userAccounts",
+                                id = existingSubscriber.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Subscribers).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(1);
-                workItemInDatabase.Subscribers.Single().Id.Should().Be(existingSubscriber.Id);
-            });
-        }
+            workItemInDatabase.Subscribers.ShouldHaveCount(1);
+            workItemInDatabase.Subscribers.Single().Id.Should().Be(existingSubscriber.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_replace_with_missing_data_in_OneToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_replace_with_missing_data_in_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    subscribers = new
                     {
-                        subscribers = new
-                        {
-                        }
                     }
                 }
-            };
+            }
+        };
+
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/subscribers");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/subscribers");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_replace_with_null_data_in_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_replace_with_null_data_in_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    tags = new
                     {
-                        tags = new
-                        {
-                            data = (object?)null
-                        }
+                        data = (object?)null
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/tags/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/tags/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_replace_with_object_data_in_ManyToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_replace_with_object_data_in_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    tags = new
                     {
-                        tags = new
+                        data = new
                         {
-                            data = new
-                            {
-                            }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/tags/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an array, instead of an object.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/tags/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_clear_cyclic_OneToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Can_clear_cyclic_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
 
-                existingWorkItem.Children = existingWorkItem.AsList();
-                await dbContext.SaveChangesAsync();
-            });
+            existingWorkItem.Children = existingWorkItem.AsList();
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    children = new
                     {
-                        children = new
-                        {
-                            data = Array.Empty<object>()
-                        }
+                        data = Array.Empty<object>()
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Children).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Children).FirstWithIdAsync(existingWorkItem.Id);
+
+            workItemInDatabase.Children.Should().BeEmpty();
+        });
+    }
 
-                workItemInDatabase.Children.Should().BeEmpty();
-            });
-        }
+    [Fact]
+    public async Task Can_clear_cyclic_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_clear_cyclic_ManyToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
+            existingWorkItem.RelatedFrom = ArrayFactory.Create(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-                existingWorkItem.RelatedFrom = ArrayFactory.Create(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    relatedFrom = new
                     {
-                        relatedFrom = new
-                        {
-                            data = Array.Empty<object>()
-                        }
+                        data = Array.Empty<object>()
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
+
+            WorkItem workItemInDatabase = await dbContext.WorkItems
+                .Include(workItem => workItem.RelatedFrom)
+                .Include(workItem => workItem.RelatedTo)
+                .FirstWithIdAsync(existingWorkItem.Id);
 
-                WorkItem workItemInDatabase = await dbContext.WorkItems
-                    .Include(workItem => workItem.RelatedFrom)
-                    .Include(workItem => workItem.RelatedTo)
-                    .FirstWithIdAsync(existingWorkItem.Id);
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            workItemInDatabase.RelatedFrom.Should().BeEmpty();
+            workItemInDatabase.RelatedTo.Should().BeEmpty();
+        });
+    }
 
-                workItemInDatabase.RelatedFrom.Should().BeEmpty();
-                workItemInDatabase.RelatedTo.Should().BeEmpty();
-            });
-        }
+    [Fact]
+    public async Task Can_assign_cyclic_OneToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Can_assign_cyclic_OneToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    children = new
                     {
-                        children = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "workItems",
-                                    id = existingWorkItem.StringId
-                                }
+                                type = "workItems",
+                                id = existingWorkItem.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Children).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Children).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Children.ShouldHaveCount(1);
-                workItemInDatabase.Children[0].Id.Should().Be(existingWorkItem.Id);
-            });
-        }
+            workItemInDatabase.Children.ShouldHaveCount(1);
+            workItemInDatabase.Children[0].Id.Should().Be(existingWorkItem.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_assign_cyclic_ManyToMany_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Can_assign_cyclic_ManyToMany_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    relatedTo = new
                     {
-                        relatedTo = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "workItems",
-                                    id = existingWorkItem.StringId
-                                }
+                                type = "workItems",
+                                id = existingWorkItem.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                WorkItem workItemInDatabase = await dbContext.WorkItems
-                    .Include(workItem => workItem.RelatedFrom)
-                    .Include(workItem => workItem.RelatedTo)
-                    .FirstWithIdAsync(existingWorkItem.Id);
+            WorkItem workItemInDatabase = await dbContext.WorkItems
+                .Include(workItem => workItem.RelatedFrom)
+                .Include(workItem => workItem.RelatedTo)
+                .FirstWithIdAsync(existingWorkItem.Id);
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                workItemInDatabase.RelatedFrom.ShouldHaveCount(1);
-                workItemInDatabase.RelatedFrom[0].Id.Should().Be(existingWorkItem.Id);
+            workItemInDatabase.RelatedFrom.ShouldHaveCount(1);
+            workItemInDatabase.RelatedFrom[0].Id.Should().Be(existingWorkItem.Id);
 
-                workItemInDatabase.RelatedTo.ShouldHaveCount(1);
-                workItemInDatabase.RelatedTo[0].Id.Should().Be(existingWorkItem.Id);
-            });
-        }
+            workItemInDatabase.RelatedTo.ShouldHaveCount(1);
+            workItemInDatabase.RelatedTo[0].Id.Should().Be(existingWorkItem.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
index d7f3779f81..87ced913e3 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateResourceTests.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Reflection;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
@@ -14,1538 +9,1537 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Resources
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Resources;
+
+public sealed class UpdateResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class UpdateResourceTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public UpdateResourceTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public UpdateResourceTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemsController>();
+        testContext.UseController<WorkItemGroupsController>();
+        testContext.UseController<UserAccountsController>();
+        testContext.UseController<RgbColorsController>();
 
-            testContext.UseController<WorkItemsController>();
-            testContext.UseController<WorkItemGroupsController>();
-            testContext.UseController<UserAccountsController>();
-            testContext.UseController<RgbColorsController>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<ImplicitlyChangingWorkItemDefinition>();
+            services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>();
+        });
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<ImplicitlyChangingWorkItemDefinition>();
-                services.AddResourceDefinition<ImplicitlyChangingWorkItemGroupDefinition>();
-            });
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownFieldsInRequestBody = false;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownFieldsInRequestBody = false;
-        }
+    [Fact]
+    public async Task Can_update_resource_without_attributes_or_relationships()
+    {
+        // Arrange
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Can_update_resource_without_attributes_or_relationships()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "userAccounts",
+                id = existingUserAccount.StringId,
+                attributes = new
+                {
+                },
+                relationships = new
                 {
-                    type = "userAccounts",
-                    id = existingUserAccount.StringId,
-                    attributes = new
-                    {
-                    },
-                    relationships = new
-                    {
-                    }
                 }
-            };
+            }
+        };
 
-            string route = $"/userAccounts/{existingUserAccount.StringId}";
+        string route = $"/userAccounts/{existingUserAccount.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                UserAccount userAccountInDatabase = await dbContext.UserAccounts.FirstWithIdAsync(existingUserAccount.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            UserAccount userAccountInDatabase = await dbContext.UserAccounts.FirstWithIdAsync(existingUserAccount.Id);
+
+            userAccountInDatabase.FirstName.Should().Be(existingUserAccount.FirstName);
+            userAccountInDatabase.LastName.Should().Be(existingUserAccount.LastName);
+        });
+    }
 
-                userAccountInDatabase.FirstName.Should().Be(existingUserAccount.FirstName);
-                userAccountInDatabase.LastName.Should().Be(existingUserAccount.LastName);
-            });
-        }
+    [Fact]
+    public async Task Cannot_update_resource_with_unknown_attribute()
+    {
+        // Arrange
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+        string newFirstName = _fakers.UserAccount.Generate().FirstName;
 
-        [Fact]
-        public async Task Cannot_update_resource_with_unknown_attribute()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
-            string newFirstName = _fakers.UserAccount.Generate().FirstName;
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "userAccounts",
+                id = existingUserAccount.StringId,
+                attributes = new
                 {
-                    type = "userAccounts",
-                    id = existingUserAccount.StringId,
-                    attributes = new
-                    {
-                        firstName = newFirstName,
-                        doesNotExist = "Ignored"
-                    }
+                    firstName = newFirstName,
+                    doesNotExist = "Ignored"
                 }
-            };
+            }
+        };
 
-            string route = $"/userAccounts/{existingUserAccount.StringId}";
+        string route = $"/userAccounts/{existingUserAccount.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown attribute found.");
-            error.Detail.Should().Be("Attribute 'doesNotExist' does not exist on resource type 'userAccounts'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/doesNotExist");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown attribute found.");
+        error.Detail.Should().Be("Attribute 'doesNotExist' does not exist on resource type 'userAccounts'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/doesNotExist");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_unknown_attribute()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownFieldsInRequestBody = true;
+    [Fact]
+    public async Task Can_update_resource_with_unknown_attribute()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownFieldsInRequestBody = true;
 
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
-            string newFirstName = _fakers.UserAccount.Generate().FirstName;
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+        string newFirstName = _fakers.UserAccount.Generate().FirstName;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "userAccounts",
+                id = existingUserAccount.StringId,
+                attributes = new
                 {
-                    type = "userAccounts",
-                    id = existingUserAccount.StringId,
-                    attributes = new
-                    {
-                        firstName = newFirstName,
-                        doesNotExist = "Ignored"
-                    }
+                    firstName = newFirstName,
+                    doesNotExist = "Ignored"
                 }
-            };
+            }
+        };
 
-            string route = $"/userAccounts/{existingUserAccount.StringId}";
+        string route = $"/userAccounts/{existingUserAccount.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                UserAccount userAccountInDatabase = await dbContext.UserAccounts.FirstWithIdAsync(existingUserAccount.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            UserAccount userAccountInDatabase = await dbContext.UserAccounts.FirstWithIdAsync(existingUserAccount.Id);
+
+            userAccountInDatabase.FirstName.Should().Be(newFirstName);
+            userAccountInDatabase.LastName.Should().Be(existingUserAccount.LastName);
+        });
+    }
 
-                userAccountInDatabase.FirstName.Should().Be(newFirstName);
-                userAccountInDatabase.LastName.Should().Be(existingUserAccount.LastName);
-            });
-        }
+    [Fact]
+    public async Task Cannot_update_resource_with_unknown_relationship()
+    {
+        // Arrange
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Cannot_update_resource_with_unknown_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "userAccounts",
+                id = existingUserAccount.StringId,
+                relationships = new
                 {
-                    type = "userAccounts",
-                    id = existingUserAccount.StringId,
-                    relationships = new
+                    doesNotExist = new
                     {
-                        doesNotExist = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = Unknown.ResourceType,
-                                id = Unknown.StringId.Int32
-                            }
+                            type = Unknown.ResourceType,
+                            id = Unknown.StringId.Int32
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/userAccounts/{existingUserAccount.StringId}";
+        string route = $"/userAccounts/{existingUserAccount.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
-            error.Detail.Should().Be("Relationship 'doesNotExist' does not exist on resource type 'userAccounts'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/doesNotExist");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown relationship found.");
+        error.Detail.Should().Be("Relationship 'doesNotExist' does not exist on resource type 'userAccounts'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/doesNotExist");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_unknown_relationship()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.AllowUnknownFieldsInRequestBody = true;
+    [Fact]
+    public async Task Can_update_resource_with_unknown_relationship()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.AllowUnknownFieldsInRequestBody = true;
 
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "userAccounts",
+                id = existingUserAccount.StringId,
+                relationships = new
                 {
-                    type = "userAccounts",
-                    id = existingUserAccount.StringId,
-                    relationships = new
+                    doesNotExist = new
                     {
-                        doesNotExist = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = Unknown.ResourceType,
-                                id = Unknown.StringId.Int32
-                            }
+                            type = Unknown.ResourceType,
+                            id = Unknown.StringId.Int32
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/userAccounts/{existingUserAccount.StringId}";
+        string route = $"/userAccounts/{existingUserAccount.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Can_partially_update_resource_with_guid_ID()
-        {
-            // Arrange
-            WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
-            string newName = _fakers.WorkItemGroup.Generate().Name;
+    [Fact]
+    public async Task Can_partially_update_resource_with_guid_ID()
+    {
+        // Arrange
+        WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
+        string newName = _fakers.WorkItemGroup.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Groups.Add(existingGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Groups.Add(existingGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItemGroups",
+                id = existingGroup.StringId,
+                attributes = new
                 {
-                    type = "workItemGroups",
-                    id = existingGroup.StringId,
-                    attributes = new
-                    {
-                        name = newName
-                    }
+                    name = newName
                 }
-            };
+            }
+        };
 
-            string route = $"/workItemGroups/{existingGroup.StringId}";
+        string route = $"/workItemGroups/{existingGroup.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            string groupName = $"{newName}{ImplicitlyChangingWorkItemGroupDefinition.Suffix}";
+        string groupName = $"{newName}{ImplicitlyChangingWorkItemGroupDefinition.Suffix}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItemGroups");
-            responseDocument.Data.SingleValue.Id.Should().Be(existingGroup.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(groupName));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isPublic").With(value => value.Should().Be(existingGroup.IsPublic));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItemGroups");
+        responseDocument.Data.SingleValue.Id.Should().Be(existingGroup.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(groupName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isPublic").With(value => value.Should().Be(existingGroup.IsPublic));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItemGroup groupInDatabase = await dbContext.Groups.FirstWithIdAsync(existingGroup.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItemGroup groupInDatabase = await dbContext.Groups.FirstWithIdAsync(existingGroup.Id);
 
-                groupInDatabase.Name.Should().Be(groupName);
-                groupInDatabase.IsPublic.Should().Be(existingGroup.IsPublic);
-            });
+            groupInDatabase.Name.Should().Be(groupName);
+            groupInDatabase.IsPublic.Should().Be(existingGroup.IsPublic);
+        });
 
-            PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
-            property.ShouldNotBeNull();
-            property.PropertyType.Should().Be(typeof(Guid));
-        }
+        PropertyInfo? property = typeof(WorkItemGroup).GetProperty(nameof(Identifiable<object>.Id));
+        property.ShouldNotBeNull();
+        property.PropertyType.Should().Be(typeof(Guid));
+    }
 
-        [Fact]
-        public async Task Can_completely_update_resource_with_string_ID()
-        {
-            // Arrange
-            RgbColor existingColor = _fakers.RgbColor.Generate();
-            string newDisplayName = _fakers.RgbColor.Generate().DisplayName;
+    [Fact]
+    public async Task Can_completely_update_resource_with_string_ID()
+    {
+        // Arrange
+        RgbColor existingColor = _fakers.RgbColor.Generate();
+        string newDisplayName = _fakers.RgbColor.Generate().DisplayName;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RgbColors.Add(existingColor);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RgbColors.Add(existingColor);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "rgbColors",
+                id = existingColor.StringId,
+                attributes = new
                 {
-                    type = "rgbColors",
-                    id = existingColor.StringId,
-                    attributes = new
-                    {
-                        displayName = newDisplayName
-                    }
+                    displayName = newDisplayName
                 }
-            };
+            }
+        };
 
-            string route = $"/rgbColors/{existingColor.StringId}";
+        string route = $"/rgbColors/{existingColor.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                RgbColor colorInDatabase = await dbContext.RgbColors.FirstWithIdAsync(existingColor.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            RgbColor colorInDatabase = await dbContext.RgbColors.FirstWithIdAsync(existingColor.Id);
 
-                colorInDatabase.DisplayName.Should().Be(newDisplayName);
-            });
+            colorInDatabase.DisplayName.Should().Be(newDisplayName);
+        });
 
-            PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
-            property.ShouldNotBeNull();
-            property.PropertyType.Should().Be(typeof(string));
-        }
+        PropertyInfo? property = typeof(RgbColor).GetProperty(nameof(Identifiable<object>.Id));
+        property.ShouldNotBeNull();
+        property.PropertyType.Should().Be(typeof(string));
+    }
 
-        [Fact]
-        public async Task Can_update_resource_without_side_effects()
-        {
-            // Arrange
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
-            UserAccount newUserAccount = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Can_update_resource_without_side_effects()
+    {
+        // Arrange
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+        UserAccount newUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.Add(existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.Add(existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "userAccounts",
+                id = existingUserAccount.StringId,
+                attributes = new
                 {
-                    type = "userAccounts",
-                    id = existingUserAccount.StringId,
-                    attributes = new
-                    {
-                        firstName = newUserAccount.FirstName,
-                        lastName = newUserAccount.LastName
-                    }
+                    firstName = newUserAccount.FirstName,
+                    lastName = newUserAccount.LastName
                 }
-            };
+            }
+        };
 
-            string route = $"/userAccounts/{existingUserAccount.StringId}";
+        string route = $"/userAccounts/{existingUserAccount.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                UserAccount userAccountInDatabase = await dbContext.UserAccounts.FirstWithIdAsync(existingUserAccount.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            UserAccount userAccountInDatabase = await dbContext.UserAccounts.FirstWithIdAsync(existingUserAccount.Id);
 
-                userAccountInDatabase.FirstName.Should().Be(newUserAccount.FirstName);
-                userAccountInDatabase.LastName.Should().Be(newUserAccount.LastName);
-            });
-        }
+            userAccountInDatabase.FirstName.Should().Be(newUserAccount.FirstName);
+            userAccountInDatabase.LastName.Should().Be(newUserAccount.LastName);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_side_effects()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            string newDescription = _fakers.WorkItem.Generate().Description!;
+    [Fact]
+    public async Task Can_update_resource_with_side_effects()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        string newDescription = _fakers.WorkItem.Generate().Description!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                attributes = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    attributes = new
-                    {
-                        description = newDescription,
-                        dueAt = (DateTime?)null
-                    }
+                    description = newDescription,
+                    dueAt = (DateTime?)null
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            string itemDescription = $"{newDescription}{ImplicitlyChangingWorkItemDefinition.Suffix}";
+        string itemDescription = $"{newDescription}{ImplicitlyChangingWorkItemDefinition.Suffix}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItems");
-            responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(itemDescription));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("dueAt").With(value => value.Should().BeNull());
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(existingWorkItem.Priority));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isImportant").With(value => value.Should().Be(existingWorkItem.IsImportant));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItems");
+        responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(itemDescription));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("dueAt").With(value => value.Should().BeNull());
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(existingWorkItem.Priority));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isImportant").With(value => value.Should().Be(existingWorkItem.IsImportant));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Description.Should().Be(itemDescription);
-                workItemInDatabase.DueAt.Should().BeNull();
-                workItemInDatabase.Priority.Should().Be(existingWorkItem.Priority);
-            });
-        }
+            workItemInDatabase.Description.Should().Be(itemDescription);
+            workItemInDatabase.DueAt.Should().BeNull();
+            workItemInDatabase.Priority.Should().Be(existingWorkItem.Priority);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_side_effects_with_primary_fieldset()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            string newDescription = _fakers.WorkItem.Generate().Description!;
+    [Fact]
+    public async Task Can_update_resource_with_side_effects_with_primary_fieldset()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        string newDescription = _fakers.WorkItem.Generate().Description!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                attributes = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    attributes = new
-                    {
-                        description = newDescription,
-                        dueAt = (DateTime?)null
-                    }
+                    description = newDescription,
+                    dueAt = (DateTime?)null
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}?fields[workItems]=description,priority";
+        string route = $"/workItems/{existingWorkItem.StringId}?fields[workItems]=description,priority";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            string itemDescription = $"{newDescription}{ImplicitlyChangingWorkItemDefinition.Suffix}";
+        string itemDescription = $"{newDescription}{ImplicitlyChangingWorkItemDefinition.Suffix}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItems");
-            responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(2);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(itemDescription));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(existingWorkItem.Priority));
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItems");
+        responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(2);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(itemDescription));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(existingWorkItem.Priority));
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Description.Should().Be(itemDescription);
-                workItemInDatabase.DueAt.Should().BeNull();
-                workItemInDatabase.Priority.Should().Be(existingWorkItem.Priority);
-            });
-        }
+            workItemInDatabase.Description.Should().Be(itemDescription);
+            workItemInDatabase.DueAt.Should().BeNull();
+            workItemInDatabase.Priority.Should().Be(existingWorkItem.Priority);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_side_effects_with_include_and_fieldsets()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Tags = _fakers.WorkTag.Generate(1).ToHashSet();
+    [Fact]
+    public async Task Can_update_resource_with_side_effects_with_include_and_fieldsets()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Tags = _fakers.WorkTag.Generate(1).ToHashSet();
 
-            string newDescription = _fakers.WorkItem.Generate().Description!;
+        string newDescription = _fakers.WorkItem.Generate().Description!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                attributes = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    attributes = new
-                    {
-                        description = newDescription,
-                        dueAt = (DateTime?)null
-                    }
+                    description = newDescription,
+                    dueAt = (DateTime?)null
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}?fields[workItems]=description,priority,tags&include=tags&fields[workTags]=text";
+        string route = $"/workItems/{existingWorkItem.StringId}?fields[workItems]=description,priority,tags&include=tags&fields[workTags]=text";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            string itemDescription = $"{newDescription}{ImplicitlyChangingWorkItemDefinition.Suffix}";
+        string itemDescription = $"{newDescription}{ImplicitlyChangingWorkItemDefinition.Suffix}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItems");
-            responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(2);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(itemDescription));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(existingWorkItem.Priority));
-            responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItems");
+        responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(2);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(itemDescription));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("priority").With(value => value.Should().Be(existingWorkItem.Priority));
+        responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("tags").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.ManyValue.ShouldHaveCount(1);
-                value.Data.ManyValue[0].Id.Should().Be(existingWorkItem.Tags.Single().StringId);
-            });
-
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("workTags");
-            responseDocument.Included[0].Id.Should().Be(existingWorkItem.Tags.Single().StringId);
-            responseDocument.Included[0].Attributes.ShouldHaveCount(1);
-            responseDocument.Included[0].Attributes.ShouldContainKey("text").With(value => value.Should().Be(existingWorkItem.Tags.Single().Text));
-            responseDocument.Included[0].Relationships.Should().BeNull();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.FirstWithIdAsync(existingWorkItem.Id);
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("tags").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.ManyValue.ShouldHaveCount(1);
+            value.Data.ManyValue[0].Id.Should().Be(existingWorkItem.Tags.Single().StringId);
+        });
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("workTags");
+        responseDocument.Included[0].Id.Should().Be(existingWorkItem.Tags.Single().StringId);
+        responseDocument.Included[0].Attributes.ShouldHaveCount(1);
+        responseDocument.Included[0].Attributes.ShouldContainKey("text").With(value => value.Should().Be(existingWorkItem.Tags.Single().Text));
+        responseDocument.Included[0].Relationships.Should().BeNull();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.FirstWithIdAsync(existingWorkItem.Id);
+
+            workItemInDatabase.Description.Should().Be(itemDescription);
+            workItemInDatabase.DueAt.Should().BeNull();
+            workItemInDatabase.Priority.Should().Be(existingWorkItem.Priority);
+        });
+    }
 
-                workItemInDatabase.Description.Should().Be(itemDescription);
-                workItemInDatabase.DueAt.Should().BeNull();
-                workItemInDatabase.Priority.Should().Be(existingWorkItem.Priority);
-            });
-        }
+    [Fact]
+    public async Task Update_resource_with_side_effects_hides_relationship_data_in_response()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Assignee = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Update_resource_with_side_effects_hides_relationship_data_in_response()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Assignee = _fakers.UserAccount.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "workItems",
+                id = existingWorkItem.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "workItems",
-                    id = existingWorkItem.StringId
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.Relationships.Values.Should().OnlyContain(value => value.ShouldNotBeNull().Data.Value == null);
+        responseDocument.Included.Should().BeNull();
+    }
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
-            responseDocument.Data.SingleValue.Relationships.Values.Should().OnlyContain(value => value.ShouldNotBeNull().Data.Value == null);
-            responseDocument.Included.Should().BeNull();
-        }
+    [Fact]
+    public async Task Cannot_update_resource_for_missing_request_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_update_resource_for_missing_request_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        string requestBody = string.Empty;
 
-            string requestBody = string.Empty;
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Failed to deserialize request body: Missing request body.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+    [Fact]
+    public async Task Cannot_update_resource_for_null_request_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_update_resource_for_null_request_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        const string requestBody = "null";
 
-            const string requestBody = "null";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_update_resource_for_missing_data()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_update_resource_for_missing_data()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            meta = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+                key = "value"
+            }
+        };
 
-            var requestBody = new
-            {
-                meta = new
-                {
-                    key = "value"
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_update_resource_for_null_data()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_update_resource_for_null_data()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_update_resource_for_array_data()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_update_resource_for_array_data()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "workItems",
-                        id = existingWorkItem.StringId
-                    }
+                    type = "workItems",
+                    id = existingWorkItem.StringId
                 }
-            };
+            }
+        };
+
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of an array.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of an array.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_update_resource_for_missing_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_update_resource_for_missing_type()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+                id = existingWorkItem.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    id = existingWorkItem.StringId
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_update_resource_for_unknown_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_update_resource_for_unknown_type()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+                type = Unknown.ResourceType,
+                id = existingWorkItem.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = Unknown.ResourceType,
-                    id = existingWorkItem.StringId
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_update_resource_for_missing_ID()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_update_resource_for_missing_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "workItems"
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "workItems"
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_update_resource_on_unknown_resource_type_in_url()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_update_resource_on_unknown_resource_type_in_url()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "workItems",
+                id = existingWorkItem.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "workItems",
-                    id = existingWorkItem.StringId
-                }
-            };
+        string route = $"/{Unknown.ResourceType}/{existingWorkItem.StringId}";
 
-            string route = $"/{Unknown.ResourceType}/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Should().BeEmpty();
+    }
 
-            responseDocument.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Cannot_update_resource_on_unknown_resource_ID_in_url()
+    {
+        // Arrange
+        string workItemId = Unknown.StringId.For<WorkItem, int>();
 
-        [Fact]
-        public async Task Cannot_update_resource_on_unknown_resource_ID_in_url()
+        var requestBody = new
         {
-            // Arrange
-            string workItemId = Unknown.StringId.For<WorkItem, int>();
-
-            var requestBody = new
+            data = new
             {
-                data = new
-                {
-                    type = "workItems",
-                    id = workItemId
-                }
-            };
+                type = "workItems",
+                id = workItemId
+            }
+        };
 
-            string route = $"/workItems/{workItemId}";
+        string route = $"/workItems/{workItemId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'workItems' with ID '{workItemId}' does not exist.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+    [Fact]
+    public async Task Cannot_update_on_resource_type_mismatch_between_url_and_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_update_on_resource_type_mismatch_between_url_and_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "rgbColors",
+                id = existingWorkItem.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "rgbColors",
-                    id = existingWorkItem.StringId
-                }
-            };
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'workItems'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'workItems'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_update_on_resource_ID_mismatch_between_url_and_body()
+    {
+        // Arrange
+        List<WorkItem> existingWorkItems = _fakers.WorkItem.Generate(2);
 
-        [Fact]
-        public async Task Cannot_update_on_resource_ID_mismatch_between_url_and_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<WorkItem> existingWorkItems = _fakers.WorkItem.Generate(2);
+            dbContext.WorkItems.AddRange(existingWorkItems);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                dbContext.WorkItems.AddRange(existingWorkItems);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "workItems",
+                id = existingWorkItems[0].StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "workItems",
-                    id = existingWorkItems[0].StringId
-                }
-            };
+        string route = $"/workItems/{existingWorkItems[1].StringId}";
 
-            string route = $"/workItems/{existingWorkItems[1].StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Conflicting 'id' values found.");
+        error.Detail.Should().Be($"Expected '{existingWorkItems[1].StringId}' instead of '{existingWorkItems[0].StringId}'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Conflicting 'id' values found.");
-            error.Detail.Should().Be($"Expected '{existingWorkItems[1].StringId}' instead of '{existingWorkItems[0].StringId}'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_update_resource_attribute_with_blocked_capability()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_update_resource_attribute_with_blocked_capability()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                attributes = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    attributes = new
-                    {
-                        isImportant = true
-                    }
+                    isImportant = true
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Attribute value cannot be assigned when updating resource.");
-            error.Detail.Should().Be("The attribute 'isImportant' on resource type 'workItems' cannot be assigned to.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/isImportant");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Attribute value cannot be assigned when updating resource.");
+        error.Detail.Should().Be("The attribute 'isImportant' on resource type 'workItems' cannot be assigned to.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/isImportant");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_readonly_attribute()
-        {
-            // Arrange
-            WorkItemGroup existingWorkItemGroup = _fakers.WorkItemGroup.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_with_readonly_attribute()
+    {
+        // Arrange
+        WorkItemGroup existingWorkItemGroup = _fakers.WorkItemGroup.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Groups.Add(existingWorkItemGroup);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Groups.Add(existingWorkItemGroup);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItemGroups",
+                id = existingWorkItemGroup.StringId,
+                attributes = new
                 {
-                    type = "workItemGroups",
-                    id = existingWorkItemGroup.StringId,
-                    attributes = new
-                    {
-                        isDeprecated = true
-                    }
+                    isDeprecated = true
                 }
-            };
+            }
+        };
 
-            string route = $"/workItemGroups/{existingWorkItemGroup.StringId}";
+        string route = $"/workItemGroups/{existingWorkItemGroup.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Attribute is read-only.");
-            error.Detail.Should().Be("Attribute 'isDeprecated' on resource type 'workItemGroups' is read-only.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/isDeprecated");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Attribute is read-only.");
+        error.Detail.Should().Be("Attribute 'isDeprecated' on resource type 'workItemGroups' is read-only.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/isDeprecated");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
+
+    [Fact]
+    public async Task Cannot_update_resource_for_broken_JSON_request_body()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_update_resource_for_broken_JSON_request_body()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        const string requestBody = "{ \"data {";
 
-            const string requestBody = "{ \"data {";
+        string route = $"/workItemGroups/{existingWorkItem.StringId}";
 
-            string route = $"/workItemGroups/{existingWorkItem.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body.");
+        error.Detail.Should().StartWith("Expected end of string, but instead reached end of data.");
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body.");
-            error.Detail.Should().StartWith("Expected end of string, but instead reached end of data.");
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+    [Fact]
+    public async Task Cannot_change_ID_of_existing_resource()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-        [Fact]
-        public async Task Cannot_change_ID_of_existing_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                attributes = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    attributes = new
-                    {
-                        id = Unknown.StringId.For<WorkItem, int>()
-                    }
+                    id = Unknown.StringId.For<WorkItem, int>()
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Resource ID is read-only.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/id");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Resource ID is read-only.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/id");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_incompatible_ID_value()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_with_incompatible_ID_value()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.Id,
+                attributes = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.Id,
-                    attributes = new
-                    {
-                    }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body.");
-            error.Detail.Should().Be($"Failed to convert ID '{existingWorkItem.Id}' of type 'Number' to type 'String'.");
-            error.Source.Should().BeNull();
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body.");
+        error.Detail.Should().Be($"Failed to convert ID '{existingWorkItem.Id}' of type 'Number' to type 'String'.");
+        error.Source.Should().BeNull();
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_incompatible_attribute_value()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_with_incompatible_attribute_value()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                attributes = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    attributes = new
+                    dueAt = new
                     {
-                        dueAt = new
-                        {
-                            Start = 10,
-                            End = 20
-                        }
+                        Start = 10,
+                        End = 20
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible attribute value found.");
-            error.Detail.Should().Match("Failed to convert attribute 'dueAt' with value '*start*end*' of type 'Object' to type 'Nullable<DateTimeOffset>'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/attributes/dueAt");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible attribute value found.");
+        error.Detail.Should().Match("Failed to convert attribute 'dueAt' with value '*start*end*' of type 'Object' to type 'Nullable<DateTimeOffset>'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/attributes/dueAt");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_attributes_and_multiple_relationship_types()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Assignee = _fakers.UserAccount.Generate();
-            existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
-            existingWorkItem.Tags = _fakers.WorkTag.Generate(1).ToHashSet();
+    [Fact]
+    public async Task Can_update_resource_with_attributes_and_multiple_relationship_types()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Assignee = _fakers.UserAccount.Generate();
+        existingWorkItem.Subscribers = _fakers.UserAccount.Generate(1).ToHashSet();
+        existingWorkItem.Tags = _fakers.WorkTag.Generate(1).ToHashSet();
 
-            List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
-            WorkTag existingTag = _fakers.WorkTag.Generate();
+        List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
+        WorkTag existingTag = _fakers.WorkTag.Generate();
 
-            string newDescription = _fakers.WorkItem.Generate().Description!;
+        string newDescription = _fakers.WorkItem.Generate().Description!;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingTag);
-                dbContext.UserAccounts.AddRange(existingUserAccounts);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingTag);
+            dbContext.UserAccounts.AddRange(existingUserAccounts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                attributes = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    attributes = new
+                    description = newDescription
+                },
+                relationships = new
+                {
+                    assignee = new
                     {
-                        description = newDescription
+                        data = new
+                        {
+                            type = "userAccounts",
+                            id = existingUserAccounts[0].StringId
+                        }
                     },
-                    relationships = new
+                    subscribers = new
                     {
-                        assignee = new
+                        data = new[]
                         {
-                            data = new
+                            new
                             {
                                 type = "userAccounts",
-                                id = existingUserAccounts[0].StringId
-                            }
-                        },
-                        subscribers = new
-                        {
-                            data = new[]
-                            {
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccounts[1].StringId
-                                }
+                                id = existingUserAccounts[1].StringId
                             }
-                        },
-                        tags = new
+                        }
+                    },
+                    tags = new
+                    {
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "workTags",
-                                    id = existingTag.StringId
-                                }
+                                type = "workTags",
+                                id = existingTag.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            string itemDescription = $"{newDescription}{ImplicitlyChangingWorkItemDefinition.Suffix}";
+        string itemDescription = $"{newDescription}{ImplicitlyChangingWorkItemDefinition.Suffix}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(itemDescription));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(itemDescription));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                WorkItem workItemInDatabase = await dbContext.WorkItems
-                    .Include(workItem => workItem.Assignee)
-                    .Include(workItem => workItem.Subscribers)
-                    .Include(workItem => workItem.Tags)
-                    .FirstWithIdAsync(existingWorkItem.Id);
+            WorkItem workItemInDatabase = await dbContext.WorkItems
+                .Include(workItem => workItem.Assignee)
+                .Include(workItem => workItem.Subscribers)
+                .Include(workItem => workItem.Tags)
+                .FirstWithIdAsync(existingWorkItem.Id);
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                workItemInDatabase.Description.Should().Be(itemDescription);
+            workItemInDatabase.Description.Should().Be(itemDescription);
 
-                workItemInDatabase.Assignee.ShouldNotBeNull();
-                workItemInDatabase.Assignee.Id.Should().Be(existingUserAccounts[0].Id);
+            workItemInDatabase.Assignee.ShouldNotBeNull();
+            workItemInDatabase.Assignee.Id.Should().Be(existingUserAccounts[0].Id);
 
-                workItemInDatabase.Subscribers.ShouldHaveCount(1);
-                workItemInDatabase.Subscribers.Single().Id.Should().Be(existingUserAccounts[1].Id);
+            workItemInDatabase.Subscribers.ShouldHaveCount(1);
+            workItemInDatabase.Subscribers.Single().Id.Should().Be(existingUserAccounts[1].Id);
 
-                workItemInDatabase.Tags.ShouldHaveCount(1);
-                workItemInDatabase.Tags.Single().Id.Should().Be(existingTag.Id);
-            });
-        }
+            workItemInDatabase.Tags.ShouldHaveCount(1);
+            workItemInDatabase.Tags.Single().Id.Should().Be(existingTag.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_multiple_cyclic_relationship_types()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Parent = _fakers.WorkItem.Generate();
-            existingWorkItem.Children = _fakers.WorkItem.Generate(1);
-            existingWorkItem.RelatedTo = _fakers.WorkItem.Generate(1);
+    [Fact]
+    public async Task Can_update_resource_with_multiple_cyclic_relationship_types()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Parent = _fakers.WorkItem.Generate();
+        existingWorkItem.Children = _fakers.WorkItem.Generate(1);
+        existingWorkItem.RelatedTo = _fakers.WorkItem.Generate(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    parent = new
                     {
-                        parent = new
+                        data = new
                         {
-                            data = new
+                            type = "workItems",
+                            id = existingWorkItem.StringId
+                        }
+                    },
+                    children = new
+                    {
+                        data = new[]
+                        {
+                            new
                             {
                                 type = "workItems",
                                 id = existingWorkItem.StringId
                             }
-                        },
-                        children = new
-                        {
-                            data = new[]
-                            {
-                                new
-                                {
-                                    type = "workItems",
-                                    id = existingWorkItem.StringId
-                                }
-                            }
-                        },
-                        relatedTo = new
+                        }
+                    },
+                    relatedTo = new
+                    {
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "workItems",
-                                    id = existingWorkItem.StringId
-                                }
+                                type = "workItems",
+                                id = existingWorkItem.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-                WorkItem workItemInDatabase = await dbContext.WorkItems
-                    .Include(workItem => workItem.Parent)
-                    .Include(workItem => workItem.Children)
-                    .Include(workItem => workItem.RelatedFrom)
-                    .Include(workItem => workItem.RelatedTo)
-                    .FirstWithIdAsync(existingWorkItem.Id);
+            WorkItem workItemInDatabase = await dbContext.WorkItems
+                .Include(workItem => workItem.Parent)
+                .Include(workItem => workItem.Children)
+                .Include(workItem => workItem.RelatedFrom)
+                .Include(workItem => workItem.RelatedTo)
+                .FirstWithIdAsync(existingWorkItem.Id);
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
 
-                workItemInDatabase.Parent.ShouldNotBeNull();
-                workItemInDatabase.Parent.Id.Should().Be(existingWorkItem.Id);
+            workItemInDatabase.Parent.ShouldNotBeNull();
+            workItemInDatabase.Parent.Id.Should().Be(existingWorkItem.Id);
 
-                workItemInDatabase.Children.ShouldHaveCount(1);
-                workItemInDatabase.Children.Single().Id.Should().Be(existingWorkItem.Id);
+            workItemInDatabase.Children.ShouldHaveCount(1);
+            workItemInDatabase.Children.Single().Id.Should().Be(existingWorkItem.Id);
 
-                workItemInDatabase.RelatedFrom.ShouldHaveCount(1);
-                workItemInDatabase.RelatedFrom.Single().Id.Should().Be(existingWorkItem.Id);
+            workItemInDatabase.RelatedFrom.ShouldHaveCount(1);
+            workItemInDatabase.RelatedFrom.Single().Id.Should().Be(existingWorkItem.Id);
 
-                workItemInDatabase.RelatedTo.ShouldHaveCount(1);
-                workItemInDatabase.RelatedTo.Single().Id.Should().Be(existingWorkItem.Id);
-            });
-        }
+            workItemInDatabase.RelatedTo.ShouldHaveCount(1);
+            workItemInDatabase.RelatedTo.Single().Id.Should().Be(existingWorkItem.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs
index c06b3b7086..3b0e69c5f1 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/Updating/Resources/UpdateToOneRelationshipTests.cs
@@ -1,8 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -10,937 +6,936 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Resources
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite.Updating.Resources;
+
+public sealed class UpdateToOneRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
 {
-    public sealed class UpdateToOneRelationshipTests : IClassFixture<IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
+    private readonly ReadWriteFakers _fakers = new();
+
+    public UpdateToOneRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> _testContext;
-        private readonly ReadWriteFakers _fakers = new();
+        _testContext = testContext;
 
-        public UpdateToOneRelationshipTests(IntegrationTestContext<TestableStartup<ReadWriteDbContext>, ReadWriteDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<WorkItemsController>();
+        testContext.UseController<WorkItemGroupsController>();
+        testContext.UseController<RgbColorsController>();
 
-            testContext.UseController<WorkItemsController>();
-            testContext.UseController<WorkItemGroupsController>();
-            testContext.UseController<RgbColorsController>();
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<ImplicitlyChangingWorkItemDefinition>();
+        });
+    }
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<ImplicitlyChangingWorkItemDefinition>();
-            });
-        }
+    [Fact]
+    public async Task Can_clear_ManyToOne_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Assignee = _fakers.UserAccount.Generate();
 
-        [Fact]
-        public async Task Can_clear_ManyToOne_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Assignee = _fakers.UserAccount.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
-                        {
-                            data = (object?)null
-                        }
+                        data = (object?)null
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Assignee.Should().BeNull();
-            });
-        }
+            workItemInDatabase.Assignee.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_OneToOne_relationship_from_principal_side()
-        {
-            // Arrange
-            WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
-            existingGroup.Color = _fakers.RgbColor.Generate();
+    [Fact]
+    public async Task Can_create_OneToOne_relationship_from_principal_side()
+    {
+        // Arrange
+        WorkItemGroup existingGroup = _fakers.WorkItemGroup.Generate();
+        existingGroup.Color = _fakers.RgbColor.Generate();
 
-            RgbColor existingColor = _fakers.RgbColor.Generate();
+        RgbColor existingColor = _fakers.RgbColor.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingGroup, existingColor);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingGroup, existingColor);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItemGroups",
+                id = existingGroup.StringId,
+                relationships = new
                 {
-                    type = "workItemGroups",
-                    id = existingGroup.StringId,
-                    relationships = new
+                    color = new
                     {
-                        color = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "rgbColors",
-                                id = existingColor.StringId
-                            }
+                            type = "rgbColors",
+                            id = existingColor.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItemGroups/{existingGroup.StringId}";
+        string route = $"/workItemGroups/{existingGroup.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<RgbColor> colorsInDatabase = await dbContext.RgbColors.Include(rgbColor => rgbColor.Group).ToListAsync();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<RgbColor> colorsInDatabase = await dbContext.RgbColors.Include(rgbColor => rgbColor.Group).ToListAsync();
 
-                RgbColor colorInDatabase1 = colorsInDatabase.Single(color => color.Id == existingGroup.Color.Id);
-                colorInDatabase1.Group.Should().BeNull();
+            RgbColor colorInDatabase1 = colorsInDatabase.Single(color => color.Id == existingGroup.Color.Id);
+            colorInDatabase1.Group.Should().BeNull();
 
-                RgbColor colorInDatabase2 = colorsInDatabase.Single(color => color.Id == existingColor.Id);
-                colorInDatabase2.Group.ShouldNotBeNull();
-                colorInDatabase2.Group.Id.Should().Be(existingGroup.Id);
-            });
-        }
+            RgbColor colorInDatabase2 = colorsInDatabase.Single(color => color.Id == existingColor.Id);
+            colorInDatabase2.Group.ShouldNotBeNull();
+            colorInDatabase2.Group.Id.Should().Be(existingGroup.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_OneToOne_relationship_from_dependent_side()
-        {
-            // Arrange
-            List<WorkItemGroup> existingGroups = _fakers.WorkItemGroup.Generate(2);
-            existingGroups[0].Color = _fakers.RgbColor.Generate();
-            existingGroups[1].Color = _fakers.RgbColor.Generate();
+    [Fact]
+    public async Task Can_replace_OneToOne_relationship_from_dependent_side()
+    {
+        // Arrange
+        List<WorkItemGroup> existingGroups = _fakers.WorkItemGroup.Generate(2);
+        existingGroups[0].Color = _fakers.RgbColor.Generate();
+        existingGroups[1].Color = _fakers.RgbColor.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Groups.AddRange(existingGroups);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Groups.AddRange(existingGroups);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "rgbColors",
+                id = existingGroups[0].Color!.StringId,
+                relationships = new
                 {
-                    type = "rgbColors",
-                    id = existingGroups[0].Color!.StringId,
-                    relationships = new
+                    group = new
                     {
-                        group = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "workItemGroups",
-                                id = existingGroups[1].StringId
-                            }
+                            type = "workItemGroups",
+                            id = existingGroups[1].StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/rgbColors/{existingGroups[0].Color!.StringId}";
+        string route = $"/rgbColors/{existingGroups[0].Color!.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                List<WorkItemGroup> groupsInDatabase = await dbContext.Groups.Include(group => group.Color).ToListAsync();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            List<WorkItemGroup> groupsInDatabase = await dbContext.Groups.Include(group => group.Color).ToListAsync();
 
-                WorkItemGroup groupInDatabase1 = groupsInDatabase.Single(group => group.Id == existingGroups[0].Id);
-                groupInDatabase1.Color.Should().BeNull();
+            WorkItemGroup groupInDatabase1 = groupsInDatabase.Single(group => group.Id == existingGroups[0].Id);
+            groupInDatabase1.Color.Should().BeNull();
 
-                WorkItemGroup groupInDatabase2 = groupsInDatabase.Single(group => group.Id == existingGroups[1].Id);
-                groupInDatabase2.Color.ShouldNotBeNull();
-                groupInDatabase2.Color.Id.Should().Be(existingGroups[0].Color!.Id);
+            WorkItemGroup groupInDatabase2 = groupsInDatabase.Single(group => group.Id == existingGroups[1].Id);
+            groupInDatabase2.Color.ShouldNotBeNull();
+            groupInDatabase2.Color.Id.Should().Be(existingGroups[0].Color!.Id);
 
-                List<RgbColor> colorsInDatabase = await dbContext.RgbColors.Include(color => color.Group).ToListAsync();
+            List<RgbColor> colorsInDatabase = await dbContext.RgbColors.Include(color => color.Group).ToListAsync();
 
-                RgbColor colorInDatabase1 = colorsInDatabase.Single(color => color.Id == existingGroups[0].Color!.Id);
-                colorInDatabase1.Group.ShouldNotBeNull();
-                colorInDatabase1.Group.Id.Should().Be(existingGroups[1].Id);
+            RgbColor colorInDatabase1 = colorsInDatabase.Single(color => color.Id == existingGroups[0].Color!.Id);
+            colorInDatabase1.Group.ShouldNotBeNull();
+            colorInDatabase1.Group.Id.Should().Be(existingGroups[1].Id);
 
-                RgbColor? colorInDatabase2 = colorsInDatabase.SingleOrDefault(color => color.Id == existingGroups[1].Color!.Id);
-                colorInDatabase2.ShouldNotBeNull();
-                colorInDatabase2.Group.Should().BeNull();
-            });
-        }
+            RgbColor? colorInDatabase2 = colorsInDatabase.SingleOrDefault(color => color.Id == existingGroups[1].Color!.Id);
+            colorInDatabase2.ShouldNotBeNull();
+            colorInDatabase2.Group.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Can_clear_OneToOne_relationship()
-        {
-            // Arrange
-            RgbColor existingColor = _fakers.RgbColor.Generate();
-            existingColor.Group = _fakers.WorkItemGroup.Generate();
+    [Fact]
+    public async Task Can_clear_OneToOne_relationship()
+    {
+        // Arrange
+        RgbColor existingColor = _fakers.RgbColor.Generate();
+        existingColor.Group = _fakers.WorkItemGroup.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.RgbColors.AddRange(existingColor);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.RgbColors.AddRange(existingColor);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "rgbColors",
+                id = existingColor.StringId,
+                relationships = new
                 {
-                    type = "rgbColors",
-                    id = existingColor.StringId,
-                    relationships = new
+                    group = new
                     {
-                        group = new
-                        {
-                            data = (object?)null
-                        }
+                        data = (object?)null
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/rgbColors/{existingColor.StringId}";
+        string route = $"/rgbColors/{existingColor.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                RgbColor colorInDatabase = await dbContext.RgbColors.Include(color => color.Group).FirstWithIdAsync(existingColor.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            RgbColor colorInDatabase = await dbContext.RgbColors.Include(color => color.Group).FirstWithIdAsync(existingColor.Id);
 
-                colorInDatabase.Group.Should().BeNull();
-            });
-        }
+            colorInDatabase.Group.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_ManyToOne_relationship()
-        {
-            // Arrange
-            List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
-            existingUserAccounts[0].AssignedItems = _fakers.WorkItem.Generate(2).ToHashSet();
+    [Fact]
+    public async Task Can_replace_ManyToOne_relationship()
+    {
+        // Arrange
+        List<UserAccount> existingUserAccounts = _fakers.UserAccount.Generate(2);
+        existingUserAccounts[0].AssignedItems = _fakers.WorkItem.Generate(2).ToHashSet();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.UserAccounts.AddRange(existingUserAccounts);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.UserAccounts.AddRange(existingUserAccounts);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingUserAccounts[0].AssignedItems.ElementAt(1).StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingUserAccounts[0].AssignedItems.ElementAt(1).StringId,
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "userAccounts",
-                                id = existingUserAccounts[1].StringId
-                            }
+                            type = "userAccounts",
+                            id = existingUserAccounts[1].StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingUserAccounts[0].AssignedItems.ElementAt(1).StringId}";
+        string route = $"/workItems/{existingUserAccounts[0].AssignedItems.ElementAt(1).StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                int workItemId = existingUserAccounts[0].AssignedItems.ElementAt(1).Id;
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            int workItemId = existingUserAccounts[0].AssignedItems.ElementAt(1).Id;
 
-                WorkItem workItemInDatabase2 = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(workItemId);
+            WorkItem workItemInDatabase2 = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(workItemId);
 
-                workItemInDatabase2.Assignee.ShouldNotBeNull();
-                workItemInDatabase2.Assignee.Id.Should().Be(existingUserAccounts[1].Id);
-            });
-        }
+            workItemInDatabase2.Assignee.ShouldNotBeNull();
+            workItemInDatabase2.Assignee.Id.Should().Be(existingUserAccounts[1].Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_relationship_with_include()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Can_create_relationship_with_include()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "userAccounts",
-                                id = existingUserAccount.StringId
-                            }
+                            type = "userAccounts",
+                            id = existingUserAccount.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}?include=assignee";
+        string route = $"/workItems/{existingWorkItem.StringId}?include=assignee";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            string description = $"{existingWorkItem.Description}{ImplicitlyChangingWorkItemDefinition.Suffix}";
+        string description = $"{existingWorkItem.Description}{ImplicitlyChangingWorkItemDefinition.Suffix}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItems");
-            responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(description));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItems");
+        responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(description));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeEmpty();
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("userAccounts");
-            responseDocument.Included[0].Id.Should().Be(existingUserAccount.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(existingUserAccount.FirstName));
-            responseDocument.Included[0].Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(existingUserAccount.LastName));
-            responseDocument.Included[0].Relationships.ShouldNotBeEmpty();
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("userAccounts");
+        responseDocument.Included[0].Id.Should().Be(existingUserAccount.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("firstName").With(value => value.Should().Be(existingUserAccount.FirstName));
+        responseDocument.Included[0].Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(existingUserAccount.LastName));
+        responseDocument.Included[0].Relationships.ShouldNotBeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Assignee.ShouldNotBeNull();
-                workItemInDatabase.Assignee.Id.Should().Be(existingUserAccount.Id);
-            });
-        }
+            workItemInDatabase.Assignee.ShouldNotBeNull();
+            workItemInDatabase.Assignee.Id.Should().Be(existingUserAccount.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_relationship_with_include_and_fieldsets()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            existingWorkItem.Assignee = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Can_replace_relationship_with_include_and_fieldsets()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        existingWorkItem.Assignee = _fakers.UserAccount.Generate();
 
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "userAccounts",
-                                id = existingUserAccount.StringId
-                            }
+                            type = "userAccounts",
+                            id = existingUserAccount.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}?fields[workItems]=description,assignee&include=assignee&fields[userAccounts]=lastName";
+        string route = $"/workItems/{existingWorkItem.StringId}?fields[workItems]=description,assignee&include=assignee&fields[userAccounts]=lastName";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            string description = $"{existingWorkItem.Description}{ImplicitlyChangingWorkItemDefinition.Suffix}";
+        string description = $"{existingWorkItem.Description}{ImplicitlyChangingWorkItemDefinition.Suffix}";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("workItems");
-            responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(description));
-            responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("workItems");
+        responseDocument.Data.SingleValue.Id.Should().Be(existingWorkItem.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("description").With(value => value.Should().Be(description));
+        responseDocument.Data.SingleValue.Relationships.ShouldHaveCount(1);
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("assignee").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Id.Should().Be(existingUserAccount.StringId);
-            });
-
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("userAccounts");
-            responseDocument.Included[0].Id.Should().Be(existingUserAccount.StringId);
-            responseDocument.Included[0].Attributes.ShouldHaveCount(1);
-            responseDocument.Included[0].Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(existingUserAccount.LastName));
-            responseDocument.Included[0].Relationships.Should().BeNull();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(existingWorkItem.Id);
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("assignee").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Id.Should().Be(existingUserAccount.StringId);
+        });
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("userAccounts");
+        responseDocument.Included[0].Id.Should().Be(existingUserAccount.StringId);
+        responseDocument.Included[0].Attributes.ShouldHaveCount(1);
+        responseDocument.Included[0].Attributes.ShouldContainKey("lastName").With(value => value.Should().Be(existingUserAccount.LastName));
+        responseDocument.Included[0].Relationships.Should().BeNull();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Assignee).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Assignee.ShouldNotBeNull();
-                workItemInDatabase.Assignee.Id.Should().Be(existingUserAccount.Id);
-            });
-        }
+            workItemInDatabase.Assignee.ShouldNotBeNull();
+            workItemInDatabase.Assignee.Id.Should().Be(existingUserAccount.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_null_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Cannot_create_with_null_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
-                    {
-                        assignee = (object?)null
-                    }
+                    assignee = (object?)null
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object, instead of 'null'.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_missing_data_in_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Cannot_create_with_missing_data_in_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
-                        {
-                        }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'data' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_array_data_in_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
-            UserAccount existingUserAccount = _fakers.UserAccount.Generate();
+    [Fact]
+    public async Task Cannot_create_with_array_data_in_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+        UserAccount existingUserAccount = _fakers.UserAccount.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingWorkItem, existingUserAccount);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingWorkItem, existingUserAccount);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "userAccounts",
-                                    id = existingUserAccount.StringId
-                                }
+                                type = "userAccounts",
+                                id = existingUserAccount.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Expected an object or 'null', instead of an array.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Expected an object or 'null', instead of an array.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_relationship_type()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_create_for_missing_relationship_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                id = Unknown.StringId.For<UserAccount, long>()
-                            }
+                            id = Unknown.StringId.For<UserAccount, long>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'type' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_unknown_relationship_type()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_create_for_unknown_relationship_type()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = Unknown.ResourceType,
-                                id = Unknown.StringId.For<UserAccount, long>()
-                            }
+                            type = Unknown.ResourceType,
+                            id = Unknown.StringId.For<UserAccount, long>()
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
-            error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: Unknown resource type found.");
+        error.Detail.Should().Be($"Resource type '{Unknown.ResourceType}' does not exist.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_for_missing_relationship_ID()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_create_for_missing_relationship_ID()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "userAccounts"
-                            }
+                            type = "userAccounts"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee/data");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Failed to deserialize request body: The 'id' element is required.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee/data");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Cannot_create_with_unknown_relationship_ID()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_create_with_unknown_relationship_ID()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string userAccountId = Unknown.StringId.For<UserAccount, long>();
+        string userAccountId = Unknown.StringId.For<UserAccount, long>();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "userAccounts",
-                                id = userAccountId
-                            }
+                            type = "userAccounts",
+                            id = userAccountId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId}' in relationship 'assignee' does not exist.");
-            error.Source.Should().BeNull();
-            error.Meta.Should().NotContainKey("requestBody");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'userAccounts' with ID '{userAccountId}' in relationship 'assignee' does not exist.");
+        error.Source.Should().BeNull();
+        error.Meta.Should().NotContainKey("requestBody");
+    }
 
-        [Fact]
-        public async Task Cannot_create_on_relationship_type_mismatch()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Cannot_create_on_relationship_type_mismatch()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    assignee = new
                     {
-                        assignee = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "rgbColors",
-                                id = "0A0B0C"
-                            }
+                            type = "rgbColors",
+                            id = "0A0B0C"
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Conflict);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Conflict);
-            error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
-            error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'userAccounts' of relationship 'assignee'.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/assignee/data/type");
-            error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Conflict);
+        error.Title.Should().Be("Failed to deserialize request body: Incompatible resource type found.");
+        error.Detail.Should().Be("Type 'rgbColors' is incompatible with type 'userAccounts' of relationship 'assignee'.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/assignee/data/type");
+        error.Meta.ShouldContainKey("requestBody").With(value => value.ShouldNotBeNull().ToString().ShouldNotBeEmpty());
+    }
 
-        [Fact]
-        public async Task Can_clear_cyclic_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Can_clear_cyclic_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
 
-                existingWorkItem.Parent = existingWorkItem;
-                await dbContext.SaveChangesAsync();
-            });
+            existingWorkItem.Parent = existingWorkItem;
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    parent = new
                     {
-                        parent = new
-                        {
-                            data = (object?)null
-                        }
+                        data = (object?)null
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Parent).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Parent).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Parent.Should().BeNull();
-            });
-        }
+            workItemInDatabase.Parent.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Can_assign_cyclic_relationship()
-        {
-            // Arrange
-            WorkItem existingWorkItem = _fakers.WorkItem.Generate();
+    [Fact]
+    public async Task Can_assign_cyclic_relationship()
+    {
+        // Arrange
+        WorkItem existingWorkItem = _fakers.WorkItem.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(existingWorkItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(existingWorkItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                id = existingWorkItem.StringId,
+                relationships = new
                 {
-                    type = "workItems",
-                    id = existingWorkItem.StringId,
-                    relationships = new
+                    parent = new
                     {
-                        parent = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "workItems",
-                                id = existingWorkItem.StringId
-                            }
+                            type = "workItems",
+                            id = existingWorkItem.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/workItems/{existingWorkItem.StringId}";
+        string route = $"/workItems/{existingWorkItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Parent).FirstWithIdAsync(existingWorkItem.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            WorkItem workItemInDatabase = await dbContext.WorkItems.Include(workItem => workItem.Parent).FirstWithIdAsync(existingWorkItem.Id);
 
-                workItemInDatabase.Parent.ShouldNotBeNull();
-                workItemInDatabase.Parent.Id.Should().Be(existingWorkItem.Id);
-            });
-        }
+            workItemInDatabase.Parent.ShouldNotBeNull();
+            workItemInDatabase.Parent.Id.Should().Be(existingWorkItem.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccount.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccount.cs
index 0e739429b5..ab41e68390 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccount.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccount.cs
@@ -1,20 +1,19 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ReadWrite")]
+public sealed class UserAccount : Identifiable<long>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class UserAccount : Identifiable<long>
-    {
-        [Attr]
-        public string FirstName { get; set; } = null!;
+    [Attr]
+    public string FirstName { get; set; } = null!;
 
-        [Attr]
-        public string LastName { get; set; } = null!;
+    [Attr]
+    public string LastName { get; set; } = null!;
 
-        [HasMany]
-        public ISet<WorkItem> AssignedItems { get; set; } = new HashSet<WorkItem>();
-    }
+    [HasMany]
+    public ISet<WorkItem> AssignedItems { get; set; } = new HashSet<WorkItem>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccountsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccountsController.cs
deleted file mode 100644
index 61980968e8..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/UserAccountsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
-{
-    public sealed class UserAccountsController : JsonApiController<UserAccount, long>
-    {
-        public UserAccountsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<UserAccount, long> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItem.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItem.cs
index 2cd0433676..e7a0a01b5c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItem.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItem.cs
@@ -1,54 +1,52 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ReadWrite")]
+public sealed class WorkItem : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class WorkItem : Identifiable<int>
-    {
-        [Attr]
-        public string? Description { get; set; }
+    [Attr]
+    public string? Description { get; set; }
 
-        [Attr]
-        public DateTimeOffset? DueAt { get; set; }
+    [Attr]
+    public DateTimeOffset? DueAt { get; set; }
 
-        [Attr]
-        public WorkItemPriority Priority { get; set; }
+    [Attr]
+    public WorkItemPriority Priority { get; set; }
 
-        [NotMapped]
-        [Attr(Capabilities = ~(AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange))]
-        public bool IsImportant
-        {
-            get => Priority == WorkItemPriority.High;
-            set => Priority = value ? WorkItemPriority.High : throw new NotSupportedException();
-        }
+    [NotMapped]
+    [Attr(Capabilities = ~(AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange))]
+    public bool IsImportant
+    {
+        get => Priority == WorkItemPriority.High;
+        set => Priority = value ? WorkItemPriority.High : throw new NotSupportedException();
+    }
 
-        [HasOne]
-        public UserAccount? Assignee { get; set; }
+    [HasOne]
+    public UserAccount? Assignee { get; set; }
 
-        [HasMany]
-        public ISet<UserAccount> Subscribers { get; set; } = new HashSet<UserAccount>();
+    [HasMany]
+    public ISet<UserAccount> Subscribers { get; set; } = new HashSet<UserAccount>();
 
-        [HasMany]
-        public ISet<WorkTag> Tags { get; set; } = new HashSet<WorkTag>();
+    [HasMany]
+    public ISet<WorkTag> Tags { get; set; } = new HashSet<WorkTag>();
 
-        [HasOne]
-        public WorkItem? Parent { get; set; }
+    [HasOne]
+    public WorkItem? Parent { get; set; }
 
-        [HasMany]
-        public IList<WorkItem> Children { get; set; } = new List<WorkItem>();
+    [HasMany]
+    public IList<WorkItem> Children { get; set; } = new List<WorkItem>();
 
-        [HasMany]
-        public IList<WorkItem> RelatedFrom { get; set; } = new List<WorkItem>();
+    [HasMany]
+    public IList<WorkItem> RelatedFrom { get; set; } = new List<WorkItem>();
 
-        [HasMany]
-        public IList<WorkItem> RelatedTo { get; set; } = new List<WorkItem>();
+    [HasMany]
+    public IList<WorkItem> RelatedTo { get; set; } = new List<WorkItem>();
 
-        [HasOne]
-        public WorkItemGroup? Group { get; set; }
-    }
+    [HasOne]
+    public WorkItemGroup? Group { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroup.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroup.cs
index a1f66c0549..86c11391ed 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroup.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroup.cs
@@ -1,29 +1,27 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ReadWrite")]
+public sealed class WorkItemGroup : Identifiable<Guid>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class WorkItemGroup : Identifiable<Guid>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [Attr]
-        public bool IsPublic { get; set; }
+    [Attr]
+    public bool IsPublic { get; set; }
 
-        [NotMapped]
-        [Attr]
-        public bool IsDeprecated => !string.IsNullOrEmpty(Name) && Name.StartsWith("DEPRECATED:", StringComparison.OrdinalIgnoreCase);
+    [NotMapped]
+    [Attr]
+    public bool IsDeprecated => !string.IsNullOrEmpty(Name) && Name.StartsWith("DEPRECATED:", StringComparison.OrdinalIgnoreCase);
 
-        [HasOne]
-        public RgbColor? Color { get; set; }
+    [HasOne]
+    public RgbColor? Color { get; set; }
 
-        [HasMany]
-        public IList<WorkItem> Items { get; set; } = new List<WorkItem>();
-    }
+    [HasMany]
+    public IList<WorkItem> Items { get; set; } = new List<WorkItem>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroupsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroupsController.cs
deleted file mode 100644
index c9ce804450..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemGroupsController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
-{
-    public sealed class WorkItemGroupsController : JsonApiController<WorkItemGroup, Guid>
-    {
-        public WorkItemGroupsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<WorkItemGroup, Guid> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemPriority.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemPriority.cs
index e7a5a113bf..5a09a274d8 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemPriority.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemPriority.cs
@@ -1,14 +1,13 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[JsonConverter(typeof(JsonStringEnumMemberConverter))]
+public enum WorkItemPriority
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    [JsonConverter(typeof(JsonStringEnumMemberConverter))]
-    public enum WorkItemPriority
-    {
-        Low,
-        Medium,
-        High
-    }
+    Low,
+    Medium,
+    High
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemToWorkItem.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemToWorkItem.cs
index 65e063d8d7..23a62b0e4a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemToWorkItem.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemToWorkItem.cs
@@ -1,11 +1,12 @@
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[NoResource]
+public sealed class WorkItemToWorkItem
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class WorkItemToWorkItem
-    {
-        public WorkItem FromItem { get; set; } = null!;
-        public WorkItem ToItem { get; set; } = null!;
-    }
+    public WorkItem FromItem { get; set; } = null!;
+    public WorkItem ToItem { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemsController.cs
deleted file mode 100644
index 3f069590ff..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkItemsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
-{
-    public sealed class WorkItemsController : JsonApiController<WorkItem, int>
-    {
-        public WorkItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<WorkItem, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkTag.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkTag.cs
index 54fb89bd10..585690fb77 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkTag.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/WorkTag.cs
@@ -1,20 +1,18 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite
+namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class WorkTag : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class WorkTag : Identifiable<int>
-    {
-        [Attr]
-        public string Text { get; set; } = null!;
+    [Attr]
+    public string Text { get; set; } = null!;
 
-        [Attr]
-        public bool IsBuiltIn { get; set; }
+    [Attr]
+    public bool IsBuiltIn { get; set; }
 
-        [HasMany]
-        public ISet<WorkItem> WorkItems { get; set; } = new HashSet<WorkItem>();
-    }
+    [HasMany]
+    public ISet<WorkItem> WorkItems { get; set; } = new HashSet<WorkItem>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Customer.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Customer.cs
index 01420de8dc..c3ec0ad36c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Customer.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Customer.cs
@@ -1,17 +1,16 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships")]
+public sealed class Customer : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Customer : Identifiable<int>
-    {
-        [Attr]
-        public string EmailAddress { get; set; } = null!;
+    [Attr]
+    public string EmailAddress { get; set; } = null!;
 
-        [HasMany]
-        public ISet<Order> Orders { get; set; } = new HashSet<Order>();
-    }
+    [HasMany]
+    public ISet<Order> Orders { get; set; } = new HashSet<Order>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/CustomersController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/CustomersController.cs
deleted file mode 100644
index c580d90075..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/CustomersController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships
-{
-    public sealed class CustomersController : JsonApiController<Customer, int>
-    {
-        public CustomersController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Customer, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorDbContext.cs
index cce1c5e2ed..55ef653c95 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorDbContext.cs
@@ -3,35 +3,34 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class DefaultBehaviorDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class DefaultBehaviorDbContext : DbContext
-    {
-        public DbSet<Customer> Customers => Set<Customer>();
-        public DbSet<Order> Orders => Set<Order>();
-        public DbSet<Shipment> Shipments => Set<Shipment>();
+    public DbSet<Customer> Customers => Set<Customer>();
+    public DbSet<Order> Orders => Set<Order>();
+    public DbSet<Shipment> Shipments => Set<Shipment>();
 
-        public DefaultBehaviorDbContext(DbContextOptions<DefaultBehaviorDbContext> options)
-            : base(options)
-        {
-        }
+    public DefaultBehaviorDbContext(DbContextOptions<DefaultBehaviorDbContext> options)
+        : base(options)
+    {
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<Customer>()
-                .HasMany(customer => customer.Orders)
-                .WithOne(order => order.Customer);
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<Customer>()
+            .HasMany(customer => customer.Orders)
+            .WithOne(order => order.Customer);
 
-            // By default, Entity Framework Core generates an identifying foreign key for a required 1-to-1 relationship.
-            // This means no foreign key column is generated, instead the primary keys point to each other directly.
-            // That mechanism does not make sense for JSON:API, because patching a relationship would result in also
-            // changing the identity of a resource. Naming the foreign key explicitly fixes the problem by forcing to
-            // create a foreign key column.
-            builder.Entity<Order>()
-                .HasOne(order => order.Shipment)
-                .WithOne(shipment => shipment.Order)
-                .HasForeignKey<Shipment>("OrderId");
-        }
+        // By default, Entity Framework Core generates an identifying foreign key for a required 1-to-1 relationship.
+        // This means no foreign key column is generated, instead the primary keys point to each other directly.
+        // That mechanism does not make sense for JSON:API, because patching a relationship would result in also
+        // changing the identity of a resource. Naming the foreign key explicitly fixes the problem by forcing to
+        // create a foreign key column.
+        builder.Entity<Order>()
+            .HasOne(order => order.Shipment)
+            .WithOne(shipment => shipment.Order)
+            .HasForeignKey<Shipment>("OrderId");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorFakers.cs
index 1c7386413f..939324d41b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorFakers.cs
@@ -1,33 +1,31 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships;
+
+internal sealed class DefaultBehaviorFakers : FakerContainer
 {
-    internal sealed class DefaultBehaviorFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<Order>> _lazyOrderFaker = new(() =>
-            new Faker<Order>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(order => order.Amount, faker => faker.Finance.Amount()));
+    private readonly Lazy<Faker<Order>> _lazyOrderFaker = new(() =>
+        new Faker<Order>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(order => order.Amount, faker => faker.Finance.Amount()));
 
-        private readonly Lazy<Faker<Customer>> _lazyCustomerFaker = new(() =>
-            new Faker<Customer>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(customer => customer.EmailAddress, faker => faker.Person.Email));
+    private readonly Lazy<Faker<Customer>> _lazyCustomerFaker = new(() =>
+        new Faker<Customer>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(customer => customer.EmailAddress, faker => faker.Person.Email));
 
-        private readonly Lazy<Faker<Shipment>> _lazyShipmentFaker = new(() =>
-            new Faker<Shipment>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(shipment => shipment.TrackAndTraceCode, faker => faker.Commerce.Ean13())
-                .RuleFor(shipment => shipment.ShippedAt, faker => faker.Date.Past()
-                    .TruncateToWholeMilliseconds()));
+    private readonly Lazy<Faker<Shipment>> _lazyShipmentFaker = new(() =>
+        new Faker<Shipment>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(shipment => shipment.TrackAndTraceCode, faker => faker.Commerce.Ean13())
+            .RuleFor(shipment => shipment.ShippedAt, faker => faker.Date.Past()
+                .TruncateToWholeMilliseconds()));
 
-        public Faker<Order> Order => _lazyOrderFaker.Value;
-        public Faker<Customer> Customer => _lazyCustomerFaker.Value;
-        public Faker<Shipment> Shipment => _lazyShipmentFaker.Value;
-    }
+    public Faker<Order> Order => _lazyOrderFaker.Value;
+    public Faker<Customer> Customer => _lazyCustomerFaker.Value;
+    public Faker<Shipment> Shipment => _lazyShipmentFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorTests.cs
index 8ed55f57b3..e2d029bd1a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorTests.cs
@@ -1,7 +1,4 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -10,492 +7,491 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships;
+
+public sealed class DefaultBehaviorTests : IClassFixture<IntegrationTestContext<TestableStartup<DefaultBehaviorDbContext>, DefaultBehaviorDbContext>>
 {
-    public sealed class DefaultBehaviorTests : IClassFixture<IntegrationTestContext<TestableStartup<DefaultBehaviorDbContext>, DefaultBehaviorDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<DefaultBehaviorDbContext>, DefaultBehaviorDbContext> _testContext;
+    private readonly IntegrationTestContext<TestableStartup<DefaultBehaviorDbContext>, DefaultBehaviorDbContext> _testContext;
 
-        private readonly DefaultBehaviorFakers _fakers = new();
+    private readonly DefaultBehaviorFakers _fakers = new();
 
-        public DefaultBehaviorTests(IntegrationTestContext<TestableStartup<DefaultBehaviorDbContext>, DefaultBehaviorDbContext> testContext)
-        {
-            _testContext = testContext;
+    public DefaultBehaviorTests(IntegrationTestContext<TestableStartup<DefaultBehaviorDbContext>, DefaultBehaviorDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<OrdersController>();
-            testContext.UseController<ShipmentsController>();
-            testContext.UseController<CustomersController>();
+        testContext.UseController<OrdersController>();
+        testContext.UseController<ShipmentsController>();
+        testContext.UseController<CustomersController>();
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.UseRelativeLinks = true;
-        }
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.UseRelativeLinks = true;
+    }
 
-        [Fact]
-        public async Task Cannot_create_dependent_side_of_required_ManyToOne_relationship_without_providing_principal_side()
-        {
-            // Arrange
-            Order order = _fakers.Order.Generate();
+    [Fact]
+    public async Task Cannot_create_dependent_side_of_required_ManyToOne_relationship_without_providing_principal_side()
+    {
+        // Arrange
+        Order order = _fakers.Order.Generate();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "orders",
+                attributes = new
                 {
-                    type = "orders",
-                    attributes = new
-                    {
-                        amount = order.Amount
-                    }
+                    amount = order.Amount
                 }
-            };
+            }
+        };
 
-            const string route = "/orders";
+        const string route = "/orders";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(2);
+        responseDocument.Errors.ShouldHaveCount(2);
 
-            ErrorObject error1 = responseDocument.Errors[0];
-            error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error1.Title.Should().Be("Input validation failed.");
-            error1.Detail.Should().Be("The Customer field is required.");
-            error1.Source.ShouldNotBeNull();
-            error1.Source.Pointer.Should().Be("/data/relationships/customer/data");
+        ErrorObject error1 = responseDocument.Errors[0];
+        error1.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error1.Title.Should().Be("Input validation failed.");
+        error1.Detail.Should().Be("The Customer field is required.");
+        error1.Source.ShouldNotBeNull();
+        error1.Source.Pointer.Should().Be("/data/relationships/customer/data");
 
-            ErrorObject error2 = responseDocument.Errors[1];
-            error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error2.Title.Should().Be("Input validation failed.");
-            error2.Detail.Should().Be("The Shipment field is required.");
-            error2.Source.ShouldNotBeNull();
-            error2.Source.Pointer.Should().Be("/data/relationships/shipment/data");
-        }
+        ErrorObject error2 = responseDocument.Errors[1];
+        error2.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error2.Title.Should().Be("Input validation failed.");
+        error2.Detail.Should().Be("The Shipment field is required.");
+        error2.Source.ShouldNotBeNull();
+        error2.Source.Pointer.Should().Be("/data/relationships/shipment/data");
+    }
 
-        [Fact]
-        public async Task Cannot_create_dependent_side_of_required_OneToOne_relationship_without_providing_principal_side()
-        {
-            // Arrange
-            Shipment shipment = _fakers.Shipment.Generate();
+    [Fact]
+    public async Task Cannot_create_dependent_side_of_required_OneToOne_relationship_without_providing_principal_side()
+    {
+        // Arrange
+        Shipment shipment = _fakers.Shipment.Generate();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "shipments",
+                attributes = new
                 {
-                    type = "shipments",
-                    attributes = new
-                    {
-                        trackAndTraceCode = shipment.TrackAndTraceCode
-                    }
+                    trackAndTraceCode = shipment.TrackAndTraceCode
                 }
-            };
+            }
+        };
 
-            const string route = "/shipments";
+        const string route = "/shipments";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Input validation failed.");
-            error.Detail.Should().Be("The Order field is required.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/order/data");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Input validation failed.");
+        error.Detail.Should().Be("The Order field is required.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/order/data");
+    }
+
+    [Fact]
+    public async Task Deleting_principal_side_of_required_OneToMany_relationship_triggers_cascading_delete()
+    {
+        // Arrange
+        Order existingOrder = _fakers.Order.Generate();
+        existingOrder.Customer = _fakers.Customer.Generate();
 
-        [Fact]
-        public async Task Deleting_principal_side_of_required_OneToMany_relationship_triggers_cascading_delete()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Order existingOrder = _fakers.Order.Generate();
-            existingOrder.Customer = _fakers.Customer.Generate();
+            dbContext.Orders.Add(existingOrder);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Orders.Add(existingOrder);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/customers/{existingOrder.Customer.StringId}";
 
-            string route = $"/customers/{existingOrder.Customer.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Customer? customerInDatabase = await dbContext.Customers.FirstWithIdOrDefaultAsync(existingOrder.Customer.Id);
+            customerInDatabase.Should().BeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Customer? customerInDatabase = await dbContext.Customers.FirstWithIdOrDefaultAsync(existingOrder.Customer.Id);
-                customerInDatabase.Should().BeNull();
+            Order? orderInDatabase = await dbContext.Orders.FirstWithIdOrDefaultAsync(existingOrder.Id);
+            orderInDatabase.Should().BeNull();
+        });
+    }
 
-                Order? orderInDatabase = await dbContext.Orders.FirstWithIdOrDefaultAsync(existingOrder.Id);
-                orderInDatabase.Should().BeNull();
-            });
-        }
+    [Fact]
+    public async Task Deleting_principal_side_of_required_OneToOne_relationship_triggers_cascading_delete()
+    {
+        // Arrange
+        Order existingOrder = _fakers.Order.Generate();
+        existingOrder.Shipment = _fakers.Shipment.Generate();
+        existingOrder.Customer = _fakers.Customer.Generate();
 
-        [Fact]
-        public async Task Deleting_principal_side_of_required_OneToOne_relationship_triggers_cascading_delete()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Order existingOrder = _fakers.Order.Generate();
-            existingOrder.Shipment = _fakers.Shipment.Generate();
-            existingOrder.Customer = _fakers.Customer.Generate();
+            dbContext.Orders.Add(existingOrder);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Orders.Add(existingOrder);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/orders/{existingOrder.StringId}";
 
-            string route = $"/orders/{existingOrder.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Order? orderInDatabase = await dbContext.Orders.FirstWithIdOrDefaultAsync(existingOrder.Id);
+            orderInDatabase.Should().BeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Order? orderInDatabase = await dbContext.Orders.FirstWithIdOrDefaultAsync(existingOrder.Id);
-                orderInDatabase.Should().BeNull();
+            Shipment? shipmentInDatabase = await dbContext.Shipments.FirstWithIdOrDefaultAsync(existingOrder.Shipment.Id);
+            shipmentInDatabase.Should().BeNull();
 
-                Shipment? shipmentInDatabase = await dbContext.Shipments.FirstWithIdOrDefaultAsync(existingOrder.Shipment.Id);
-                shipmentInDatabase.Should().BeNull();
+            Customer? customerInDatabase = await dbContext.Customers.FirstWithIdOrDefaultAsync(existingOrder.Customer.Id);
+            customerInDatabase.ShouldNotBeNull();
+        });
+    }
 
-                Customer? customerInDatabase = await dbContext.Customers.FirstWithIdOrDefaultAsync(existingOrder.Customer.Id);
-                customerInDatabase.ShouldNotBeNull();
-            });
-        }
+    [Fact]
+    public async Task Cannot_clear_required_ManyToOne_relationship_through_primary_endpoint()
+    {
+        // Arrange
+        Order existingOrder = _fakers.Order.Generate();
+        existingOrder.Shipment = _fakers.Shipment.Generate();
+        existingOrder.Customer = _fakers.Customer.Generate();
 
-        [Fact]
-        public async Task Cannot_clear_required_ManyToOne_relationship_through_primary_endpoint()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Order existingOrder = _fakers.Order.Generate();
-            existingOrder.Shipment = _fakers.Shipment.Generate();
-            existingOrder.Customer = _fakers.Customer.Generate();
+            dbContext.Orders.Add(existingOrder);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Orders.Add(existingOrder);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "orders",
+                id = existingOrder.StringId,
+                relationships = new
                 {
-                    type = "orders",
-                    id = existingOrder.StringId,
-                    relationships = new
+                    customer = new
                     {
-                        customer = new
-                        {
-                            data = (object?)null
-                        }
+                        data = (object?)null
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/orders/{existingOrder.StringId}";
+        string route = $"/orders/{existingOrder.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.UnprocessableEntity);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
-            error.Title.Should().Be("Input validation failed.");
-            error.Detail.Should().Be("The Customer field is required.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Pointer.Should().Be("/data/relationships/customer/data");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.UnprocessableEntity);
+        error.Title.Should().Be("Input validation failed.");
+        error.Detail.Should().Be("The Customer field is required.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Pointer.Should().Be("/data/relationships/customer/data");
+    }
+
+    [Fact]
+    public async Task Cannot_clear_required_ManyToOne_relationship_through_relationship_endpoint()
+    {
+        // Arrange
+        Order existingOrder = _fakers.Order.Generate();
+        existingOrder.Shipment = _fakers.Shipment.Generate();
+        existingOrder.Customer = _fakers.Customer.Generate();
 
-        [Fact]
-        public async Task Cannot_clear_required_ManyToOne_relationship_through_relationship_endpoint()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Order existingOrder = _fakers.Order.Generate();
-            existingOrder.Shipment = _fakers.Shipment.Generate();
-            existingOrder.Customer = _fakers.Customer.Generate();
+            dbContext.Orders.Add(existingOrder);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Orders.Add(existingOrder);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        string route = $"/orders/{existingOrder.StringId}/relationships/customer";
 
-            string route = $"/orders/{existingOrder.StringId}/relationships/customer";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Failed to clear a required relationship.");
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Failed to clear a required relationship.");
+        error.Detail.Should().Be($"The relationship 'customer' on resource type 'orders' with ID '{existingOrder.StringId}' " +
+            "cannot be cleared because it is a required relationship.");
+    }
 
-            error.Detail.Should().Be($"The relationship 'customer' on resource type 'orders' with ID '{existingOrder.StringId}' " +
-                "cannot be cleared because it is a required relationship.");
-        }
+    [Fact]
+    public async Task Clearing_OneToMany_relationship_through_primary_endpoint_triggers_cascading_delete()
+    {
+        // Arrange
+        Order existingOrder = _fakers.Order.Generate();
+        existingOrder.Shipment = _fakers.Shipment.Generate();
+        existingOrder.Customer = _fakers.Customer.Generate();
 
-        [Fact]
-        public async Task Clearing_OneToMany_relationship_through_primary_endpoint_triggers_cascading_delete()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Order existingOrder = _fakers.Order.Generate();
-            existingOrder.Shipment = _fakers.Shipment.Generate();
-            existingOrder.Customer = _fakers.Customer.Generate();
+            dbContext.Orders.Add(existingOrder);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Orders.Add(existingOrder);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "customers",
+                id = existingOrder.Customer.StringId,
+                relationships = new
                 {
-                    type = "customers",
-                    id = existingOrder.Customer.StringId,
-                    relationships = new
+                    orders = new
                     {
-                        orders = new
-                        {
-                            data = Array.Empty<object>()
-                        }
+                        data = Array.Empty<object>()
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/customers/{existingOrder.Customer.StringId}";
+        string route = $"/customers/{existingOrder.Customer.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Order? orderInDatabase = await dbContext.Orders.Include(order => order.Customer).FirstWithIdOrDefaultAsync(existingOrder.Id);
-                orderInDatabase.Should().BeNull();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Order? orderInDatabase = await dbContext.Orders.Include(order => order.Customer).FirstWithIdOrDefaultAsync(existingOrder.Id);
+            orderInDatabase.Should().BeNull();
 
-                Customer customerInDatabase = await dbContext.Customers.Include(customer => customer.Orders).FirstWithIdAsync(existingOrder.Customer.Id);
-                customerInDatabase.Orders.Should().BeEmpty();
-            });
-        }
+            Customer customerInDatabase = await dbContext.Customers.Include(customer => customer.Orders).FirstWithIdAsync(existingOrder.Customer.Id);
+            customerInDatabase.Orders.Should().BeEmpty();
+        });
+    }
 
-        [Fact]
-        public async Task Clearing_OneToMany_relationship_through_update_relationship_endpoint_triggers_cascading_delete()
+    [Fact]
+    public async Task Clearing_OneToMany_relationship_through_update_relationship_endpoint_triggers_cascading_delete()
+    {
+        // Arrange
+        Order existingOrder = _fakers.Order.Generate();
+        existingOrder.Shipment = _fakers.Shipment.Generate();
+        existingOrder.Customer = _fakers.Customer.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Order existingOrder = _fakers.Order.Generate();
-            existingOrder.Shipment = _fakers.Shipment.Generate();
-            existingOrder.Customer = _fakers.Customer.Generate();
+            dbContext.Orders.Add(existingOrder);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Orders.Add(existingOrder);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        string route = $"/customers/{existingOrder.Customer.StringId}/relationships/orders";
 
-            string route = $"/customers/{existingOrder.Customer.StringId}/relationships/orders";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Order? orderInDatabase = await dbContext.Orders.Include(order => order.Customer).FirstWithIdOrDefaultAsync(existingOrder.Id);
+            orderInDatabase.Should().BeNull();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Order? orderInDatabase = await dbContext.Orders.Include(order => order.Customer).FirstWithIdOrDefaultAsync(existingOrder.Id);
-                orderInDatabase.Should().BeNull();
+            Customer customerInDatabase = await dbContext.Customers.Include(customer => customer.Orders).FirstWithIdAsync(existingOrder.Customer.Id);
+            customerInDatabase.Orders.Should().BeEmpty();
+        });
+    }
 
-                Customer customerInDatabase = await dbContext.Customers.Include(customer => customer.Orders).FirstWithIdAsync(existingOrder.Customer.Id);
-                customerInDatabase.Orders.Should().BeEmpty();
-            });
-        }
+    [Fact]
+    public async Task Clearing_OneToMany_relationship_through_delete_relationship_endpoint_triggers_cascading_delete()
+    {
+        // Arrange
+        Order existingOrder = _fakers.Order.Generate();
+        existingOrder.Shipment = _fakers.Shipment.Generate();
+        existingOrder.Customer = _fakers.Customer.Generate();
 
-        [Fact]
-        public async Task Clearing_OneToMany_relationship_through_delete_relationship_endpoint_triggers_cascading_delete()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Order existingOrder = _fakers.Order.Generate();
-            existingOrder.Shipment = _fakers.Shipment.Generate();
-            existingOrder.Customer = _fakers.Customer.Generate();
+            dbContext.Orders.Add(existingOrder);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Orders.Add(existingOrder);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new object[]
             {
-                data = new object[]
+                new
                 {
-                    new
-                    {
-                        type = "orders",
-                        id = existingOrder.StringId
-                    }
+                    type = "orders",
+                    id = existingOrder.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/customers/{existingOrder.Customer.StringId}/relationships/orders";
+        string route = $"/customers/{existingOrder.Customer.StringId}/relationships/orders";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Order? orderInDatabase = await dbContext.Orders.Include(order => order.Customer).FirstWithIdOrDefaultAsync(existingOrder.Id);
-                orderInDatabase.Should().BeNull();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Order? orderInDatabase = await dbContext.Orders.Include(order => order.Customer).FirstWithIdOrDefaultAsync(existingOrder.Id);
+            orderInDatabase.Should().BeNull();
 
-                Customer customerInDatabase = await dbContext.Customers.Include(customer => customer.Orders).FirstWithIdAsync(existingOrder.Customer.Id);
-                customerInDatabase.Orders.Should().BeEmpty();
-            });
-        }
+            Customer customerInDatabase = await dbContext.Customers.Include(customer => customer.Orders).FirstWithIdAsync(existingOrder.Customer.Id);
+            customerInDatabase.Orders.Should().BeEmpty();
+        });
+    }
 
-        [Fact]
-        public async Task Can_reassign_dependent_side_of_ZeroOrOneToOne_relationship_through_primary_endpoint()
-        {
-            // Arrange
-            Order orderWithShipment = _fakers.Order.Generate();
-            orderWithShipment.Shipment = _fakers.Shipment.Generate();
-            orderWithShipment.Customer = _fakers.Customer.Generate();
+    [Fact]
+    public async Task Can_reassign_dependent_side_of_ZeroOrOneToOne_relationship_through_primary_endpoint()
+    {
+        // Arrange
+        Order orderWithShipment = _fakers.Order.Generate();
+        orderWithShipment.Shipment = _fakers.Shipment.Generate();
+        orderWithShipment.Customer = _fakers.Customer.Generate();
 
-            Order orderWithoutShipment = _fakers.Order.Generate();
-            orderWithoutShipment.Customer = _fakers.Customer.Generate();
+        Order orderWithoutShipment = _fakers.Order.Generate();
+        orderWithoutShipment.Customer = _fakers.Customer.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Orders.AddRange(orderWithShipment, orderWithoutShipment);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Orders.AddRange(orderWithShipment, orderWithoutShipment);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "orders",
+                id = orderWithoutShipment.StringId,
+                relationships = new
                 {
-                    type = "orders",
-                    id = orderWithoutShipment.StringId,
-                    relationships = new
+                    shipment = new
                     {
-                        shipment = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "shipments",
-                                id = orderWithShipment.Shipment.StringId
-                            }
+                            type = "shipments",
+                            id = orderWithShipment.Shipment.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/orders/{orderWithoutShipment.StringId}";
+        string route = $"/orders/{orderWithoutShipment.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Shipment shipmentInDatabase = await dbContext.Shipments.Include(shipment => shipment.Order).FirstWithIdAsync(orderWithShipment.Shipment.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Shipment shipmentInDatabase = await dbContext.Shipments.Include(shipment => shipment.Order).FirstWithIdAsync(orderWithShipment.Shipment.Id);
 
-                shipmentInDatabase.Order.Id.Should().Be(orderWithoutShipment.Id);
-            });
-        }
+            shipmentInDatabase.Order.Id.Should().Be(orderWithoutShipment.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_reassign_dependent_side_of_ZeroOrOneToOne_relationship_through_relationship_endpoint()
-        {
-            // Arrange
-            Order orderWithShipment = _fakers.Order.Generate();
-            orderWithShipment.Shipment = _fakers.Shipment.Generate();
-            orderWithShipment.Customer = _fakers.Customer.Generate();
+    [Fact]
+    public async Task Can_reassign_dependent_side_of_ZeroOrOneToOne_relationship_through_relationship_endpoint()
+    {
+        // Arrange
+        Order orderWithShipment = _fakers.Order.Generate();
+        orderWithShipment.Shipment = _fakers.Shipment.Generate();
+        orderWithShipment.Customer = _fakers.Customer.Generate();
 
-            Order orderWithoutShipment = _fakers.Order.Generate();
-            orderWithoutShipment.Customer = _fakers.Customer.Generate();
+        Order orderWithoutShipment = _fakers.Order.Generate();
+        orderWithoutShipment.Customer = _fakers.Customer.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Orders.AddRange(orderWithShipment, orderWithoutShipment);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Orders.AddRange(orderWithShipment, orderWithoutShipment);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
-                {
-                    type = "shipments",
-                    id = orderWithShipment.Shipment.StringId
-                }
-            };
+                type = "shipments",
+                id = orderWithShipment.Shipment.StringId
+            }
+        };
 
-            string route = $"/orders/{orderWithoutShipment.StringId}/relationships/shipment";
+        string route = $"/orders/{orderWithoutShipment.StringId}/relationships/shipment";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Shipment shipmentInDatabase = await dbContext.Shipments.Include(shipment => shipment.Order).FirstWithIdAsync(orderWithShipment.Shipment.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Shipment shipmentInDatabase = await dbContext.Shipments.Include(shipment => shipment.Order).FirstWithIdAsync(orderWithShipment.Shipment.Id);
 
-                shipmentInDatabase.Order.Id.Should().Be(orderWithoutShipment.Id);
-            });
-        }
+            shipmentInDatabase.Order.Id.Should().Be(orderWithoutShipment.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Order.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Order.cs
index e371b25bb5..1ad05f412b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Order.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Order.cs
@@ -2,18 +2,18 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships")]
+public sealed class Order : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Order : Identifiable<int>
-    {
-        [Attr]
-        public decimal Amount { get; set; }
+    [Attr]
+    public decimal Amount { get; set; }
 
-        [HasOne]
-        public Customer Customer { get; set; } = null!;
+    [HasOne]
+    public Customer Customer { get; set; } = null!;
 
-        [HasOne]
-        public Shipment Shipment { get; set; } = null!;
-    }
+    [HasOne]
+    public Shipment Shipment { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/OrdersController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/OrdersController.cs
deleted file mode 100644
index 47c4d47d2a..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/OrdersController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships
-{
-    public sealed class OrdersController : JsonApiController<Order, int>
-    {
-        public OrdersController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Order, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Shipment.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Shipment.cs
index aeef7e0cbf..fa84f8bd7a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Shipment.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/Shipment.cs
@@ -1,22 +1,21 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
 #pragma warning disable AV1115 // Member or local function contains the word 'and', which suggests doing multiple things
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships
+namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships")]
+public sealed class Shipment : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Shipment : Identifiable<int>
-    {
-        [Attr]
-        public string TrackAndTraceCode { get; set; } = null!;
+    [Attr]
+    public string TrackAndTraceCode { get; set; } = null!;
 
-        [Attr]
-        public DateTimeOffset ShippedAt { get; set; }
+    [Attr]
+    public DateTimeOffset ShippedAt { get; set; }
 
-        [HasOne]
-        public Order Order { get; set; } = null!;
-    }
+    [HasOne]
+    public Order Order { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/ShipmentsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/ShipmentsController.cs
deleted file mode 100644
index 0bd68b5af6..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/ShipmentsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships
-{
-    public sealed class ShipmentsController : JsonApiController<Shipment, int>
-    {
-        public ShipmentsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Shipment, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificate.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificate.cs
index e6a5b7a0e2..2cd1ff91d8 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificate.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificate.cs
@@ -1,30 +1,29 @@
-using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.AspNetCore.Authentication;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection")]
+public sealed class GiftCertificate : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class GiftCertificate : Identifiable<int>
-    {
-        private readonly ISystemClock _systemClock;
+    private readonly ISystemClock _systemClock;
 
-        [Attr]
-        public DateTimeOffset IssueDate { get; set; }
+    [Attr]
+    public DateTimeOffset IssueDate { get; set; }
 
-        [Attr(Capabilities = AttrCapabilities.AllowView)]
-        [NotMapped]
-        public bool HasExpired => IssueDate.AddYears(1) < _systemClock.UtcNow;
+    [Attr(Capabilities = AttrCapabilities.AllowView)]
+    [NotMapped]
+    public bool HasExpired => IssueDate.AddYears(1) < _systemClock.UtcNow;
 
-        [HasOne]
-        public PostOffice? Issuer { get; set; }
+    [HasOne]
+    public PostOffice? Issuer { get; set; }
 
-        public GiftCertificate(InjectionDbContext injectionDbContext)
-        {
-            _systemClock = injectionDbContext.SystemClock;
-        }
+    public GiftCertificate(InjectionDbContext injectionDbContext)
+    {
+        _systemClock = injectionDbContext.SystemClock;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificatesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificatesController.cs
deleted file mode 100644
index d51ceb542b..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/GiftCertificatesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection
-{
-    public sealed class GiftCertificatesController : JsonApiController<GiftCertificate, int>
-    {
-        public GiftCertificatesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<GiftCertificate, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionDbContext.cs
index cf8fd93d8f..6516100641 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionDbContext.cs
@@ -3,22 +3,21 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class InjectionDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class InjectionDbContext : DbContext
-    {
-        public ISystemClock SystemClock { get; }
+    public ISystemClock SystemClock { get; }
 
-        public DbSet<PostOffice> PostOffice => Set<PostOffice>();
-        public DbSet<GiftCertificate> GiftCertificates => Set<GiftCertificate>();
+    public DbSet<PostOffice> PostOffice => Set<PostOffice>();
+    public DbSet<GiftCertificate> GiftCertificates => Set<GiftCertificate>();
 
-        public InjectionDbContext(DbContextOptions<InjectionDbContext> options, ISystemClock systemClock)
-            : base(options)
-        {
-            ArgumentGuard.NotNull(systemClock, nameof(systemClock));
+    public InjectionDbContext(DbContextOptions<InjectionDbContext> options, ISystemClock systemClock)
+        : base(options)
+    {
+        ArgumentGuard.NotNull(systemClock, nameof(systemClock));
 
-            SystemClock = systemClock;
-        }
+        SystemClock = systemClock;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionFakers.cs
index 12d1f05145..6aea10c7ea 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionFakers.cs
@@ -1,4 +1,3 @@
-using System;
 using Bogus;
 using JsonApiDotNetCore;
 using Microsoft.Extensions.DependencyInjection;
@@ -7,42 +6,41 @@
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection;
+
+internal sealed class InjectionFakers : FakerContainer
 {
-    internal sealed class InjectionFakers : FakerContainer
+    private readonly IServiceProvider _serviceProvider;
+
+    private readonly Lazy<Faker<PostOffice>> _lazyPostOfficeFaker;
+    private readonly Lazy<Faker<GiftCertificate>> _lazyGiftCertificateFaker;
+
+    public Faker<PostOffice> PostOffice => _lazyPostOfficeFaker.Value;
+    public Faker<GiftCertificate> GiftCertificate => _lazyGiftCertificateFaker.Value;
+
+    public InjectionFakers(IServiceProvider serviceProvider)
+    {
+        ArgumentGuard.NotNull(serviceProvider, nameof(serviceProvider));
+
+        _serviceProvider = serviceProvider;
+
+        _lazyPostOfficeFaker = new Lazy<Faker<PostOffice>>(() =>
+            new Faker<PostOffice>()
+                .UseSeed(GetFakerSeed())
+                .CustomInstantiator(_ => new PostOffice(ResolveDbContext()))
+                .RuleFor(postOffice => postOffice.Address, faker => faker.Address.FullAddress()));
+
+        _lazyGiftCertificateFaker = new Lazy<Faker<GiftCertificate>>(() =>
+            new Faker<GiftCertificate>()
+                .UseSeed(GetFakerSeed())
+                .CustomInstantiator(_ => new GiftCertificate(ResolveDbContext()))
+                .RuleFor(giftCertificate => giftCertificate.IssueDate, faker => faker.Date.PastOffset()
+                    .TruncateToWholeMilliseconds()));
+    }
+
+    private InjectionDbContext ResolveDbContext()
     {
-        private readonly IServiceProvider _serviceProvider;
-
-        private readonly Lazy<Faker<PostOffice>> _lazyPostOfficeFaker;
-        private readonly Lazy<Faker<GiftCertificate>> _lazyGiftCertificateFaker;
-
-        public Faker<PostOffice> PostOffice => _lazyPostOfficeFaker.Value;
-        public Faker<GiftCertificate> GiftCertificate => _lazyGiftCertificateFaker.Value;
-
-        public InjectionFakers(IServiceProvider serviceProvider)
-        {
-            ArgumentGuard.NotNull(serviceProvider, nameof(serviceProvider));
-
-            _serviceProvider = serviceProvider;
-
-            _lazyPostOfficeFaker = new Lazy<Faker<PostOffice>>(() =>
-                new Faker<PostOffice>()
-                    .UseSeed(GetFakerSeed())
-                    .CustomInstantiator(_ => new PostOffice(ResolveDbContext()))
-                    .RuleFor(postOffice => postOffice.Address, faker => faker.Address.FullAddress()));
-
-            _lazyGiftCertificateFaker = new Lazy<Faker<GiftCertificate>>(() =>
-                new Faker<GiftCertificate>()
-                    .UseSeed(GetFakerSeed())
-                    .CustomInstantiator(_ => new GiftCertificate(ResolveDbContext()))
-                    .RuleFor(giftCertificate => giftCertificate.IssueDate, faker => faker.Date.PastOffset()
-                        .TruncateToWholeMilliseconds()));
-        }
-
-        private InjectionDbContext ResolveDbContext()
-        {
-            using IServiceScope scope = _serviceProvider.CreateScope();
-            return scope.ServiceProvider.GetRequiredService<InjectionDbContext>();
-        }
+        using IServiceScope scope = _serviceProvider.CreateScope();
+        return scope.ServiceProvider.GetRequiredService<InjectionDbContext>();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOffice.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOffice.cs
index 5ca24b69b2..da163d9cee 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOffice.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOffice.cs
@@ -1,37 +1,35 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.AspNetCore.Authentication;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection")]
+public sealed class PostOffice : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class PostOffice : Identifiable<int>
-    {
-        private readonly ISystemClock _systemClock;
+    private readonly ISystemClock _systemClock;
 
-        [Attr]
-        public string Address { get; set; } = null!;
+    [Attr]
+    public string Address { get; set; } = null!;
 
-        [Attr(Capabilities = AttrCapabilities.AllowView)]
-        [NotMapped]
-        public bool IsOpen => IsWithinOperatingHours();
+    [Attr(Capabilities = AttrCapabilities.AllowView)]
+    [NotMapped]
+    public bool IsOpen => IsWithinOperatingHours();
 
-        [HasMany]
-        public IList<GiftCertificate> GiftCertificates { get; set; } = new List<GiftCertificate>();
+    [HasMany]
+    public IList<GiftCertificate> GiftCertificates { get; set; } = new List<GiftCertificate>();
 
-        public PostOffice(InjectionDbContext injectionDbContext)
-        {
-            _systemClock = injectionDbContext.SystemClock;
-        }
+    public PostOffice(InjectionDbContext injectionDbContext)
+    {
+        _systemClock = injectionDbContext.SystemClock;
+    }
 
-        private bool IsWithinOperatingHours()
-        {
-            DateTimeOffset currentTime = _systemClock.UtcNow;
-            return currentTime.DayOfWeek is >= DayOfWeek.Monday and <= DayOfWeek.Friday && currentTime.Hour is >= 9 and <= 17;
-        }
+    private bool IsWithinOperatingHours()
+    {
+        DateTimeOffset currentTime = _systemClock.UtcNow;
+        return currentTime.DayOfWeek is >= DayOfWeek.Monday and <= DayOfWeek.Friday && currentTime.Hour is >= 9 and <= 17;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOfficesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOfficesController.cs
deleted file mode 100644
index 5d0bbb5b0f..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/PostOfficesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection
-{
-    public sealed class PostOfficesController : JsonApiController<PostOffice, int>
-    {
-        public PostOfficesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<PostOffice, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/ResourceInjectionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/ResourceInjectionTests.cs
index b744dfa690..f7a92ed7d9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/ResourceInjectionTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/ResourceInjectionTests.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
-using FluentAssertions.Common;
 using FluentAssertions.Extensions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.AspNetCore.Authentication;
@@ -13,367 +8,360 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection;
+
+public sealed class ResourceInjectionTests : IClassFixture<IntegrationTestContext<TestableStartup<InjectionDbContext>, InjectionDbContext>>
 {
-    public sealed class ResourceInjectionTests : IClassFixture<IntegrationTestContext<TestableStartup<InjectionDbContext>, InjectionDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<InjectionDbContext>, InjectionDbContext> _testContext;
+    private readonly InjectionFakers _fakers;
+
+    public ResourceInjectionTests(IntegrationTestContext<TestableStartup<InjectionDbContext>, InjectionDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<InjectionDbContext>, InjectionDbContext> _testContext;
-        private readonly InjectionFakers _fakers;
+        _testContext = testContext;
+
+        testContext.UseController<GiftCertificatesController>();
+        testContext.UseController<PostOfficesController>();
 
-        public ResourceInjectionTests(IntegrationTestContext<TestableStartup<InjectionDbContext>, InjectionDbContext> testContext)
+        testContext.ConfigureServicesBeforeStartup(services =>
         {
-            _testContext = testContext;
+            services.AddSingleton<ISystemClock, FrozenSystemClock>();
+        });
 
-            testContext.UseController<GiftCertificatesController>();
-            testContext.UseController<PostOfficesController>();
+        _fakers = new InjectionFakers(testContext.Factory.Services);
+    }
 
-            testContext.ConfigureServicesBeforeStartup(services =>
-            {
-                services.AddSingleton<ISystemClock, FrozenSystemClock>();
-            });
+    [Fact]
+    public async Task Can_get_resource_by_ID()
+    {
+        // Arrange
+        var clock = (FrozenSystemClock)_testContext.Factory.Services.GetRequiredService<ISystemClock>();
+        clock.UtcNow = 27.January(2021).AsUtc();
 
-            _fakers = new InjectionFakers(testContext.Factory.Services);
-        }
+        GiftCertificate certificate = _fakers.GiftCertificate.Generate();
+        certificate.IssueDate = 28.January(2020).AsUtc();
 
-        [Fact]
-        public async Task Can_get_resource_by_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var clock = (FrozenSystemClock)_testContext.Factory.Services.GetRequiredService<ISystemClock>();
-            clock.UtcNow = 27.January(2021);
-
-            GiftCertificate certificate = _fakers.GiftCertificate.Generate();
-            certificate.IssueDate = 28.January(2020);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.GiftCertificates.Add(certificate);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.GiftCertificates.Add(certificate);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/giftCertificates/{certificate.StringId}";
+        string route = $"/giftCertificates/{certificate.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(certificate.StringId);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(certificate.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("issueDate").With(value => value.Should().Be(certificate.IssueDate));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("hasExpired").With(value => value.Should().Be(false));
+    }
 
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("issueDate")
-                .With(value => value.As<DateTimeOffset>().Should().BeCloseTo(certificate.IssueDate));
+    [Fact]
+    public async Task Can_filter_resources_by_ID()
+    {
+        // Arrange
+        var clock = (FrozenSystemClock)_testContext.Factory.Services.GetRequiredService<ISystemClock>();
+        clock.UtcNow = 27.January(2021).At(13, 53).AsUtc();
 
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("hasExpired").With(value => value.Should().Be(false));
-        }
+        List<PostOffice> postOffices = _fakers.PostOffice.Generate(2);
 
-        [Fact]
-        public async Task Can_filter_resources_by_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var clock = (FrozenSystemClock)_testContext.Factory.Services.GetRequiredService<ISystemClock>();
-            clock.UtcNow = 27.January(2021).At(13, 53);
+            await dbContext.ClearTableAsync<PostOffice>();
+            dbContext.PostOffice.AddRange(postOffices);
+            await dbContext.SaveChangesAsync();
+        });
 
-            List<PostOffice> postOffices = _fakers.PostOffice.Generate(2);
+        string route = $"/postOffices?filter=equals(id,'{postOffices[1].StringId}')";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<PostOffice>();
-                dbContext.PostOffice.AddRange(postOffices);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/postOffices?filter=equals(id,'{postOffices[1].StringId}')";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(postOffices[1].StringId);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("address").With(value => value.Should().Be(postOffices[1].Address));
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("isOpen").With(value => value.Should().Be(true));
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    [Fact]
+    public async Task Can_get_secondary_resource_with_fieldset()
+    {
+        // Arrange
+        var clock = (FrozenSystemClock)_testContext.Factory.Services.GetRequiredService<ISystemClock>();
+        clock.UtcNow = 27.January(2021).At(13, 53).AsUtc();
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(postOffices[1].StringId);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("address").With(value => value.Should().Be(postOffices[1].Address));
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("isOpen").With(value => value.Should().Be(true));
-        }
+        GiftCertificate certificate = _fakers.GiftCertificate.Generate();
+        certificate.Issuer = _fakers.PostOffice.Generate();
 
-        [Fact]
-        public async Task Can_get_secondary_resource_with_fieldset()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var clock = (FrozenSystemClock)_testContext.Factory.Services.GetRequiredService<ISystemClock>();
-            clock.UtcNow = 27.January(2021).At(13, 53);
-
-            GiftCertificate certificate = _fakers.GiftCertificate.Generate();
-            certificate.Issuer = _fakers.PostOffice.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.GiftCertificates.Add(certificate);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.GiftCertificates.Add(certificate);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/giftCertificates/{certificate.StringId}/issuer?fields[postOffices]=id,isOpen";
+        string route = $"/giftCertificates/{certificate.StringId}/issuer?fields[postOffices]=id,isOpen";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(certificate.Issuer.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isOpen").With(value => value.Should().Be(true));
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(certificate.Issuer.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isOpen").With(value => value.Should().Be(true));
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_ToOne_relationship_and_include()
-        {
-            // Arrange
-            var clock = (FrozenSystemClock)_testContext.Factory.Services.GetRequiredService<ISystemClock>();
-            clock.UtcNow = 19.March(1998).At(6, 34);
+    [Fact]
+    public async Task Can_create_resource_with_ToOne_relationship_and_include()
+    {
+        // Arrange
+        var clock = (FrozenSystemClock)_testContext.Factory.Services.GetRequiredService<ISystemClock>();
+        clock.UtcNow = 19.March(1998).At(6, 34).AsUtc();
 
-            PostOffice existingOffice = _fakers.PostOffice.Generate();
+        PostOffice existingOffice = _fakers.PostOffice.Generate();
 
-            var newIssueDate = 18.March(1997).ToDateTimeOffset();
+        DateTimeOffset newIssueDate = 18.March(1997).AsUtc();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PostOffice.Add(existingOffice);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.PostOffice.Add(existingOffice);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "giftCertificates",
+                attributes = new
                 {
-                    type = "giftCertificates",
-                    attributes = new
-                    {
-                        issueDate = newIssueDate
-                    },
-                    relationships = new
+                    issueDate = newIssueDate
+                },
+                relationships = new
+                {
+                    issuer = new
                     {
-                        issuer = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "postOffices",
-                                id = existingOffice.StringId
-                            }
+                            type = "postOffices",
+                            id = existingOffice.StringId
                         }
                     }
                 }
-            };
-
-            const string route = "/giftCertificates?include=issuer";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+            }
+        };
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        const string route = "/giftCertificates?include=issuer";
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("issueDate")
-                .With(value => value.As<DateTimeOffset>().Should().BeCloseTo(newIssueDate));
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("hasExpired").With(value => value.Should().Be(true));
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("issueDate").With(value => value.Should().Be(newIssueDate));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("hasExpired").With(value => value.Should().Be(true));
 
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("issuer").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Id.Should().Be(existingOffice.StringId);
-            });
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("issuer").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Id.Should().Be(existingOffice.StringId);
+        });
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].With(resource =>
-            {
-                resource.Id.Should().Be(existingOffice.StringId);
-                resource.Attributes.ShouldContainKey("address").With(value => value.Should().Be(existingOffice.Address));
-                resource.Attributes.ShouldContainKey("isOpen").With(value => value.Should().Be(false));
-            });
+        responseDocument.Included[0].With(resource =>
+        {
+            resource.Id.Should().Be(existingOffice.StringId);
+            resource.Attributes.ShouldContainKey("address").With(value => value.Should().Be(existingOffice.Address));
+            resource.Attributes.ShouldContainKey("isOpen").With(value => value.Should().Be(false));
+        });
 
-            int newCertificateId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newCertificateId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                GiftCertificate certificateInDatabase = await dbContext.GiftCertificates
-                    .Include(certificate => certificate.Issuer).FirstWithIdAsync(newCertificateId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            GiftCertificate certificateInDatabase = await dbContext.GiftCertificates
+                .Include(certificate => certificate.Issuer).FirstWithIdAsync(newCertificateId);
 
-                certificateInDatabase.IssueDate.Should().Be(newIssueDate);
+            certificateInDatabase.IssueDate.Should().Be(newIssueDate);
 
-                certificateInDatabase.Issuer.ShouldNotBeNull();
-                certificateInDatabase.Issuer.Id.Should().Be(existingOffice.Id);
-            });
-        }
+            certificateInDatabase.Issuer.ShouldNotBeNull();
+            certificateInDatabase.Issuer.Id.Should().Be(existingOffice.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_ToMany_relationship()
-        {
-            // Arrange
-            var clock = (FrozenSystemClock)_testContext.Factory.Services.GetRequiredService<ISystemClock>();
-            clock.UtcNow = 19.March(1998).At(6, 34);
+    [Fact]
+    public async Task Can_update_resource_with_ToMany_relationship()
+    {
+        // Arrange
+        var clock = (FrozenSystemClock)_testContext.Factory.Services.GetRequiredService<ISystemClock>();
+        clock.UtcNow = 19.March(1998).At(6, 34).AsUtc();
 
-            PostOffice existingOffice = _fakers.PostOffice.Generate();
-            existingOffice.GiftCertificates = _fakers.GiftCertificate.Generate(1);
+        PostOffice existingOffice = _fakers.PostOffice.Generate();
+        existingOffice.GiftCertificates = _fakers.GiftCertificate.Generate(1);
 
-            string newAddress = _fakers.PostOffice.Generate().Address;
+        string newAddress = _fakers.PostOffice.Generate().Address;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PostOffice.Add(existingOffice);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.PostOffice.Add(existingOffice);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "postOffices",
+                id = existingOffice.StringId,
+                attributes = new
                 {
-                    type = "postOffices",
-                    id = existingOffice.StringId,
-                    attributes = new
-                    {
-                        address = newAddress
-                    },
-                    relationships = new
+                    address = newAddress
+                },
+                relationships = new
+                {
+                    giftCertificates = new
                     {
-                        giftCertificates = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "giftCertificates",
-                                    id = existingOffice.GiftCertificates[0].StringId
-                                }
+                                type = "giftCertificates",
+                                id = existingOffice.GiftCertificates[0].StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/postOffices/{existingOffice.StringId}";
+        string route = $"/postOffices/{existingOffice.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                PostOffice officeInDatabase = await dbContext.PostOffice.Include(postOffice => postOffice.GiftCertificates).FirstWithIdAsync(existingOffice.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            PostOffice officeInDatabase = await dbContext.PostOffice.Include(postOffice => postOffice.GiftCertificates).FirstWithIdAsync(existingOffice.Id);
+
+            officeInDatabase.Address.Should().Be(newAddress);
 
-                officeInDatabase.Address.Should().Be(newAddress);
+            officeInDatabase.GiftCertificates.ShouldHaveCount(1);
+            officeInDatabase.GiftCertificates[0].Id.Should().Be(existingOffice.GiftCertificates[0].Id);
+        });
+    }
 
-                officeInDatabase.GiftCertificates.ShouldHaveCount(1);
-                officeInDatabase.GiftCertificates[0].Id.Should().Be(existingOffice.GiftCertificates[0].Id);
-            });
-        }
+    [Fact]
+    public async Task Can_delete_resource()
+    {
+        // Arrange
+        PostOffice existingOffice = _fakers.PostOffice.Generate();
 
-        [Fact]
-        public async Task Can_delete_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            PostOffice existingOffice = _fakers.PostOffice.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.PostOffice.Add(existingOffice);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.PostOffice.Add(existingOffice);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/postOffices/{existingOffice.StringId}";
+        string route = $"/postOffices/{existingOffice.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                PostOffice? officeInDatabase = await dbContext.PostOffice.FirstWithIdOrDefaultAsync(existingOffice.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            PostOffice? officeInDatabase = await dbContext.PostOffice.FirstWithIdOrDefaultAsync(existingOffice.Id);
 
-                officeInDatabase.Should().BeNull();
-            });
-        }
+            officeInDatabase.Should().BeNull();
+        });
+    }
 
-        [Fact]
-        public async Task Cannot_delete_unknown_resource()
-        {
-            // Arrange
-            string officeId = Unknown.StringId.For<PostOffice, int>();
+    [Fact]
+    public async Task Cannot_delete_unknown_resource()
+    {
+        // Arrange
+        string officeId = Unknown.StringId.For<PostOffice, int>();
 
-            string route = $"/postOffices/{officeId}";
+        string route = $"/postOffices/{officeId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'postOffices' with ID '{officeId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'postOffices' with ID '{officeId}' does not exist.");
+    }
 
-        [Fact]
-        public async Task Can_add_to_ToMany_relationship()
-        {
-            // Arrange
-            PostOffice existingOffice = _fakers.PostOffice.Generate();
-            existingOffice.GiftCertificates = _fakers.GiftCertificate.Generate(1);
+    [Fact]
+    public async Task Can_add_to_ToMany_relationship()
+    {
+        // Arrange
+        PostOffice existingOffice = _fakers.PostOffice.Generate();
+        existingOffice.GiftCertificates = _fakers.GiftCertificate.Generate(1);
 
-            GiftCertificate existingCertificate = _fakers.GiftCertificate.Generate();
+        GiftCertificate existingCertificate = _fakers.GiftCertificate.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingOffice, existingCertificate);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingOffice, existingCertificate);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "giftCertificates",
-                        id = existingCertificate.StringId
-                    }
+                    type = "giftCertificates",
+                    id = existingCertificate.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/postOffices/{existingOffice.StringId}/relationships/giftCertificates";
+        string route = $"/postOffices/{existingOffice.StringId}/relationships/giftCertificates";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                PostOffice officeInDatabase = await dbContext.PostOffice.Include(postOffice => postOffice.GiftCertificates).FirstWithIdAsync(existingOffice.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            PostOffice officeInDatabase = await dbContext.PostOffice.Include(postOffice => postOffice.GiftCertificates).FirstWithIdAsync(existingOffice.Id);
 
-                officeInDatabase.GiftCertificates.ShouldHaveCount(2);
-            });
-        }
+            officeInDatabase.GiftCertificates.ShouldHaveCount(2);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitionExtensibilityPoints.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitionExtensibilityPoints.cs
index 212a92cd75..988489f651 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitionExtensibilityPoints.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitionExtensibilityPoints.cs
@@ -1,42 +1,40 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests
+namespace JsonApiDotNetCoreTests.IntegrationTests;
+
+/// <summary>
+/// Lists the various extensibility points on <see cref="IResourceDefinition{TResource,TId}" />.
+/// </summary>
+[Flags]
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public enum ResourceDefinitionExtensibilityPoints
 {
-    /// <summary>
-    /// Lists the various extensibility points on <see cref="IResourceDefinition{TResource,TId}" />.
-    /// </summary>
-    [Flags]
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public enum ResourceDefinitionExtensibilityPoints
-    {
-        None = 0,
-        OnApplyIncludes = 1,
-        OnApplyFilter = 1 << 1,
-        OnApplySort = 1 << 2,
-        OnApplyPagination = 1 << 3,
-        OnApplySparseFieldSet = 1 << 4,
-        OnRegisterQueryableHandlersForQueryStringParameters = 1 << 5,
-        GetMeta = 1 << 6,
-        OnPrepareWriteAsync = 1 << 7,
-        OnSetToOneRelationshipAsync = 1 << 8,
-        OnSetToManyRelationshipAsync = 1 << 9,
-        OnAddToRelationshipAsync = 1 << 10,
-        OnRemoveFromRelationshipAsync = 1 << 11,
-        OnWritingAsync = 1 << 12,
-        OnWriteSucceededAsync = 1 << 13,
-        OnDeserialize = 1 << 14,
-        OnSerialize = 1 << 15,
+    None = 0,
+    OnApplyIncludes = 1,
+    OnApplyFilter = 1 << 1,
+    OnApplySort = 1 << 2,
+    OnApplyPagination = 1 << 3,
+    OnApplySparseFieldSet = 1 << 4,
+    OnRegisterQueryableHandlersForQueryStringParameters = 1 << 5,
+    GetMeta = 1 << 6,
+    OnPrepareWriteAsync = 1 << 7,
+    OnSetToOneRelationshipAsync = 1 << 8,
+    OnSetToManyRelationshipAsync = 1 << 9,
+    OnAddToRelationshipAsync = 1 << 10,
+    OnRemoveFromRelationshipAsync = 1 << 11,
+    OnWritingAsync = 1 << 12,
+    OnWriteSucceededAsync = 1 << 13,
+    OnDeserialize = 1 << 14,
+    OnSerialize = 1 << 15,
 
-        Reading = OnApplyIncludes | OnApplyFilter | OnApplySort | OnApplyPagination | OnApplySparseFieldSet |
-            OnRegisterQueryableHandlersForQueryStringParameters | GetMeta,
+    Reading = OnApplyIncludes | OnApplyFilter | OnApplySort | OnApplyPagination | OnApplySparseFieldSet | OnRegisterQueryableHandlersForQueryStringParameters |
+        GetMeta,
 
-        Writing = OnPrepareWriteAsync | OnSetToOneRelationshipAsync | OnSetToManyRelationshipAsync | OnAddToRelationshipAsync | OnRemoveFromRelationshipAsync |
-            OnWritingAsync | OnWriteSucceededAsync,
+    Writing = OnPrepareWriteAsync | OnSetToOneRelationshipAsync | OnSetToManyRelationshipAsync | OnAddToRelationshipAsync | OnRemoveFromRelationshipAsync |
+        OnWritingAsync | OnWriteSucceededAsync,
 
-        Serialization = OnDeserialize | OnSerialize,
+    Serialization = OnDeserialize | OnSerialize,
 
-        All = Reading | Writing | Serialization
-    }
+    All = Reading | Writing | Serialization
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitionHitCounter.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitionHitCounter.cs
index 14c0fdaf9e..14a1f54e37 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitionHitCounter.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitionHitCounter.cs
@@ -1,26 +1,22 @@
-using System;
-using System.Collections.Generic;
 using JsonApiDotNetCore.Resources;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests
+namespace JsonApiDotNetCoreTests.IntegrationTests;
+
+/// <summary>
+/// Used to keep track of invocations on <see cref="IResourceDefinition{TResource,TId}" /> callback methods.
+/// </summary>
+public sealed class ResourceDefinitionHitCounter
 {
-    /// <summary>
-    /// Used to keep track of invocations on <see cref="IResourceDefinition{TResource,TId}" /> callback methods.
-    /// </summary>
-    public sealed class ResourceDefinitionHitCounter
-    {
-        internal IList<(Type, ResourceDefinitionExtensibilityPoints)> HitExtensibilityPoints { get; } =
-            new List<(Type, ResourceDefinitionExtensibilityPoints)>();
+    internal IList<(Type, ResourceDefinitionExtensibilityPoints)> HitExtensibilityPoints { get; } = new List<(Type, ResourceDefinitionExtensibilityPoints)>();
 
-        internal void TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints extensibilityPoint)
-            where TResource : IIdentifiable
-        {
-            HitExtensibilityPoints.Add((typeof(TResource), extensibilityPoint));
-        }
+    internal void TrackInvocation<TResource>(ResourceDefinitionExtensibilityPoints extensibilityPoint)
+        where TResource : IIdentifiable
+    {
+        HitExtensibilityPoints.Add((typeof(TResource), extensibilityPoint));
+    }
 
-        internal void Reset()
-        {
-            HitExtensibilityPoints.Clear();
-        }
+    internal void Reset()
+    {
+        HitExtensibilityPoints.Clear();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/IClientSettingsProvider.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/IClientSettingsProvider.cs
index ef79f15157..65f32a4f65 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/IClientSettingsProvider.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/IClientSettingsProvider.cs
@@ -1,9 +1,8 @@
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
+
+public interface IClientSettingsProvider
 {
-    public interface IClientSettingsProvider
-    {
-        bool IsIncludePlanetMoonsBlocked { get; }
-        bool ArePlanetsWithPrivateNameHidden { get; }
-        bool IsMoonOrbitingPlanetAutoIncluded { get; }
-    }
+    bool IsIncludePlanetMoonsBlocked { get; }
+    bool ArePlanetsWithPrivateNameHidden { get; }
+    bool IsMoonOrbitingPlanetAutoIncluded { get; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Moon.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Moon.cs
index 67de51806a..0a394c6d17 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Moon.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Moon.cs
@@ -2,18 +2,18 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading")]
+public sealed class Moon : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Moon : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [Attr]
-        public decimal SolarRadius { get; set; }
+    [Attr]
+    public decimal SolarRadius { get; set; }
 
-        [HasOne]
-        public Planet OrbitsAround { get; set; } = null!;
-    }
+    [HasOne]
+    public Planet OrbitsAround { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonDefinition.cs
index 550a733739..7ef545b462 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonDefinition.cs
@@ -1,5 +1,4 @@
 using System.Collections.Immutable;
-using System.Linq;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
@@ -7,53 +6,52 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class MoonDefinition : HitCountingResourceDefinition<Moon, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class MoonDefinition : HitCountingResourceDefinition<Moon, int>
-    {
-        private readonly IClientSettingsProvider _clientSettingsProvider;
+    private readonly IClientSettingsProvider _clientSettingsProvider;
 
-        protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Reading;
+    protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Reading;
 
-        public MoonDefinition(IResourceGraph resourceGraph, IClientSettingsProvider clientSettingsProvider, ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, hitCounter)
-        {
-            // This constructor will be resolved from the container, which means
-            // you can take on any dependency that is also defined in the container.
+    public MoonDefinition(IResourceGraph resourceGraph, IClientSettingsProvider clientSettingsProvider, ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, hitCounter)
+    {
+        // This constructor will be resolved from the container, which means
+        // you can take on any dependency that is also defined in the container.
 
-            _clientSettingsProvider = clientSettingsProvider;
-        }
+        _clientSettingsProvider = clientSettingsProvider;
+    }
+
+    public override IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes)
+    {
+        base.OnApplyIncludes(existingIncludes);
 
-        public override IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes)
+        if (!_clientSettingsProvider.IsMoonOrbitingPlanetAutoIncluded ||
+            existingIncludes.Any(include => include.Relationship.Property.Name == nameof(Moon.OrbitsAround)))
         {
-            base.OnApplyIncludes(existingIncludes);
+            return existingIncludes;
+        }
 
-            if (!_clientSettingsProvider.IsMoonOrbitingPlanetAutoIncluded ||
-                existingIncludes.Any(include => include.Relationship.Property.Name == nameof(Moon.OrbitsAround)))
-            {
-                return existingIncludes;
-            }
+        RelationshipAttribute orbitsAroundRelationship = ResourceType.GetRelationshipByPropertyName(nameof(Moon.OrbitsAround));
 
-            RelationshipAttribute orbitsAroundRelationship = ResourceType.GetRelationshipByPropertyName(nameof(Moon.OrbitsAround));
+        return existingIncludes.Add(new IncludeElementExpression(orbitsAroundRelationship));
+    }
 
-            return existingIncludes.Add(new IncludeElementExpression(orbitsAroundRelationship));
-        }
+    public override QueryStringParameterHandlers<Moon> OnRegisterQueryableHandlersForQueryStringParameters()
+    {
+        base.OnRegisterQueryableHandlersForQueryStringParameters();
 
-        public override QueryStringParameterHandlers<Moon> OnRegisterQueryableHandlersForQueryStringParameters()
+        return new QueryStringParameterHandlers<Moon>
         {
-            base.OnRegisterQueryableHandlersForQueryStringParameters();
-
-            return new QueryStringParameterHandlers<Moon>
-            {
-                ["isLargerThanTheSun"] = FilterByRadius
-            };
-        }
+            ["isLargerThanTheSun"] = FilterByRadius
+        };
+    }
 
-        private static IQueryable<Moon> FilterByRadius(IQueryable<Moon> source, StringValues parameterValue)
-        {
-            bool isFilterOnLargerThan = bool.Parse(parameterValue);
-            return isFilterOnLargerThan ? source.Where(moon => moon.SolarRadius > 1m) : source.Where(moon => moon.SolarRadius <= 1m);
-        }
+    private static IQueryable<Moon> FilterByRadius(IQueryable<Moon> source, StringValues parameterValue)
+    {
+        bool isFilterOnLargerThan = bool.Parse(parameterValue);
+        return isFilterOnLargerThan ? source.Where(moon => moon.SolarRadius > 1m) : source.Where(moon => moon.SolarRadius <= 1m);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonsController.cs
deleted file mode 100644
index d498a8630b..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/MoonsController.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
-{
-    public sealed class MoonsController : JsonApiController<Moon, int>
-    {
-        public MoonsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<Moon, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Planet.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Planet.cs
index 21f196935a..531ee6cb8c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Planet.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Planet.cs
@@ -1,29 +1,28 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading")]
+public sealed class Planet : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Planet : Identifiable<int>
-    {
-        [Attr]
-        public string PublicName { get; set; } = null!;
+    [Attr]
+    public string PublicName { get; set; } = null!;
 
-        [Attr]
-        public string? PrivateName { get; set; }
+    [Attr]
+    public string? PrivateName { get; set; }
 
-        [Attr]
-        public bool HasRingSystem { get; set; }
+    [Attr]
+    public bool HasRingSystem { get; set; }
 
-        [Attr]
-        public decimal SolarMass { get; set; }
+    [Attr]
+    public decimal SolarMass { get; set; }
 
-        [HasMany]
-        public ISet<Moon> Moons { get; set; } = new HashSet<Moon>();
+    [HasMany]
+    public ISet<Moon> Moons { get; set; } = new HashSet<Moon>();
 
-        [HasOne]
-        public Star? BelongsTo { get; set; }
-    }
+    [HasOne]
+    public Star? BelongsTo { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetDefinition.cs
index d7152bf962..70f77ecb24 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetDefinition.cs
@@ -1,5 +1,4 @@
 using System.Collections.Immutable;
-using System.Linq;
 using System.Net;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
@@ -8,55 +7,53 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using JsonApiDotNetCore.Serialization.Objects;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class PlanetDefinition : HitCountingResourceDefinition<Planet, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class PlanetDefinition : HitCountingResourceDefinition<Planet, int>
-    {
-        private readonly IClientSettingsProvider _clientSettingsProvider;
+    private readonly IClientSettingsProvider _clientSettingsProvider;
 
-        protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Reading;
+    protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Reading;
 
-        public PlanetDefinition(IResourceGraph resourceGraph, IClientSettingsProvider clientSettingsProvider, ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, hitCounter)
-        {
-            // This constructor will be resolved from the container, which means
-            // you can take on any dependency that is also defined in the container.
+    public PlanetDefinition(IResourceGraph resourceGraph, IClientSettingsProvider clientSettingsProvider, ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, hitCounter)
+    {
+        // This constructor will be resolved from the container, which means
+        // you can take on any dependency that is also defined in the container.
 
-            _clientSettingsProvider = clientSettingsProvider;
-        }
+        _clientSettingsProvider = clientSettingsProvider;
+    }
 
-        public override IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes)
-        {
-            base.OnApplyIncludes(existingIncludes);
+    public override IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes)
+    {
+        base.OnApplyIncludes(existingIncludes);
 
-            if (_clientSettingsProvider.IsIncludePlanetMoonsBlocked &&
-                existingIncludes.Any(include => include.Relationship.Property.Name == nameof(Planet.Moons)))
+        if (_clientSettingsProvider.IsIncludePlanetMoonsBlocked && existingIncludes.Any(include => include.Relationship.Property.Name == nameof(Planet.Moons)))
+        {
+            throw new JsonApiException(new ErrorObject(HttpStatusCode.BadRequest)
             {
-                throw new JsonApiException(new ErrorObject(HttpStatusCode.BadRequest)
-                {
-                    Title = "Including moons is not permitted."
-                });
-            }
-
-            return existingIncludes;
+                Title = "Including moons is not permitted."
+            });
         }
 
-        public override FilterExpression? OnApplyFilter(FilterExpression? existingFilter)
-        {
-            base.OnApplyFilter(existingFilter);
+        return existingIncludes;
+    }
 
-            if (_clientSettingsProvider.ArePlanetsWithPrivateNameHidden)
-            {
-                AttrAttribute privateNameAttribute = ResourceType.GetAttributeByPropertyName(nameof(Planet.PrivateName));
+    public override FilterExpression? OnApplyFilter(FilterExpression? existingFilter)
+    {
+        base.OnApplyFilter(existingFilter);
 
-                FilterExpression hasNoPrivateName = new ComparisonExpression(ComparisonOperator.Equals, new ResourceFieldChainExpression(privateNameAttribute),
-                    NullConstantExpression.Instance);
+        if (_clientSettingsProvider.ArePlanetsWithPrivateNameHidden)
+        {
+            AttrAttribute privateNameAttribute = ResourceType.GetAttributeByPropertyName(nameof(Planet.PrivateName));
 
-                return LogicalExpression.Compose(LogicalOperator.And, hasNoPrivateName, existingFilter);
-            }
+            FilterExpression hasNoPrivateName = new ComparisonExpression(ComparisonOperator.Equals, new ResourceFieldChainExpression(privateNameAttribute),
+                NullConstantExpression.Instance);
 
-            return existingFilter;
+            return LogicalExpression.Compose(LogicalOperator.And, hasNoPrivateName, existingFilter);
         }
+
+        return existingFilter;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetsController.cs
deleted file mode 100644
index ec8a670592..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/PlanetsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
-{
-    public sealed class PlanetsController : JsonApiController<Planet, int>
-    {
-        public PlanetsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Planet, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
index ea8971d6f0..d6b97d556a 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/ResourceDefinitionReadTests.cs
@@ -1,9 +1,5 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -11,870 +7,869 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
+
+public sealed class ResourceDefinitionReadTests : IClassFixture<IntegrationTestContext<TestableStartup<UniverseDbContext>, UniverseDbContext>>
 {
-    public sealed class ResourceDefinitionReadTests : IClassFixture<IntegrationTestContext<TestableStartup<UniverseDbContext>, UniverseDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<UniverseDbContext>, UniverseDbContext> _testContext;
+    private readonly UniverseFakers _fakers = new();
+
+    public ResourceDefinitionReadTests(IntegrationTestContext<TestableStartup<UniverseDbContext>, UniverseDbContext> testContext)
+    {
+        _testContext = testContext;
+
+        testContext.UseController<StarsController>();
+        testContext.UseController<PlanetsController>();
+        testContext.UseController<MoonsController>();
+
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddResourceDefinition<StarDefinition>();
+            services.AddResourceDefinition<PlanetDefinition>();
+            services.AddResourceDefinition<MoonDefinition>();
+
+            services.AddSingleton<IClientSettingsProvider, TestClientSettingsProvider>();
+            services.AddSingleton<ResourceDefinitionHitCounter>();
+        });
+
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeTotalResourceCount = true;
+
+        var settingsProvider = (TestClientSettingsProvider)testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
+        settingsProvider.ResetToDefaults();
+
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        hitCounter.Reset();
+    }
+
+    [Fact]
+    public async Task Include_from_resource_definition_is_blocked()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
+        settingsProvider.BlockIncludePlanetMoons();
+
+        Planet planet = _fakers.Planet.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Planet>();
+            dbContext.Planets.Add(planet);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/planets?include=moons";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Including moons is not permitted.");
+        error.Detail.Should().BeNull();
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Include_from_resource_definition_is_added()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
+        settingsProvider.AutoIncludeOrbitingPlanetForMoons();
+
+        Moon moon = _fakers.Moon.Generate();
+        moon.OrbitsAround = _fakers.Planet.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Moons.Add(moon);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/moons/{moon.StringId}";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+
+        responseDocument.Data.SingleValue.Relationships.ShouldContainKey("orbitsAround").With(value =>
+        {
+            value.ShouldNotBeNull();
+            value.Data.SingleValue.ShouldNotBeNull();
+            value.Data.SingleValue.Type.Should().Be("planets");
+            value.Data.SingleValue.Id.Should().Be(moon.OrbitsAround.StringId);
+        });
+
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("planets");
+        responseDocument.Included[0].Id.Should().Be(moon.OrbitsAround.StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("publicName").With(value => value.Should().Be(moon.OrbitsAround.PublicName));
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Include_from_included_resource_definition_is_added()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
+        settingsProvider.AutoIncludeOrbitingPlanetForMoons();
+
+        Planet planet = _fakers.Planet.Generate();
+        planet.Moons = _fakers.Moon.Generate(1).ToHashSet();
+        planet.Moons.ElementAt(0).OrbitsAround = _fakers.Planet.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Planets.Add(planet);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/planets/{planet.StringId}?include=moons";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+
+        responseDocument.Included.ShouldHaveCount(2);
+
+        responseDocument.Included[0].Type.Should().Be("moons");
+        responseDocument.Included[0].Id.Should().Be(planet.Moons.ElementAt(0).StringId);
+        responseDocument.Included[0].Attributes.ShouldContainKey("name").With(value => value.Should().Be(planet.Moons.ElementAt(0).Name));
+
+        string moonName = planet.Moons.ElementAt(0).OrbitsAround.PublicName;
+
+        responseDocument.Included[1].Type.Should().Be("planets");
+        responseDocument.Included[1].Id.Should().Be(planet.Moons.ElementAt(0).OrbitsAround.StringId);
+        responseDocument.Included[1].Attributes.ShouldContainKey("publicName").With(value => value.Should().Be(moonName));
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Filter_from_resource_definition_is_applied()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
+        settingsProvider.HidePlanetsWithPrivateName();
+
+        List<Planet> planets = _fakers.Planet.Generate(4);
+        planets[0].PrivateName = "A";
+        planets[2].PrivateName = "B";
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Planet>();
+            dbContext.Planets.AddRange(planets);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/planets";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(planets[1].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(planets[3].StringId);
+
+        responseDocument.Meta.ShouldContainKey("total").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetInt32().Should().Be(2);
+        });
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Filter_from_resource_definition_and_query_string_are_applied()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
+        settingsProvider.HidePlanetsWithPrivateName();
+
+        List<Planet> planets = _fakers.Planet.Generate(4);
+
+        planets[0].HasRingSystem = true;
+        planets[0].PrivateName = "A";
+
+        planets[1].HasRingSystem = false;
+        planets[1].PrivateName = "B";
+
+        planets[2].HasRingSystem = true;
+
+        planets[3].HasRingSystem = false;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Planet>();
+            dbContext.Planets.AddRange(planets);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/planets?filter=equals(hasRingSystem,'false')";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(planets[3].StringId);
+
+        responseDocument.Meta.ShouldContainKey("total").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetInt32().Should().Be(1);
+        });
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Filter_from_resource_definition_is_applied_on_secondary_endpoint()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
+        settingsProvider.HidePlanetsWithPrivateName();
+
+        Star star = _fakers.Star.Generate();
+        star.Planets = _fakers.Planet.Generate(4).ToHashSet();
+        star.Planets.ElementAt(0).PrivateName = "A";
+        star.Planets.ElementAt(2).PrivateName = "B";
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Planet>();
+            dbContext.Stars.AddRange(star);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/stars/{star.StringId}/planets";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(star.Planets.ElementAt(1).StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(star.Planets.ElementAt(3).StringId);
+
+        responseDocument.Meta.ShouldContainKey("total").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetInt32().Should().Be(2);
+        });
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Filter_from_resource_definition_is_applied_on_relationship_endpoint()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
+        settingsProvider.HidePlanetsWithPrivateName();
+
+        Star star = _fakers.Star.Generate();
+        star.Planets = _fakers.Planet.Generate(4).ToHashSet();
+        star.Planets.ElementAt(0).PrivateName = "A";
+        star.Planets.ElementAt(2).PrivateName = "B";
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Planet>();
+            dbContext.Stars.AddRange(star);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/stars/{star.StringId}/relationships/planets";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(star.Planets.ElementAt(1).StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(star.Planets.ElementAt(3).StringId);
+
+        responseDocument.Meta.ShouldContainKey("total").With(value =>
+        {
+            JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
+            element.GetInt32().Should().Be(2);
+        });
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Sort_from_resource_definition_is_applied()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        List<Star> stars = _fakers.Star.Generate(3);
+
+        stars[0].SolarMass = 500m;
+        stars[0].SolarRadius = 1m;
+
+        stars[1].SolarMass = 500m;
+        stars[1].SolarRadius = 10m;
+
+        stars[2].SolarMass = 50m;
+        stars[2].SolarRadius = 15m;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Star>();
+            dbContext.Stars.AddRange(stars);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/stars";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(3);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(stars[1].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(stars[0].StringId);
+        responseDocument.Data.ManyValue[2].Id.Should().Be(stars[2].StringId);
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Sort_from_query_string_is_applied()
     {
-        private readonly IntegrationTestContext<TestableStartup<UniverseDbContext>, UniverseDbContext> _testContext;
-        private readonly UniverseFakers _fakers = new();
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        List<Star> stars = _fakers.Star.Generate(3);
+
+        stars[0].Name = "B";
+        stars[0].SolarRadius = 10m;
+
+        stars[1].Name = "B";
+        stars[1].SolarRadius = 1m;
+
+        stars[2].Name = "A";
+        stars[2].SolarRadius = 15m;
 
-        public ResourceDefinitionReadTests(IntegrationTestContext<TestableStartup<UniverseDbContext>, UniverseDbContext> testContext)
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            _testContext = testContext;
+            await dbContext.ClearTableAsync<Star>();
+            dbContext.Stars.AddRange(stars);
+            await dbContext.SaveChangesAsync();
+        });
 
-            testContext.UseController<StarsController>();
-            testContext.UseController<PlanetsController>();
-            testContext.UseController<MoonsController>();
+        const string route = "/stars?sort=name,-solarRadius";
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<StarDefinition>();
-                services.AddResourceDefinition<PlanetDefinition>();
-                services.AddResourceDefinition<MoonDefinition>();
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-                services.AddSingleton<IClientSettingsProvider, TestClientSettingsProvider>();
-                services.AddSingleton<ResourceDefinitionHitCounter>();
-            });
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeTotalResourceCount = true;
+        responseDocument.Data.ManyValue.ShouldHaveCount(3);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(stars[2].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(stars[0].StringId);
+        responseDocument.Data.ManyValue[2].Id.Should().Be(stars[1].StringId);
 
-            var settingsProvider = (TestClientSettingsProvider)testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
-            settingsProvider.ResetToDefaults();
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
 
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            hitCounter.Reset();
-        }
-
-        [Fact]
-        public async Task Include_from_resource_definition_is_blocked()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
-            settingsProvider.BlockIncludePlanetMoons();
-
-            Planet planet = _fakers.Planet.Generate();
+    [Fact]
+    public async Task Page_size_from_resource_definition_is_applied()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Planet>();
-                dbContext.Planets.Add(planet);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/planets?include=moons";
+        List<Star> stars = _fakers.Star.Generate(10);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Star>();
+            dbContext.Stars.AddRange(stars);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        const string route = "/stars?page[size]=8";
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Including moons is not permitted.");
-            error.Detail.Should().BeNull();
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes)
-            }, options => options.WithStrictOrdering());
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(5);
 
-        [Fact]
-        public async Task Include_from_resource_definition_is_added()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Attribute_inclusion_from_resource_definition_is_applied_for_omitted_query_string()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        Star star = _fakers.Star.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Stars.Add(star);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/stars/{star.StringId}";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(star.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(star.Name));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("kind").With(value => value.Should().Be(star.Kind));
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeNull();
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Attribute_inclusion_from_resource_definition_is_applied_for_fields_query_string()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        Star star = _fakers.Star.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Stars.Add(star);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/stars/{star.StringId}?fields[stars]=name,solarRadius";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(star.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(2);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(star.Name));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("solarRadius").With(value => value.Should().Be(star.SolarRadius));
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Attribute_exclusion_from_resource_definition_is_applied_for_omitted_query_string()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        Star star = _fakers.Star.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Stars.Add(star);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/stars/{star.StringId}";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
-            settingsProvider.AutoIncludeOrbitingPlanetForMoons();
-
-            Moon moon = _fakers.Moon.Generate();
-            moon.OrbitsAround = _fakers.Planet.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Moons.Add(moon);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/moons/{moon.StringId}";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-
-            responseDocument.Data.SingleValue.Relationships.ShouldContainKey("orbitsAround").With(value =>
-            {
-                value.ShouldNotBeNull();
-                value.Data.SingleValue.ShouldNotBeNull();
-                value.Data.SingleValue.Type.Should().Be("planets");
-                value.Data.SingleValue.Id.Should().Be(moon.OrbitsAround.StringId);
-            });
-
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("planets");
-            responseDocument.Included[0].Id.Should().Be(moon.OrbitsAround.StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("publicName").With(value => value.Should().Be(moon.OrbitsAround.PublicName));
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Include_from_included_resource_definition_is_added()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
-            settingsProvider.AutoIncludeOrbitingPlanetForMoons();
-
-            Planet planet = _fakers.Planet.Generate();
-            planet.Moons = _fakers.Moon.Generate(1).ToHashSet();
-            planet.Moons.ElementAt(0).OrbitsAround = _fakers.Planet.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Planets.Add(planet);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/planets/{planet.StringId}?include=moons";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-
-            responseDocument.Included.ShouldHaveCount(2);
-
-            responseDocument.Included[0].Type.Should().Be("moons");
-            responseDocument.Included[0].Id.Should().Be(planet.Moons.ElementAt(0).StringId);
-            responseDocument.Included[0].Attributes.ShouldContainKey("name").With(value => value.Should().Be(planet.Moons.ElementAt(0).Name));
-
-            string moonName = planet.Moons.ElementAt(0).OrbitsAround.PublicName;
-
-            responseDocument.Included[1].Type.Should().Be("planets");
-            responseDocument.Included[1].Id.Should().Be(planet.Moons.ElementAt(0).OrbitsAround.StringId);
-            responseDocument.Included[1].Attributes.ShouldContainKey("publicName").With(value => value.Should().Be(moonName));
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Filter_from_resource_definition_is_applied()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
-            settingsProvider.HidePlanetsWithPrivateName();
-
-            List<Planet> planets = _fakers.Planet.Generate(4);
-            planets[0].PrivateName = "A";
-            planets[2].PrivateName = "B";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Planet>();
-                dbContext.Planets.AddRange(planets);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/planets";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(planets[1].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(planets[3].StringId);
-
-            responseDocument.Meta.ShouldContainKey("total").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetInt32().Should().Be(2);
-            });
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Filter_from_resource_definition_and_query_string_are_applied()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
-            settingsProvider.HidePlanetsWithPrivateName();
-
-            List<Planet> planets = _fakers.Planet.Generate(4);
-
-            planets[0].HasRingSystem = true;
-            planets[0].PrivateName = "A";
-
-            planets[1].HasRingSystem = false;
-            planets[1].PrivateName = "B";
-
-            planets[2].HasRingSystem = true;
-
-            planets[3].HasRingSystem = false;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Planet>();
-                dbContext.Planets.AddRange(planets);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/planets?filter=equals(hasRingSystem,'false')";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(planets[3].StringId);
-
-            responseDocument.Meta.ShouldContainKey("total").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetInt32().Should().Be(1);
-            });
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Filter_from_resource_definition_is_applied_on_secondary_endpoint()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
-            settingsProvider.HidePlanetsWithPrivateName();
-
-            Star star = _fakers.Star.Generate();
-            star.Planets = _fakers.Planet.Generate(4).ToHashSet();
-            star.Planets.ElementAt(0).PrivateName = "A";
-            star.Planets.ElementAt(2).PrivateName = "B";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Planet>();
-                dbContext.Stars.AddRange(star);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/stars/{star.StringId}/planets";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(star.Planets.ElementAt(1).StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(star.Planets.ElementAt(3).StringId);
-
-            responseDocument.Meta.ShouldContainKey("total").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetInt32().Should().Be(2);
-            });
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Filter_from_resource_definition_is_applied_on_relationship_endpoint()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            var settingsProvider = (TestClientSettingsProvider)_testContext.Factory.Services.GetRequiredService<IClientSettingsProvider>();
-            settingsProvider.HidePlanetsWithPrivateName();
-
-            Star star = _fakers.Star.Generate();
-            star.Planets = _fakers.Planet.Generate(4).ToHashSet();
-            star.Planets.ElementAt(0).PrivateName = "A";
-            star.Planets.ElementAt(2).PrivateName = "B";
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Planet>();
-                dbContext.Stars.AddRange(star);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/stars/{star.StringId}/relationships/planets";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(star.Planets.ElementAt(1).StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(star.Planets.ElementAt(3).StringId);
-
-            responseDocument.Meta.ShouldContainKey("total").With(value =>
-            {
-                JsonElement element = value.Should().BeOfType<JsonElement>().Subject;
-                element.GetInt32().Should().Be(2);
-            });
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Planet), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Sort_from_resource_definition_is_applied()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            List<Star> stars = _fakers.Star.Generate(3);
-
-            stars[0].SolarMass = 500m;
-            stars[0].SolarRadius = 1m;
-
-            stars[1].SolarMass = 500m;
-            stars[1].SolarRadius = 10m;
-
-            stars[2].SolarMass = 50m;
-            stars[2].SolarRadius = 15m;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Star>();
-                dbContext.Stars.AddRange(stars);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/stars";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(3);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(stars[1].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(stars[0].StringId);
-            responseDocument.Data.ManyValue[2].Id.Should().Be(stars[2].StringId);
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Sort_from_query_string_is_applied()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            List<Star> stars = _fakers.Star.Generate(3);
-
-            stars[0].Name = "B";
-            stars[0].SolarRadius = 10m;
-
-            stars[1].Name = "B";
-            stars[1].SolarRadius = 1m;
-
-            stars[2].Name = "A";
-            stars[2].SolarRadius = 15m;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Star>();
-                dbContext.Stars.AddRange(stars);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/stars?sort=name,-solarRadius";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(3);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(stars[2].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(stars[0].StringId);
-            responseDocument.Data.ManyValue[2].Id.Should().Be(stars[1].StringId);
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Page_size_from_resource_definition_is_applied()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            List<Star> stars = _fakers.Star.Generate(10);
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Star>();
-                dbContext.Stars.AddRange(stars);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/stars?page[size]=8";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(5);
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Attribute_inclusion_from_resource_definition_is_applied_for_omitted_query_string()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            Star star = _fakers.Star.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Stars.Add(star);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/stars/{star.StringId}";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(star.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(star.Name));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("kind").With(value => value.Should().Be(star.Kind));
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeNull();
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Attribute_inclusion_from_resource_definition_is_applied_for_fields_query_string()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            Star star = _fakers.Star.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Stars.Add(star);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/stars/{star.StringId}?fields[stars]=name,solarRadius";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(star.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(2);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(star.Name));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("solarRadius").With(value => value.Should().Be(star.SolarRadius));
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Attribute_exclusion_from_resource_definition_is_applied_for_omitted_query_string()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            Star star = _fakers.Star.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Stars.Add(star);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/stars/{star.StringId}";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(star.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(star.Name));
-            responseDocument.Data.SingleValue.Attributes.Should().NotContainKey("isVisibleFromEarth");
-            responseDocument.Data.SingleValue.Relationships.ShouldNotBeNull();
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Attribute_exclusion_from_resource_definition_is_applied_for_fields_query_string()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            Star star = _fakers.Star.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Stars.Add(star);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/stars/{star.StringId}?fields[stars]=name,isVisibleFromEarth";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(star.StringId);
-            responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(star.Name));
-            responseDocument.Data.SingleValue.Relationships.Should().BeNull();
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Queryable_parameter_handler_from_resource_definition_is_applied()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            List<Moon> moons = _fakers.Moon.Generate(2);
-
-            moons[0].SolarRadius = .5m;
-            moons[0].OrbitsAround = _fakers.Planet.Generate();
-
-            moons[1].SolarRadius = 50m;
-            moons[1].OrbitsAround = _fakers.Planet.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Moon>();
-                dbContext.Moons.AddRange(moons);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/moons?isLargerThanTheSun=true";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(moons[1].StringId);
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Queryable_parameter_handler_from_resource_definition_and_query_string_filter_are_applied()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            List<Moon> moons = _fakers.Moon.Generate(4);
-
-            moons[0].Name = "Alpha1";
-            moons[0].SolarRadius = 1m;
-            moons[0].OrbitsAround = _fakers.Planet.Generate();
-
-            moons[1].Name = "Alpha2";
-            moons[1].SolarRadius = 5m;
-            moons[1].OrbitsAround = _fakers.Planet.Generate();
-
-            moons[2].Name = "Beta1";
-            moons[2].SolarRadius = 1m;
-            moons[2].OrbitsAround = _fakers.Planet.Generate();
-
-            moons[3].Name = "Beta2";
-            moons[3].SolarRadius = 5m;
-            moons[3].OrbitsAround = _fakers.Planet.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Moon>();
-                dbContext.Moons.AddRange(moons);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/moons?isLargerThanTheSun=false&filter=startsWith(name,'B')";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(moons[2].StringId);
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySort),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.GetMeta)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Queryable_parameter_handler_from_resource_definition_is_not_applied_on_secondary_request()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            Planet planet = _fakers.Planet.Generate();
-            planet.Moons = _fakers.Moon.Generate(1).ToHashSet();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Planets.Add(planet);
-                await dbContext.SaveChangesAsync();
-            });
-
-            string route = $"/planets/{planet.StringId}/moons?isLargerThanTheSun=false";
-
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
-
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
-
-            responseDocument.Errors.ShouldHaveCount(1);
-
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Custom query string parameters cannot be used on nested resource endpoints.");
-            error.Detail.Should().Be("Query string parameter 'isLargerThanTheSun' cannot be used on a nested resource endpoint.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("isLargerThanTheSun");
-
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters)
-            }, options => options.WithStrictOrdering());
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(star.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(star.Name));
+        responseDocument.Data.SingleValue.Attributes.Should().NotContainKey("isVisibleFromEarth");
+        responseDocument.Data.SingleValue.Relationships.ShouldNotBeNull();
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Attribute_exclusion_from_resource_definition_is_applied_for_fields_query_string()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        Star star = _fakers.Star.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Stars.Add(star);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/stars/{star.StringId}?fields[stars]=name,isVisibleFromEarth";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(star.StringId);
+        responseDocument.Data.SingleValue.Attributes.ShouldHaveCount(1);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("name").With(value => value.Should().Be(star.Name));
+        responseDocument.Data.SingleValue.Relationships.Should().BeNull();
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Star), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Queryable_parameter_handler_from_resource_definition_is_applied()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        List<Moon> moons = _fakers.Moon.Generate(2);
+
+        moons[0].SolarRadius = .5m;
+        moons[0].OrbitsAround = _fakers.Planet.Generate();
+
+        moons[1].SolarRadius = 50m;
+        moons[1].OrbitsAround = _fakers.Planet.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Moon>();
+            dbContext.Moons.AddRange(moons);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/moons?isLargerThanTheSun=true";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(moons[1].StringId);
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Queryable_parameter_handler_from_resource_definition_and_query_string_filter_are_applied()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        List<Moon> moons = _fakers.Moon.Generate(4);
+
+        moons[0].Name = "Alpha1";
+        moons[0].SolarRadius = 1m;
+        moons[0].OrbitsAround = _fakers.Planet.Generate();
+
+        moons[1].Name = "Alpha2";
+        moons[1].SolarRadius = 5m;
+        moons[1].OrbitsAround = _fakers.Planet.Generate();
+
+        moons[2].Name = "Beta1";
+        moons[2].SolarRadius = 1m;
+        moons[2].OrbitsAround = _fakers.Planet.Generate();
+
+        moons[3].Name = "Beta2";
+        moons[3].SolarRadius = 5m;
+        moons[3].OrbitsAround = _fakers.Planet.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Moon>();
+            dbContext.Moons.AddRange(moons);
+            await dbContext.SaveChangesAsync();
+        });
+
+        const string route = "/moons?isLargerThanTheSun=false&filter=startsWith(name,'B')";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(moons[2].StringId);
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyPagination),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyFilter),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySort),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplyIncludes),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnApplySparseFieldSet),
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.GetMeta)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Queryable_parameter_handler_from_resource_definition_is_not_applied_on_secondary_request()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        Planet planet = _fakers.Planet.Generate();
+        planet.Moons = _fakers.Moon.Generate(1).ToHashSet();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Planets.Add(planet);
+            await dbContext.SaveChangesAsync();
+        });
+
+        string route = $"/planets/{planet.StringId}/moons?isLargerThanTheSun=false";
+
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+
+        responseDocument.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Custom query string parameters cannot be used on nested resource endpoints.");
+        error.Detail.Should().Be("Query string parameter 'isLargerThanTheSun' cannot be used on a nested resource endpoint.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("isLargerThanTheSun");
+
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Moon), ResourceDefinitionExtensibilityPoints.OnRegisterQueryableHandlersForQueryStringParameters)
+        }, options => options.WithStrictOrdering());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Star.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Star.cs
index b8d40ebde7..e79c2ae8af 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Star.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/Star.cs
@@ -1,29 +1,28 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading")]
+public sealed class Star : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Star : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [Attr]
-        public StarKind Kind { get; set; }
+    [Attr]
+    public StarKind Kind { get; set; }
 
-        [Attr]
-        public decimal SolarRadius { get; set; }
+    [Attr]
+    public decimal SolarRadius { get; set; }
 
-        [Attr]
-        public decimal SolarMass { get; set; }
+    [Attr]
+    public decimal SolarMass { get; set; }
 
-        [Attr]
-        public bool IsVisibleFromEarth { get; set; }
+    [Attr]
+    public bool IsVisibleFromEarth { get; set; }
 
-        [HasMany]
-        public ISet<Planet> Planets { get; set; } = new HashSet<Planet>();
-    }
+    [HasMany]
+    public ISet<Planet> Planets { get; set; } = new HashSet<Planet>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarDefinition.cs
index c209ff3295..f6a6474823 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarDefinition.cs
@@ -3,62 +3,61 @@
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Queries.Expressions;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
-{
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class StarDefinition : HitCountingResourceDefinition<Star, int>
-    {
-        protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Reading;
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
 
-        public StarDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, hitCounter)
-        {
-            // This constructor will be resolved from the container, which means
-            // you can take on any dependency that is also defined in the container.
-        }
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class StarDefinition : HitCountingResourceDefinition<Star, int>
+{
+    protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Reading;
 
-        public override SortExpression OnApplySort(SortExpression? existingSort)
-        {
-            base.OnApplySort(existingSort);
+    public StarDefinition(IResourceGraph resourceGraph, ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, hitCounter)
+    {
+        // This constructor will be resolved from the container, which means
+        // you can take on any dependency that is also defined in the container.
+    }
 
-            return existingSort ?? GetDefaultSortOrder();
-        }
+    public override SortExpression OnApplySort(SortExpression? existingSort)
+    {
+        base.OnApplySort(existingSort);
 
-        private SortExpression GetDefaultSortOrder()
-        {
-            return CreateSortExpressionFromLambda(new PropertySortOrder
-            {
-                (star => star.SolarMass, ListSortDirection.Descending),
-                (star => star.SolarRadius, ListSortDirection.Descending)
-            });
-        }
+        return existingSort ?? GetDefaultSortOrder();
+    }
 
-        public override PaginationExpression OnApplyPagination(PaginationExpression? existingPagination)
+    private SortExpression GetDefaultSortOrder()
+    {
+        return CreateSortExpressionFromLambda(new PropertySortOrder
         {
-            base.OnApplyPagination(existingPagination);
+            (star => star.SolarMass, ListSortDirection.Descending),
+            (star => star.SolarRadius, ListSortDirection.Descending)
+        });
+    }
 
-            var maxPageSize = new PageSize(5);
+    public override PaginationExpression OnApplyPagination(PaginationExpression? existingPagination)
+    {
+        base.OnApplyPagination(existingPagination);
 
-            if (existingPagination != null)
-            {
-                PageSize pageSize = existingPagination.PageSize?.Value <= maxPageSize.Value ? existingPagination.PageSize : maxPageSize;
-                return new PaginationExpression(existingPagination.PageNumber, pageSize);
-            }
+        var maxPageSize = new PageSize(5);
 
-            return new PaginationExpression(PageNumber.ValueOne, maxPageSize);
+        if (existingPagination != null)
+        {
+            PageSize pageSize = existingPagination.PageSize?.Value <= maxPageSize.Value ? existingPagination.PageSize : maxPageSize;
+            return new PaginationExpression(existingPagination.PageNumber, pageSize);
         }
 
-        public override SparseFieldSetExpression? OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet)
-        {
-            base.OnApplySparseFieldSet(existingSparseFieldSet);
+        return new PaginationExpression(PageNumber.ValueOne, maxPageSize);
+    }
 
-            // @formatter:keep_existing_linebreaks true
+    public override SparseFieldSetExpression? OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet)
+    {
+        base.OnApplySparseFieldSet(existingSparseFieldSet);
 
-            return existingSparseFieldSet
-                .Including<Star>(star => star.Kind, ResourceGraph)
-                .Excluding<Star>(star => star.IsVisibleFromEarth, ResourceGraph);
+        // @formatter:keep_existing_linebreaks true
 
-            // @formatter:keep_existing_linebreaks restore
-        }
+        return existingSparseFieldSet
+            .Including<Star>(star => star.Kind, ResourceGraph)
+            .Excluding<Star>(star => star.IsVisibleFromEarth, ResourceGraph);
+
+        // @formatter:keep_existing_linebreaks restore
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarKind.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarKind.cs
index d3c4685d1c..5e64c578e7 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarKind.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarKind.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[JsonConverter(typeof(JsonStringEnumMemberConverter))]
+public enum StarKind
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    [JsonConverter(typeof(JsonStringEnumMemberConverter))]
-    public enum StarKind
-    {
-        Other,
-        RedDwarf,
-        MainSequence,
-        RedGiant
-    }
+    Other,
+    RedDwarf,
+    MainSequence,
+    RedGiant
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarsController.cs
deleted file mode 100644
index b1d661c207..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/StarsController.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
-{
-    public sealed class StarsController : JsonApiController<Star, int>
-    {
-        public StarsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<Star, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/TestClientSettingsProvider.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/TestClientSettingsProvider.cs
index d975f4a85b..63f0033119 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/TestClientSettingsProvider.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/TestClientSettingsProvider.cs
@@ -1,31 +1,30 @@
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
+
+internal sealed class TestClientSettingsProvider : IClientSettingsProvider
 {
-    internal sealed class TestClientSettingsProvider : IClientSettingsProvider
-    {
-        public bool IsIncludePlanetMoonsBlocked { get; private set; }
-        public bool ArePlanetsWithPrivateNameHidden { get; private set; }
-        public bool IsMoonOrbitingPlanetAutoIncluded { get; private set; }
+    public bool IsIncludePlanetMoonsBlocked { get; private set; }
+    public bool ArePlanetsWithPrivateNameHidden { get; private set; }
+    public bool IsMoonOrbitingPlanetAutoIncluded { get; private set; }
 
-        public void ResetToDefaults()
-        {
-            IsIncludePlanetMoonsBlocked = false;
-            ArePlanetsWithPrivateNameHidden = false;
-            IsMoonOrbitingPlanetAutoIncluded = false;
-        }
+    public void ResetToDefaults()
+    {
+        IsIncludePlanetMoonsBlocked = false;
+        ArePlanetsWithPrivateNameHidden = false;
+        IsMoonOrbitingPlanetAutoIncluded = false;
+    }
 
-        public void BlockIncludePlanetMoons()
-        {
-            IsIncludePlanetMoonsBlocked = true;
-        }
+    public void BlockIncludePlanetMoons()
+    {
+        IsIncludePlanetMoonsBlocked = true;
+    }
 
-        public void HidePlanetsWithPrivateName()
-        {
-            ArePlanetsWithPrivateNameHidden = true;
-        }
+    public void HidePlanetsWithPrivateName()
+    {
+        ArePlanetsWithPrivateNameHidden = true;
+    }
 
-        public void AutoIncludeOrbitingPlanetForMoons()
-        {
-            IsMoonOrbitingPlanetAutoIncluded = true;
-        }
+    public void AutoIncludeOrbitingPlanetForMoons()
+    {
+        IsMoonOrbitingPlanetAutoIncluded = true;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseDbContext.cs
index 49b96ee7c7..7964bfdd09 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseDbContext.cs
@@ -1,18 +1,17 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class UniverseDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class UniverseDbContext : DbContext
-    {
-        public DbSet<Star> Stars => Set<Star>();
-        public DbSet<Planet> Planets => Set<Planet>();
-        public DbSet<Moon> Moons => Set<Moon>();
+    public DbSet<Star> Stars => Set<Star>();
+    public DbSet<Planet> Planets => Set<Planet>();
+    public DbSet<Moon> Moons => Set<Moon>();
 
-        public UniverseDbContext(DbContextOptions<UniverseDbContext> options)
-            : base(options)
-        {
-        }
+    public UniverseDbContext(DbContextOptions<UniverseDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseFakers.cs
index de46186008..b9744511a5 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseFakers.cs
@@ -1,38 +1,36 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
+
+internal sealed class UniverseFakers : FakerContainer
 {
-    internal sealed class UniverseFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<Star>> _lazyStarFaker = new(() =>
-            new Faker<Star>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(star => star.Name, faker => faker.Random.Word())
-                .RuleFor(star => star.Kind, faker => faker.PickRandom<StarKind>())
-                .RuleFor(star => star.SolarRadius, faker => faker.Random.Decimal(.01M, 1000M))
-                .RuleFor(star => star.SolarMass, faker => faker.Random.Decimal(.001M, 100M))
-                .RuleFor(star => star.IsVisibleFromEarth, faker => faker.Random.Bool()));
+    private readonly Lazy<Faker<Star>> _lazyStarFaker = new(() =>
+        new Faker<Star>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(star => star.Name, faker => faker.Random.Word())
+            .RuleFor(star => star.Kind, faker => faker.PickRandom<StarKind>())
+            .RuleFor(star => star.SolarRadius, faker => faker.Random.Decimal(.01M, 1000M))
+            .RuleFor(star => star.SolarMass, faker => faker.Random.Decimal(.001M, 100M))
+            .RuleFor(star => star.IsVisibleFromEarth, faker => faker.Random.Bool()));
 
-        private readonly Lazy<Faker<Planet>> _lazyPlanetFaker = new(() =>
-            new Faker<Planet>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(planet => planet.PublicName, faker => faker.Random.Word())
-                .RuleFor(planet => planet.HasRingSystem, faker => faker.Random.Bool())
-                .RuleFor(planet => planet.SolarMass, faker => faker.Random.Decimal(.001M, 100M)));
+    private readonly Lazy<Faker<Planet>> _lazyPlanetFaker = new(() =>
+        new Faker<Planet>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(planet => planet.PublicName, faker => faker.Random.Word())
+            .RuleFor(planet => planet.HasRingSystem, faker => faker.Random.Bool())
+            .RuleFor(planet => planet.SolarMass, faker => faker.Random.Decimal(.001M, 100M)));
 
-        private readonly Lazy<Faker<Moon>> _lazyMoonFaker = new(() =>
-            new Faker<Moon>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(moon => moon.Name, faker => faker.Random.Word())
-                .RuleFor(moon => moon.SolarRadius, faker => faker.Random.Decimal(.01M, 1000M)));
+    private readonly Lazy<Faker<Moon>> _lazyMoonFaker = new(() =>
+        new Faker<Moon>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(moon => moon.Name, faker => faker.Random.Word())
+            .RuleFor(moon => moon.SolarRadius, faker => faker.Random.Decimal(.01M, 1000M)));
 
-        public Faker<Star> Star => _lazyStarFaker.Value;
-        public Faker<Planet> Planet => _lazyPlanetFaker.Value;
-        public Faker<Moon> Moon => _lazyMoonFaker.Value;
-    }
+    public Faker<Star> Star => _lazyStarFaker.Value;
+    public Faker<Planet> Planet => _lazyPlanetFaker.Value;
+    public Faker<Moon> Moon => _lazyMoonFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/AesEncryptionService.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/AesEncryptionService.cs
index 5074d86359..07cd2c40d0 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/AesEncryptionService.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/AesEncryptionService.cs
@@ -1,50 +1,48 @@
-using System;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization;
+
+public sealed class AesEncryptionService : IEncryptionService
 {
-    public sealed class AesEncryptionService : IEncryptionService
-    {
-        private static readonly byte[] CryptoKey = Encoding.UTF8.GetBytes("Secret!".PadRight(32, '-'));
+    private static readonly byte[] CryptoKey = Encoding.UTF8.GetBytes("Secret!".PadRight(32, '-'));
 
-        public string Encrypt(string value)
-        {
-            using SymmetricAlgorithm cipher = CreateCipher();
+    public string Encrypt(string value)
+    {
+        using SymmetricAlgorithm cipher = CreateCipher();
 
-            using ICryptoTransform transform = cipher.CreateEncryptor();
-            byte[] plaintext = Encoding.UTF8.GetBytes(value);
-            byte[] cipherText = transform.TransformFinalBlock(plaintext, 0, plaintext.Length);
+        using ICryptoTransform transform = cipher.CreateEncryptor();
+        byte[] plaintext = Encoding.UTF8.GetBytes(value);
+        byte[] cipherText = transform.TransformFinalBlock(plaintext, 0, plaintext.Length);
 
-            byte[] buffer = new byte[cipher.IV.Length + cipherText.Length];
-            Buffer.BlockCopy(cipher.IV, 0, buffer, 0, cipher.IV.Length);
-            Buffer.BlockCopy(cipherText, 0, buffer, cipher.IV.Length, cipherText.Length);
+        byte[] buffer = new byte[cipher.IV.Length + cipherText.Length];
+        Buffer.BlockCopy(cipher.IV, 0, buffer, 0, cipher.IV.Length);
+        Buffer.BlockCopy(cipherText, 0, buffer, cipher.IV.Length, cipherText.Length);
 
-            return Convert.ToBase64String(buffer);
-        }
+        return Convert.ToBase64String(buffer);
+    }
 
-        public string Decrypt(string value)
-        {
-            byte[] buffer = Convert.FromBase64String(value);
+    public string Decrypt(string value)
+    {
+        byte[] buffer = Convert.FromBase64String(value);
 
-            using SymmetricAlgorithm cipher = CreateCipher();
+        using SymmetricAlgorithm cipher = CreateCipher();
 
-            byte[] initVector = new byte[cipher.IV.Length];
-            Buffer.BlockCopy(buffer, 0, initVector, 0, initVector.Length);
-            cipher.IV = initVector;
+        byte[] initVector = new byte[cipher.IV.Length];
+        Buffer.BlockCopy(buffer, 0, initVector, 0, initVector.Length);
+        cipher.IV = initVector;
 
-            using ICryptoTransform transform = cipher.CreateDecryptor();
-            byte[] plainBytes = transform.TransformFinalBlock(buffer, initVector.Length, buffer.Length - initVector.Length);
+        using ICryptoTransform transform = cipher.CreateDecryptor();
+        byte[] plainBytes = transform.TransformFinalBlock(buffer, initVector.Length, buffer.Length - initVector.Length);
 
-            return Encoding.UTF8.GetString(plainBytes);
-        }
+        return Encoding.UTF8.GetString(plainBytes);
+    }
 
-        private static SymmetricAlgorithm CreateCipher()
-        {
-            var cipher = Aes.Create();
-            cipher.Key = CryptoKey;
+    private static SymmetricAlgorithm CreateCipher()
+    {
+        var cipher = Aes.Create();
+        cipher.Key = CryptoKey;
 
-            return cipher;
-        }
+        return cipher;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/IEncryptionService.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/IEncryptionService.cs
index 2500137339..f9fbe038e8 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/IEncryptionService.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/IEncryptionService.cs
@@ -1,9 +1,8 @@
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization;
+
+public interface IEncryptionService
 {
-    public interface IEncryptionService
-    {
-        string Encrypt(string value);
+    string Encrypt(string value);
 
-        string Decrypt(string value);
-    }
+    string Decrypt(string value);
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ResourceDefinitionSerializationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ResourceDefinitionSerializationTests.cs
index 7bd35f1130..23c2fa388e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ResourceDefinitionSerializationTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ResourceDefinitionSerializationTests.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
@@ -10,828 +7,827 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization;
+
+public sealed class ResourceDefinitionSerializationTests
+    : IClassFixture<IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext>>
 {
-    public sealed class ResourceDefinitionSerializationTests
-        : IClassFixture<IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext> _testContext;
+    private readonly SerializationFakers _fakers = new();
+
+    public ResourceDefinitionSerializationTests(IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext> _testContext;
-        private readonly SerializationFakers _fakers = new();
+        _testContext = testContext;
+
+        testContext.UseController<StudentsController>();
+        testContext.UseController<ScholarshipsController>();
 
-        public ResourceDefinitionSerializationTests(IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext> testContext)
+        testContext.ConfigureServicesAfterStartup(services =>
         {
-            _testContext = testContext;
+            services.AddResourceDefinition<StudentDefinition>();
 
-            testContext.UseController<StudentsController>();
-            testContext.UseController<ScholarshipsController>();
+            services.AddSingleton<IEncryptionService, AesEncryptionService>();
+            services.AddSingleton<ResourceDefinitionHitCounter>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddResourceDefinition<StudentDefinition>();
+            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+        });
 
-                services.AddSingleton<IEncryptionService, AesEncryptionService>();
-                services.AddSingleton<ResourceDefinitionHitCounter>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+        hitCounter.Reset();
+    }
 
-                services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-            });
+    [Fact]
+    public async Task Encrypts_on_get_primary_resources()
+    {
+        // Arrange
+        var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-            hitCounter.Reset();
-        }
+        List<Student> students = _fakers.Student.Generate(2);
 
-        [Fact]
-        public async Task Encrypts_on_get_primary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            await dbContext.ClearTableAsync<Student>();
+            dbContext.Students.AddRange(students);
+            await dbContext.SaveChangesAsync();
+        });
 
-            List<Student> students = _fakers.Student.Generate(2);
+        const string route = "/students";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Student>();
-                dbContext.Students.AddRange(students);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            const string route = "/students";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
+            socialSecurityNumber.Should().Be(students[0].SocialSecurityNumber);
+        });
 
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        responseDocument.Data.ManyValue[1].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-                socialSecurityNumber.Should().Be(students[0].SocialSecurityNumber);
-            });
+            socialSecurityNumber.Should().Be(students[1].SocialSecurityNumber);
+        });
 
-            responseDocument.Data.ManyValue[1].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize),
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
+        }, options => options.WithStrictOrdering());
+    }
 
-                socialSecurityNumber.Should().Be(students[1].SocialSecurityNumber);
-            });
+    [Fact]
+    public async Task Encrypts_on_get_primary_resources_with_ToMany_include()
+    {
+        // Arrange
+        var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize),
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
-            }, options => options.WithStrictOrdering());
-        }
+        List<Scholarship> scholarships = _fakers.Scholarship.Generate(2);
+        scholarships[0].Participants = _fakers.Student.Generate(2);
+        scholarships[1].Participants = _fakers.Student.Generate(2);
 
-        [Fact]
-        public async Task Encrypts_on_get_primary_resources_with_ToMany_include()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            await dbContext.ClearTableAsync<Scholarship>();
+            dbContext.Scholarships.AddRange(scholarships);
+            await dbContext.SaveChangesAsync();
+        });
 
-            List<Scholarship> scholarships = _fakers.Scholarship.Generate(2);
-            scholarships[0].Participants = _fakers.Student.Generate(2);
-            scholarships[1].Participants = _fakers.Student.Generate(2);
+        const string route = "/scholarships?include=participants";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Scholarship>();
-                dbContext.Scholarships.AddRange(scholarships);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            const string route = "/scholarships?include=participants";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Included.ShouldHaveCount(4);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Included[0].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-            responseDocument.Included.ShouldHaveCount(4);
+            socialSecurityNumber.Should().Be(scholarships[0].Participants[0].SocialSecurityNumber);
+        });
 
-            responseDocument.Included[0].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        responseDocument.Included[1].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-                socialSecurityNumber.Should().Be(scholarships[0].Participants[0].SocialSecurityNumber);
-            });
+            socialSecurityNumber.Should().Be(scholarships[0].Participants[1].SocialSecurityNumber);
+        });
 
-            responseDocument.Included[1].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        responseDocument.Included[2].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-                socialSecurityNumber.Should().Be(scholarships[0].Participants[1].SocialSecurityNumber);
-            });
+            socialSecurityNumber.Should().Be(scholarships[1].Participants[0].SocialSecurityNumber);
+        });
 
-            responseDocument.Included[2].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        responseDocument.Included[3].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-                socialSecurityNumber.Should().Be(scholarships[1].Participants[0].SocialSecurityNumber);
-            });
+            socialSecurityNumber.Should().Be(scholarships[1].Participants[1].SocialSecurityNumber);
+        });
 
-            responseDocument.Included[3].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize),
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize),
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize),
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
+        }, options => options.WithStrictOrdering());
+    }
 
-                socialSecurityNumber.Should().Be(scholarships[1].Participants[1].SocialSecurityNumber);
-            });
+    [Fact]
+    public async Task Encrypts_on_get_primary_resource_by_ID()
+    {
+        // Arrange
+        var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize),
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize),
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize),
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
-            }, options => options.WithStrictOrdering());
-        }
+        Student student = _fakers.Student.Generate();
 
-        [Fact]
-        public async Task Encrypts_on_get_primary_resource_by_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            dbContext.Students.Add(student);
+            await dbContext.SaveChangesAsync();
+        });
 
-            Student student = _fakers.Student.Generate();
+        string route = $"/students/{student.StringId}";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Students.Add(student);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/students/{student.StringId}";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+            socialSecurityNumber.Should().Be(student.SocialSecurityNumber);
+        });
 
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
+        }, options => options.WithStrictOrdering());
+    }
 
-                socialSecurityNumber.Should().Be(student.SocialSecurityNumber);
-            });
+    [Fact]
+    public async Task Encrypts_on_get_secondary_resources()
+    {
+        // Arrange
+        var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
-            }, options => options.WithStrictOrdering());
-        }
+        Scholarship scholarship = _fakers.Scholarship.Generate();
+        scholarship.Participants = _fakers.Student.Generate(2);
 
-        [Fact]
-        public async Task Encrypts_on_get_secondary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            dbContext.Scholarships.Add(scholarship);
+            await dbContext.SaveChangesAsync();
+        });
 
-            Scholarship scholarship = _fakers.Scholarship.Generate();
-            scholarship.Participants = _fakers.Student.Generate(2);
+        string route = $"/scholarships/{scholarship.StringId}/participants";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Scholarships.Add(scholarship);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/scholarships/{scholarship.StringId}/participants";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
+            socialSecurityNumber.Should().Be(scholarship.Participants[0].SocialSecurityNumber);
+        });
 
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        responseDocument.Data.ManyValue[1].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-                socialSecurityNumber.Should().Be(scholarship.Participants[0].SocialSecurityNumber);
-            });
+            socialSecurityNumber.Should().Be(scholarship.Participants[1].SocialSecurityNumber);
+        });
 
-            responseDocument.Data.ManyValue[1].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize),
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
+        }, options => options.WithStrictOrdering());
+    }
 
-                socialSecurityNumber.Should().Be(scholarship.Participants[1].SocialSecurityNumber);
-            });
+    [Fact]
+    public async Task Encrypts_on_get_secondary_resource()
+    {
+        // Arrange
+        var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize),
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
-            }, options => options.WithStrictOrdering());
-        }
+        Scholarship scholarship = _fakers.Scholarship.Generate();
+        scholarship.PrimaryContact = _fakers.Student.Generate();
 
-        [Fact]
-        public async Task Encrypts_on_get_secondary_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            dbContext.Scholarships.Add(scholarship);
+            await dbContext.SaveChangesAsync();
+        });
 
-            Scholarship scholarship = _fakers.Scholarship.Generate();
-            scholarship.PrimaryContact = _fakers.Student.Generate();
+        string route = $"/scholarships/{scholarship.StringId}/primaryContact";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Scholarships.Add(scholarship);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/scholarships/{scholarship.StringId}/primaryContact";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+            socialSecurityNumber.Should().Be(scholarship.PrimaryContact.SocialSecurityNumber);
+        });
 
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
+        }, options => options.WithStrictOrdering());
+    }
 
-                socialSecurityNumber.Should().Be(scholarship.PrimaryContact.SocialSecurityNumber);
-            });
+    [Fact]
+    public async Task Encrypts_on_get_secondary_resource_with_ToOne_include()
+    {
+        // Arrange
+        var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
-            }, options => options.WithStrictOrdering());
-        }
+        Scholarship scholarship = _fakers.Scholarship.Generate();
+        scholarship.PrimaryContact = _fakers.Student.Generate();
 
-        [Fact]
-        public async Task Encrypts_on_get_secondary_resource_with_ToOne_include()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            dbContext.Scholarships.Add(scholarship);
+            await dbContext.SaveChangesAsync();
+        });
 
-            Scholarship scholarship = _fakers.Scholarship.Generate();
-            scholarship.PrimaryContact = _fakers.Student.Generate();
+        string route = $"/scholarships/{scholarship.StringId}?include=primaryContact";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Scholarships.Add(scholarship);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/scholarships/{scholarship.StringId}?include=primaryContact";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Included[0].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-            responseDocument.Included.ShouldHaveCount(1);
+            socialSecurityNumber.Should().Be(scholarship.PrimaryContact.SocialSecurityNumber);
+        });
 
-            responseDocument.Included[0].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
+        }, options => options.WithStrictOrdering());
+    }
 
-                socialSecurityNumber.Should().Be(scholarship.PrimaryContact.SocialSecurityNumber);
-            });
+    [Fact]
+    public async Task Decrypts_on_create_resource()
+    {
+        // Arrange
+        var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
-            }, options => options.WithStrictOrdering());
-        }
+        string newName = _fakers.Student.Generate().Name;
+        string newSocialSecurityNumber = _fakers.Student.Generate().SocialSecurityNumber;
 
-        [Fact]
-        public async Task Decrypts_on_create_resource()
+        var requestBody = new
         {
-            // Arrange
-            var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            string newName = _fakers.Student.Generate().Name;
-            string newSocialSecurityNumber = _fakers.Student.Generate().SocialSecurityNumber;
-
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "students",
+                attributes = new
                 {
-                    type = "students",
-                    attributes = new
-                    {
-                        name = newName,
-                        socialSecurityNumber = encryptionService.Encrypt(newSocialSecurityNumber)
-                    }
+                    name = newName,
+                    socialSecurityNumber = encryptionService.Encrypt(newSocialSecurityNumber)
                 }
-            };
-
-            const string route = "/students";
+            }
+        };
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        const string route = "/students";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-                socialSecurityNumber.Should().Be(newSocialSecurityNumber);
-            });
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-            int newStudentId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+            socialSecurityNumber.Should().Be(newSocialSecurityNumber);
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Student studentInDatabase = await dbContext.Students.FirstWithIdAsync(newStudentId);
+        int newStudentId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-                studentInDatabase.SocialSecurityNumber.Should().Be(newSocialSecurityNumber);
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Student studentInDatabase = await dbContext.Students.FirstWithIdAsync(newStudentId);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnDeserialize),
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
-            }, options => options.WithStrictOrdering());
-        }
+            studentInDatabase.SocialSecurityNumber.Should().Be(newSocialSecurityNumber);
+        });
 
-        [Fact]
-        public async Task Encrypts_on_create_resource_with_included_ToOne_relationship()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnDeserialize),
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
+        }, options => options.WithStrictOrdering());
+    }
 
-            Student existingStudent = _fakers.Student.Generate();
+    [Fact]
+    public async Task Encrypts_on_create_resource_with_included_ToOne_relationship()
+    {
+        // Arrange
+        var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            string newProgramName = _fakers.Scholarship.Generate().ProgramName;
-            decimal newAmount = _fakers.Scholarship.Generate().Amount;
+        Student existingStudent = _fakers.Student.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Students.Add(existingStudent);
-                await dbContext.SaveChangesAsync();
-            });
+        string newProgramName = _fakers.Scholarship.Generate().ProgramName;
+        decimal newAmount = _fakers.Scholarship.Generate().Amount;
 
-            var requestBody = new
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Students.Add(existingStudent);
+            await dbContext.SaveChangesAsync();
+        });
+
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "scholarships",
+                attributes = new
                 {
-                    type = "scholarships",
-                    attributes = new
-                    {
-                        programName = newProgramName,
-                        amount = newAmount
-                    },
-                    relationships = new
+                    programName = newProgramName,
+                    amount = newAmount
+                },
+                relationships = new
+                {
+                    primaryContact = new
                     {
-                        primaryContact = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "students",
-                                id = existingStudent.StringId
-                            }
+                            type = "students",
+                            id = existingStudent.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/scholarships?include=primaryContact";
+        const string route = "/scholarships?include=primaryContact";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included.ShouldHaveCount(1);
 
-            responseDocument.Included[0].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        responseDocument.Included[0].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-                socialSecurityNumber.Should().Be(existingStudent.SocialSecurityNumber);
-            });
+            socialSecurityNumber.Should().Be(existingStudent.SocialSecurityNumber);
+        });
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
-            }, options => options.WithStrictOrdering());
-        }
-
-        [Fact]
-        public async Task Decrypts_on_update_resource()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
+        }, options => options.WithStrictOrdering());
+    }
 
-            Student existingStudent = _fakers.Student.Generate();
+    [Fact]
+    public async Task Decrypts_on_update_resource()
+    {
+        // Arrange
+        var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            string newSocialSecurityNumber = _fakers.Student.Generate().SocialSecurityNumber;
+        Student existingStudent = _fakers.Student.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Students.Add(existingStudent);
-                await dbContext.SaveChangesAsync();
-            });
+        string newSocialSecurityNumber = _fakers.Student.Generate().SocialSecurityNumber;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Students.Add(existingStudent);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "students",
+                id = existingStudent.StringId,
+                attributes = new
                 {
-                    type = "students",
-                    id = existingStudent.StringId,
-                    attributes = new
-                    {
-                        socialSecurityNumber = encryptionService.Encrypt(newSocialSecurityNumber)
-                    }
+                    socialSecurityNumber = encryptionService.Encrypt(newSocialSecurityNumber)
                 }
-            };
+            }
+        };
 
-            string route = $"/students/{existingStudent.StringId}";
+        string route = $"/students/{existingStudent.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-                socialSecurityNumber.Should().Be(newSocialSecurityNumber);
-            });
+            socialSecurityNumber.Should().Be(newSocialSecurityNumber);
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Student studentInDatabase = await dbContext.Students.FirstWithIdAsync(existingStudent.Id);
-
-                studentInDatabase.SocialSecurityNumber.Should().Be(newSocialSecurityNumber);
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Student studentInDatabase = await dbContext.Students.FirstWithIdAsync(existingStudent.Id);
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnDeserialize),
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
-            }, options => options.WithStrictOrdering());
-        }
+            studentInDatabase.SocialSecurityNumber.Should().Be(newSocialSecurityNumber);
+        });
 
-        [Fact]
-        public async Task Encrypts_on_update_resource_with_included_ToMany_relationship()
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
         {
-            // Arrange
-            var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnDeserialize),
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
+        }, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public async Task Encrypts_on_update_resource_with_included_ToMany_relationship()
+    {
+        // Arrange
+        var encryptionService = _testContext.Factory.Services.GetRequiredService<IEncryptionService>();
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            Scholarship existingScholarship = _fakers.Scholarship.Generate();
-            existingScholarship.Participants = _fakers.Student.Generate(3);
+        Scholarship existingScholarship = _fakers.Scholarship.Generate();
+        existingScholarship.Participants = _fakers.Student.Generate(3);
 
-            decimal newAmount = _fakers.Scholarship.Generate().Amount;
+        decimal newAmount = _fakers.Scholarship.Generate().Amount;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Scholarships.Add(existingScholarship);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Scholarships.Add(existingScholarship);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "scholarships",
+                id = existingScholarship.StringId,
+                attributes = new
                 {
-                    type = "scholarships",
-                    id = existingScholarship.StringId,
-                    attributes = new
-                    {
-                        amount = newAmount
-                    },
-                    relationships = new
+                    amount = newAmount
+                },
+                relationships = new
+                {
+                    participants = new
                     {
-                        participants = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
+                            {
+                                type = "students",
+                                id = existingScholarship.Participants[0].StringId
+                            },
+                            new
                             {
-                                new
-                                {
-                                    type = "students",
-                                    id = existingScholarship.Participants[0].StringId
-                                },
-                                new
-                                {
-                                    type = "students",
-                                    id = existingScholarship.Participants[2].StringId
-                                }
+                                type = "students",
+                                id = existingScholarship.Participants[2].StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/scholarships/{existingScholarship.StringId}?include=participants";
+        string route = $"/scholarships/{existingScholarship.StringId}?include=participants";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
 
-            responseDocument.Included.ShouldHaveCount(2);
+        responseDocument.Included.ShouldHaveCount(2);
 
-            responseDocument.Included[0].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        responseDocument.Included[0].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-                socialSecurityNumber.Should().Be(existingScholarship.Participants[0].SocialSecurityNumber);
-            });
+            socialSecurityNumber.Should().Be(existingScholarship.Participants[0].SocialSecurityNumber);
+        });
 
-            responseDocument.Included[1].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
-            {
-                string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
-                string socialSecurityNumber = encryptionService.Decrypt(stringValue);
+        responseDocument.Included[1].Attributes.ShouldContainKey("socialSecurityNumber").With(value =>
+        {
+            string stringValue = value.Should().BeOfType<string?>().Subject.ShouldNotBeNull();
+            string socialSecurityNumber = encryptionService.Decrypt(stringValue);
 
-                socialSecurityNumber.Should().Be(existingScholarship.Participants[2].SocialSecurityNumber);
-            });
+            socialSecurityNumber.Should().Be(existingScholarship.Participants[2].SocialSecurityNumber);
+        });
 
-            hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
-            {
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize),
-                (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
-            }, options => options.WithStrictOrdering());
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEquivalentTo(new[]
+        {
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize),
+            (typeof(Student), ResourceDefinitionExtensibilityPoints.OnSerialize)
+        }, options => options.WithStrictOrdering());
+    }
 
-        [Fact]
-        public async Task Skips_on_get_ToOne_relationship()
+    [Fact]
+    public async Task Skips_on_get_ToOne_relationship()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+
+        Scholarship scholarship = _fakers.Scholarship.Generate();
+        scholarship.PrimaryContact = _fakers.Student.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            dbContext.Scholarships.Add(scholarship);
+            await dbContext.SaveChangesAsync();
+        });
 
-            Scholarship scholarship = _fakers.Scholarship.Generate();
-            scholarship.PrimaryContact = _fakers.Student.Generate();
+        string route = $"/scholarships/{scholarship.StringId}/relationships/primaryContact";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Scholarships.Add(scholarship);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/scholarships/{scholarship.StringId}/relationships/primaryContact";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(scholarship.PrimaryContact.StringId);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        hitCounter.HitExtensibilityPoints.Should().BeEmpty();
+    }
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(scholarship.PrimaryContact.StringId);
+    [Fact]
+    public async Task Skips_on_get_ToMany_relationship()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEmpty();
-        }
+        Scholarship scholarship = _fakers.Scholarship.Generate();
+        scholarship.Participants = _fakers.Student.Generate(2);
 
-        [Fact]
-        public async Task Skips_on_get_ToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+            dbContext.Scholarships.Add(scholarship);
+            await dbContext.SaveChangesAsync();
+        });
 
-            Scholarship scholarship = _fakers.Scholarship.Generate();
-            scholarship.Participants = _fakers.Student.Generate(2);
+        string route = $"/scholarships/{scholarship.StringId}/relationships/participants";
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Scholarships.Add(scholarship);
-                await dbContext.SaveChangesAsync();
-            });
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            string route = $"/scholarships/{scholarship.StringId}/relationships/participants";
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        responseDocument.Data.ManyValue.ShouldHaveCount(2);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(scholarship.Participants[0].StringId);
+        responseDocument.Data.ManyValue[1].Id.Should().Be(scholarship.Participants[1].StringId);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        hitCounter.HitExtensibilityPoints.Should().BeEmpty();
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(2);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(scholarship.Participants[0].StringId);
-            responseDocument.Data.ManyValue[1].Id.Should().Be(scholarship.Participants[1].StringId);
+    [Fact]
+    public async Task Skips_on_update_ToOne_relationship()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEmpty();
-        }
+        Scholarship existingScholarship = _fakers.Scholarship.Generate();
+        Student existingStudent = _fakers.Student.Generate();
 
-        [Fact]
-        public async Task Skips_on_update_ToOne_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
-
-            Scholarship existingScholarship = _fakers.Scholarship.Generate();
-            Student existingStudent = _fakers.Student.Generate();
+            dbContext.AddInRange(existingScholarship, existingStudent);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingScholarship, existingStudent);
-                await dbContext.SaveChangesAsync();
-            });
-
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
-                {
-                    type = "students",
-                    id = existingStudent.StringId
-                }
-            };
+                type = "students",
+                id = existingStudent.StringId
+            }
+        };
 
-            string route = $"/scholarships/{existingScholarship.StringId}/relationships/primaryContact";
+        string route = $"/scholarships/{existingScholarship.StringId}/relationships/primaryContact";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEmpty();
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Skips_on_set_ToMany_relationship()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+    [Fact]
+    public async Task Skips_on_set_ToMany_relationship()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            Scholarship existingScholarship = _fakers.Scholarship.Generate();
-            List<Student> existingStudents = _fakers.Student.Generate(2);
+        Scholarship existingScholarship = _fakers.Scholarship.Generate();
+        List<Student> existingStudents = _fakers.Student.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Scholarships.Add(existingScholarship);
-                dbContext.Students.AddRange(existingStudents);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Scholarships.Add(existingScholarship);
+            dbContext.Students.AddRange(existingStudents);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "students",
-                        id = existingStudents[0].StringId
-                    },
-                    new
-                    {
-                        type = "students",
-                        id = existingStudents[1].StringId
-                    }
+                    type = "students",
+                    id = existingStudents[0].StringId
+                },
+                new
+                {
+                    type = "students",
+                    id = existingStudents[1].StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/scholarships/{existingScholarship.StringId}/relationships/participants";
+        string route = $"/scholarships/{existingScholarship.StringId}/relationships/participants";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEmpty();
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Skips_on_add_to_ToMany_relationship()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+    [Fact]
+    public async Task Skips_on_add_to_ToMany_relationship()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            Scholarship existingScholarship = _fakers.Scholarship.Generate();
-            List<Student> existingStudents = _fakers.Student.Generate(2);
+        Scholarship existingScholarship = _fakers.Scholarship.Generate();
+        List<Student> existingStudents = _fakers.Student.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Scholarships.Add(existingScholarship);
-                dbContext.Students.AddRange(existingStudents);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Scholarships.Add(existingScholarship);
+            dbContext.Students.AddRange(existingStudents);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "students",
-                        id = existingStudents[0].StringId
-                    },
-                    new
-                    {
-                        type = "students",
-                        id = existingStudents[1].StringId
-                    }
+                    type = "students",
+                    id = existingStudents[0].StringId
+                },
+                new
+                {
+                    type = "students",
+                    id = existingStudents[1].StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/scholarships/{existingScholarship.StringId}/relationships/participants";
+        string route = $"/scholarships/{existingScholarship.StringId}/relationships/participants";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEmpty();
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Skips_on_remove_from_ToMany_relationship()
-        {
-            // Arrange
-            var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
+    [Fact]
+    public async Task Skips_on_remove_from_ToMany_relationship()
+    {
+        // Arrange
+        var hitCounter = _testContext.Factory.Services.GetRequiredService<ResourceDefinitionHitCounter>();
 
-            Scholarship existingScholarship = _fakers.Scholarship.Generate();
-            existingScholarship.Participants = _fakers.Student.Generate(2);
+        Scholarship existingScholarship = _fakers.Scholarship.Generate();
+        existingScholarship.Participants = _fakers.Student.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Scholarships.Add(existingScholarship);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Scholarships.Add(existingScholarship);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "students",
-                        id = existingScholarship.Participants[0].StringId
-                    },
-                    new
-                    {
-                        type = "students",
-                        id = existingScholarship.Participants[1].StringId
-                    }
+                    type = "students",
+                    id = existingScholarship.Participants[0].StringId
+                },
+                new
+                {
+                    type = "students",
+                    id = existingScholarship.Participants[1].StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/scholarships/{existingScholarship.StringId}/relationships/participants";
+        string route = $"/scholarships/{existingScholarship.StringId}/relationships/participants";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            hitCounter.HitExtensibilityPoints.Should().BeEmpty();
-        }
+        hitCounter.HitExtensibilityPoints.Should().BeEmpty();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Scholarship.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Scholarship.cs
index 60a0bb0170..b85ba68f43 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Scholarship.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Scholarship.cs
@@ -1,23 +1,22 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization")]
+public sealed class Scholarship : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Scholarship : Identifiable<int>
-    {
-        [Attr]
-        public string ProgramName { get; set; } = null!;
+    [Attr]
+    public string ProgramName { get; set; } = null!;
 
-        [Attr]
-        public decimal Amount { get; set; }
+    [Attr]
+    public decimal Amount { get; set; }
 
-        [HasMany]
-        public IList<Student> Participants { get; set; } = new List<Student>();
+    [HasMany]
+    public IList<Student> Participants { get; set; } = new List<Student>();
 
-        [HasOne]
-        public Student? PrimaryContact { get; set; }
-    }
+    [HasOne]
+    public Student? PrimaryContact { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ScholarshipsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ScholarshipsController.cs
deleted file mode 100644
index bd792e0cdf..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/ScholarshipsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization
-{
-    public sealed class ScholarshipsController : JsonApiController<Scholarship, int>
-    {
-        public ScholarshipsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Scholarship, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationDbContext.cs
index 215cee8fc6..c8695f2ab4 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationDbContext.cs
@@ -3,24 +3,23 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class SerializationDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class SerializationDbContext : DbContext
-    {
-        public DbSet<Student> Students => Set<Student>();
-        public DbSet<Scholarship> Scholarships => Set<Scholarship>();
+    public DbSet<Student> Students => Set<Student>();
+    public DbSet<Scholarship> Scholarships => Set<Scholarship>();
 
-        public SerializationDbContext(DbContextOptions<SerializationDbContext> options)
-            : base(options)
-        {
-        }
+    public SerializationDbContext(DbContextOptions<SerializationDbContext> options)
+        : base(options)
+    {
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<Scholarship>()
-                .HasMany(scholarship => scholarship.Participants)
-                .WithOne(student => student.Scholarship!);
-        }
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<Scholarship>()
+            .HasMany(scholarship => scholarship.Participants)
+            .WithOne(student => student.Scholarship!);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationFakers.cs
index 814474a4ed..48e57dd8a6 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationFakers.cs
@@ -1,4 +1,3 @@
-using System;
 using Bogus;
 using Bogus.Extensions.UnitedStates;
 using TestBuildingBlocks;
@@ -6,23 +5,22 @@
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization;
+
+internal sealed class SerializationFakers : FakerContainer
 {
-    internal sealed class SerializationFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<Student>> _lazyStudentFaker = new(() =>
-            new Faker<Student>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(student => student.Name, faker => faker.Person.FullName)
-                .RuleFor(student => student.SocialSecurityNumber, faker => faker.Person.Ssn()));
+    private readonly Lazy<Faker<Student>> _lazyStudentFaker = new(() =>
+        new Faker<Student>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(student => student.Name, faker => faker.Person.FullName)
+            .RuleFor(student => student.SocialSecurityNumber, faker => faker.Person.Ssn()));
 
-        private readonly Lazy<Faker<Scholarship>> _lazyScholarshipFaker = new(() =>
-            new Faker<Scholarship>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(scholarship => scholarship.ProgramName, faker => faker.Commerce.Department())
-                .RuleFor(scholarship => scholarship.Amount, faker => faker.Finance.Amount()));
+    private readonly Lazy<Faker<Scholarship>> _lazyScholarshipFaker = new(() =>
+        new Faker<Scholarship>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(scholarship => scholarship.ProgramName, faker => faker.Commerce.Department())
+            .RuleFor(scholarship => scholarship.Amount, faker => faker.Finance.Amount()));
 
-        public Faker<Student> Student => _lazyStudentFaker.Value;
-        public Faker<Scholarship> Scholarship => _lazyScholarshipFaker.Value;
-    }
+    public Faker<Student> Student => _lazyStudentFaker.Value;
+    public Faker<Scholarship> Scholarship => _lazyScholarshipFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Student.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Student.cs
index f6d0e5f97b..61ef124269 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Student.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/Student.cs
@@ -2,18 +2,18 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization")]
+public sealed class Student : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Student : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [Attr]
-        public string SocialSecurityNumber { get; set; } = null!;
+    [Attr]
+    public string SocialSecurityNumber { get; set; } = null!;
 
-        [HasOne]
-        public Scholarship? Scholarship { get; set; }
-    }
+    [HasOne]
+    public Scholarship? Scholarship { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentDefinition.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentDefinition.cs
index 82b02e682f..8c857b5bc9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentDefinition.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentDefinition.cs
@@ -1,42 +1,41 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class StudentDefinition : HitCountingResourceDefinition<Student, int>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class StudentDefinition : HitCountingResourceDefinition<Student, int>
-    {
-        private readonly IEncryptionService _encryptionService;
+    private readonly IEncryptionService _encryptionService;
 
-        protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Serialization;
+    protected override ResourceDefinitionExtensibilityPoints ExtensibilityPointsToTrack => ResourceDefinitionExtensibilityPoints.Serialization;
 
-        public StudentDefinition(IResourceGraph resourceGraph, IEncryptionService encryptionService, ResourceDefinitionHitCounter hitCounter)
-            : base(resourceGraph, hitCounter)
-        {
-            // This constructor will be resolved from the container, which means
-            // you can take on any dependency that is also defined in the container.
+    public StudentDefinition(IResourceGraph resourceGraph, IEncryptionService encryptionService, ResourceDefinitionHitCounter hitCounter)
+        : base(resourceGraph, hitCounter)
+    {
+        // This constructor will be resolved from the container, which means
+        // you can take on any dependency that is also defined in the container.
 
-            _encryptionService = encryptionService;
-        }
+        _encryptionService = encryptionService;
+    }
 
-        public override void OnDeserialize(Student resource)
-        {
-            base.OnDeserialize(resource);
+    public override void OnDeserialize(Student resource)
+    {
+        base.OnDeserialize(resource);
 
-            if (!string.IsNullOrEmpty(resource.SocialSecurityNumber))
-            {
-                resource.SocialSecurityNumber = _encryptionService.Decrypt(resource.SocialSecurityNumber);
-            }
+        if (!string.IsNullOrEmpty(resource.SocialSecurityNumber))
+        {
+            resource.SocialSecurityNumber = _encryptionService.Decrypt(resource.SocialSecurityNumber);
         }
+    }
 
-        public override void OnSerialize(Student resource)
-        {
-            base.OnSerialize(resource);
+    public override void OnSerialize(Student resource)
+    {
+        base.OnSerialize(resource);
 
-            if (!string.IsNullOrEmpty(resource.SocialSecurityNumber))
-            {
-                resource.SocialSecurityNumber = _encryptionService.Encrypt(resource.SocialSecurityNumber);
-            }
+        if (!string.IsNullOrEmpty(resource.SocialSecurityNumber))
+        {
+            resource.SocialSecurityNumber = _encryptionService.Encrypt(resource.SocialSecurityNumber);
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentsController.cs
deleted file mode 100644
index 3cb63c97c4..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/StudentsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization
-{
-    public sealed class StudentsController : JsonApiController<Student, int>
-    {
-        public StudentsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Student, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Book.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Book.cs
index 357e4d35e2..f453b59915 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Book.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Book.cs
@@ -1,12 +1,11 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class Book : ContentItem
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Book : ContentItem
-    {
-        [Attr]
-        public int PageCount { get; set; }
-    }
+    [Attr]
+    public int PageCount { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/CompanyHealthInsurance.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/CompanyHealthInsurance.cs
index 9c3a24255e..53f6af49f7 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/CompanyHealthInsurance.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/CompanyHealthInsurance.cs
@@ -1,12 +1,11 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class CompanyHealthInsurance : HealthInsurance
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class CompanyHealthInsurance : HealthInsurance
-    {
-        [Attr]
-        public string CompanyCode { get; set; } = null!;
-    }
+    [Attr]
+    public string CompanyCode { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ContentItem.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ContentItem.cs
index d8e8d90c39..3dd1d00eaa 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ContentItem.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ContentItem.cs
@@ -2,12 +2,11 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public abstract class ContentItem : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public abstract class ContentItem : Identifiable<int>
-    {
-        [Attr]
-        public string Title { get; set; } = null!;
-    }
+    [Attr]
+    public string Title { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/FamilyHealthInsurance.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/FamilyHealthInsurance.cs
index df9b4af31f..4975835f69 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/FamilyHealthInsurance.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/FamilyHealthInsurance.cs
@@ -1,12 +1,11 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class FamilyHealthInsurance : HealthInsurance
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class FamilyHealthInsurance : HealthInsurance
-    {
-        [Attr]
-        public int PermittedFamilySize { get; set; }
-    }
+    [Attr]
+    public int PermittedFamilySize { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/HealthInsurance.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/HealthInsurance.cs
index 34ddee9a22..c194d5bb86 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/HealthInsurance.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/HealthInsurance.cs
@@ -2,12 +2,11 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public abstract class HealthInsurance : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public abstract class HealthInsurance : Identifiable<int>
-    {
-        [Attr]
-        public bool HasMonthlyFee { get; set; }
-    }
+    [Attr]
+    public bool HasMonthlyFee { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Human.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Human.cs
index 63efc0443d..d32d182dc4 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Human.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Human.cs
@@ -1,26 +1,24 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public abstract class Human : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public abstract class Human : Identifiable<int>
-    {
-        [Attr]
-        public string FamilyName { get; set; } = null!;
+    [Attr]
+    public string FamilyName { get; set; } = null!;
 
-        [Attr]
-        public bool IsRetired { get; set; }
+    [Attr]
+    public bool IsRetired { get; set; }
 
-        [HasOne]
-        public HealthInsurance? HealthInsurance { get; set; }
+    [HasOne]
+    public HealthInsurance? HealthInsurance { get; set; }
 
-        [HasMany]
-        public ICollection<Human> Parents { get; set; } = new List<Human>();
+    [HasMany]
+    public ICollection<Human> Parents { get; set; } = new List<Human>();
 
-        [HasMany]
-        public ICollection<ContentItem> FavoriteContent { get; set; } = new List<ContentItem>();
-    }
+    [HasMany]
+    public ICollection<ContentItem> FavoriteContent { get; set; } = new List<ContentItem>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceDbContext.cs
index 08444d9080..ddf70ad29e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceDbContext.cs
@@ -3,37 +3,36 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class InheritanceDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class InheritanceDbContext : DbContext
-    {
-        public DbSet<Human> Humans => Set<Human>();
-        public DbSet<Man> Men => Set<Man>();
-        public DbSet<CompanyHealthInsurance> CompanyHealthInsurances => Set<CompanyHealthInsurance>();
-        public DbSet<ContentItem> ContentItems => Set<ContentItem>();
+    public DbSet<Human> Humans => Set<Human>();
+    public DbSet<Man> Men => Set<Man>();
+    public DbSet<CompanyHealthInsurance> CompanyHealthInsurances => Set<CompanyHealthInsurance>();
+    public DbSet<ContentItem> ContentItems => Set<ContentItem>();
 
-        public InheritanceDbContext(DbContextOptions<InheritanceDbContext> options)
-            : base(options)
-        {
-        }
+    public InheritanceDbContext(DbContextOptions<InheritanceDbContext> options)
+        : base(options)
+    {
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<Human>()
-                .HasDiscriminator<int>("Type")
-                .HasValue<Man>(1)
-                .HasValue<Woman>(2);
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<Human>()
+            .HasDiscriminator<int>("Type")
+            .HasValue<Man>(1)
+            .HasValue<Woman>(2);
 
-            builder.Entity<HealthInsurance>()
-                .HasDiscriminator<int>("Type")
-                .HasValue<CompanyHealthInsurance>(1)
-                .HasValue<FamilyHealthInsurance>(2);
+        builder.Entity<HealthInsurance>()
+            .HasDiscriminator<int>("Type")
+            .HasValue<CompanyHealthInsurance>(1)
+            .HasValue<FamilyHealthInsurance>(2);
 
-            builder.Entity<ContentItem>()
-                .HasDiscriminator<int>("Type")
-                .HasValue<Video>(1)
-                .HasValue<Book>(2);
-        }
+        builder.Entity<ContentItem>()
+            .HasDiscriminator<int>("Type")
+            .HasValue<Video>(1)
+            .HasValue<Book>(2);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceFakers.cs
index 298ebb6f64..8c88b8aa49 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceFakers.cs
@@ -1,57 +1,55 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
+
+internal sealed class InheritanceFakers : FakerContainer
 {
-    internal sealed class InheritanceFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<Man>> _lazyManFaker = new(() =>
-            new Faker<Man>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(man => man.FamilyName, faker => faker.Person.LastName)
-                .RuleFor(man => man.IsRetired, faker => faker.Random.Bool())
-                .RuleFor(man => man.HasBeard, faker => faker.Random.Bool()));
-
-        private readonly Lazy<Faker<Woman>> _lazyWomanFaker = new(() =>
-            new Faker<Woman>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(woman => woman.FamilyName, faker => faker.Person.LastName)
-                .RuleFor(woman => woman.IsRetired, faker => faker.Random.Bool())
-                .RuleFor(woman => woman.IsPregnant, faker => faker.Random.Bool()));
-
-        private readonly Lazy<Faker<Book>> _lazyBookFaker = new(() =>
-            new Faker<Book>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(book => book.Title, faker => faker.Commerce.ProductName())
-                .RuleFor(book => book.PageCount, faker => faker.Random.Int(50, 150)));
-
-        private readonly Lazy<Faker<Video>> _lazyVideoFaker = new(() =>
-            new Faker<Video>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(video => video.Title, faker => faker.Commerce.ProductName())
-                .RuleFor(video => video.DurationInSeconds, faker => faker.Random.Int(250, 750)));
-
-        private readonly Lazy<Faker<FamilyHealthInsurance>> _lazyFamilyHealthInsuranceFaker = new(() =>
-            new Faker<FamilyHealthInsurance>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(familyHealthInsurance => familyHealthInsurance.HasMonthlyFee, faker => faker.Random.Bool())
-                .RuleFor(familyHealthInsurance => familyHealthInsurance.PermittedFamilySize, faker => faker.Random.Int(2, 10)));
-
-        private readonly Lazy<Faker<CompanyHealthInsurance>> _lazyCompanyHealthInsuranceFaker = new(() =>
-            new Faker<CompanyHealthInsurance>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(companyHealthInsurance => companyHealthInsurance.HasMonthlyFee, faker => faker.Random.Bool())
-                .RuleFor(companyHealthInsurance => companyHealthInsurance.CompanyCode, faker => faker.Company.CompanyName()));
-
-        public Faker<Man> Man => _lazyManFaker.Value;
-        public Faker<Woman> Woman => _lazyWomanFaker.Value;
-        public Faker<Book> Book => _lazyBookFaker.Value;
-        public Faker<Video> Video => _lazyVideoFaker.Value;
-        public Faker<FamilyHealthInsurance> FamilyHealthInsurance => _lazyFamilyHealthInsuranceFaker.Value;
-        public Faker<CompanyHealthInsurance> CompanyHealthInsurance => _lazyCompanyHealthInsuranceFaker.Value;
-    }
+    private readonly Lazy<Faker<Man>> _lazyManFaker = new(() =>
+        new Faker<Man>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(man => man.FamilyName, faker => faker.Person.LastName)
+            .RuleFor(man => man.IsRetired, faker => faker.Random.Bool())
+            .RuleFor(man => man.HasBeard, faker => faker.Random.Bool()));
+
+    private readonly Lazy<Faker<Woman>> _lazyWomanFaker = new(() =>
+        new Faker<Woman>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(woman => woman.FamilyName, faker => faker.Person.LastName)
+            .RuleFor(woman => woman.IsRetired, faker => faker.Random.Bool())
+            .RuleFor(woman => woman.IsPregnant, faker => faker.Random.Bool()));
+
+    private readonly Lazy<Faker<Book>> _lazyBookFaker = new(() =>
+        new Faker<Book>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(book => book.Title, faker => faker.Commerce.ProductName())
+            .RuleFor(book => book.PageCount, faker => faker.Random.Int(50, 150)));
+
+    private readonly Lazy<Faker<Video>> _lazyVideoFaker = new(() =>
+        new Faker<Video>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(video => video.Title, faker => faker.Commerce.ProductName())
+            .RuleFor(video => video.DurationInSeconds, faker => faker.Random.Int(250, 750)));
+
+    private readonly Lazy<Faker<FamilyHealthInsurance>> _lazyFamilyHealthInsuranceFaker = new(() =>
+        new Faker<FamilyHealthInsurance>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(familyHealthInsurance => familyHealthInsurance.HasMonthlyFee, faker => faker.Random.Bool())
+            .RuleFor(familyHealthInsurance => familyHealthInsurance.PermittedFamilySize, faker => faker.Random.Int(2, 10)));
+
+    private readonly Lazy<Faker<CompanyHealthInsurance>> _lazyCompanyHealthInsuranceFaker = new(() =>
+        new Faker<CompanyHealthInsurance>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(companyHealthInsurance => companyHealthInsurance.HasMonthlyFee, faker => faker.Random.Bool())
+            .RuleFor(companyHealthInsurance => companyHealthInsurance.CompanyCode, faker => faker.Company.CompanyName()));
+
+    public Faker<Man> Man => _lazyManFaker.Value;
+    public Faker<Woman> Woman => _lazyWomanFaker.Value;
+    public Faker<Book> Book => _lazyBookFaker.Value;
+    public Faker<Video> Video => _lazyVideoFaker.Value;
+    public Faker<FamilyHealthInsurance> FamilyHealthInsurance => _lazyFamilyHealthInsuranceFaker.Value;
+    public Faker<CompanyHealthInsurance> CompanyHealthInsurance => _lazyCompanyHealthInsuranceFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceTests.cs
index 98ea25890a..0aed279351 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/InheritanceTests.cs
@@ -1,461 +1,458 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
+
+public sealed class InheritanceTests : IClassFixture<IntegrationTestContext<TestableStartup<InheritanceDbContext>, InheritanceDbContext>>
 {
-    public sealed class InheritanceTests : IClassFixture<IntegrationTestContext<TestableStartup<InheritanceDbContext>, InheritanceDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<InheritanceDbContext>, InheritanceDbContext> _testContext;
+    private readonly InheritanceFakers _fakers = new();
+
+    public InheritanceTests(IntegrationTestContext<TestableStartup<InheritanceDbContext>, InheritanceDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<InheritanceDbContext>, InheritanceDbContext> _testContext;
-        private readonly InheritanceFakers _fakers = new();
+        _testContext = testContext;
 
-        public InheritanceTests(IntegrationTestContext<TestableStartup<InheritanceDbContext>, InheritanceDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<MenController>();
+    }
 
-            testContext.UseController<MenController>();
-        }
+    [Fact]
+    public async Task Can_create_resource_with_inherited_attributes()
+    {
+        // Arrange
+        Man newMan = _fakers.Man.Generate();
 
-        [Fact]
-        public async Task Can_create_resource_with_inherited_attributes()
+        var requestBody = new
         {
-            // Arrange
-            Man newMan = _fakers.Man.Generate();
-
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "men",
+                attributes = new
                 {
-                    type = "men",
-                    attributes = new
-                    {
-                        familyName = newMan.FamilyName,
-                        isRetired = newMan.IsRetired,
-                        hasBeard = newMan.HasBeard
-                    }
+                    familyName = newMan.FamilyName,
+                    isRetired = newMan.IsRetired,
+                    hasBeard = newMan.HasBeard
                 }
-            };
+            }
+        };
 
-            const string route = "/men";
+        const string route = "/men";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Type.Should().Be("men");
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("familyName").With(value => value.Should().Be(newMan.FamilyName));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isRetired").With(value => value.Should().Be(newMan.IsRetired));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("hasBeard").With(value => value.Should().Be(newMan.HasBeard));
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Type.Should().Be("men");
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("familyName").With(value => value.Should().Be(newMan.FamilyName));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isRetired").With(value => value.Should().Be(newMan.IsRetired));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("hasBeard").With(value => value.Should().Be(newMan.HasBeard));
 
-            int newManId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        int newManId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Man manInDatabase = await dbContext.Men.FirstWithIdAsync(newManId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Man manInDatabase = await dbContext.Men.FirstWithIdAsync(newManId);
 
-                manInDatabase.FamilyName.Should().Be(newMan.FamilyName);
-                manInDatabase.IsRetired.Should().Be(newMan.IsRetired);
-                manInDatabase.HasBeard.Should().Be(newMan.HasBeard);
-            });
-        }
+            manInDatabase.FamilyName.Should().Be(newMan.FamilyName);
+            manInDatabase.IsRetired.Should().Be(newMan.IsRetired);
+            manInDatabase.HasBeard.Should().Be(newMan.HasBeard);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_ToOne_relationship()
-        {
-            // Arrange
-            CompanyHealthInsurance existingInsurance = _fakers.CompanyHealthInsurance.Generate();
+    [Fact]
+    public async Task Can_create_resource_with_ToOne_relationship()
+    {
+        // Arrange
+        CompanyHealthInsurance existingInsurance = _fakers.CompanyHealthInsurance.Generate();
 
-            string newFamilyName = _fakers.Man.Generate().FamilyName;
+        string newFamilyName = _fakers.Man.Generate().FamilyName;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<CompanyHealthInsurance>();
-                dbContext.CompanyHealthInsurances.Add(existingInsurance);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<CompanyHealthInsurance>();
+            dbContext.CompanyHealthInsurances.Add(existingInsurance);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "men",
+                attributes = new
                 {
-                    type = "men",
-                    attributes = new
-                    {
-                        familyName = newFamilyName
-                    },
-                    relationships = new
+                    familyName = newFamilyName
+                },
+                relationships = new
+                {
+                    healthInsurance = new
                     {
-                        healthInsurance = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "companyHealthInsurances",
-                                id = existingInsurance.StringId
-                            }
+                            type = "companyHealthInsurances",
+                            id = existingInsurance.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/men";
+        const string route = "/men";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            int newManId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        int newManId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Man manInDatabase = await dbContext.Men.Include(man => man.HealthInsurance).FirstWithIdAsync(newManId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Man manInDatabase = await dbContext.Men.Include(man => man.HealthInsurance).FirstWithIdAsync(newManId);
 
-                manInDatabase.HealthInsurance.ShouldNotBeNull();
-                manInDatabase.HealthInsurance.Should().BeOfType<CompanyHealthInsurance>();
-                manInDatabase.HealthInsurance.Id.Should().Be(existingInsurance.Id);
-            });
-        }
+            manInDatabase.HealthInsurance.ShouldNotBeNull();
+            manInDatabase.HealthInsurance.Should().BeOfType<CompanyHealthInsurance>();
+            manInDatabase.HealthInsurance.Id.Should().Be(existingInsurance.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource()
-        {
-            // Arrange
-            Man existingMan = _fakers.Man.Generate();
+    [Fact]
+    public async Task Can_update_resource()
+    {
+        // Arrange
+        Man existingMan = _fakers.Man.Generate();
 
-            Man newMan = _fakers.Man.Generate();
+        Man newMan = _fakers.Man.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Men.Add(existingMan);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Men.Add(existingMan);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "men",
+                id = existingMan.StringId,
+                attributes = new
                 {
-                    type = "men",
-                    id = existingMan.StringId,
-                    attributes = new
-                    {
-                        familyName = newMan.FamilyName,
-                        isRetired = newMan.IsRetired,
-                        hasBeard = newMan.HasBeard
-                    }
+                    familyName = newMan.FamilyName,
+                    isRetired = newMan.IsRetired,
+                    hasBeard = newMan.HasBeard
                 }
-            };
+            }
+        };
 
-            string route = $"/men/{existingMan.StringId}";
+        string route = $"/men/{existingMan.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Man manInDatabase = await dbContext.Men.FirstWithIdAsync(existingMan.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Man manInDatabase = await dbContext.Men.FirstWithIdAsync(existingMan.Id);
 
-                manInDatabase.FamilyName.Should().Be(newMan.FamilyName);
-                manInDatabase.IsRetired.Should().Be(newMan.IsRetired);
-                manInDatabase.HasBeard.Should().Be(newMan.HasBeard);
-            });
-        }
+            manInDatabase.FamilyName.Should().Be(newMan.FamilyName);
+            manInDatabase.IsRetired.Should().Be(newMan.IsRetired);
+            manInDatabase.HasBeard.Should().Be(newMan.HasBeard);
+        });
+    }
 
-        [Fact]
-        public async Task Can_assign_ToOne_relationship()
+    [Fact]
+    public async Task Can_assign_ToOne_relationship()
+    {
+        // Arrange
+        Man existingMan = _fakers.Man.Generate();
+        FamilyHealthInsurance existingInsurance = _fakers.FamilyHealthInsurance.Generate();
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Man existingMan = _fakers.Man.Generate();
-            FamilyHealthInsurance existingInsurance = _fakers.FamilyHealthInsurance.Generate();
+            await dbContext.ClearTablesAsync<Man, CompanyHealthInsurance>();
+            dbContext.AddInRange(existingMan, existingInsurance);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
+        var requestBody = new
+        {
+            data = new
             {
-                await dbContext.ClearTablesAsync<Man, CompanyHealthInsurance>();
-                dbContext.AddInRange(existingMan, existingInsurance);
-                await dbContext.SaveChangesAsync();
-            });
+                type = "familyHealthInsurances",
+                id = existingInsurance.StringId
+            }
+        };
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "familyHealthInsurances",
-                    id = existingInsurance.StringId
-                }
-            };
+        string route = $"/men/{existingMan.StringId}/relationships/healthInsurance";
 
-            string route = $"/men/{existingMan.StringId}/relationships/healthInsurance";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Man manInDatabase = await dbContext.Men.Include(man => man.HealthInsurance).FirstWithIdAsync(existingMan.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Man manInDatabase = await dbContext.Men.Include(man => man.HealthInsurance).FirstWithIdAsync(existingMan.Id);
 
-                manInDatabase.HealthInsurance.ShouldNotBeNull();
-                manInDatabase.HealthInsurance.Should().BeOfType<FamilyHealthInsurance>();
-                manInDatabase.HealthInsurance.Id.Should().Be(existingInsurance.Id);
-            });
-        }
+            manInDatabase.HealthInsurance.ShouldNotBeNull();
+            manInDatabase.HealthInsurance.Should().BeOfType<FamilyHealthInsurance>();
+            manInDatabase.HealthInsurance.Id.Should().Be(existingInsurance.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_OneToMany_relationship()
-        {
-            // Arrange
-            Man existingFather = _fakers.Man.Generate();
-            Woman existingMother = _fakers.Woman.Generate();
+    [Fact]
+    public async Task Can_create_resource_with_OneToMany_relationship()
+    {
+        // Arrange
+        Man existingFather = _fakers.Man.Generate();
+        Woman existingMother = _fakers.Woman.Generate();
 
-            string newFamilyName = _fakers.Man.Generate().FamilyName;
+        string newFamilyName = _fakers.Man.Generate().FamilyName;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTablesAsync<Woman, Man>();
-                dbContext.Humans.AddRange(existingFather, existingMother);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTablesAsync<Woman, Man>();
+            dbContext.Humans.AddRange(existingFather, existingMother);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "men",
+                attributes = new
                 {
-                    type = "men",
-                    attributes = new
-                    {
-                        familyName = newFamilyName
-                    },
-                    relationships = new
+                    familyName = newFamilyName
+                },
+                relationships = new
+                {
+                    parents = new
                     {
-                        parents = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
+                            {
+                                type = "men",
+                                id = existingFather.StringId
+                            },
+                            new
                             {
-                                new
-                                {
-                                    type = "men",
-                                    id = existingFather.StringId
-                                },
-                                new
-                                {
-                                    type = "women",
-                                    id = existingMother.StringId
-                                }
+                                type = "women",
+                                id = existingMother.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/men";
+        const string route = "/men";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            int newManId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        int newManId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Man manInDatabase = await dbContext.Men.Include(man => man.Parents).FirstWithIdAsync(newManId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Man manInDatabase = await dbContext.Men.Include(man => man.Parents).FirstWithIdAsync(newManId);
 
-                manInDatabase.Parents.ShouldHaveCount(2);
-                manInDatabase.Parents.Should().ContainSingle(human => human is Man);
-                manInDatabase.Parents.Should().ContainSingle(human => human is Woman);
-            });
-        }
+            manInDatabase.Parents.ShouldHaveCount(2);
+            manInDatabase.Parents.Should().ContainSingle(human => human is Man);
+            manInDatabase.Parents.Should().ContainSingle(human => human is Woman);
+        });
+    }
 
-        [Fact]
-        public async Task Can_assign_OneToMany_relationship()
-        {
-            // Arrange
-            Man existingChild = _fakers.Man.Generate();
-            Man existingFather = _fakers.Man.Generate();
-            Woman existingMother = _fakers.Woman.Generate();
+    [Fact]
+    public async Task Can_assign_OneToMany_relationship()
+    {
+        // Arrange
+        Man existingChild = _fakers.Man.Generate();
+        Man existingFather = _fakers.Man.Generate();
+        Woman existingMother = _fakers.Woman.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTablesAsync<Woman, Man>();
-                dbContext.Humans.AddRange(existingChild, existingFather, existingMother);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTablesAsync<Woman, Man>();
+            dbContext.Humans.AddRange(existingChild, existingFather, existingMother);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "men",
-                        id = existingFather.StringId
-                    },
-                    new
-                    {
-                        type = "women",
-                        id = existingMother.StringId
-                    }
+                    type = "men",
+                    id = existingFather.StringId
+                },
+                new
+                {
+                    type = "women",
+                    id = existingMother.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/men/{existingChild.StringId}/relationships/parents";
+        string route = $"/men/{existingChild.StringId}/relationships/parents";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Man manInDatabase = await dbContext.Men.Include(man => man.Parents).FirstWithIdAsync(existingChild.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Man manInDatabase = await dbContext.Men.Include(man => man.Parents).FirstWithIdAsync(existingChild.Id);
 
-                manInDatabase.Parents.ShouldHaveCount(2);
-                manInDatabase.Parents.Should().ContainSingle(human => human is Man);
-                manInDatabase.Parents.Should().ContainSingle(human => human is Woman);
-            });
-        }
+            manInDatabase.Parents.ShouldHaveCount(2);
+            manInDatabase.Parents.Should().ContainSingle(human => human is Man);
+            manInDatabase.Parents.Should().ContainSingle(human => human is Woman);
+        });
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_ManyToMany_relationship()
-        {
-            // Arrange
-            Book existingBook = _fakers.Book.Generate();
-            Video existingVideo = _fakers.Video.Generate();
+    [Fact]
+    public async Task Can_create_resource_with_ManyToMany_relationship()
+    {
+        // Arrange
+        Book existingBook = _fakers.Book.Generate();
+        Video existingVideo = _fakers.Video.Generate();
 
-            string newFamilyName = _fakers.Man.Generate().FamilyName;
+        string newFamilyName = _fakers.Man.Generate().FamilyName;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTablesAsync<Book, Video, Man>();
-                dbContext.ContentItems.AddRange(existingBook, existingVideo);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTablesAsync<Book, Video, Man>();
+            dbContext.ContentItems.AddRange(existingBook, existingVideo);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "men",
+                attributes = new
                 {
-                    type = "men",
-                    attributes = new
-                    {
-                        familyName = newFamilyName
-                    },
-                    relationships = new
+                    familyName = newFamilyName
+                },
+                relationships = new
+                {
+                    favoriteContent = new
                     {
-                        favoriteContent = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
+                            {
+                                type = "books",
+                                id = existingBook.StringId
+                            },
+                            new
                             {
-                                new
-                                {
-                                    type = "books",
-                                    id = existingBook.StringId
-                                },
-                                new
-                                {
-                                    type = "videos",
-                                    id = existingVideo.StringId
-                                }
+                                type = "videos",
+                                id = existingVideo.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/men";
+        const string route = "/men";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            int newManId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        int newManId = int.Parse(responseDocument.Data.SingleValue.Id.ShouldNotBeNull());
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Man manInDatabase = await dbContext.Men.Include(man => man.FavoriteContent).FirstWithIdAsync(newManId);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Man manInDatabase = await dbContext.Men.Include(man => man.FavoriteContent).FirstWithIdAsync(newManId);
 
-                manInDatabase.FavoriteContent.ShouldHaveCount(2);
-                manInDatabase.FavoriteContent.Should().ContainSingle(item => item is Book && item.Id == existingBook.Id);
-                manInDatabase.FavoriteContent.Should().ContainSingle(item => item is Video && item.Id == existingVideo.Id);
-            });
-        }
+            manInDatabase.FavoriteContent.ShouldHaveCount(2);
+            manInDatabase.FavoriteContent.Should().ContainSingle(item => item is Book && item.Id == existingBook.Id);
+            manInDatabase.FavoriteContent.Should().ContainSingle(item => item is Video && item.Id == existingVideo.Id);
+        });
+    }
 
-        [Fact]
-        public async Task Can_assign_ManyToMany_relationship()
-        {
-            // Arrange
-            Book existingBook = _fakers.Book.Generate();
-            Video existingVideo = _fakers.Video.Generate();
-            Man existingMan = _fakers.Man.Generate();
+    [Fact]
+    public async Task Can_assign_ManyToMany_relationship()
+    {
+        // Arrange
+        Book existingBook = _fakers.Book.Generate();
+        Video existingVideo = _fakers.Video.Generate();
+        Man existingMan = _fakers.Man.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTablesAsync<Book, Video, Man>();
-                dbContext.AddInRange(existingBook, existingVideo, existingMan);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTablesAsync<Book, Video, Man>();
+            dbContext.AddInRange(existingBook, existingVideo, existingMan);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "books",
-                        id = existingBook.StringId
-                    },
-                    new
-                    {
-                        type = "videos",
-                        id = existingVideo.StringId
-                    }
+                    type = "books",
+                    id = existingBook.StringId
+                },
+                new
+                {
+                    type = "videos",
+                    id = existingVideo.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/men/{existingMan.StringId}/relationships/favoriteContent";
+        string route = $"/men/{existingMan.StringId}/relationships/favoriteContent";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Man manInDatabase = await dbContext.Men.Include(man => man.FavoriteContent).FirstWithIdAsync(existingMan.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Man manInDatabase = await dbContext.Men.Include(man => man.FavoriteContent).FirstWithIdAsync(existingMan.Id);
 
-                manInDatabase.FavoriteContent.ShouldHaveCount(2);
-                manInDatabase.FavoriteContent.Should().ContainSingle(item => item is Book && item.Id == existingBook.Id);
-                manInDatabase.FavoriteContent.Should().ContainSingle(item => item is Video && item.Id == existingVideo.Id);
-            });
-        }
+            manInDatabase.FavoriteContent.ShouldHaveCount(2);
+            manInDatabase.FavoriteContent.Should().ContainSingle(item => item is Book && item.Id == existingBook.Id);
+            manInDatabase.FavoriteContent.Should().ContainSingle(item => item is Video && item.Id == existingVideo.Id);
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Man.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Man.cs
index 943a5df785..7a2ca673eb 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Man.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Man.cs
@@ -1,12 +1,12 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance")]
+public sealed class Man : Human
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Man : Human
-    {
-        [Attr]
-        public bool HasBeard { get; set; }
-    }
+    [Attr]
+    public bool HasBeard { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/MenController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/MenController.cs
deleted file mode 100644
index 76026d6e58..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/MenController.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
-{
-    public sealed class MenController : JsonApiController<Man, int>
-    {
-        public MenController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<Man, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Video.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Video.cs
index 0cd13a1818..606bc942f6 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Video.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Video.cs
@@ -1,12 +1,11 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class Video : ContentItem
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Video : ContentItem
-    {
-        [Attr]
-        public int DurationInSeconds { get; set; }
-    }
+    [Attr]
+    public int DurationInSeconds { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Woman.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Woman.cs
index 2de4b9b2d6..9c33a16cd9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Woman.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/Woman.cs
@@ -1,12 +1,11 @@
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance
+namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class Woman : Human
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Woman : Human
-    {
-        [Attr]
-        public bool IsPregnant { get; set; }
-    }
+    [Attr]
+    public bool IsPregnant { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Bed.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Bed.cs
index d197b4337e..484a25a2a6 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Bed.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Bed.cs
@@ -1,20 +1,20 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(GenerateControllerEndpoints = JsonApiEndpoints.Query, ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers")]
+public sealed class Bed : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Bed : Identifiable<int>
-    {
-        [Attr]
-        public bool IsDouble { get; set; }
+    [Attr]
+    public bool IsDouble { get; set; }
 
-        [HasMany]
-        public IList<Pillow> Pillows { get; set; } = new List<Pillow>();
+    [HasMany]
+    public IList<Pillow> Pillows { get; set; } = new List<Pillow>();
 
-        [HasOne]
-        public Room? Room { get; set; }
-    }
+    [HasOne]
+    public Room? Room { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BedsReadOnlyController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BedsReadOnlyController.cs
deleted file mode 100644
index 0b0aa04d45..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/BedsReadOnlyController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
-{
-    public sealed class BedsReadOnlyController : JsonApiQueryController<Bed, int>
-    {
-        public BedsReadOnlyController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceQueryService<Bed, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Chair.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Chair.cs
index 4e4a337b5b..3f2b303ad8 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Chair.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Chair.cs
@@ -1,20 +1,23 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(GenerateControllerEndpoints = NoRelationshipEndpoints, ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers")]
+public sealed class Chair : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Chair : Identifiable<int>
-    {
-        [Attr]
-        public int LegCount { get; set; }
+    private const JsonApiEndpoints NoRelationshipEndpoints = JsonApiEndpoints.GetCollection | JsonApiEndpoints.GetSingle | JsonApiEndpoints.Post |
+        JsonApiEndpoints.Patch | JsonApiEndpoints.Delete;
+
+    [Attr]
+    public int LegCount { get; set; }
 
-        [HasMany]
-        public IList<Pillow> Pillows { get; set; } = new List<Pillow>();
+    [HasMany]
+    public IList<Pillow> Pillows { get; set; } = new List<Pillow>();
 
-        [HasOne]
-        public Room? Room { get; set; }
-    }
+    [HasOne]
+    public Room? Room { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/ChairsNoRelationshipsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/ChairsNoRelationshipsController.cs
deleted file mode 100644
index 5b4bb83f3f..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/ChairsNoRelationshipsController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
-{
-    public sealed class ChairsNoRelationshipsController : JsonApiController<Chair, int>
-    {
-        public ChairsNoRelationshipsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IGetAllService<Chair, int>? getAll, IGetByIdService<Chair, int>? getById, ICreateService<Chair, int>? create, IUpdateService<Chair, int>? update,
-            IDeleteService<Chair, int>? delete)
-            : base(options, resourceGraph, loggerFactory, getAll, getById, null, null, create, null, update, null, delete)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/DisableQueryStringTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/DisableQueryStringTests.cs
index 003a481928..ecb0a05579 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/DisableQueryStringTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/DisableQueryStringTests.cs
@@ -1,6 +1,4 @@
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.QueryStrings;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -8,105 +6,104 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
-{
-    public sealed class DisableQueryStringTests : IClassFixture<IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext>>
-    {
-        private readonly IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> _testContext;
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
 
-        public DisableQueryStringTests(IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> testContext)
-        {
-            _testContext = testContext;
+public sealed class DisableQueryStringTests : IClassFixture<IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext>>
+{
+    private readonly IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> _testContext;
 
-            testContext.UseController<SofasBlockingSortPageController>();
-            testContext.UseController<PillowsNoSkipCacheController>();
+    public DisableQueryStringTests(IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddScoped<SkipCacheQueryStringParameterReader>();
-                services.AddScoped<IQueryStringParameterReader>(sp => sp.GetRequiredService<SkipCacheQueryStringParameterReader>());
-            });
-        }
+        testContext.UseController<SofasController>();
+        testContext.UseController<PillowsController>();
 
-        [Fact]
-        public async Task Cannot_sort_if_query_string_parameter_is_blocked_by_controller()
+        testContext.ConfigureServicesAfterStartup(services =>
         {
-            // Arrange
-            const string route = "/sofas?sort=id";
+            services.AddScoped<SkipCacheQueryStringParameterReader>();
+            services.AddScoped<IQueryStringParameterReader>(sp => sp.GetRequiredService<SkipCacheQueryStringParameterReader>());
+        });
+    }
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+    [Fact]
+    public async Task Cannot_sort_if_query_string_parameter_is_blocked_by_controller()
+    {
+        // Arrange
+        const string route = "/sofas?sort=id";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
-            error.Detail.Should().Be("The parameter 'sort' cannot be used at this endpoint.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("sort");
-        }
+        responseDocument.Errors.ShouldHaveCount(1);
 
-        [Fact]
-        public async Task Cannot_paginate_if_query_string_parameter_is_blocked_by_controller()
-        {
-            // Arrange
-            const string route = "/sofas?page[number]=2";
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
+        error.Detail.Should().Be("The parameter 'sort' cannot be used at this endpoint.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("sort");
+    }
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+    [Fact]
+    public async Task Cannot_paginate_if_query_string_parameter_is_blocked_by_controller()
+    {
+        // Arrange
+        const string route = "/sofas?page[number]=2";
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
-            error.Detail.Should().Be("The parameter 'page[number]' cannot be used at this endpoint.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[number]");
-        }
+        responseDocument.Errors.ShouldHaveCount(1);
 
-        [Fact]
-        public async Task Can_use_custom_query_string_parameter()
-        {
-            // Arrange
-            const string route = "/sofas?skipCache";
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
+        error.Detail.Should().Be("The parameter 'page[number]' cannot be used at this endpoint.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[number]");
+    }
+
+    [Fact]
+    public async Task Can_use_custom_query_string_parameter()
+    {
+        // Arrange
+        const string route = "/sofas?skipCache";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.ShouldNotBeEmpty();
-        }
+        responseDocument.ShouldNotBeEmpty();
+    }
 
-        [Fact]
-        public async Task Cannot_use_custom_query_string_parameter_if_blocked_by_controller()
-        {
-            // Arrange
-            const string route = "/pillows?skipCache";
+    [Fact]
+    public async Task Cannot_use_custom_query_string_parameter_if_blocked_by_controller()
+    {
+        // Arrange
+        const string route = "/pillows?skipCache";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.BadRequest);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
-            error.Detail.Should().Be("The parameter 'skipCache' cannot be used at this endpoint.");
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("skipCache");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("Usage of one or more query string parameters is not allowed at the requested endpoint.");
+        error.Detail.Should().Be("The parameter 'skipCache' cannot be used at this endpoint.");
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("skipCache");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoRelationshipsControllerTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoRelationshipsControllerTests.cs
index 191238463f..48480ea88f 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoRelationshipsControllerTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/NoRelationshipsControllerTests.cs
@@ -1,319 +1,315 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+public sealed class NoRelationshipsControllerTests : IClassFixture<IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext>>
 {
-    public sealed class NoRelationshipsControllerTests : IClassFixture<IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> _testContext;
+    private readonly RestrictionFakers _fakers = new();
+
+    public NoRelationshipsControllerTests(IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> _testContext;
-        private readonly RestrictionFakers _fakers = new();
+        _testContext = testContext;
 
-        public NoRelationshipsControllerTests(IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<ChairsController>();
+    }
 
-            testContext.UseController<ChairsNoRelationshipsController>();
-        }
+    [Fact]
+    public async Task Can_get_resources()
+    {
+        // Arrange
+        const string route = "/chairs";
 
-        [Fact]
-        public async Task Can_get_resources()
-        {
-            // Arrange
-            const string route = "/chairs";
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+    [Fact]
+    public async Task Can_get_resource()
+    {
+        // Arrange
+        Chair chair = _fakers.Chair.Generate();
 
-        [Fact]
-        public async Task Can_get_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Chair chair = _fakers.Chair.Generate();
+            dbContext.Chairs.Add(chair);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Chairs.Add(chair);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/chairs/{chair.StringId}";
 
-            string route = $"/chairs/{chair.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+    [Fact]
+    public async Task Cannot_get_secondary_resources()
+    {
+        // Arrange
+        Chair chair = _fakers.Chair.Generate();
 
-        [Fact]
-        public async Task Cannot_get_secondary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Chair chair = _fakers.Chair.Generate();
+            dbContext.Chairs.Add(chair);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Chairs.Add(chair);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/chairs/{chair.StringId}/pillows";
 
-            string route = $"/chairs/{chair.StringId}/pillows";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
-        }
+    [Fact]
+    public async Task Cannot_get_secondary_resource()
+    {
+        // Arrange
+        Chair chair = _fakers.Chair.Generate();
 
-        [Fact]
-        public async Task Cannot_get_secondary_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Chair chair = _fakers.Chair.Generate();
+            dbContext.Chairs.Add(chair);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Chairs.Add(chair);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/chairs/{chair.StringId}/room";
 
-            string route = $"/chairs/{chair.StringId}/room";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
-        }
+    [Fact]
+    public async Task Cannot_get_relationship()
+    {
+        // Arrange
+        Chair chair = _fakers.Chair.Generate();
 
-        [Fact]
-        public async Task Cannot_get_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Chair chair = _fakers.Chair.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Chairs.Add(chair);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Chairs.Add(chair);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/chairs/{chair.StringId}/relationships/pillows";
+        string route = $"/chairs/{chair.StringId}/relationships/pillows";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
+    }
 
-        [Fact]
-        public async Task Can_create_resource()
+    [Fact]
+    public async Task Can_create_resource()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "chairs",
+                attributes = new
                 {
-                    type = "chairs",
-                    attributes = new
-                    {
-                    }
                 }
-            };
+            }
+        };
 
-            const string route = "/chairs";
+        const string route = "/chairs";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+    }
 
-        [Fact]
-        public async Task Can_update_resource()
-        {
-            // Arrange
-            Chair existingChair = _fakers.Chair.Generate();
+    [Fact]
+    public async Task Can_update_resource()
+    {
+        // Arrange
+        Chair existingChair = _fakers.Chair.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Chairs.Add(existingChair);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Chairs.Add(existingChair);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "chairs",
+                id = existingChair.StringId,
+                attributes = new
                 {
-                    type = "chairs",
-                    id = existingChair.StringId,
-                    attributes = new
-                    {
-                    }
                 }
-            };
+            }
+        };
 
-            string route = $"/chairs/{existingChair.StringId}";
+        string route = $"/chairs/{existingChair.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+    }
+
+    [Fact]
+    public async Task Can_delete_resource()
+    {
+        // Arrange
+        Chair existingChair = _fakers.Chair.Generate();
 
-        [Fact]
-        public async Task Can_delete_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Chair existingChair = _fakers.Chair.Generate();
+            dbContext.Chairs.Add(existingChair);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Chairs.Add(existingChair);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/chairs/{existingChair.StringId}";
 
-            string route = $"/chairs/{existingChair.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
-        }
+    [Fact]
+    public async Task Cannot_update_relationship()
+    {
+        // Arrange
+        Chair existingChair = _fakers.Chair.Generate();
 
-        [Fact]
-        public async Task Cannot_update_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Chair existingChair = _fakers.Chair.Generate();
+            dbContext.Chairs.Add(existingChair);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Chairs.Add(existingChair);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        string route = $"/chairs/{existingChair.StringId}/relationships/room";
 
-            string route = $"/chairs/{existingChair.StringId}/relationships/room";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for PATCH requests.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for PATCH requests.");
-        }
+    [Fact]
+    public async Task Cannot_add_to_ToMany_relationship()
+    {
+        // Arrange
+        Chair existingChair = _fakers.Chair.Generate();
 
-        [Fact]
-        public async Task Cannot_add_to_ToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Chair existingChair = _fakers.Chair.Generate();
+            dbContext.Chairs.Add(existingChair);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Chairs.Add(existingChair);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        string route = $"/chairs/{existingChair.StringId}/relationships/pillows";
 
-            string route = $"/chairs/{existingChair.StringId}/relationships/pillows";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for POST requests.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for POST requests.");
-        }
+    [Fact]
+    public async Task Cannot_remove_from_ToMany_relationship()
+    {
+        // Arrange
+        Chair existingChair = _fakers.Chair.Generate();
 
-        [Fact]
-        public async Task Cannot_remove_from_ToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Chair existingChair = _fakers.Chair.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Chairs.Add(existingChair);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Chairs.Add(existingChair);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            string route = $"/chairs/{existingChair.StringId}/relationships/pillows";
+        string route = $"/chairs/{existingChair.StringId}/relationships/pillows";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for DELETE requests.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for DELETE requests.");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Pillow.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Pillow.cs
index cf3642aeaf..304c0a5e53 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Pillow.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Pillow.cs
@@ -2,12 +2,12 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers")]
+public sealed class Pillow : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Pillow : Identifiable<int>
-    {
-        [Attr]
-        public string Color { get; set; } = null!;
-    }
+    [Attr]
+    public string Color { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/PillowsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/PillowsController.cs
new file mode 100644
index 0000000000..f50cae1908
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/PillowsController.cs
@@ -0,0 +1,13 @@
+using JsonApiDotNetCore.Controllers.Annotations;
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
+public partial class PillowsController
+{
+}
+
+[DisableQueryString("skipCache")]
+partial class PillowsController
+{
+}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/PillowsNoSkipCacheController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/PillowsNoSkipCacheController.cs
deleted file mode 100644
index 2ca39b0072..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/PillowsNoSkipCacheController.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Controllers.Annotations;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
-{
-    [DisableQueryString("skipCache")]
-    public sealed class PillowsNoSkipCacheController : JsonApiController<Pillow, int>
-    {
-        public PillowsNoSkipCacheController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Pillow, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/ReadOnlyControllerTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/ReadOnlyControllerTests.cs
index d171982473..d70bc50786 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/ReadOnlyControllerTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/ReadOnlyControllerTests.cs
@@ -1,319 +1,315 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+public sealed class ReadOnlyControllerTests : IClassFixture<IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext>>
 {
-    public sealed class ReadOnlyControllerTests : IClassFixture<IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> _testContext;
+    private readonly RestrictionFakers _fakers = new();
+
+    public ReadOnlyControllerTests(IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> _testContext;
-        private readonly RestrictionFakers _fakers = new();
+        _testContext = testContext;
 
-        public ReadOnlyControllerTests(IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<BedsController>();
+    }
 
-            testContext.UseController<BedsReadOnlyController>();
-        }
+    [Fact]
+    public async Task Can_get_resources()
+    {
+        // Arrange
+        const string route = "/beds";
 
-        [Fact]
-        public async Task Can_get_resources()
-        {
-            // Arrange
-            const string route = "/beds";
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+    [Fact]
+    public async Task Can_get_resource()
+    {
+        // Arrange
+        Bed bed = _fakers.Bed.Generate();
 
-        [Fact]
-        public async Task Can_get_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Bed bed = _fakers.Bed.Generate();
+            dbContext.Beds.Add(bed);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Beds.Add(bed);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/beds/{bed.StringId}";
 
-            string route = $"/beds/{bed.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+    [Fact]
+    public async Task Can_get_secondary_resources()
+    {
+        // Arrange
+        Bed bed = _fakers.Bed.Generate();
 
-        [Fact]
-        public async Task Can_get_secondary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Bed bed = _fakers.Bed.Generate();
+            dbContext.Beds.Add(bed);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Beds.Add(bed);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/beds/{bed.StringId}/pillows";
 
-            string route = $"/beds/{bed.StringId}/pillows";
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+    [Fact]
+    public async Task Can_get_secondary_resource()
+    {
+        // Arrange
+        Bed bed = _fakers.Bed.Generate();
 
-        [Fact]
-        public async Task Can_get_secondary_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Bed bed = _fakers.Bed.Generate();
+            dbContext.Beds.Add(bed);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Beds.Add(bed);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/beds/{bed.StringId}/room";
 
-            string route = $"/beds/{bed.StringId}/room";
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+    [Fact]
+    public async Task Can_get_relationship()
+    {
+        // Arrange
+        Bed bed = _fakers.Bed.Generate();
 
-        [Fact]
-        public async Task Can_get_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Bed bed = _fakers.Bed.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Beds.Add(bed);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Beds.Add(bed);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/beds/{bed.StringId}/relationships/pillows";
+        string route = $"/beds/{bed.StringId}/relationships/pillows";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource()
+    [Fact]
+    public async Task Cannot_create_resource()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "beds",
+                attributes = new
                 {
-                    type = "beds",
-                    attributes = new
-                    {
-                    }
                 }
-            };
+            }
+        };
 
-            const string route = "/beds?include=pillows";
+        const string route = "/beds?include=pillows";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be("Endpoint '/beds' is not accessible for POST requests.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be("Endpoint '/beds' is not accessible for POST requests.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource()
-        {
-            // Arrange
-            Bed existingBed = _fakers.Bed.Generate();
+    [Fact]
+    public async Task Cannot_update_resource()
+    {
+        // Arrange
+        Bed existingBed = _fakers.Bed.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Beds.Add(existingBed);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Beds.Add(existingBed);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "beds",
+                id = existingBed.StringId,
+                attributes = new
                 {
-                    type = "beds",
-                    id = existingBed.StringId,
-                    attributes = new
-                    {
-                    }
                 }
-            };
+            }
+        };
 
-            string route = $"/beds/{existingBed.StringId}";
+        string route = $"/beds/{existingBed.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for PATCH requests.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for PATCH requests.");
+    }
+
+    [Fact]
+    public async Task Cannot_delete_resource()
+    {
+        // Arrange
+        Bed existingBed = _fakers.Bed.Generate();
 
-        [Fact]
-        public async Task Cannot_delete_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Bed existingBed = _fakers.Bed.Generate();
+            dbContext.Beds.Add(existingBed);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Beds.Add(existingBed);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/beds/{existingBed.StringId}";
 
-            string route = $"/beds/{existingBed.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for DELETE requests.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for DELETE requests.");
-        }
+    [Fact]
+    public async Task Cannot_update_relationship()
+    {
+        // Arrange
+        Bed existingBed = _fakers.Bed.Generate();
 
-        [Fact]
-        public async Task Cannot_update_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Bed existingBed = _fakers.Bed.Generate();
+            dbContext.Beds.Add(existingBed);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Beds.Add(existingBed);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        string route = $"/beds/{existingBed.StringId}/relationships/room";
 
-            string route = $"/beds/{existingBed.StringId}/relationships/room";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for PATCH requests.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for PATCH requests.");
-        }
+    [Fact]
+    public async Task Cannot_add_to_ToMany_relationship()
+    {
+        // Arrange
+        Bed existingBed = _fakers.Bed.Generate();
 
-        [Fact]
-        public async Task Cannot_add_to_ToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Bed existingBed = _fakers.Bed.Generate();
+            dbContext.Beds.Add(existingBed);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Beds.Add(existingBed);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        string route = $"/beds/{existingBed.StringId}/relationships/pillows";
 
-            string route = $"/beds/{existingBed.StringId}/relationships/pillows";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for POST requests.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for POST requests.");
-        }
+    [Fact]
+    public async Task Cannot_remove_from_ToMany_relationship()
+    {
+        // Arrange
+        Bed existingBed = _fakers.Bed.Generate();
 
-        [Fact]
-        public async Task Cannot_remove_from_ToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Bed existingBed = _fakers.Bed.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Beds.Add(existingBed);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Beds.Add(existingBed);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            string route = $"/beds/{existingBed.StringId}/relationships/pillows";
+        string route = $"/beds/{existingBed.StringId}/relationships/pillows";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for DELETE requests.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for DELETE requests.");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionDbContext.cs
index ab2cae949b..8db6489aba 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionDbContext.cs
@@ -1,19 +1,18 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class RestrictionDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class RestrictionDbContext : DbContext
-    {
-        public DbSet<Table> Tables => Set<Table>();
-        public DbSet<Chair> Chairs => Set<Chair>();
-        public DbSet<Sofa> Sofas => Set<Sofa>();
-        public DbSet<Bed> Beds => Set<Bed>();
+    public DbSet<Table> Tables => Set<Table>();
+    public DbSet<Chair> Chairs => Set<Chair>();
+    public DbSet<Sofa> Sofas => Set<Sofa>();
+    public DbSet<Bed> Beds => Set<Bed>();
 
-        public RestrictionDbContext(DbContextOptions<RestrictionDbContext> options)
-            : base(options)
-        {
-        }
+    public RestrictionDbContext(DbContextOptions<RestrictionDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionFakers.cs
index d7d8b884de..f737052623 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionFakers.cs
@@ -1,4 +1,3 @@
-using System;
 using Bogus;
 using JetBrains.Annotations;
 using TestBuildingBlocks;
@@ -6,46 +5,45 @@
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+internal sealed class RestrictionFakers : FakerContainer
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    internal sealed class RestrictionFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<Room>> _lazyRoomFaker = new(() =>
-            new Faker<Room>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(room => room.WindowCount, faker => faker.Random.Int(0, 3)));
-
-        private readonly Lazy<Faker<Table>> _lazyTableFaker = new(() =>
-            new Faker<Table>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(table => table.LegCount, faker => faker.Random.Int(1, 4)));
-
-        private readonly Lazy<Faker<Chair>> _lazyChairFaker = new(() =>
-            new Faker<Chair>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(chair => chair.LegCount, faker => faker.Random.Int(2, 4)));
-
-        private readonly Lazy<Faker<Sofa>> _lazySofaFaker = new(() =>
-            new Faker<Sofa>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(sofa => sofa.SeatCount, faker => faker.Random.Int(2, 6)));
-
-        private readonly Lazy<Faker<Pillow>> _lazyPillowFaker = new(() =>
-            new Faker<Pillow>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(pillow => pillow.Color, faker => faker.Internet.Color()));
-
-        private readonly Lazy<Faker<Bed>> _lazyBedFaker = new(() =>
-            new Faker<Bed>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(bed => bed.IsDouble, faker => faker.Random.Bool()));
-
-        public Faker<Room> Room => _lazyRoomFaker.Value;
-        public Faker<Table> Table => _lazyTableFaker.Value;
-        public Faker<Chair> Chair => _lazyChairFaker.Value;
-        public Faker<Sofa> Sofa => _lazySofaFaker.Value;
-        public Faker<Bed> Bed => _lazyBedFaker.Value;
-        public Faker<Pillow> Pillow => _lazyPillowFaker.Value;
-    }
+    private readonly Lazy<Faker<Room>> _lazyRoomFaker = new(() =>
+        new Faker<Room>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(room => room.WindowCount, faker => faker.Random.Int(0, 3)));
+
+    private readonly Lazy<Faker<Table>> _lazyTableFaker = new(() =>
+        new Faker<Table>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(table => table.LegCount, faker => faker.Random.Int(1, 4)));
+
+    private readonly Lazy<Faker<Chair>> _lazyChairFaker = new(() =>
+        new Faker<Chair>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(chair => chair.LegCount, faker => faker.Random.Int(2, 4)));
+
+    private readonly Lazy<Faker<Sofa>> _lazySofaFaker = new(() =>
+        new Faker<Sofa>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(sofa => sofa.SeatCount, faker => faker.Random.Int(2, 6)));
+
+    private readonly Lazy<Faker<Pillow>> _lazyPillowFaker = new(() =>
+        new Faker<Pillow>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(pillow => pillow.Color, faker => faker.Internet.Color()));
+
+    private readonly Lazy<Faker<Bed>> _lazyBedFaker = new(() =>
+        new Faker<Bed>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(bed => bed.IsDouble, faker => faker.Random.Bool()));
+
+    public Faker<Room> Room => _lazyRoomFaker.Value;
+    public Faker<Table> Table => _lazyTableFaker.Value;
+    public Faker<Chair> Chair => _lazyChairFaker.Value;
+    public Faker<Sofa> Sofa => _lazySofaFaker.Value;
+    public Faker<Bed> Bed => _lazyBedFaker.Value;
+    public Faker<Pillow> Pillow => _lazyPillowFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Room.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Room.cs
index 74714d0d01..2860b6d344 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Room.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Room.cs
@@ -2,12 +2,11 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class Room : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Room : Identifiable<int>
-    {
-        [Attr]
-        public int WindowCount { get; set; }
-    }
+    [Attr]
+    public int WindowCount { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SkipCacheQueryStringParameterReader.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SkipCacheQueryStringParameterReader.cs
index ec8e731983..8d8f0e67f7 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SkipCacheQueryStringParameterReader.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SkipCacheQueryStringParameterReader.cs
@@ -3,30 +3,29 @@
 using JsonApiDotNetCore.QueryStrings;
 using Microsoft.Extensions.Primitives;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+public sealed class SkipCacheQueryStringParameterReader : IQueryStringParameterReader
 {
-    public sealed class SkipCacheQueryStringParameterReader : IQueryStringParameterReader
-    {
-        private const string SkipCacheParameterName = "skipCache";
+    private const string SkipCacheParameterName = "skipCache";
 
-        [UsedImplicitly]
-        public bool SkipCache { get; private set; }
+    [UsedImplicitly]
+    public bool SkipCache { get; private set; }
 
-        public bool AllowEmptyValue => true;
+    public bool AllowEmptyValue => true;
 
-        public bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
-        {
-            return !disableQueryStringAttribute.ParameterNames.Contains(SkipCacheParameterName);
-        }
+    public bool IsEnabled(DisableQueryStringAttribute disableQueryStringAttribute)
+    {
+        return !disableQueryStringAttribute.ParameterNames.Contains(SkipCacheParameterName);
+    }
 
-        public bool CanRead(string parameterName)
-        {
-            return parameterName == SkipCacheParameterName;
-        }
+    public bool CanRead(string parameterName)
+    {
+        return parameterName == SkipCacheParameterName;
+    }
 
-        public void Read(string parameterName, StringValues parameterValue)
-        {
-            SkipCache = true;
-        }
+    public void Read(string parameterName, StringValues parameterValue)
+    {
+        SkipCache = true;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Sofa.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Sofa.cs
index c110b5d0d8..813b08c56e 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Sofa.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Sofa.cs
@@ -2,12 +2,12 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers")]
+public sealed class Sofa : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Sofa : Identifiable<int>
-    {
-        [Attr]
-        public int SeatCount { get; set; }
-    }
+    [Attr]
+    public int SeatCount { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SofasBlockingSortPageController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SofasBlockingSortPageController.cs
deleted file mode 100644
index 7f300a3e0a..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SofasBlockingSortPageController.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Controllers.Annotations;
-using JsonApiDotNetCore.QueryStrings;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
-{
-    [DisableQueryString(JsonApiQueryStringParameters.Sort | JsonApiQueryStringParameters.Page)]
-    public sealed class SofasBlockingSortPageController : JsonApiController<Sofa, int>
-    {
-        public SofasBlockingSortPageController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Sofa, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SofasController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SofasController.cs
new file mode 100644
index 0000000000..8ec503ce22
--- /dev/null
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/SofasController.cs
@@ -0,0 +1,14 @@
+using JsonApiDotNetCore.Controllers.Annotations;
+using JsonApiDotNetCore.QueryStrings;
+
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
+public partial class SofasController
+{
+}
+
+[DisableQueryString(JsonApiQueryStringParameters.Sort | JsonApiQueryStringParameters.Page)]
+partial class SofasController
+{
+}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Table.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Table.cs
index c0df183f38..1f3225af9d 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Table.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/Table.cs
@@ -1,20 +1,20 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(GenerateControllerEndpoints = JsonApiEndpoints.Command, ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers")]
+public sealed class Table : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Table : Identifiable<int>
-    {
-        [Attr]
-        public int LegCount { get; set; }
+    [Attr]
+    public int LegCount { get; set; }
 
-        [HasMany]
-        public IList<Chair> Chairs { get; set; } = new List<Chair>();
+    [HasMany]
+    public IList<Chair> Chairs { get; set; } = new List<Chair>();
 
-        [HasOne]
-        public Room? Room { get; set; }
-    }
+    [HasOne]
+    public Room? Room { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/TablesWriteOnlyController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/TablesWriteOnlyController.cs
deleted file mode 100644
index 484e8fc13a..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/TablesWriteOnlyController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
-{
-    public sealed class TablesWriteOnlyController : JsonApiCommandController<Table, int>
-    {
-        public TablesWriteOnlyController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceCommandService<Table, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/WriteOnlyControllerTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/WriteOnlyControllerTests.cs
index 7008eafd9a..4a06e44472 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/WriteOnlyControllerTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/WriteOnlyControllerTests.cs
@@ -1,312 +1,308 @@
-using System;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers
+namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
+
+public sealed class WriteOnlyControllerTests : IClassFixture<IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext>>
 {
-    public sealed class WriteOnlyControllerTests : IClassFixture<IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> _testContext;
+    private readonly RestrictionFakers _fakers = new();
+
+    public WriteOnlyControllerTests(IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> _testContext;
-        private readonly RestrictionFakers _fakers = new();
+        _testContext = testContext;
 
-        public WriteOnlyControllerTests(IntegrationTestContext<TestableStartup<RestrictionDbContext>, RestrictionDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<TablesController>();
+    }
 
-            testContext.UseController<TablesWriteOnlyController>();
-        }
+    [Fact]
+    public async Task Cannot_get_resources()
+    {
+        // Arrange
+        const string route = "/tables?fields[tables]=legCount";
 
-        [Fact]
-        public async Task Cannot_get_resources()
-        {
-            // Arrange
-            const string route = "/tables?fields[tables]=legCount";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be("Endpoint '/tables' is not accessible for GET requests.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be("Endpoint '/tables' is not accessible for GET requests.");
-        }
+    [Fact]
+    public async Task Cannot_get_resource()
+    {
+        // Arrange
+        Table table = _fakers.Table.Generate();
 
-        [Fact]
-        public async Task Cannot_get_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Table table = _fakers.Table.Generate();
+            dbContext.Tables.Add(table);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Tables.Add(table);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/tables/{table.StringId}";
 
-            string route = $"/tables/{table.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
-        }
+    [Fact]
+    public async Task Cannot_get_secondary_resources()
+    {
+        // Arrange
+        Table table = _fakers.Table.Generate();
 
-        [Fact]
-        public async Task Cannot_get_secondary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Table table = _fakers.Table.Generate();
+            dbContext.Tables.Add(table);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Tables.Add(table);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/tables/{table.StringId}/chairs";
 
-            string route = $"/tables/{table.StringId}/chairs";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
-        }
+    [Fact]
+    public async Task Cannot_get_secondary_resource()
+    {
+        // Arrange
+        Table table = _fakers.Table.Generate();
 
-        [Fact]
-        public async Task Cannot_get_secondary_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Table table = _fakers.Table.Generate();
+            dbContext.Tables.Add(table);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Tables.Add(table);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/tables/{table.StringId}/room";
 
-            string route = $"/tables/{table.StringId}/room";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
-        }
+    [Fact]
+    public async Task Cannot_get_relationship()
+    {
+        // Arrange
+        Table table = _fakers.Table.Generate();
 
-        [Fact]
-        public async Task Cannot_get_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Table table = _fakers.Table.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Tables.Add(table);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Tables.Add(table);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/tables/{table.StringId}/relationships/chairs";
+        string route = $"/tables/{table.StringId}/relationships/chairs";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Forbidden);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
-            error.Title.Should().Be("The requested endpoint is not accessible.");
-            error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.Forbidden);
+        error.Title.Should().Be("The requested endpoint is not accessible.");
+        error.Detail.Should().Be($"Endpoint '{route}' is not accessible for GET requests.");
+    }
 
-        [Fact]
-        public async Task Can_create_resource()
+    [Fact]
+    public async Task Can_create_resource()
+    {
+        // Arrange
+        var requestBody = new
         {
-            // Arrange
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "tables",
+                attributes = new
                 {
-                    type = "tables",
-                    attributes = new
-                    {
-                    }
                 }
-            };
+            }
+        };
 
-            const string route = "/tables";
+        const string route = "/tables";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+    }
 
-        [Fact]
-        public async Task Can_update_resource()
-        {
-            // Arrange
-            Table existingTable = _fakers.Table.Generate();
+    [Fact]
+    public async Task Can_update_resource()
+    {
+        // Arrange
+        Table existingTable = _fakers.Table.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Tables.Add(existingTable);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Tables.Add(existingTable);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "tables",
+                id = existingTable.StringId,
+                attributes = new
                 {
-                    type = "tables",
-                    id = existingTable.StringId,
-                    attributes = new
-                    {
-                    }
                 }
-            };
+            }
+        };
 
-            string route = $"/tables/{existingTable.StringId}";
+        string route = $"/tables/{existingTable.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+    }
+
+    [Fact]
+    public async Task Can_delete_resource()
+    {
+        // Arrange
+        Table existingTable = _fakers.Table.Generate();
 
-        [Fact]
-        public async Task Can_delete_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Table existingTable = _fakers.Table.Generate();
+            dbContext.Tables.Add(existingTable);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Tables.Add(existingTable);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/tables/{existingTable.StringId}";
 
-            string route = $"/tables/{existingTable.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
-        }
+    [Fact]
+    public async Task Can_update_relationship()
+    {
+        // Arrange
+        Table existingTable = _fakers.Table.Generate();
 
-        [Fact]
-        public async Task Can_update_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Table existingTable = _fakers.Table.Generate();
+            dbContext.Tables.Add(existingTable);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Tables.Add(existingTable);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        string route = $"/tables/{existingTable.StringId}/relationships/room";
 
-            string route = $"/tables/{existingTable.StringId}/relationships/room";
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
-        }
+    [Fact]
+    public async Task Can_add_to_ToMany_relationship()
+    {
+        // Arrange
+        Table existingTable = _fakers.Table.Generate();
 
-        [Fact]
-        public async Task Can_add_to_ToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Table existingTable = _fakers.Table.Generate();
+            dbContext.Tables.Add(existingTable);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Tables.Add(existingTable);
-                await dbContext.SaveChangesAsync();
-            });
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        string route = $"/tables/{existingTable.StringId}/relationships/chairs";
 
-            string route = $"/tables/{existingTable.StringId}/relationships/chairs";
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+    }
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
-        }
+    [Fact]
+    public async Task Can_remove_from_ToMany_relationship()
+    {
+        // Arrange
+        Table existingTable = _fakers.Table.Generate();
 
-        [Fact]
-        public async Task Can_remove_from_ToMany_relationship()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Table existingTable = _fakers.Table.Generate();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Tables.Add(existingTable);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Tables.Add(existingTable);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            string route = $"/tables/{existingTable.StringId}/relationships/chairs";
+        string route = $"/tables/{existingTable.StringId}/relationships/chairs";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/ETagTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/ETagTests.cs
index 540b820bc8..46e1cae5ba 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/ETagTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/ETagTests.cs
@@ -1,252 +1,247 @@
-using System;
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization;
+
+public sealed class ETagTests : IClassFixture<IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext>>
 {
-    public sealed class ETagTests : IClassFixture<IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext> _testContext;
+    private readonly SerializationFakers _fakers = new();
+
+    public ETagTests(IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext> _testContext;
-        private readonly SerializationFakers _fakers = new();
+        _testContext = testContext;
 
-        public ETagTests(IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<MeetingAttendeesController>();
+        testContext.UseController<MeetingsController>();
+    }
 
-            testContext.UseController<MeetingAttendeesController>();
-            testContext.UseController<MeetingsController>();
-        }
+    [Fact]
+    public async Task Returns_ETag_for_HEAD_request()
+    {
+        // Arrange
+        List<Meeting> meetings = _fakers.Meeting.Generate(2);
 
-        [Fact]
-        public async Task Returns_ETag_for_HEAD_request()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Meeting> meetings = _fakers.Meeting.Generate(2);
+            await dbContext.ClearTableAsync<Meeting>();
+            dbContext.Meetings.AddRange(meetings);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Meeting>();
-                dbContext.Meetings.AddRange(meetings);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/meetings";
 
-            const string route = "/meetings";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteHeadAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteHeadAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        httpResponse.Headers.ETag.ShouldNotBeNull();
+        httpResponse.Headers.ETag.IsWeak.Should().BeFalse();
+        httpResponse.Headers.ETag.Tag.ShouldNotBeNullOrEmpty();
 
-            httpResponse.Headers.ETag.ShouldNotBeNull();
-            httpResponse.Headers.ETag.IsWeak.Should().BeFalse();
-            httpResponse.Headers.ETag.Tag.ShouldNotBeNullOrEmpty();
+        responseDocument.Should().BeEmpty();
+    }
 
-            responseDocument.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Returns_ETag_for_GET_request()
+    {
+        // Arrange
+        List<Meeting> meetings = _fakers.Meeting.Generate(2);
 
-        [Fact]
-        public async Task Returns_ETag_for_GET_request()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Meeting> meetings = _fakers.Meeting.Generate(2);
+            await dbContext.ClearTableAsync<Meeting>();
+            dbContext.Meetings.AddRange(meetings);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Meeting>();
-                dbContext.Meetings.AddRange(meetings);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/meetings";
 
-            const string route = "/meetings";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        httpResponse.Headers.ETag.ShouldNotBeNull();
+        httpResponse.Headers.ETag.IsWeak.Should().BeFalse();
+        httpResponse.Headers.ETag.Tag.ShouldNotBeNullOrEmpty();
 
-            httpResponse.Headers.ETag.ShouldNotBeNull();
-            httpResponse.Headers.ETag.IsWeak.Should().BeFalse();
-            httpResponse.Headers.ETag.Tag.ShouldNotBeNullOrEmpty();
+        responseDocument.ShouldNotBeEmpty();
+    }
 
-            responseDocument.ShouldNotBeEmpty();
-        }
+    [Fact]
+    public async Task Returns_no_ETag_for_failed_GET_request()
+    {
+        // Arrange
+        string route = $"/meetings/{Unknown.StringId.For<Meeting, Guid>()}";
 
-        [Fact]
-        public async Task Returns_no_ETag_for_failed_GET_request()
-        {
-            // Arrange
-            string route = $"/meetings/{Unknown.StringId.For<Meeting, Guid>()}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        httpResponse.Headers.ETag.Should().BeNull();
 
-            httpResponse.Headers.ETag.Should().BeNull();
+        responseDocument.ShouldNotBeEmpty();
+    }
 
-            responseDocument.ShouldNotBeEmpty();
-        }
+    [Fact]
+    public async Task Returns_no_ETag_for_POST_request()
+    {
+        // Arrange
+        string newTitle = _fakers.Meeting.Generate().Title;
 
-        [Fact]
-        public async Task Returns_no_ETag_for_POST_request()
+        var requestBody = new
         {
-            // Arrange
-            string newTitle = _fakers.Meeting.Generate().Title;
-
-            var requestBody = new
+            data = new
             {
-                data = new
+                type = "meetings",
+                attributes = new
                 {
-                    type = "meetings",
-                    attributes = new
-                    {
-                        title = newTitle
-                    }
+                    title = newTitle
                 }
-            };
+            }
+        };
 
-            const string route = "/meetings";
+        const string route = "/meetings";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            httpResponse.Headers.ETag.Should().BeNull();
+        httpResponse.Headers.ETag.Should().BeNull();
 
-            responseDocument.ShouldNotBeEmpty();
-        }
+        responseDocument.ShouldNotBeEmpty();
+    }
 
-        [Fact]
-        public async Task Fails_on_ETag_in_PATCH_request()
-        {
-            // Arrange
-            Meeting existingMeeting = _fakers.Meeting.Generate();
+    [Fact]
+    public async Task Fails_on_ETag_in_PATCH_request()
+    {
+        // Arrange
+        Meeting existingMeeting = _fakers.Meeting.Generate();
 
-            string newTitle = _fakers.Meeting.Generate().Title;
+        string newTitle = _fakers.Meeting.Generate().Title;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Meetings.Add(existingMeeting);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Meetings.Add(existingMeeting);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "meetings",
+                id = existingMeeting.StringId,
+                attributes = new
                 {
-                    type = "meetings",
-                    id = existingMeeting.StringId,
-                    attributes = new
-                    {
-                        title = newTitle
-                    }
+                    title = newTitle
                 }
-            };
+            }
+        };
 
-            string route = $"/meetings/{existingMeeting.StringId}";
+        string route = $"/meetings/{existingMeeting.StringId}";
 
-            Action<HttpRequestHeaders> setRequestHeaders = headers =>
-            {
-                headers.IfMatch.ParseAdd("\"12345\"");
-            };
+        Action<HttpRequestHeaders> setRequestHeaders = headers =>
+        {
+            headers.IfMatch.ParseAdd("\"12345\"");
+        };
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) =
-                await _testContext.ExecutePatchAsync<Document>(route, requestBody, setRequestHeaders: setRequestHeaders);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) =
+            await _testContext.ExecutePatchAsync<Document>(route, requestBody, setRequestHeaders: setRequestHeaders);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.PreconditionFailed);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.PreconditionFailed);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.PreconditionFailed);
-            error.Title.Should().Be("Detection of mid-air edit collisions using ETags is not supported.");
-            error.Detail.Should().BeNull();
-            error.Source.ShouldNotBeNull();
-            error.Source.Header.Should().Be("If-Match");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.PreconditionFailed);
+        error.Title.Should().Be("Detection of mid-air edit collisions using ETags is not supported.");
+        error.Detail.Should().BeNull();
+        error.Source.ShouldNotBeNull();
+        error.Source.Header.Should().Be("If-Match");
+    }
+
+    [Fact]
+    public async Task Returns_NotModified_for_matching_ETag()
+    {
+        // Arrange
+        List<Meeting> meetings = _fakers.Meeting.Generate(2);
 
-        [Fact]
-        public async Task Returns_NotModified_for_matching_ETag()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Meeting> meetings = _fakers.Meeting.Generate(2);
+            await dbContext.ClearTableAsync<Meeting>();
+            dbContext.Meetings.AddRange(meetings);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Meeting>();
-                dbContext.Meetings.AddRange(meetings);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/meetings";
 
-            const string route = "/meetings";
+        (HttpResponseMessage httpResponse1, _) = await _testContext.ExecuteGetAsync<string>(route);
 
-            (HttpResponseMessage httpResponse1, _) = await _testContext.ExecuteGetAsync<string>(route);
+        string responseETag = httpResponse1.Headers.ETag!.Tag;
 
-            string responseETag = httpResponse1.Headers.ETag!.Tag;
+        Action<HttpRequestHeaders> setRequestHeaders2 = headers =>
+        {
+            headers.IfNoneMatch.ParseAdd($"\"12345\", W/\"67890\", {responseETag}");
+        };
 
-            Action<HttpRequestHeaders> setRequestHeaders2 = headers =>
-            {
-                headers.IfNoneMatch.ParseAdd($"\"12345\", W/\"67890\", {responseETag}");
-            };
+        // Act
+        (HttpResponseMessage httpResponse2, string responseDocument2) = await _testContext.ExecuteGetAsync<string>(route, setRequestHeaders2);
 
-            // Act
-            (HttpResponseMessage httpResponse2, string responseDocument2) = await _testContext.ExecuteGetAsync<string>(route, setRequestHeaders2);
+        // Assert
+        httpResponse2.Should().HaveStatusCode(HttpStatusCode.NotModified);
 
-            // Assert
-            httpResponse2.Should().HaveStatusCode(HttpStatusCode.NotModified);
+        httpResponse2.Headers.ETag.ShouldNotBeNull();
+        httpResponse2.Headers.ETag.IsWeak.Should().BeFalse();
+        httpResponse2.Headers.ETag.Tag.ShouldNotBeNullOrEmpty();
 
-            httpResponse2.Headers.ETag.ShouldNotBeNull();
-            httpResponse2.Headers.ETag.IsWeak.Should().BeFalse();
-            httpResponse2.Headers.ETag.Tag.ShouldNotBeNullOrEmpty();
+        responseDocument2.Should().BeEmpty();
+    }
 
-            responseDocument2.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Returns_content_for_mismatching_ETag()
+    {
+        // Arrange
+        List<Meeting> meetings = _fakers.Meeting.Generate(2);
 
-        [Fact]
-        public async Task Returns_content_for_mismatching_ETag()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Meeting> meetings = _fakers.Meeting.Generate(2);
+            await dbContext.ClearTableAsync<Meeting>();
+            dbContext.Meetings.AddRange(meetings);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Meeting>();
-                dbContext.Meetings.AddRange(meetings);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/meetings";
+        const string route = "/meetings";
 
-            Action<HttpRequestHeaders> setRequestHeaders = headers =>
-            {
-                headers.IfNoneMatch.ParseAdd("\"Not-a-matching-value\"");
-            };
+        Action<HttpRequestHeaders> setRequestHeaders = headers =>
+        {
+            headers.IfNoneMatch.ParseAdd("\"Not-a-matching-value\"");
+        };
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route, setRequestHeaders);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route, setRequestHeaders);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            httpResponse.Headers.ETag.ShouldNotBeNull();
-            httpResponse.Headers.ETag.IsWeak.Should().BeFalse();
-            httpResponse.Headers.ETag.Tag.ShouldNotBeNullOrEmpty();
+        httpResponse.Headers.ETag.ShouldNotBeNull();
+        httpResponse.Headers.ETag.IsWeak.Should().BeFalse();
+        httpResponse.Headers.ETag.Tag.ShouldNotBeNullOrEmpty();
 
-            responseDocument.ShouldNotBeEmpty();
-        }
+        responseDocument.ShouldNotBeEmpty();
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/Meeting.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/Meeting.cs
index 7e35498f92..e8ddb054ff 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/Meeting.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/Meeting.cs
@@ -1,47 +1,45 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Diagnostics.CodeAnalysis;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Serialization")]
+public sealed class Meeting : Identifiable<Guid>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Meeting : Identifiable<Guid>
-    {
-        [Attr]
-        public string Title { get; set; } = null!;
+    [Attr]
+    public string Title { get; set; } = null!;
 
-        [Attr]
-        public DateTimeOffset StartTime { get; set; }
+    [Attr]
+    public DateTimeOffset StartTime { get; set; }
 
-        [Attr]
-        public TimeSpan Duration { get; set; }
+    [Attr]
+    public TimeSpan Duration { get; set; }
 
-        [Attr]
-        [NotMapped]
-        [AllowNull]
-        public MeetingLocation Location
-        {
-            get =>
-                new()
-                {
-                    Latitude = Latitude,
-                    Longitude = Longitude
-                };
-            set
+    [Attr]
+    [NotMapped]
+    [AllowNull]
+    public MeetingLocation Location
+    {
+        get =>
+            new()
             {
-                Latitude = value?.Latitude ?? double.NaN;
-                Longitude = value?.Longitude ?? double.NaN;
-            }
+                Latitude = Latitude,
+                Longitude = Longitude
+            };
+        set
+        {
+            Latitude = value?.Latitude ?? double.NaN;
+            Longitude = value?.Longitude ?? double.NaN;
         }
+    }
 
-        public double Latitude { get; set; }
-        public double Longitude { get; set; }
+    public double Latitude { get; set; }
+    public double Longitude { get; set; }
 
-        [HasMany]
-        public IList<MeetingAttendee> Attendees { get; set; } = new List<MeetingAttendee>();
-    }
+    [HasMany]
+    public IList<MeetingAttendee> Attendees { get; set; } = new List<MeetingAttendee>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendee.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendee.cs
index 76d3f17b3b..4580d21c52 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendee.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendee.cs
@@ -1,17 +1,16 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.Serialization")]
+public sealed class MeetingAttendee : Identifiable<Guid>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class MeetingAttendee : Identifiable<Guid>
-    {
-        [Attr]
-        public string DisplayName { get; set; } = null!;
+    [Attr]
+    public string DisplayName { get; set; } = null!;
 
-        [HasOne]
-        public Meeting? Meeting { get; set; }
-    }
+    [HasOne]
+    public Meeting? Meeting { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendeesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendeesController.cs
deleted file mode 100644
index bc3e213001..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingAttendeesController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization
-{
-    public sealed class MeetingAttendeesController : JsonApiController<MeetingAttendee, Guid>
-    {
-        public MeetingAttendeesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<MeetingAttendee, Guid> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingLocation.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingLocation.cs
index 8ca431bc1c..fb0591dc56 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingLocation.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingLocation.cs
@@ -1,15 +1,14 @@
 using System.Text.Json.Serialization;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class MeetingLocation
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class MeetingLocation
-    {
-        [JsonPropertyName("lat")]
-        public double Latitude { get; set; }
+    [JsonPropertyName("lat")]
+    public double Latitude { get; set; }
 
-        [JsonPropertyName("lng")]
-        public double Longitude { get; set; }
-    }
+    [JsonPropertyName("lng")]
+    public double Longitude { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingsController.cs
deleted file mode 100644
index f21b312e42..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/MeetingsController.cs
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization
-{
-    public sealed class MeetingsController : JsonApiController<Meeting, Guid>
-    {
-        public MeetingsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Meeting, Guid> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationDbContext.cs
index 9d74cc499d..83c39f1791 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationDbContext.cs
@@ -1,17 +1,16 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class SerializationDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class SerializationDbContext : DbContext
-    {
-        public DbSet<Meeting> Meetings => Set<Meeting>();
-        public DbSet<MeetingAttendee> Attendees => Set<MeetingAttendee>();
+    public DbSet<Meeting> Meetings => Set<Meeting>();
+    public DbSet<MeetingAttendee> Attendees => Set<MeetingAttendee>();
 
-        public SerializationDbContext(DbContextOptions<SerializationDbContext> options)
-            : base(options)
-        {
-        }
+    public SerializationDbContext(DbContextOptions<SerializationDbContext> options)
+        : base(options)
+    {
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationFakers.cs
index 3453c0f98e..a7dded542c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationFakers.cs
@@ -1,38 +1,36 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization;
+
+internal sealed class SerializationFakers : FakerContainer
 {
-    internal sealed class SerializationFakers : FakerContainer
+    private static readonly TimeSpan[] MeetingDurations =
     {
-        private static readonly TimeSpan[] MeetingDurations =
-        {
-            TimeSpan.FromMinutes(15),
-            TimeSpan.FromMinutes(30),
-            TimeSpan.FromMinutes(45),
-            TimeSpan.FromMinutes(60)
-        };
+        TimeSpan.FromMinutes(15),
+        TimeSpan.FromMinutes(30),
+        TimeSpan.FromMinutes(45),
+        TimeSpan.FromMinutes(60)
+    };
 
-        private readonly Lazy<Faker<Meeting>> _lazyMeetingFaker = new(() =>
-            new Faker<Meeting>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(meeting => meeting.Title, faker => faker.Lorem.Word())
-                .RuleFor(meeting => meeting.StartTime, faker => faker.Date.FutureOffset()
-                    .TruncateToWholeMilliseconds())
-                .RuleFor(meeting => meeting.Duration, faker => faker.PickRandom(MeetingDurations))
-                .RuleFor(meeting => meeting.Latitude, faker => faker.Address.Latitude())
-                .RuleFor(meeting => meeting.Longitude, faker => faker.Address.Longitude()));
+    private readonly Lazy<Faker<Meeting>> _lazyMeetingFaker = new(() =>
+        new Faker<Meeting>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(meeting => meeting.Title, faker => faker.Lorem.Word())
+            .RuleFor(meeting => meeting.StartTime, faker => faker.Date.FutureOffset()
+                .TruncateToWholeMilliseconds())
+            .RuleFor(meeting => meeting.Duration, faker => faker.PickRandom(MeetingDurations))
+            .RuleFor(meeting => meeting.Latitude, faker => faker.Address.Latitude())
+            .RuleFor(meeting => meeting.Longitude, faker => faker.Address.Longitude()));
 
-        private readonly Lazy<Faker<MeetingAttendee>> _lazyMeetingAttendeeFaker = new(() =>
-            new Faker<MeetingAttendee>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(attendee => attendee.DisplayName, faker => faker.Random.Utf16String()));
+    private readonly Lazy<Faker<MeetingAttendee>> _lazyMeetingAttendeeFaker = new(() =>
+        new Faker<MeetingAttendee>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(attendee => attendee.DisplayName, faker => faker.Random.Utf16String()));
 
-        public Faker<Meeting> Meeting => _lazyMeetingFaker.Value;
-        public Faker<MeetingAttendee> MeetingAttendee => _lazyMeetingAttendeeFaker.Value;
-    }
+    public Faker<Meeting> Meeting => _lazyMeetingFaker.Value;
+    public Faker<MeetingAttendee> MeetingAttendee => _lazyMeetingAttendeeFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationTests.cs
index eaedd8324b..85c93428a2 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationTests.cs
@@ -1,10 +1,6 @@
-using System;
 using System.Globalization;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json.Serialization;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
@@ -12,104 +8,104 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization
+namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization;
+
+public sealed class SerializationTests : IClassFixture<IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext>>
 {
-    public sealed class SerializationTests : IClassFixture<IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext>>
-    {
-        private const string JsonDateTimeOffsetFormatSpecifier = "yyyy-MM-ddTHH:mm:ss.FFFFFFFK";
+    private const string JsonDateTimeOffsetFormatSpecifier = "yyyy-MM-ddTHH:mm:ss.FFFFFFFK";
 
-        private readonly IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext> _testContext;
-        private readonly SerializationFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext> _testContext;
+    private readonly SerializationFakers _fakers = new();
 
-        public SerializationTests(IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext> testContext)
-        {
-            _testContext = testContext;
+    public SerializationTests(IntegrationTestContext<TestableStartup<SerializationDbContext>, SerializationDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<MeetingAttendeesController>();
-            testContext.UseController<MeetingsController>();
+        testContext.UseController<MeetingAttendeesController>();
+        testContext.UseController<MeetingsController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
-            {
-                services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
-            });
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddScoped(typeof(IResourceChangeTracker<>), typeof(NeverSameResourceChangeTracker<>));
+        });
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeExceptionStackTraceInErrors = false;
-            options.AllowClientGeneratedIds = true;
-            options.IncludeJsonApiVersion = false;
-            options.IncludeTotalResourceCount = true;
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeExceptionStackTraceInErrors = false;
+        options.AllowClientGeneratedIds = true;
+        options.IncludeJsonApiVersion = false;
+        options.IncludeTotalResourceCount = true;
 
-            if (!options.SerializerOptions.Converters.Any(converter => converter is JsonTimeSpanConverter))
-            {
-                options.SerializerOptions.Converters.Add(new JsonTimeSpanConverter());
-            }
+        if (!options.SerializerOptions.Converters.Any(converter => converter is JsonTimeSpanConverter))
+        {
+            options.SerializerOptions.Converters.Add(new JsonTimeSpanConverter());
         }
+    }
+
+    [Fact]
+    public async Task Returns_no_body_for_successful_HEAD_request()
+    {
+        // Arrange
+        Meeting meeting = _fakers.Meeting.Generate();
 
-        [Fact]
-        public async Task Returns_no_body_for_successful_HEAD_request()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Meeting meeting = _fakers.Meeting.Generate();
+            dbContext.Meetings.Add(meeting);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Meetings.Add(meeting);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/meetings/{meeting.StringId}";
 
-            string route = $"/meetings/{meeting.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteHeadAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteHeadAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        httpResponse.Content.Headers.ContentLength.Should().BeGreaterThan(0);
 
-            httpResponse.Content.Headers.ContentLength.Should().BeGreaterThan(0);
+        responseDocument.Should().BeEmpty();
+    }
 
-            responseDocument.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Returns_no_body_for_failed_HEAD_request()
+    {
+        // Arrange
+        string route = $"/meetings/{Unknown.StringId.For<Meeting, Guid>()}";
 
-        [Fact]
-        public async Task Returns_no_body_for_failed_HEAD_request()
-        {
-            // Arrange
-            string route = $"/meetings/{Unknown.StringId.For<Meeting, Guid>()}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteHeadAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteHeadAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        httpResponse.Content.Headers.ContentLength.Should().BeGreaterThan(0);
 
-            httpResponse.Content.Headers.ContentLength.Should().BeGreaterThan(0);
+        responseDocument.Should().BeEmpty();
+    }
 
-            responseDocument.Should().BeEmpty();
-        }
+    [Fact]
+    public async Task Can_get_primary_resources_with_include()
+    {
+        // Arrange
+        Meeting meeting = _fakers.Meeting.Generate();
+        meeting.Attendees = _fakers.MeetingAttendee.Generate(1);
 
-        [Fact]
-        public async Task Can_get_primary_resources_with_include()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Meeting meeting = _fakers.Meeting.Generate();
-            meeting.Attendees = _fakers.MeetingAttendee.Generate(1);
+            await dbContext.ClearTableAsync<Meeting>();
+            dbContext.Meetings.Add(meeting);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Meeting>();
-                dbContext.Meetings.Add(meeting);
-                await dbContext.SaveChangesAsync();
-            });
-
-            const string route = "/meetings?include=attendees";
+        const string route = "/meetings?include=attendees";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetings?include=attendees"",
     ""first"": ""http://localhost/meetings?include=attendees"",
@@ -171,29 +167,29 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     ""total"": 1
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Can_get_primary_resource_with_empty_ToOne_include()
-        {
-            // Arrange
-            MeetingAttendee attendee = _fakers.MeetingAttendee.Generate();
+    [Fact]
+    public async Task Can_get_primary_resource_with_empty_ToOne_include()
+    {
+        // Arrange
+        MeetingAttendee attendee = _fakers.MeetingAttendee.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Attendees.Add(attendee);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Attendees.Add(attendee);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/meetingAttendees/{attendee.StringId}?include=meeting";
+        string route = $"/meetingAttendees/{attendee.StringId}?include=meeting";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetingAttendees/" + attendee.StringId + @"?include=meeting""
   },
@@ -218,30 +214,30 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
   },
   ""included"": []
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Can_get_primary_resources_with_empty_ToMany_include()
-        {
-            // Arrange
-            Meeting meeting = _fakers.Meeting.Generate();
+    [Fact]
+    public async Task Can_get_primary_resources_with_empty_ToMany_include()
+    {
+        // Arrange
+        Meeting meeting = _fakers.Meeting.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Meeting>();
-                dbContext.Meetings.Add(meeting);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Meeting>();
+            dbContext.Meetings.Add(meeting);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/meetings/?include=attendees";
+        const string route = "/meetings/?include=attendees";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetings/?include=attendees"",
     ""first"": ""http://localhost/meetings/?include=attendees"",
@@ -279,29 +275,29 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     ""total"": 1
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Can_get_primary_resource_by_ID()
-        {
-            // Arrange
-            Meeting meeting = _fakers.Meeting.Generate();
+    [Fact]
+    public async Task Can_get_primary_resource_by_ID()
+    {
+        // Arrange
+        Meeting meeting = _fakers.Meeting.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Meetings.Add(meeting);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Meetings.Add(meeting);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/meetings/{meeting.StringId}";
+        string route = $"/meetings/{meeting.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetings/" + meeting.StringId + @"""
   },
@@ -330,25 +326,25 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     }
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Cannot_get_unknown_primary_resource_by_ID()
-        {
-            // Arrange
-            string meetingId = Unknown.StringId.For<Meeting, Guid>();
+    [Fact]
+    public async Task Cannot_get_unknown_primary_resource_by_ID()
+    {
+        // Arrange
+        string meetingId = Unknown.StringId.For<Meeting, Guid>();
 
-            string route = $"/meetings/{meetingId}";
+        string route = $"/meetings/{meetingId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            string errorId = JsonApiStringConverter.ExtractErrorId(responseDocument);
+        string errorId = JsonApiStringConverter.ExtractErrorId(responseDocument);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetings/ffffffff-ffff-ffff-ffff-ffffffffffff""
   },
@@ -361,30 +357,30 @@ public async Task Cannot_get_unknown_primary_resource_by_ID()
     }
   ]
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Can_get_secondary_resource()
-        {
-            // Arrange
-            MeetingAttendee attendee = _fakers.MeetingAttendee.Generate();
-            attendee.Meeting = _fakers.Meeting.Generate();
+    [Fact]
+    public async Task Can_get_secondary_resource()
+    {
+        // Arrange
+        MeetingAttendee attendee = _fakers.MeetingAttendee.Generate();
+        attendee.Meeting = _fakers.Meeting.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Attendees.Add(attendee);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Attendees.Add(attendee);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/meetingAttendees/{attendee.StringId}/meeting";
+        string route = $"/meetingAttendees/{attendee.StringId}/meeting";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetingAttendees/" + attendee.StringId + @"/meeting""
   },
@@ -413,58 +409,58 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     }
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Can_get_unknown_secondary_resource()
-        {
-            // Arrange
-            MeetingAttendee attendee = _fakers.MeetingAttendee.Generate();
+    [Fact]
+    public async Task Can_get_unknown_secondary_resource()
+    {
+        // Arrange
+        MeetingAttendee attendee = _fakers.MeetingAttendee.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Attendees.Add(attendee);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Attendees.Add(attendee);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/meetingAttendees/{attendee.StringId}/meeting";
+        string route = $"/meetingAttendees/{attendee.StringId}/meeting";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetingAttendees/" + attendee.StringId + @"/meeting""
   },
   ""data"": null
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Can_get_secondary_resources()
-        {
-            // Arrange
-            Meeting meeting = _fakers.Meeting.Generate();
-            meeting.Attendees = _fakers.MeetingAttendee.Generate(1);
+    [Fact]
+    public async Task Can_get_secondary_resources()
+    {
+        // Arrange
+        Meeting meeting = _fakers.Meeting.Generate();
+        meeting.Attendees = _fakers.MeetingAttendee.Generate(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Meetings.Add(meeting);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Meetings.Add(meeting);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/meetings/{meeting.StringId}/attendees";
+        string route = $"/meetings/{meeting.StringId}/attendees";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetings/" + meeting.StringId + @"/attendees"",
     ""first"": ""http://localhost/meetings/" + meeting.StringId + @"/attendees"",
@@ -494,29 +490,29 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     ""total"": 1
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Can_get_unknown_secondary_resources()
-        {
-            // Arrange
-            Meeting meeting = _fakers.Meeting.Generate();
+    [Fact]
+    public async Task Can_get_unknown_secondary_resources()
+    {
+        // Arrange
+        Meeting meeting = _fakers.Meeting.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Meetings.Add(meeting);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Meetings.Add(meeting);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/meetings/{meeting.StringId}/attendees";
+        string route = $"/meetings/{meeting.StringId}/attendees";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetings/" + meeting.StringId + @"/attendees"",
     ""first"": ""http://localhost/meetings/" + meeting.StringId + @"/attendees""
@@ -526,30 +522,30 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     ""total"": 0
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Can_get_ToOne_relationship()
-        {
-            // Arrange
-            MeetingAttendee attendee = _fakers.MeetingAttendee.Generate();
-            attendee.Meeting = _fakers.Meeting.Generate();
+    [Fact]
+    public async Task Can_get_ToOne_relationship()
+    {
+        // Arrange
+        MeetingAttendee attendee = _fakers.MeetingAttendee.Generate();
+        attendee.Meeting = _fakers.Meeting.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Attendees.Add(attendee);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Attendees.Add(attendee);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/meetingAttendees/{attendee.StringId}/relationships/meeting";
+        string route = $"/meetingAttendees/{attendee.StringId}/relationships/meeting";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetingAttendees/" + attendee.StringId + @"/relationships/meeting"",
     ""related"": ""http://localhost/meetingAttendees/" + attendee.StringId + @"/meeting""
@@ -559,32 +555,32 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     ""id"": """ + attendee.Meeting.StringId + @"""
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Can_get_ToMany_relationship()
-        {
-            // Arrange
-            Meeting meeting = _fakers.Meeting.Generate();
-            meeting.Attendees = _fakers.MeetingAttendee.Generate(2);
+    [Fact]
+    public async Task Can_get_ToMany_relationship()
+    {
+        // Arrange
+        Meeting meeting = _fakers.Meeting.Generate();
+        meeting.Attendees = _fakers.MeetingAttendee.Generate(2);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Meetings.Add(meeting);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Meetings.Add(meeting);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/meetings/{meeting.StringId}/relationships/attendees";
+        string route = $"/meetings/{meeting.StringId}/relationships/attendees";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            string[] meetingIds = meeting.Attendees.Select(attendee => attendee.StringId!).OrderBy(id => id).ToArray();
+        string[] meetingIds = meeting.Attendees.Select(attendee => attendee.StringId!).OrderBy(id => id).ToArray();
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetings/" + meeting.StringId + @"/relationships/attendees"",
     ""related"": ""http://localhost/meetings/" + meeting.StringId + @"/attendees"",
@@ -605,44 +601,44 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     ""total"": 2
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Can_create_resource_with_side_effects()
-        {
-            // Arrange
-            Meeting newMeeting = _fakers.Meeting.Generate();
-            newMeeting.Id = Guid.NewGuid();
+    [Fact]
+    public async Task Can_create_resource_with_side_effects()
+    {
+        // Arrange
+        Meeting newMeeting = _fakers.Meeting.Generate();
+        newMeeting.Id = Guid.NewGuid();
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "meetings",
+                id = newMeeting.StringId,
+                attributes = new
                 {
-                    type = "meetings",
-                    id = newMeeting.StringId,
-                    attributes = new
+                    title = newMeeting.Title,
+                    startTime = newMeeting.StartTime,
+                    duration = newMeeting.Duration,
+                    location = new
                     {
-                        title = newMeeting.Title,
-                        startTime = newMeeting.StartTime,
-                        duration = newMeeting.Duration,
-                        location = new
-                        {
-                            lat = newMeeting.Latitude,
-                            lng = newMeeting.Longitude
-                        }
+                        lat = newMeeting.Latitude,
+                        lng = newMeeting.Longitude
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/meetings";
+        const string route = "/meetings";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetings""
   },
@@ -671,42 +667,42 @@ public async Task Can_create_resource_with_side_effects()
     }
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_side_effects()
-        {
-            // Arrange
-            MeetingAttendee existingAttendee = _fakers.MeetingAttendee.Generate();
+    [Fact]
+    public async Task Can_update_resource_with_side_effects()
+    {
+        // Arrange
+        MeetingAttendee existingAttendee = _fakers.MeetingAttendee.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Attendees.Add(existingAttendee);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Attendees.Add(existingAttendee);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "meetingAttendees",
+                id = existingAttendee.StringId,
+                attributes = new
                 {
-                    type = "meetingAttendees",
-                    id = existingAttendee.StringId,
-                    attributes = new
-                    {
-                        displayName = existingAttendee.DisplayName
-                    }
+                    displayName = existingAttendee.DisplayName
                 }
-            };
+            }
+        };
 
-            string route = $"/meetingAttendees/{existingAttendee.StringId}";
+        string route = $"/meetingAttendees/{existingAttendee.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""links"": {
     ""self"": ""http://localhost/meetingAttendees/" + existingAttendee.StringId + @"""
   },
@@ -729,78 +725,78 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
     }
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_relationship_for_type_at_end()
-        {
-            // Arrange
-            MeetingAttendee existingAttendee = _fakers.MeetingAttendee.Generate();
-            existingAttendee.Meeting = _fakers.Meeting.Generate();
+    [Fact]
+    public async Task Can_update_resource_with_relationship_for_type_at_end()
+    {
+        // Arrange
+        MeetingAttendee existingAttendee = _fakers.MeetingAttendee.Generate();
+        existingAttendee.Meeting = _fakers.Meeting.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Attendees.Add(existingAttendee);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Attendees.Add(existingAttendee);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                id = existingAttendee.StringId,
+                attributes = new
                 {
-                    id = existingAttendee.StringId,
-                    attributes = new
-                    {
-                        displayName = existingAttendee.DisplayName
-                    },
-                    relationships = new
+                    displayName = existingAttendee.DisplayName
+                },
+                relationships = new
+                {
+                    meeting = new
                     {
-                        meeting = new
+                        data = new
                         {
-                            data = new
-                            {
-                                id = existingAttendee.Meeting.StringId,
-                                type = "meetings"
-                            }
+                            id = existingAttendee.Meeting.StringId,
+                            type = "meetings"
                         }
-                    },
-                    type = "meetingAttendees"
-                }
-            };
+                    }
+                },
+                type = "meetingAttendees"
+            }
+        };
 
-            string route = $"/meetingAttendees/{existingAttendee.StringId}";
+        string route = $"/meetingAttendees/{existingAttendee.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, _) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-        }
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+    }
 
-        [Fact]
-        public async Task Includes_version_on_resource_endpoint()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeJsonApiVersion = true;
+    [Fact]
+    public async Task Includes_version_on_resource_endpoint()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeJsonApiVersion = true;
 
-            MeetingAttendee attendee = _fakers.MeetingAttendee.Generate();
+        MeetingAttendee attendee = _fakers.MeetingAttendee.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Attendees.Add(attendee);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Attendees.Add(attendee);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/meetingAttendees/{attendee.StringId}/meeting";
+        string route = $"/meetingAttendees/{attendee.StringId}/meeting";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteGetAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""jsonapi"": {
     ""version"": ""1.1""
   },
@@ -809,28 +805,28 @@ await _testContext.RunOnDatabaseAsync(async dbContext =>
   },
   ""data"": null
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Includes_version_on_error_in_resource_endpoint()
-        {
-            // Arrange
-            var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.IncludeJsonApiVersion = true;
+    [Fact]
+    public async Task Includes_version_on_error_in_resource_endpoint()
+    {
+        // Arrange
+        var options = (JsonApiOptions)_testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.IncludeJsonApiVersion = true;
 
-            string attendeeId = Unknown.StringId.For<MeetingAttendee, Guid>();
+        string attendeeId = Unknown.StringId.For<MeetingAttendee, Guid>();
 
-            string route = $"/meetingAttendees/{attendeeId}";
+        string route = $"/meetingAttendees/{attendeeId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            string errorId = JsonApiStringConverter.ExtractErrorId(responseDocument);
+        string errorId = JsonApiStringConverter.ExtractErrorId(responseDocument);
 
-            responseDocument.Should().BeJson(@"{
+        responseDocument.Should().BeJson(@"{
   ""jsonapi"": {
     ""version"": ""1.1""
   },
@@ -846,6 +842,5 @@ public async Task Includes_version_on_error_in_resource_endpoint()
     }
   ]
 }");
-        }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/CompaniesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/CompaniesController.cs
deleted file mode 100644
index fab829e553..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/CompaniesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion
-{
-    public sealed class CompaniesController : JsonApiController<Company, int>
-    {
-        public CompaniesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Company, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Company.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Company.cs
index 9246a523ab..d9b74411f9 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Company.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Company.cs
@@ -1,20 +1,18 @@
-using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion
+namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion")]
+public sealed class Company : Identifiable<int>, ISoftDeletable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Company : Identifiable<int>, ISoftDeletable
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        public DateTimeOffset? SoftDeletedAt { get; set; }
+    public DateTimeOffset? SoftDeletedAt { get; set; }
 
-        [HasMany]
-        public ICollection<Department> Departments { get; set; } = new List<Department>();
-    }
+    [HasMany]
+    public ICollection<Department> Departments { get; set; } = new List<Department>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Department.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Department.cs
index 26f85f4026..82e2e59007 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Department.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/Department.cs
@@ -1,19 +1,18 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion
+namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion")]
+public sealed class Department : Identifiable<int>, ISoftDeletable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Department : Identifiable<int>, ISoftDeletable
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        public DateTimeOffset? SoftDeletedAt { get; set; }
+    public DateTimeOffset? SoftDeletedAt { get; set; }
 
-        [HasOne]
-        public Company? Company { get; set; }
-    }
+    [HasOne]
+    public Company? Company { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/DepartmentsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/DepartmentsController.cs
deleted file mode 100644
index b3302da92d..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/DepartmentsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion
-{
-    public sealed class DepartmentsController : JsonApiController<Department, int>
-    {
-        public DepartmentsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Department, int> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/ISoftDeletable.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/ISoftDeletable.cs
index 5b575288f9..c5d98f3cb8 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/ISoftDeletable.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/ISoftDeletable.cs
@@ -1,11 +1,9 @@
-using System;
 using JetBrains.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion
+namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public interface ISoftDeletable
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public interface ISoftDeletable
-    {
-        DateTimeOffset? SoftDeletedAt { get; set; }
-    }
+    DateTimeOffset? SoftDeletedAt { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionAwareResourceService.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionAwareResourceService.cs
index 5da32576b6..299a40bad8 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionAwareResourceService.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionAwareResourceService.cs
@@ -1,8 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -13,103 +8,101 @@
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.Extensions.Logging;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion
+namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public class SoftDeletionAwareResourceService<TResource, TId> : JsonApiResourceService<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public class SoftDeletionAwareResourceService<TResource, TId> : JsonApiResourceService<TResource, TId>
-        where TResource : class, IIdentifiable<TId>
+    private readonly ISystemClock _systemClock;
+    private readonly ITargetedFields _targetedFields;
+    private readonly IResourceRepositoryAccessor _repositoryAccessor;
+    private readonly IJsonApiRequest _request;
+
+    public SoftDeletionAwareResourceService(ISystemClock systemClock, ITargetedFields targetedFields, IResourceRepositoryAccessor repositoryAccessor,
+        IQueryLayerComposer queryLayerComposer, IPaginationContext paginationContext, IJsonApiOptions options, ILoggerFactory loggerFactory,
+        IJsonApiRequest request, IResourceChangeTracker<TResource> resourceChangeTracker, IResourceDefinitionAccessor resourceDefinitionAccessor)
+        : base(repositoryAccessor, queryLayerComposer, paginationContext, options, loggerFactory, request, resourceChangeTracker, resourceDefinitionAccessor)
+    {
+        _systemClock = systemClock;
+        _targetedFields = targetedFields;
+        _repositoryAccessor = repositoryAccessor;
+        _request = request;
+    }
+
+    // To optimize performance, the default resource service does not always fetch all resources on write operations.
+    // We do that here, to assure a 404 error is thrown for soft-deleted resources.
+
+    public override async Task<TResource?> CreateAsync(TResource resource, CancellationToken cancellationToken)
     {
-        private readonly ISystemClock _systemClock;
-        private readonly ITargetedFields _targetedFields;
-        private readonly IResourceRepositoryAccessor _repositoryAccessor;
-        private readonly IJsonApiRequest _request;
-
-        public SoftDeletionAwareResourceService(ISystemClock systemClock, ITargetedFields targetedFields, IResourceRepositoryAccessor repositoryAccessor,
-            IQueryLayerComposer queryLayerComposer, IPaginationContext paginationContext, IJsonApiOptions options, ILoggerFactory loggerFactory,
-            IJsonApiRequest request, IResourceChangeTracker<TResource> resourceChangeTracker, IResourceDefinitionAccessor resourceDefinitionAccessor)
-            : base(repositoryAccessor, queryLayerComposer, paginationContext, options, loggerFactory, request, resourceChangeTracker,
-                resourceDefinitionAccessor)
+        if (_targetedFields.Relationships.Any(relationship => IsSoftDeletable(relationship.RightType.ClrType)))
         {
-            _systemClock = systemClock;
-            _targetedFields = targetedFields;
-            _repositoryAccessor = repositoryAccessor;
-            _request = request;
+            await AssertResourcesToAssignInRelationshipsExistAsync(resource, cancellationToken);
         }
 
-        // To optimize performance, the default resource service does not always fetch all resources on write operations.
-        // We do that here, to assure a 404 error is thrown for soft-deleted resources.
+        return await base.CreateAsync(resource, cancellationToken);
+    }
 
-        public override async Task<TResource?> CreateAsync(TResource resource, CancellationToken cancellationToken)
+    public override async Task<TResource?> UpdateAsync(TId id, TResource resource, CancellationToken cancellationToken)
+    {
+        if (_targetedFields.Relationships.Any(relationship => IsSoftDeletable(relationship.RightType.ClrType)))
         {
-            if (_targetedFields.Relationships.Any(relationship => IsSoftDeletable(relationship.RightType.ClrType)))
-            {
-                await AssertResourcesToAssignInRelationshipsExistAsync(resource, cancellationToken);
-            }
-
-            return await base.CreateAsync(resource, cancellationToken);
+            await AssertResourcesToAssignInRelationshipsExistAsync(resource, cancellationToken);
         }
 
-        public override async Task<TResource?> UpdateAsync(TId id, TResource resource, CancellationToken cancellationToken)
-        {
-            if (_targetedFields.Relationships.Any(relationship => IsSoftDeletable(relationship.RightType.ClrType)))
-            {
-                await AssertResourcesToAssignInRelationshipsExistAsync(resource, cancellationToken);
-            }
+        return await base.UpdateAsync(id, resource, cancellationToken);
+    }
 
-            return await base.UpdateAsync(id, resource, cancellationToken);
+    public override async Task SetRelationshipAsync(TId leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken)
+    {
+        if (IsSoftDeletable(_request.Relationship!.RightType.ClrType))
+        {
+            await AssertRightResourcesExistAsync(rightValue, cancellationToken);
         }
 
-        public override async Task SetRelationshipAsync(TId leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken)
-        {
-            if (IsSoftDeletable(_request.Relationship!.RightType.ClrType))
-            {
-                await AssertRightResourcesExistAsync(rightValue, cancellationToken);
-            }
+        await base.SetRelationshipAsync(leftId, relationshipName, rightValue, cancellationToken);
+    }
 
-            await base.SetRelationshipAsync(leftId, relationshipName, rightValue, cancellationToken);
+    public override async Task AddToToManyRelationshipAsync(TId leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
+        CancellationToken cancellationToken)
+    {
+        if (IsSoftDeletable(typeof(TResource)))
+        {
+            _ = await GetPrimaryResourceByIdAsync(leftId, TopFieldSelection.OnlyIdAttribute, cancellationToken);
         }
 
-        public override async Task AddToToManyRelationshipAsync(TId leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
-            CancellationToken cancellationToken)
+        if (IsSoftDeletable(_request.Relationship!.RightType.ClrType))
         {
-            if (IsSoftDeletable(typeof(TResource)))
-            {
-                _ = await GetPrimaryResourceByIdAsync(leftId, TopFieldSelection.OnlyIdAttribute, cancellationToken);
-            }
+            await AssertRightResourcesExistAsync(rightResourceIds, cancellationToken);
+        }
 
-            if (IsSoftDeletable(_request.Relationship!.RightType.ClrType))
-            {
-                await AssertRightResourcesExistAsync(rightResourceIds, cancellationToken);
-            }
+        await base.AddToToManyRelationshipAsync(leftId, relationshipName, rightResourceIds, cancellationToken);
+    }
 
-            await base.AddToToManyRelationshipAsync(leftId, relationshipName, rightResourceIds, cancellationToken);
+    public override async Task DeleteAsync(TId id, CancellationToken cancellationToken)
+    {
+        if (IsSoftDeletable(typeof(TResource)))
+        {
+            await SoftDeleteAsync(id, cancellationToken);
         }
-
-        public override async Task DeleteAsync(TId id, CancellationToken cancellationToken)
+        else
         {
-            if (IsSoftDeletable(typeof(TResource)))
-            {
-                await SoftDeleteAsync(id, cancellationToken);
-            }
-            else
-            {
-                await base.DeleteAsync(id, cancellationToken);
-            }
+            await base.DeleteAsync(id, cancellationToken);
         }
+    }
 
-        private async Task SoftDeleteAsync(TId id, CancellationToken cancellationToken)
-        {
-            TResource resourceFromDatabase = await GetPrimaryResourceForUpdateAsync(id, cancellationToken);
+    private async Task SoftDeleteAsync(TId id, CancellationToken cancellationToken)
+    {
+        TResource resourceFromDatabase = await GetPrimaryResourceForUpdateAsync(id, cancellationToken);
 
-            ((ISoftDeletable)resourceFromDatabase).SoftDeletedAt = _systemClock.UtcNow;
+        ((ISoftDeletable)resourceFromDatabase).SoftDeletedAt = _systemClock.UtcNow;
 
-            // A delete operation does not target any fields, so we can just pass resourceFromDatabase twice.
-            await _repositoryAccessor.UpdateAsync(resourceFromDatabase, resourceFromDatabase, cancellationToken);
-        }
+        // A delete operation does not target any fields, so we can just pass resourceFromDatabase twice.
+        await _repositoryAccessor.UpdateAsync(resourceFromDatabase, resourceFromDatabase, cancellationToken);
+    }
 
-        private static bool IsSoftDeletable(Type resourceClrType)
-        {
-            return typeof(ISoftDeletable).IsAssignableFrom(resourceClrType);
-        }
+    private static bool IsSoftDeletable(Type resourceClrType)
+    {
+        return typeof(ISoftDeletable).IsAssignableFrom(resourceClrType);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionDbContext.cs
index 0fe98b869e..e9a03df2f6 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionDbContext.cs
@@ -3,26 +3,25 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion
+namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class SoftDeletionDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class SoftDeletionDbContext : DbContext
-    {
-        public DbSet<Company> Companies => Set<Company>();
-        public DbSet<Department> Departments => Set<Department>();
+    public DbSet<Company> Companies => Set<Company>();
+    public DbSet<Department> Departments => Set<Department>();
 
-        public SoftDeletionDbContext(DbContextOptions<SoftDeletionDbContext> options)
-            : base(options)
-        {
-        }
+    public SoftDeletionDbContext(DbContextOptions<SoftDeletionDbContext> options)
+        : base(options)
+    {
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<Company>()
-                .HasQueryFilter(company => company.SoftDeletedAt == null);
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<Company>()
+            .HasQueryFilter(company => company.SoftDeletedAt == null);
 
-            builder.Entity<Department>()
-                .HasQueryFilter(department => department.SoftDeletedAt == null);
-        }
+        builder.Entity<Department>()
+            .HasQueryFilter(department => department.SoftDeletedAt == null);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionFakers.cs
index 85ddfd20e5..254d186fac 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionFakers.cs
@@ -1,25 +1,23 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion
+namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion;
+
+internal sealed class SoftDeletionFakers : FakerContainer
 {
-    internal sealed class SoftDeletionFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<Company>> _lazyCompanyFaker = new(() =>
-            new Faker<Company>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(company => company.Name, faker => faker.Company.CompanyName()));
+    private readonly Lazy<Faker<Company>> _lazyCompanyFaker = new(() =>
+        new Faker<Company>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(company => company.Name, faker => faker.Company.CompanyName()));
 
-        private readonly Lazy<Faker<Department>> _lazyDepartmentFaker = new(() =>
-            new Faker<Department>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(department => department.Name, faker => faker.Commerce.Department()));
+    private readonly Lazy<Faker<Department>> _lazyDepartmentFaker = new(() =>
+        new Faker<Department>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(department => department.Name, faker => faker.Commerce.Department()));
 
-        public Faker<Company> Company => _lazyCompanyFaker.Value;
-        public Faker<Department> Department => _lazyDepartmentFaker.Value;
-    }
+    public Faker<Company> Company => _lazyCompanyFaker.Value;
+    public Faker<Department> Department => _lazyDepartmentFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionTests.cs
index f9ffae63bb..0f0dd72056 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionTests.cs
@@ -1,11 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
-using FluentAssertions.Common;
 using FluentAssertions.Extensions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -15,1029 +9,1028 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion
+namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion;
+
+public sealed class SoftDeletionTests : IClassFixture<IntegrationTestContext<TestableStartup<SoftDeletionDbContext>, SoftDeletionDbContext>>
 {
-    public sealed class SoftDeletionTests : IClassFixture<IntegrationTestContext<TestableStartup<SoftDeletionDbContext>, SoftDeletionDbContext>>
-    {
-        private static readonly DateTimeOffset SoftDeletionTime = 1.January(2001).ToDateTimeOffset();
+    private static readonly DateTimeOffset SoftDeletionTime = 1.January(2001).AsUtc();
 
-        private readonly IntegrationTestContext<TestableStartup<SoftDeletionDbContext>, SoftDeletionDbContext> _testContext;
-        private readonly SoftDeletionFakers _fakers = new();
+    private readonly IntegrationTestContext<TestableStartup<SoftDeletionDbContext>, SoftDeletionDbContext> _testContext;
+    private readonly SoftDeletionFakers _fakers = new();
 
-        public SoftDeletionTests(IntegrationTestContext<TestableStartup<SoftDeletionDbContext>, SoftDeletionDbContext> testContext)
-        {
-            _testContext = testContext;
+    public SoftDeletionTests(IntegrationTestContext<TestableStartup<SoftDeletionDbContext>, SoftDeletionDbContext> testContext)
+    {
+        _testContext = testContext;
 
-            testContext.UseController<CompaniesController>();
-            testContext.UseController<DepartmentsController>();
+        testContext.UseController<CompaniesController>();
+        testContext.UseController<DepartmentsController>();
 
-            testContext.ConfigureServicesAfterStartup(services =>
+        testContext.ConfigureServicesAfterStartup(services =>
+        {
+            services.AddSingleton<ISystemClock>(new FrozenSystemClock
             {
-                services.AddSingleton<ISystemClock>(new FrozenSystemClock
-                {
-                    UtcNow = 1.January(2005).ToDateTimeOffset()
-                });
-
-                services.AddResourceService<SoftDeletionAwareResourceService<Company, int>>();
-                services.AddResourceService<SoftDeletionAwareResourceService<Department, int>>();
+                UtcNow = 1.January(2005).AsUtc()
             });
-        }
 
-        [Fact]
-        public async Task Get_primary_resources_excludes_soft_deleted()
+            services.AddResourceService<SoftDeletionAwareResourceService<Company, int>>();
+            services.AddResourceService<SoftDeletionAwareResourceService<Department, int>>();
+        });
+    }
+
+    [Fact]
+    public async Task Get_primary_resources_excludes_soft_deleted()
+    {
+        // Arrange
+        List<Department> departments = _fakers.Department.Generate(2);
+        departments[0].SoftDeletedAt = SoftDeletionTime;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Department> departments = _fakers.Department.Generate(2);
-            departments[0].SoftDeletedAt = SoftDeletionTime;
+            await dbContext.ClearTableAsync<Department>();
+            dbContext.Departments.AddRange(departments);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Department>();
-                dbContext.Departments.AddRange(departments);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/departments";
 
-            const string route = "/departments";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(departments[1].StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(departments[1].StringId);
-        }
+    [Fact]
+    public async Task Filter_on_primary_resources_excludes_soft_deleted()
+    {
+        // Arrange
+        List<Department> departments = _fakers.Department.Generate(3);
 
-        [Fact]
-        public async Task Filter_on_primary_resources_excludes_soft_deleted()
-        {
-            // Arrange
-            List<Department> departments = _fakers.Department.Generate(3);
+        departments[0].Name = "Support";
 
-            departments[0].Name = "Support";
+        departments[1].Name = "Sales";
+        departments[1].SoftDeletedAt = SoftDeletionTime;
 
-            departments[1].Name = "Sales";
-            departments[1].SoftDeletedAt = SoftDeletionTime;
+        departments[2].Name = "Marketing";
 
-            departments[2].Name = "Marketing";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Department>();
+            dbContext.Departments.AddRange(departments);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Department>();
-                dbContext.Departments.AddRange(departments);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/departments?filter=startsWith(name,'S')";
 
-            const string route = "/departments?filter=startsWith(name,'S')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(departments[0].StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(departments[0].StringId);
-        }
+    [Fact]
+    public async Task Get_primary_resources_with_include_excludes_soft_deleted()
+    {
+        // Arrange
+        List<Company> companies = _fakers.Company.Generate(2);
 
-        [Fact]
-        public async Task Get_primary_resources_with_include_excludes_soft_deleted()
-        {
-            // Arrange
-            List<Company> companies = _fakers.Company.Generate(2);
+        companies[0].SoftDeletedAt = SoftDeletionTime;
+        companies[0].Departments = _fakers.Department.Generate(1);
 
-            companies[0].SoftDeletedAt = SoftDeletionTime;
-            companies[0].Departments = _fakers.Department.Generate(1);
+        companies[1].Departments = _fakers.Department.Generate(2);
+        companies[1].Departments.ElementAt(1).SoftDeletedAt = SoftDeletionTime;
 
-            companies[1].Departments = _fakers.Department.Generate(2);
-            companies[1].Departments.ElementAt(1).SoftDeletedAt = SoftDeletionTime;
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Company>();
+            dbContext.Companies.AddRange(companies);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Company>();
-                dbContext.Companies.AddRange(companies);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/companies?include=departments";
 
-            const string route = "/companies?include=departments";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Type.Should().Be("companies");
+        responseDocument.Data.ManyValue[0].Id.Should().Be(companies[1].StringId);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Type.Should().Be("companies");
-            responseDocument.Data.ManyValue[0].Id.Should().Be(companies[1].StringId);
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Type.Should().Be("departments");
+        responseDocument.Included[0].Id.Should().Be(companies[1].Departments.ElementAt(0).StringId);
+    }
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Type.Should().Be("departments");
-            responseDocument.Included[0].Id.Should().Be(companies[1].Departments.ElementAt(0).StringId);
-        }
+    [Fact]
+    public async Task Cannot_get_soft_deleted_primary_resource_by_ID()
+    {
+        // Arrange
+        Department department = _fakers.Department.Generate();
+        department.SoftDeletedAt = SoftDeletionTime;
 
-        [Fact]
-        public async Task Cannot_get_soft_deleted_primary_resource_by_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Department department = _fakers.Department.Generate();
-            department.SoftDeletedAt = SoftDeletionTime;
+            dbContext.Departments.Add(department);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Departments.Add(department);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/departments/{department.StringId}";
 
-            string route = $"/departments/{department.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'departments' with ID '{department.StringId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'departments' with ID '{department.StringId}' does not exist.");
-        }
+    [Fact]
+    public async Task Cannot_get_secondary_resources_for_soft_deleted_parent()
+    {
+        // Arrange
+        Company company = _fakers.Company.Generate();
+        company.SoftDeletedAt = SoftDeletionTime;
+        company.Departments = _fakers.Department.Generate(1);
 
-        [Fact]
-        public async Task Cannot_get_secondary_resources_for_soft_deleted_parent()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Company company = _fakers.Company.Generate();
-            company.SoftDeletedAt = SoftDeletionTime;
-            company.Departments = _fakers.Department.Generate(1);
+            dbContext.Companies.Add(company);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Companies.Add(company);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/companies/{company.StringId}/departments";
 
-            string route = $"/companies/{company.StringId}/departments";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'companies' with ID '{company.StringId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'companies' with ID '{company.StringId}' does not exist.");
-        }
+    [Fact]
+    public async Task Get_secondary_resources_excludes_soft_deleted()
+    {
+        // Arrange
+        Company company = _fakers.Company.Generate();
+        company.Departments = _fakers.Department.Generate(2);
+        company.Departments.ElementAt(0).SoftDeletedAt = SoftDeletionTime;
 
-        [Fact]
-        public async Task Get_secondary_resources_excludes_soft_deleted()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Company company = _fakers.Company.Generate();
-            company.Departments = _fakers.Department.Generate(2);
-            company.Departments.ElementAt(0).SoftDeletedAt = SoftDeletionTime;
+            dbContext.Companies.Add(company);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Companies.Add(company);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/companies/{company.StringId}/departments";
 
-            string route = $"/companies/{company.StringId}/departments";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(company.Departments.ElementAt(1).StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(company.Departments.ElementAt(1).StringId);
-        }
+    [Fact]
+    public async Task Cannot_get_secondary_resource_for_soft_deleted_parent()
+    {
+        // Arrange
+        Department department = _fakers.Department.Generate();
+        department.SoftDeletedAt = SoftDeletionTime;
+        department.Company = _fakers.Company.Generate();
 
-        [Fact]
-        public async Task Cannot_get_secondary_resource_for_soft_deleted_parent()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Department department = _fakers.Department.Generate();
-            department.SoftDeletedAt = SoftDeletionTime;
-            department.Company = _fakers.Company.Generate();
+            dbContext.Departments.Add(department);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Departments.Add(department);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/departments/{department.StringId}/company";
 
-            string route = $"/departments/{department.StringId}/company";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'departments' with ID '{department.StringId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'departments' with ID '{department.StringId}' does not exist.");
-        }
+    [Fact]
+    public async Task Cannot_get_soft_deleted_secondary_resource()
+    {
+        // Arrange
+        Department department = _fakers.Department.Generate();
+        department.Company = _fakers.Company.Generate();
+        department.Company.SoftDeletedAt = SoftDeletionTime;
 
-        [Fact]
-        public async Task Cannot_get_soft_deleted_secondary_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Department department = _fakers.Department.Generate();
-            department.Company = _fakers.Company.Generate();
-            department.Company.SoftDeletedAt = SoftDeletionTime;
+            dbContext.Departments.Add(department);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Departments.Add(department);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/departments/{department.StringId}/company";
 
-            string route = $"/departments/{department.StringId}/company";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.Value.Should().BeNull();
+    }
 
-            responseDocument.Data.Value.Should().BeNull();
-        }
+    [Fact]
+    public async Task Cannot_get_ToMany_relationship_for_soft_deleted_parent()
+    {
+        // Arrange
+        Company company = _fakers.Company.Generate();
+        company.SoftDeletedAt = SoftDeletionTime;
+        company.Departments = _fakers.Department.Generate(1);
 
-        [Fact]
-        public async Task Cannot_get_ToMany_relationship_for_soft_deleted_parent()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Company company = _fakers.Company.Generate();
-            company.SoftDeletedAt = SoftDeletionTime;
-            company.Departments = _fakers.Department.Generate(1);
+            dbContext.Companies.Add(company);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Companies.Add(company);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/companies/{company.StringId}/relationships/departments";
 
-            string route = $"/companies/{company.StringId}/relationships/departments";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'companies' with ID '{company.StringId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'companies' with ID '{company.StringId}' does not exist.");
-        }
+    [Fact]
+    public async Task Get_ToMany_relationship_excludes_soft_deleted()
+    {
+        // Arrange
+        Company company = _fakers.Company.Generate();
+        company.Departments = _fakers.Department.Generate(2);
+        company.Departments.ElementAt(0).SoftDeletedAt = SoftDeletionTime;
 
-        [Fact]
-        public async Task Get_ToMany_relationship_excludes_soft_deleted()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Company company = _fakers.Company.Generate();
-            company.Departments = _fakers.Department.Generate(2);
-            company.Departments.ElementAt(0).SoftDeletedAt = SoftDeletionTime;
+            dbContext.Companies.Add(company);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Companies.Add(company);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/companies/{company.StringId}/relationships/departments";
 
-            string route = $"/companies/{company.StringId}/relationships/departments";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be(company.Departments.ElementAt(1).StringId);
+    }
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be(company.Departments.ElementAt(1).StringId);
-        }
+    [Fact]
+    public async Task Cannot_get_ToOne_relationship_for_soft_deleted_parent()
+    {
+        // Arrange
+        Department department = _fakers.Department.Generate();
+        department.SoftDeletedAt = SoftDeletionTime;
+        department.Company = _fakers.Company.Generate();
 
-        [Fact]
-        public async Task Cannot_get_ToOne_relationship_for_soft_deleted_parent()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Department department = _fakers.Department.Generate();
-            department.SoftDeletedAt = SoftDeletionTime;
-            department.Company = _fakers.Company.Generate();
+            dbContext.Departments.Add(department);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Departments.Add(department);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/departments/{department.StringId}/relationships/company";
 
-            string route = $"/departments/{department.StringId}/relationships/company";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'departments' with ID '{department.StringId}' does not exist.");
+    }
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'departments' with ID '{department.StringId}' does not exist.");
-        }
+    [Fact]
+    public async Task Get_ToOne_relationship_excludes_soft_deleted()
+    {
+        // Arrange
+        Department department = _fakers.Department.Generate();
+        department.Company = _fakers.Company.Generate();
+        department.Company.SoftDeletedAt = SoftDeletionTime;
 
-        [Fact]
-        public async Task Get_ToOne_relationship_excludes_soft_deleted()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Department department = _fakers.Department.Generate();
-            department.Company = _fakers.Company.Generate();
-            department.Company.SoftDeletedAt = SoftDeletionTime;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Departments.Add(department);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Departments.Add(department);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/departments/{department.StringId}/relationships/company";
+        string route = $"/departments/{department.StringId}/relationships/company";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.Value.Should().BeNull();
-        }
+        responseDocument.Data.Value.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_ToMany_relationship_to_soft_deleted()
-        {
-            // Arrange
-            Department existingDepartment = _fakers.Department.Generate();
-            existingDepartment.SoftDeletedAt = SoftDeletionTime;
+    [Fact]
+    public async Task Cannot_create_resource_with_ToMany_relationship_to_soft_deleted()
+    {
+        // Arrange
+        Department existingDepartment = _fakers.Department.Generate();
+        existingDepartment.SoftDeletedAt = SoftDeletionTime;
 
-            string newCompanyName = _fakers.Company.Generate().Name;
+        string newCompanyName = _fakers.Company.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Departments.Add(existingDepartment);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Departments.Add(existingDepartment);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "companies",
+                attributes = new
                 {
-                    type = "companies",
-                    attributes = new
-                    {
-                        name = newCompanyName
-                    },
-                    relationships = new
+                    name = newCompanyName
+                },
+                relationships = new
+                {
+                    departments = new
                     {
-                        departments = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "departments",
-                                    id = existingDepartment.StringId
-                                }
+                                type = "departments",
+                                id = existingDepartment.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/companies";
+        const string route = "/companies";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
 
-            error.Detail.Should()
-                .Be($"Related resource of type 'departments' with ID '{existingDepartment.StringId}' in relationship 'departments' does not exist.");
-        }
+        error.Detail.Should()
+            .Be($"Related resource of type 'departments' with ID '{existingDepartment.StringId}' in relationship 'departments' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_create_resource_with_ToOne_relationship_to_soft_deleted()
-        {
-            // Arrange
-            Company existingCompany = _fakers.Company.Generate();
-            existingCompany.SoftDeletedAt = SoftDeletionTime;
+    [Fact]
+    public async Task Cannot_create_resource_with_ToOne_relationship_to_soft_deleted()
+    {
+        // Arrange
+        Company existingCompany = _fakers.Company.Generate();
+        existingCompany.SoftDeletedAt = SoftDeletionTime;
 
-            string newDepartmentName = _fakers.Department.Generate().Name;
+        string newDepartmentName = _fakers.Department.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Companies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Companies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "departments",
+                attributes = new
                 {
-                    type = "departments",
-                    attributes = new
-                    {
-                        name = newDepartmentName
-                    },
-                    relationships = new
+                    name = newDepartmentName
+                },
+                relationships = new
+                {
+                    company = new
                     {
-                        company = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "companies",
-                                id = existingCompany.StringId
-                            }
+                            type = "companies",
+                            id = existingCompany.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            const string route = "/departments";
+        const string route = "/departments";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'companies' with ID '{existingCompany.StringId}' in relationship 'company' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'companies' with ID '{existingCompany.StringId}' in relationship 'company' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_soft_deleted_resource()
-        {
-            // Arrange
-            Company existingCompany = _fakers.Company.Generate();
-            existingCompany.SoftDeletedAt = SoftDeletionTime;
+    [Fact]
+    public async Task Cannot_update_soft_deleted_resource()
+    {
+        // Arrange
+        Company existingCompany = _fakers.Company.Generate();
+        existingCompany.SoftDeletedAt = SoftDeletionTime;
 
-            string newCompanyName = _fakers.Company.Generate().Name;
+        string newCompanyName = _fakers.Company.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Companies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Companies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "companies",
+                id = existingCompany.StringId,
+                attributes = new
                 {
-                    type = "companies",
-                    id = existingCompany.StringId,
-                    attributes = new
-                    {
-                        name = newCompanyName
-                    }
+                    name = newCompanyName
                 }
-            };
+            }
+        };
 
-            string route = $"/companies/{existingCompany.StringId}";
+        string route = $"/companies/{existingCompany.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'companies' with ID '{existingCompany.StringId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'companies' with ID '{existingCompany.StringId}' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_ToMany_relationship_to_soft_deleted()
-        {
-            // Arrange
-            Company existingCompany = _fakers.Company.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_with_ToMany_relationship_to_soft_deleted()
+    {
+        // Arrange
+        Company existingCompany = _fakers.Company.Generate();
 
-            Department existingDepartment = _fakers.Department.Generate();
-            existingDepartment.SoftDeletedAt = SoftDeletionTime;
+        Department existingDepartment = _fakers.Department.Generate();
+        existingDepartment.SoftDeletedAt = SoftDeletionTime;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingCompany, existingDepartment);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingCompany, existingDepartment);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "companies",
+                id = existingCompany.StringId,
+                relationships = new
                 {
-                    type = "companies",
-                    id = existingCompany.StringId,
-                    relationships = new
+                    departments = new
                     {
-                        departments = new
+                        data = new[]
                         {
-                            data = new[]
+                            new
                             {
-                                new
-                                {
-                                    type = "departments",
-                                    id = existingDepartment.StringId
-                                }
+                                type = "departments",
+                                id = existingDepartment.StringId
                             }
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/companies/{existingCompany.StringId}";
+        string route = $"/companies/{existingCompany.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
 
-            error.Detail.Should()
-                .Be($"Related resource of type 'departments' with ID '{existingDepartment.StringId}' in relationship 'departments' does not exist.");
-        }
+        error.Detail.Should()
+            .Be($"Related resource of type 'departments' with ID '{existingDepartment.StringId}' in relationship 'departments' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_resource_with_ToOne_relationship_to_soft_deleted()
-        {
-            // Arrange
-            Department existingDepartment = _fakers.Department.Generate();
+    [Fact]
+    public async Task Cannot_update_resource_with_ToOne_relationship_to_soft_deleted()
+    {
+        // Arrange
+        Department existingDepartment = _fakers.Department.Generate();
 
-            Company existingCompany = _fakers.Company.Generate();
-            existingCompany.SoftDeletedAt = SoftDeletionTime;
+        Company existingCompany = _fakers.Company.Generate();
+        existingCompany.SoftDeletedAt = SoftDeletionTime;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingDepartment, existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingDepartment, existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "departments",
+                id = existingDepartment.StringId,
+                relationships = new
                 {
-                    type = "departments",
-                    id = existingDepartment.StringId,
-                    relationships = new
+                    company = new
                     {
-                        company = new
+                        data = new
                         {
-                            data = new
-                            {
-                                type = "companies",
-                                id = existingCompany.StringId
-                            }
+                            type = "companies",
+                            id = existingCompany.StringId
                         }
                     }
                 }
-            };
+            }
+        };
 
-            string route = $"/departments/{existingDepartment.StringId}";
+        string route = $"/departments/{existingDepartment.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'companies' with ID '{existingCompany.StringId}' in relationship 'company' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'companies' with ID '{existingCompany.StringId}' in relationship 'company' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_ToMany_relationship_for_soft_deleted_parent()
-        {
-            // Arrange
-            Company existingCompany = _fakers.Company.Generate();
-            existingCompany.SoftDeletedAt = SoftDeletionTime;
-            existingCompany.Departments = _fakers.Department.Generate(1);
+    [Fact]
+    public async Task Cannot_update_ToMany_relationship_for_soft_deleted_parent()
+    {
+        // Arrange
+        Company existingCompany = _fakers.Company.Generate();
+        existingCompany.SoftDeletedAt = SoftDeletionTime;
+        existingCompany.Departments = _fakers.Department.Generate(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Companies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Companies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            string route = $"/companies/{existingCompany.StringId}/relationships/departments";
+        string route = $"/companies/{existingCompany.StringId}/relationships/departments";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'companies' with ID '{existingCompany.StringId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'companies' with ID '{existingCompany.StringId}' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_ToMany_relationship_to_soft_deleted()
-        {
-            // Arrange
-            Company existingCompany = _fakers.Company.Generate();
+    [Fact]
+    public async Task Cannot_update_ToMany_relationship_to_soft_deleted()
+    {
+        // Arrange
+        Company existingCompany = _fakers.Company.Generate();
 
-            Department existingDepartment = _fakers.Department.Generate();
-            existingDepartment.SoftDeletedAt = SoftDeletionTime;
+        Department existingDepartment = _fakers.Department.Generate();
+        existingDepartment.SoftDeletedAt = SoftDeletionTime;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingCompany, existingDepartment);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingCompany, existingDepartment);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "departments",
-                        id = existingDepartment.StringId
-                    }
+                    type = "departments",
+                    id = existingDepartment.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/companies/{existingCompany.StringId}/relationships/departments";
+        string route = $"/companies/{existingCompany.StringId}/relationships/departments";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
 
-            error.Detail.Should()
-                .Be($"Related resource of type 'departments' with ID '{existingDepartment.StringId}' in relationship 'departments' does not exist.");
-        }
+        error.Detail.Should()
+            .Be($"Related resource of type 'departments' with ID '{existingDepartment.StringId}' in relationship 'departments' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_ToOne_relationship_for_soft_deleted_parent()
-        {
-            // Arrange
-            Department existingDepartment = _fakers.Department.Generate();
-            existingDepartment.SoftDeletedAt = SoftDeletionTime;
+    [Fact]
+    public async Task Cannot_update_ToOne_relationship_for_soft_deleted_parent()
+    {
+        // Arrange
+        Department existingDepartment = _fakers.Department.Generate();
+        existingDepartment.SoftDeletedAt = SoftDeletionTime;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Departments.Add(existingDepartment);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Departments.Add(existingDepartment);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            string route = $"/departments/{existingDepartment.StringId}/relationships/company";
+        string route = $"/departments/{existingDepartment.StringId}/relationships/company";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'departments' with ID '{existingDepartment.StringId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'departments' with ID '{existingDepartment.StringId}' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_update_ToOne_relationship_to_soft_deleted()
-        {
-            // Arrange
-            Department existingDepartment = _fakers.Department.Generate();
+    [Fact]
+    public async Task Cannot_update_ToOne_relationship_to_soft_deleted()
+    {
+        // Arrange
+        Department existingDepartment = _fakers.Department.Generate();
 
-            Company existingCompany = _fakers.Company.Generate();
-            existingCompany.SoftDeletedAt = SoftDeletionTime;
+        Company existingCompany = _fakers.Company.Generate();
+        existingCompany.SoftDeletedAt = SoftDeletionTime;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingDepartment, existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingDepartment, existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
-                {
-                    type = "companies",
-                    id = existingCompany.StringId
-                }
-            };
+                type = "companies",
+                id = existingCompany.StringId
+            }
+        };
 
-            string route = $"/departments/{existingDepartment.StringId}/relationships/company";
+        string route = $"/departments/{existingDepartment.StringId}/relationships/company";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
-            error.Detail.Should().Be($"Related resource of type 'companies' with ID '{existingCompany.StringId}' in relationship 'company' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be($"Related resource of type 'companies' with ID '{existingCompany.StringId}' in relationship 'company' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_add_to_ToMany_relationship_for_soft_deleted_parent()
-        {
-            // Arrange
-            Company existingCompany = _fakers.Company.Generate();
-            existingCompany.SoftDeletedAt = SoftDeletionTime;
+    [Fact]
+    public async Task Cannot_add_to_ToMany_relationship_for_soft_deleted_parent()
+    {
+        // Arrange
+        Company existingCompany = _fakers.Company.Generate();
+        existingCompany.SoftDeletedAt = SoftDeletionTime;
 
-            Department existingDepartment = _fakers.Department.Generate();
+        Department existingDepartment = _fakers.Department.Generate();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingCompany, existingDepartment);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingCompany, existingDepartment);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "departments",
-                        id = existingDepartment.StringId
-                    }
+                    type = "departments",
+                    id = existingDepartment.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/companies/{existingCompany.StringId}/relationships/departments";
+        string route = $"/companies/{existingCompany.StringId}/relationships/departments";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'companies' with ID '{existingCompany.StringId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'companies' with ID '{existingCompany.StringId}' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_add_to_ToMany_relationship_with_soft_deleted()
-        {
-            // Arrange
-            Company existingCompany = _fakers.Company.Generate();
+    [Fact]
+    public async Task Cannot_add_to_ToMany_relationship_with_soft_deleted()
+    {
+        // Arrange
+        Company existingCompany = _fakers.Company.Generate();
 
-            Department existingDepartment = _fakers.Department.Generate();
-            existingDepartment.SoftDeletedAt = SoftDeletionTime;
+        Department existingDepartment = _fakers.Department.Generate();
+        existingDepartment.SoftDeletedAt = SoftDeletionTime;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.AddInRange(existingCompany, existingDepartment);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.AddInRange(existingCompany, existingDepartment);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "departments",
-                        id = existingDepartment.StringId
-                    }
+                    type = "departments",
+                    id = existingDepartment.StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/companies/{existingCompany.StringId}/relationships/departments";
+        string route = $"/companies/{existingCompany.StringId}/relationships/departments";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
 
-            error.Detail.Should()
-                .Be($"Related resource of type 'departments' with ID '{existingDepartment.StringId}' in relationship 'departments' does not exist.");
-        }
+        error.Detail.Should()
+            .Be($"Related resource of type 'departments' with ID '{existingDepartment.StringId}' in relationship 'departments' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_remove_from_ToMany_relationship_for_soft_deleted_parent()
-        {
-            // Arrange
-            Company existingCompany = _fakers.Company.Generate();
-            existingCompany.SoftDeletedAt = SoftDeletionTime;
-            existingCompany.Departments = _fakers.Department.Generate(1);
+    [Fact]
+    public async Task Cannot_remove_from_ToMany_relationship_for_soft_deleted_parent()
+    {
+        // Arrange
+        Company existingCompany = _fakers.Company.Generate();
+        existingCompany.SoftDeletedAt = SoftDeletionTime;
+        existingCompany.Departments = _fakers.Department.Generate(1);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Companies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Companies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "departments",
-                        id = existingCompany.Departments.ElementAt(0).StringId
-                    }
+                    type = "departments",
+                    id = existingCompany.Departments.ElementAt(0).StringId
                 }
-            };
+            }
+        };
 
-            string route = $"/companies/{existingCompany.StringId}/relationships/departments";
+        string route = $"/companies/{existingCompany.StringId}/relationships/departments";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'companies' with ID '{existingCompany.StringId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'companies' with ID '{existingCompany.StringId}' does not exist.");
+    }
 
-        [Fact]
-        public async Task Cannot_remove_from_ToMany_relationship_with_soft_deleted()
-        {
-            // Arrange
-            Company existingCompany = _fakers.Company.Generate();
-            existingCompany.Departments = _fakers.Department.Generate(1);
-            existingCompany.Departments.ElementAt(0).SoftDeletedAt = SoftDeletionTime;
+    [Fact]
+    public async Task Cannot_remove_from_ToMany_relationship_with_soft_deleted()
+    {
+        // Arrange
+        Company existingCompany = _fakers.Company.Generate();
+        existingCompany.Departments = _fakers.Department.Generate(1);
+        existingCompany.Departments.ElementAt(0).SoftDeletedAt = SoftDeletionTime;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Companies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.Companies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "departments",
-                        id = existingCompany.Departments.ElementAt(0).StringId
-                    }
+                    type = "departments",
+                    id = existingCompany.Departments.ElementAt(0).StringId
                 }
-            };
+            }
+        };
+
+        string route = $"/companies/{existingCompany.StringId}/relationships/departments";
 
-            string route = $"/companies/{existingCompany.StringId}/relationships/departments";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route, requestBody);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("A related resource does not exist.");
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("A related resource does not exist.");
+        error.Detail.Should().Be(
+            $"Related resource of type 'departments' with ID '{existingCompany.Departments.ElementAt(0).StringId}' in relationship 'departments' does not exist.");
+    }
 
-            error.Detail.Should().Be(
-                $"Related resource of type 'departments' with ID '{existingCompany.Departments.ElementAt(0).StringId}' in relationship 'departments' does not exist.");
-        }
+    [Fact]
+    public async Task Can_soft_delete_resource()
+    {
+        // Arrange
+        Company existingCompany = _fakers.Company.Generate();
 
-        [Fact]
-        public async Task Can_soft_delete_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Company existingCompany = _fakers.Company.Generate();
+            dbContext.Companies.Add(existingCompany);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Companies.Add(existingCompany);
-                await dbContext.SaveChangesAsync();
-            });
+        string route = $"/companies/{existingCompany.StringId}";
 
-            string route = $"/companies/{existingCompany.StringId}";
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        responseDocument.Should().BeEmpty();
 
-            responseDocument.Should().BeEmpty();
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Company companyInDatabase = await dbContext.Companies.IgnoreQueryFilters().FirstWithIdAsync(existingCompany.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Company companyInDatabase = await dbContext.Companies.IgnoreQueryFilters().FirstWithIdAsync(existingCompany.Id);
+            companyInDatabase.Name.Should().Be(existingCompany.Name);
+            companyInDatabase.SoftDeletedAt.ShouldNotBeNull();
+        });
+    }
 
-                companyInDatabase.Name.Should().Be(existingCompany.Name);
-                companyInDatabase.SoftDeletedAt.ShouldNotBeNull();
-            });
-        }
+    [Fact]
+    public async Task Cannot_delete_soft_deleted_resource()
+    {
+        // Arrange
+        Department existingDepartment = _fakers.Department.Generate();
+        existingDepartment.SoftDeletedAt = SoftDeletionTime;
 
-        [Fact]
-        public async Task Cannot_delete_soft_deleted_resource()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Department existingDepartment = _fakers.Department.Generate();
-            existingDepartment.SoftDeletedAt = SoftDeletionTime;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.Departments.Add(existingDepartment);
-                await dbContext.SaveChangesAsync();
-            });
+            dbContext.Departments.Add(existingDepartment);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/departments/{existingDepartment.StringId}";
+        string route = $"/departments/{existingDepartment.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteDeleteAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NotFound);
 
-            responseDocument.Errors.ShouldHaveCount(1);
+        responseDocument.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = responseDocument.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.NotFound);
-            error.Title.Should().Be("The requested resource does not exist.");
-            error.Detail.Should().Be($"Resource of type 'departments' with ID '{existingDepartment.StringId}' does not exist.");
-        }
+        ErrorObject error = responseDocument.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.NotFound);
+        error.Title.Should().Be("The requested resource does not exist.");
+        error.Detail.Should().Be($"Resource of type 'departments' with ID '{existingDepartment.StringId}' does not exist.");
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/EmptyGuidAsKeyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/EmptyGuidAsKeyTests.cs
index 954e5d2ab1..b2207348e2 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/EmptyGuidAsKeyTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/EmptyGuidAsKeyTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -12,576 +7,575 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys;
+
+public sealed class EmptyGuidAsKeyTests : IClassFixture<IntegrationTestContext<TestableStartup<ZeroKeyDbContext>, ZeroKeyDbContext>>
 {
-    public sealed class EmptyGuidAsKeyTests : IClassFixture<IntegrationTestContext<TestableStartup<ZeroKeyDbContext>, ZeroKeyDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ZeroKeyDbContext>, ZeroKeyDbContext> _testContext;
+    private readonly ZeroKeyFakers _fakers = new();
+
+    public EmptyGuidAsKeyTests(IntegrationTestContext<TestableStartup<ZeroKeyDbContext>, ZeroKeyDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ZeroKeyDbContext>, ZeroKeyDbContext> _testContext;
-        private readonly ZeroKeyFakers _fakers = new();
+        _testContext = testContext;
 
-        public EmptyGuidAsKeyTests(IntegrationTestContext<TestableStartup<ZeroKeyDbContext>, ZeroKeyDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<PlayersController>();
+        testContext.UseController<GamesController>();
+        testContext.UseController<MapsController>();
 
-            testContext.UseController<PlayersController>();
-            testContext.UseController<GamesController>();
-            testContext.UseController<MapsController>();
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.UseRelativeLinks = true;
+        options.AllowClientGeneratedIds = true;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.UseRelativeLinks = true;
-            options.AllowClientGeneratedIds = true;
-        }
+    [Fact]
+    public async Task Can_filter_by_empty_ID_on_primary_resources()
+    {
+        // Arrange
+        List<Map> maps = _fakers.Map.Generate(2);
+        maps[0].Id = Guid.Empty;
 
-        [Fact]
-        public async Task Can_filter_by_empty_ID_on_primary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Map> maps = _fakers.Map.Generate(2);
-            maps[0].Id = Guid.Empty;
+            await dbContext.ClearTableAsync<Map>();
+            dbContext.Maps.AddRange(maps);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Map>();
-                dbContext.Maps.AddRange(maps);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/maps?filter=equals(id,'00000000-0000-0000-0000-000000000000')";
 
-            const string route = "/maps?filter=equals(id,'00000000-0000-0000-0000-000000000000')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be("00000000-0000-0000-0000-000000000000");
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be("00000000-0000-0000-0000-000000000000");
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be("/maps/00000000-0000-0000-0000-000000000000");
+        });
+    }
 
-            responseDocument.Data.ManyValue[0].With(resource =>
-            {
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be("/maps/00000000-0000-0000-0000-000000000000");
-            });
-        }
+    [Fact]
+    public async Task Can_get_primary_resource_by_empty_ID_with_include()
+    {
+        // Arrange
+        Map map = _fakers.Map.Generate();
+        map.Id = Guid.Empty;
+        map.Game = _fakers.Game.Generate();
+        map.Game.Id = 0;
 
-        [Fact]
-        public async Task Can_get_primary_resource_by_empty_ID_with_include()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Map map = _fakers.Map.Generate();
-            map.Id = Guid.Empty;
-            map.Game = _fakers.Game.Generate();
-            map.Game.Id = 0;
+            await dbContext.ClearTablesAsync<Map, Game>();
+            dbContext.Maps.Add(map);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTablesAsync<Map, Game>();
-                dbContext.Maps.Add(map);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/maps/00000000-0000-0000-0000-000000000000?include=game";
 
-            const string route = "/maps/00000000-0000-0000-0000-000000000000?include=game";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be("00000000-0000-0000-0000-000000000000");
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be("/maps/00000000-0000-0000-0000-000000000000");
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be("00000000-0000-0000-0000-000000000000");
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be("/maps/00000000-0000-0000-0000-000000000000");
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Id.Should().Be("0");
+    }
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Id.Should().Be("0");
-        }
+    [Fact]
+    public async Task Can_create_resource_with_empty_ID()
+    {
+        // Arrange
+        string newName = _fakers.Map.Generate().Name;
 
-        [Fact]
-        public async Task Can_create_resource_with_empty_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            string newName = _fakers.Map.Generate().Name;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Map>();
-            });
+            await dbContext.ClearTableAsync<Map>();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "maps",
+                id = "00000000-0000-0000-0000-000000000000",
+                attributes = new
                 {
-                    type = "maps",
-                    id = "00000000-0000-0000-0000-000000000000",
-                    attributes = new
-                    {
-                        name = newName
-                    }
+                    name = newName
                 }
-            };
+            }
+        };
 
-            const string route = "/maps";
+        const string route = "/maps";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            httpResponse.Headers.Location.Should().Be("/maps/00000000-0000-0000-0000-000000000000");
+        httpResponse.Headers.Location.Should().Be("/maps/00000000-0000-0000-0000-000000000000");
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Map mapInDatabase = await dbContext.Maps.FirstWithIdAsync((Guid?)Guid.Empty);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Map mapInDatabase = await dbContext.Maps.FirstWithIdAsync((Guid?)Guid.Empty);
 
-                mapInDatabase.ShouldNotBeNull();
-                mapInDatabase.Name.Should().Be(newName);
-            });
-        }
+            mapInDatabase.ShouldNotBeNull();
+            mapInDatabase.Name.Should().Be(newName);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_empty_ID()
-        {
-            // Arrange
-            Map existingMap = _fakers.Map.Generate();
-            existingMap.Id = Guid.Empty;
+    [Fact]
+    public async Task Can_update_resource_with_empty_ID()
+    {
+        // Arrange
+        Map existingMap = _fakers.Map.Generate();
+        existingMap.Id = Guid.Empty;
 
-            string newName = _fakers.Map.Generate().Name;
+        string newName = _fakers.Map.Generate().Name;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Map>();
-                dbContext.Maps.Add(existingMap);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Map>();
+            dbContext.Maps.Add(existingMap);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "maps",
+                id = "00000000-0000-0000-0000-000000000000",
+                attributes = new
                 {
-                    type = "maps",
-                    id = "00000000-0000-0000-0000-000000000000",
-                    attributes = new
-                    {
-                        name = newName
-                    }
+                    name = newName
                 }
-            };
+            }
+        };
 
-            const string route = "/maps/00000000-0000-0000-0000-000000000000";
+        const string route = "/maps/00000000-0000-0000-0000-000000000000";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
-
-            responseDocument.Should().BeEmpty();
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Map mapInDatabase = await dbContext.Maps.FirstWithIdAsync((Guid?)Guid.Empty);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                mapInDatabase.ShouldNotBeNull();
-                mapInDatabase.Name.Should().Be(newName);
-            });
-        }
+        responseDocument.Should().BeEmpty();
 
-        [Fact]
-        public async Task Can_clear_ToOne_relationship_with_empty_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.ActiveMap = _fakers.Map.Generate();
-            existingGame.ActiveMap.Id = Guid.Empty;
+            Map mapInDatabase = await dbContext.Maps.FirstWithIdAsync((Guid?)Guid.Empty);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Map>();
-                dbContext.Games.Add(existingGame);
-                await dbContext.SaveChangesAsync();
-            });
+            mapInDatabase.ShouldNotBeNull();
+            mapInDatabase.Name.Should().Be(newName);
+        });
+    }
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+    [Fact]
+    public async Task Can_clear_ToOne_relationship_with_empty_ID()
+    {
+        // Arrange
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.ActiveMap = _fakers.Map.Generate();
+        existingGame.ActiveMap.Id = Guid.Empty;
 
-            string route = $"/games/{existingGame.StringId}/relationships/activeMap";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Map>();
+            dbContext.Games.Add(existingGame);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        string route = $"/games/{existingGame.StringId}/relationships/activeMap";
 
-            responseDocument.Should().BeEmpty();
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Game gameInDatabase = await dbContext.Games.Include(game => game.ActiveMap).FirstWithIdAsync(existingGame.Id);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                gameInDatabase.ShouldNotBeNull();
-                gameInDatabase.ActiveMap.Should().BeNull();
-            });
-        }
+        responseDocument.Should().BeEmpty();
 
-        [Fact]
-        public async Task Can_assign_ToOne_relationship_with_empty_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Game existingGame = _fakers.Game.Generate();
+            Game gameInDatabase = await dbContext.Games.Include(game => game.ActiveMap).FirstWithIdAsync(existingGame.Id);
 
-            Map existingMap = _fakers.Map.Generate();
-            existingMap.Id = Guid.Empty;
+            gameInDatabase.ShouldNotBeNull();
+            gameInDatabase.ActiveMap.Should().BeNull();
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Map>();
-                dbContext.AddInRange(existingGame, existingMap);
-                await dbContext.SaveChangesAsync();
-            });
+    [Fact]
+    public async Task Can_assign_ToOne_relationship_with_empty_ID()
+    {
+        // Arrange
+        Game existingGame = _fakers.Game.Generate();
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "maps",
-                    id = "00000000-0000-0000-0000-000000000000"
-                }
-            };
+        Map existingMap = _fakers.Map.Generate();
+        existingMap.Id = Guid.Empty;
 
-            string route = $"/games/{existingGame.StringId}/relationships/activeMap";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Map>();
+            dbContext.AddInRange(existingGame, existingMap);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        var requestBody = new
+        {
+            data = new
+            {
+                type = "maps",
+                id = "00000000-0000-0000-0000-000000000000"
+            }
+        };
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        string route = $"/games/{existingGame.StringId}/relationships/activeMap";
 
-            responseDocument.Should().BeEmpty();
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Game gameInDatabase = await dbContext.Games.Include(game => game.ActiveMap).FirstWithIdAsync(existingGame.Id);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                gameInDatabase.ShouldNotBeNull();
-                gameInDatabase.ActiveMap.ShouldNotBeNull();
-                gameInDatabase.ActiveMap.Id.Should().Be(Guid.Empty);
-            });
-        }
+        responseDocument.Should().BeEmpty();
 
-        [Fact]
-        public async Task Can_replace_ToOne_relationship_with_empty_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.ActiveMap = _fakers.Map.Generate();
+            Game gameInDatabase = await dbContext.Games.Include(game => game.ActiveMap).FirstWithIdAsync(existingGame.Id);
 
-            Map existingMap = _fakers.Map.Generate();
-            existingMap.Id = Guid.Empty;
+            gameInDatabase.ShouldNotBeNull();
+            gameInDatabase.ActiveMap.ShouldNotBeNull();
+            gameInDatabase.ActiveMap.Id.Should().Be(Guid.Empty);
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Map>();
-                dbContext.AddInRange(existingGame, existingMap);
-                await dbContext.SaveChangesAsync();
-            });
+    [Fact]
+    public async Task Can_replace_ToOne_relationship_with_empty_ID()
+    {
+        // Arrange
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.ActiveMap = _fakers.Map.Generate();
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "maps",
-                    id = "00000000-0000-0000-0000-000000000000"
-                }
-            };
+        Map existingMap = _fakers.Map.Generate();
+        existingMap.Id = Guid.Empty;
 
-            string route = $"/games/{existingGame.StringId}/relationships/activeMap";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Map>();
+            dbContext.AddInRange(existingGame, existingMap);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        var requestBody = new
+        {
+            data = new
+            {
+                type = "maps",
+                id = "00000000-0000-0000-0000-000000000000"
+            }
+        };
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        string route = $"/games/{existingGame.StringId}/relationships/activeMap";
 
-            responseDocument.Should().BeEmpty();
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Game gameInDatabase = await dbContext.Games.Include(game => game.ActiveMap).FirstWithIdAsync(existingGame.Id);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                gameInDatabase.ShouldNotBeNull();
-                gameInDatabase.ActiveMap.ShouldNotBeNull();
-                gameInDatabase.ActiveMap.Id.Should().Be(Guid.Empty);
-            });
-        }
+        responseDocument.Should().BeEmpty();
 
-        [Fact]
-        public async Task Can_clear_ToMany_relationship_with_empty_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.Maps = _fakers.Map.Generate(2);
-            existingGame.Maps.ElementAt(0).Id = Guid.Empty;
+            Game gameInDatabase = await dbContext.Games.Include(game => game.ActiveMap).FirstWithIdAsync(existingGame.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Map>();
-                dbContext.Games.Add(existingGame);
-                await dbContext.SaveChangesAsync();
-            });
+            gameInDatabase.ShouldNotBeNull();
+            gameInDatabase.ActiveMap.ShouldNotBeNull();
+            gameInDatabase.ActiveMap.Id.Should().Be(Guid.Empty);
+        });
+    }
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+    [Fact]
+    public async Task Can_clear_ToMany_relationship_with_empty_ID()
+    {
+        // Arrange
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.Maps = _fakers.Map.Generate(2);
+        existingGame.Maps.ElementAt(0).Id = Guid.Empty;
 
-            string route = $"/games/{existingGame.StringId}/relationships/maps";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Map>();
+            dbContext.Games.Add(existingGame);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        string route = $"/games/{existingGame.StringId}/relationships/maps";
 
-            responseDocument.Should().BeEmpty();
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Game gameInDatabase = await dbContext.Games.Include(game => game.Maps).FirstWithIdAsync(existingGame.Id);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                gameInDatabase.ShouldNotBeNull();
-                gameInDatabase.Maps.Should().BeEmpty();
-            });
-        }
+        responseDocument.Should().BeEmpty();
 
-        [Fact]
-        public async Task Can_assign_ToMany_relationship_with_empty_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Game existingGame = _fakers.Game.Generate();
+            Game gameInDatabase = await dbContext.Games.Include(game => game.Maps).FirstWithIdAsync(existingGame.Id);
 
-            Map existingMap = _fakers.Map.Generate();
-            existingMap.Id = Guid.Empty;
+            gameInDatabase.ShouldNotBeNull();
+            gameInDatabase.Maps.Should().BeEmpty();
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Map>();
-                dbContext.AddInRange(existingGame, existingMap);
-                await dbContext.SaveChangesAsync();
-            });
+    [Fact]
+    public async Task Can_assign_ToMany_relationship_with_empty_ID()
+    {
+        // Arrange
+        Game existingGame = _fakers.Game.Generate();
+
+        Map existingMap = _fakers.Map.Generate();
+        existingMap.Id = Guid.Empty;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Map>();
+            dbContext.AddInRange(existingGame, existingMap);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "maps",
-                        id = "00000000-0000-0000-0000-000000000000"
-                    }
+                    type = "maps",
+                    id = "00000000-0000-0000-0000-000000000000"
                 }
-            };
+            }
+        };
 
-            string route = $"/games/{existingGame.StringId}/relationships/maps";
+        string route = $"/games/{existingGame.StringId}/relationships/maps";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Game gameInDatabase = await dbContext.Games.Include(game => game.Maps).FirstWithIdAsync(existingGame.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Game gameInDatabase = await dbContext.Games.Include(game => game.Maps).FirstWithIdAsync(existingGame.Id);
 
-                gameInDatabase.ShouldNotBeNull();
-                gameInDatabase.Maps.ShouldHaveCount(1);
-                gameInDatabase.Maps.ElementAt(0).Id.Should().Be(Guid.Empty);
-            });
-        }
+            gameInDatabase.ShouldNotBeNull();
+            gameInDatabase.Maps.ShouldHaveCount(1);
+            gameInDatabase.Maps.ElementAt(0).Id.Should().Be(Guid.Empty);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_ToMany_relationship_with_empty_ID()
-        {
-            // Arrange
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.Maps = _fakers.Map.Generate(2);
+    [Fact]
+    public async Task Can_replace_ToMany_relationship_with_empty_ID()
+    {
+        // Arrange
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.Maps = _fakers.Map.Generate(2);
 
-            Map existingMap = _fakers.Map.Generate();
-            existingMap.Id = Guid.Empty;
+        Map existingMap = _fakers.Map.Generate();
+        existingMap.Id = Guid.Empty;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Map>();
-                dbContext.AddInRange(existingGame, existingMap);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Map>();
+            dbContext.AddInRange(existingGame, existingMap);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "maps",
-                        id = "00000000-0000-0000-0000-000000000000"
-                    }
+                    type = "maps",
+                    id = "00000000-0000-0000-0000-000000000000"
                 }
-            };
+            }
+        };
 
-            string route = $"/games/{existingGame.StringId}/relationships/maps";
+        string route = $"/games/{existingGame.StringId}/relationships/maps";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Game gameInDatabase = await dbContext.Games.Include(game => game.Maps).FirstWithIdAsync(existingGame.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Game gameInDatabase = await dbContext.Games.Include(game => game.Maps).FirstWithIdAsync(existingGame.Id);
 
-                gameInDatabase.ShouldNotBeNull();
-                gameInDatabase.Maps.ShouldHaveCount(1);
-                gameInDatabase.Maps.ElementAt(0).Id.Should().Be(Guid.Empty);
-            });
-        }
+            gameInDatabase.ShouldNotBeNull();
+            gameInDatabase.Maps.ShouldHaveCount(1);
+            gameInDatabase.Maps.ElementAt(0).Id.Should().Be(Guid.Empty);
+        });
+    }
 
-        [Fact]
-        public async Task Can_add_to_ToMany_relationship_with_empty_ID()
-        {
-            // Arrange
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.Maps = _fakers.Map.Generate(1);
+    [Fact]
+    public async Task Can_add_to_ToMany_relationship_with_empty_ID()
+    {
+        // Arrange
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.Maps = _fakers.Map.Generate(1);
 
-            Map existingMap = _fakers.Map.Generate();
-            existingMap.Id = Guid.Empty;
+        Map existingMap = _fakers.Map.Generate();
+        existingMap.Id = Guid.Empty;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Map>();
-                dbContext.AddInRange(existingGame, existingMap);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Map>();
+            dbContext.AddInRange(existingGame, existingMap);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "maps",
-                        id = "00000000-0000-0000-0000-000000000000"
-                    }
+                    type = "maps",
+                    id = "00000000-0000-0000-0000-000000000000"
                 }
-            };
+            }
+        };
 
-            string route = $"/games/{existingGame.StringId}/relationships/maps";
+        string route = $"/games/{existingGame.StringId}/relationships/maps";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Game gameInDatabase = await dbContext.Games.Include(game => game.Maps).FirstWithIdAsync(existingGame.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Game gameInDatabase = await dbContext.Games.Include(game => game.Maps).FirstWithIdAsync(existingGame.Id);
 
-                gameInDatabase.ShouldNotBeNull();
-                gameInDatabase.Maps.ShouldHaveCount(2);
-                gameInDatabase.Maps.Should().ContainSingle(map => map.Id == Guid.Empty);
-            });
-        }
+            gameInDatabase.ShouldNotBeNull();
+            gameInDatabase.Maps.ShouldHaveCount(2);
+            gameInDatabase.Maps.Should().ContainSingle(map => map.Id == Guid.Empty);
+        });
+    }
 
-        [Fact]
-        public async Task Can_remove_from_ToMany_relationship_with_empty_ID()
-        {
-            // Arrange
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.Maps = _fakers.Map.Generate(2);
-            existingGame.Maps.ElementAt(0).Id = Guid.Empty;
+    [Fact]
+    public async Task Can_remove_from_ToMany_relationship_with_empty_ID()
+    {
+        // Arrange
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.Maps = _fakers.Map.Generate(2);
+        existingGame.Maps.ElementAt(0).Id = Guid.Empty;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Map>();
-                dbContext.Games.Add(existingGame);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Map>();
+            dbContext.Games.Add(existingGame);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "maps",
-                        id = "00000000-0000-0000-0000-000000000000"
-                    }
+                    type = "maps",
+                    id = "00000000-0000-0000-0000-000000000000"
                 }
-            };
+            }
+        };
 
-            string route = $"/games/{existingGame.StringId}/relationships/maps";
+        string route = $"/games/{existingGame.StringId}/relationships/maps";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Game gameInDatabase = await dbContext.Games.Include(game => game.Maps).FirstWithIdAsync(existingGame.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Game gameInDatabase = await dbContext.Games.Include(game => game.Maps).FirstWithIdAsync(existingGame.Id);
 
-                gameInDatabase.ShouldNotBeNull();
-                gameInDatabase.Maps.ShouldHaveCount(1);
-                gameInDatabase.Maps.Should().ContainSingle(map => map.Id != Guid.Empty);
-            });
-        }
+            gameInDatabase.ShouldNotBeNull();
+            gameInDatabase.Maps.ShouldHaveCount(1);
+            gameInDatabase.Maps.Should().ContainSingle(map => map.Id != Guid.Empty);
+        });
+    }
 
-        [Fact]
-        public async Task Can_delete_resource_with_empty_ID()
-        {
-            // Arrange
-            Map existingMap = _fakers.Map.Generate();
-            existingMap.Id = Guid.Empty;
+    [Fact]
+    public async Task Can_delete_resource_with_empty_ID()
+    {
+        // Arrange
+        Map existingMap = _fakers.Map.Generate();
+        existingMap.Id = Guid.Empty;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Map>();
-                dbContext.Maps.Add(existingMap);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Map>();
+            dbContext.Maps.Add(existingMap);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/maps/00000000-0000-0000-0000-000000000000";
+        const string route = "/maps/00000000-0000-0000-0000-000000000000";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Map? gameInDatabase = await dbContext.Maps.FirstWithIdOrDefaultAsync(existingMap.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Map? gameInDatabase = await dbContext.Maps.FirstWithIdOrDefaultAsync(existingMap.Id);
 
-                gameInDatabase.Should().BeNull();
-            });
-        }
+            gameInDatabase.Should().BeNull();
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Game.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Game.cs
index afe1365d16..b75b5935b8 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Game.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Game.cs
@@ -1,29 +1,27 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys")]
+public sealed class Game : Identifiable<int?>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Game : Identifiable<int?>
-    {
-        [Attr]
-        public string Title { get; set; } = null!;
+    [Attr]
+    public string Title { get; set; } = null!;
 
-        [NotMapped]
-        [Attr]
-        public Guid SessionToken => Guid.NewGuid();
+    [NotMapped]
+    [Attr]
+    public Guid SessionToken => Guid.NewGuid();
 
-        [HasMany]
-        public ICollection<Player> ActivePlayers { get; set; } = new List<Player>();
+    [HasMany]
+    public ICollection<Player> ActivePlayers { get; set; } = new List<Player>();
 
-        [HasOne]
-        public Map? ActiveMap { get; set; }
+    [HasOne]
+    public Map? ActiveMap { get; set; }
 
-        [HasMany]
-        public ICollection<Map> Maps { get; set; } = new List<Map>();
-    }
+    [HasMany]
+    public ICollection<Map> Maps { get; set; } = new List<Map>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/GamesController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/GamesController.cs
deleted file mode 100644
index 8497e9c91e..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/GamesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys
-{
-    public sealed class GamesController : JsonApiController<Game, int?>
-    {
-        public GamesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Game, int?> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Map.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Map.cs
index bf17d26b1c..3bd21bab38 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Map.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Map.cs
@@ -1,17 +1,16 @@
-using System;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys")]
+public sealed class Map : Identifiable<Guid?>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Map : Identifiable<Guid?>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [HasOne]
-        public Game? Game { get; set; }
-    }
+    [HasOne]
+    public Game? Game { get; set; }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/MapsController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/MapsController.cs
deleted file mode 100644
index af38cf0a92..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/MapsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys
-{
-    public sealed class MapsController : JsonApiController<Map, Guid?>
-    {
-        public MapsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory, IResourceService<Map, Guid?> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Player.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Player.cs
index d83d14ddc2..cc38d5360b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Player.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/Player.cs
@@ -1,20 +1,19 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys")]
+public sealed class Player : Identifiable<string>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Player : Identifiable<string>
-    {
-        [Attr]
-        public string EmailAddress { get; set; } = null!;
+    [Attr]
+    public string EmailAddress { get; set; } = null!;
 
-        [HasOne]
-        public Game? ActiveGame { get; set; }
+    [HasOne]
+    public Game? ActiveGame { get; set; }
 
-        [HasMany]
-        public ICollection<Game> RecentlyPlayed { get; set; } = new List<Game>();
-    }
+    [HasMany]
+    public ICollection<Game> RecentlyPlayed { get; set; } = new List<Game>();
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/PlayersController.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/PlayersController.cs
deleted file mode 100644
index d9c9ebd302..0000000000
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/PlayersController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys
-{
-    public sealed class PlayersController : JsonApiController<Player, string>
-    {
-        public PlayersController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Player, string> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroAsKeyTests.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroAsKeyTests.cs
index 45b445e7f8..8c85ba27b0 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroAsKeyTests.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroAsKeyTests.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -12,578 +7,577 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys;
+
+public sealed class ZeroAsKeyTests : IClassFixture<IntegrationTestContext<TestableStartup<ZeroKeyDbContext>, ZeroKeyDbContext>>
 {
-    public sealed class ZeroAsKeyTests : IClassFixture<IntegrationTestContext<TestableStartup<ZeroKeyDbContext>, ZeroKeyDbContext>>
+    private readonly IntegrationTestContext<TestableStartup<ZeroKeyDbContext>, ZeroKeyDbContext> _testContext;
+    private readonly ZeroKeyFakers _fakers = new();
+
+    public ZeroAsKeyTests(IntegrationTestContext<TestableStartup<ZeroKeyDbContext>, ZeroKeyDbContext> testContext)
     {
-        private readonly IntegrationTestContext<TestableStartup<ZeroKeyDbContext>, ZeroKeyDbContext> _testContext;
-        private readonly ZeroKeyFakers _fakers = new();
+        _testContext = testContext;
 
-        public ZeroAsKeyTests(IntegrationTestContext<TestableStartup<ZeroKeyDbContext>, ZeroKeyDbContext> testContext)
-        {
-            _testContext = testContext;
+        testContext.UseController<GamesController>();
+        testContext.UseController<MapsController>();
+        testContext.UseController<PlayersController>();
 
-            testContext.UseController<GamesController>();
-            testContext.UseController<MapsController>();
-            testContext.UseController<PlayersController>();
+        var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
+        options.UseRelativeLinks = true;
+        options.AllowClientGeneratedIds = true;
+    }
 
-            var options = (JsonApiOptions)testContext.Factory.Services.GetRequiredService<IJsonApiOptions>();
-            options.UseRelativeLinks = true;
-            options.AllowClientGeneratedIds = true;
-        }
+    [Fact]
+    public async Task Can_filter_by_zero_ID_on_primary_resources()
+    {
+        // Arrange
+        List<Game> games = _fakers.Game.Generate(2);
+        games[0].Id = 0;
 
-        [Fact]
-        public async Task Can_filter_by_zero_ID_on_primary_resources()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            List<Game> games = _fakers.Game.Generate(2);
-            games[0].Id = 0;
+            await dbContext.ClearTableAsync<Game>();
+            dbContext.Games.AddRange(games);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-                dbContext.Games.AddRange(games);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/games?filter=equals(id,'0')";
 
-            const string route = "/games?filter=equals(id,'0')";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Id.Should().Be("0");
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Id.Should().Be("0");
+        responseDocument.Data.ManyValue[0].With(resource =>
+        {
+            resource.Links.ShouldNotBeNull();
+            resource.Links.Self.Should().Be("/games/0");
+        });
+    }
 
-            responseDocument.Data.ManyValue[0].With(resource =>
-            {
-                resource.Links.ShouldNotBeNull();
-                resource.Links.Self.Should().Be("/games/0");
-            });
-        }
+    [Fact]
+    public async Task Can_get_primary_resource_by_zero_ID_with_include()
+    {
+        // Arrange
+        Game game = _fakers.Game.Generate();
+        game.Id = 0;
+        game.ActivePlayers = _fakers.Player.Generate(1);
 
-        [Fact]
-        public async Task Can_get_primary_resource_by_zero_ID_with_include()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Game game = _fakers.Game.Generate();
-            game.Id = 0;
-            game.ActivePlayers = _fakers.Player.Generate(1);
+            await dbContext.ClearTableAsync<Game>();
+            dbContext.Games.Add(game);
+            await dbContext.SaveChangesAsync();
+        });
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-                dbContext.Games.Add(game);
-                await dbContext.SaveChangesAsync();
-            });
+        const string route = "/games/0?include=activePlayers";
 
-            const string route = "/games/0?include=activePlayers";
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecuteGetAsync<Document>(route);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be("0");
+        responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Links.Self.Should().Be("/games/0");
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be("0");
-            responseDocument.Data.SingleValue.Links.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Links.Self.Should().Be("/games/0");
+        responseDocument.Included.ShouldHaveCount(1);
+        responseDocument.Included[0].Id.Should().Be(game.ActivePlayers.ElementAt(0).StringId);
+    }
 
-            responseDocument.Included.ShouldHaveCount(1);
-            responseDocument.Included[0].Id.Should().Be(game.ActivePlayers.ElementAt(0).StringId);
-        }
+    [Fact]
+    public async Task Can_create_resource_with_zero_ID()
+    {
+        // Arrange
+        string newTitle = _fakers.Game.Generate().Title;
 
-        [Fact]
-        public async Task Can_create_resource_with_zero_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            string newTitle = _fakers.Game.Generate().Title;
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-            });
+            await dbContext.ClearTableAsync<Game>();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "games",
+                id = "0",
+                attributes = new
                 {
-                    type = "games",
-                    id = "0",
-                    attributes = new
-                    {
-                        title = newTitle
-                    }
+                    title = newTitle
                 }
-            };
+            }
+        };
 
-            const string route = "/games";
+        const string route = "/games";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            httpResponse.Headers.Location.Should().Be("/games/0");
+        httpResponse.Headers.Location.Should().Be("/games/0");
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be("0");
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be("0");
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Game gameInDatabase = await dbContext.Games.FirstWithIdAsync((int?)0);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Game gameInDatabase = await dbContext.Games.FirstWithIdAsync((int?)0);
 
-                gameInDatabase.ShouldNotBeNull();
-                gameInDatabase.Title.Should().Be(newTitle);
-            });
-        }
+            gameInDatabase.ShouldNotBeNull();
+            gameInDatabase.Title.Should().Be(newTitle);
+        });
+    }
 
-        [Fact]
-        public async Task Can_update_resource_with_zero_ID()
-        {
-            // Arrange
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.Id = 0;
+    [Fact]
+    public async Task Can_update_resource_with_zero_ID()
+    {
+        // Arrange
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.Id = 0;
 
-            string newTitle = _fakers.Game.Generate().Title;
+        string newTitle = _fakers.Game.Generate().Title;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-                dbContext.Games.Add(existingGame);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Game>();
+            dbContext.Games.Add(existingGame);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "games",
+                id = "0",
+                attributes = new
                 {
-                    type = "games",
-                    id = "0",
-                    attributes = new
-                    {
-                        title = newTitle
-                    }
+                    title = newTitle
                 }
-            };
+            }
+        };
 
-            const string route = "/games/0";
+        const string route = "/games/0";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await _testContext.ExecutePatchAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
-
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be("0");
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTitle));
-
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Game gameInDatabase = await dbContext.Games.FirstWithIdAsync((int?)0);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-                gameInDatabase.ShouldNotBeNull();
-                gameInDatabase.Title.Should().Be(newTitle);
-            });
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be("0");
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newTitle));
 
-        [Fact]
-        public async Task Can_clear_ToOne_relationship_with_zero_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Player existingPlayer = _fakers.Player.Generate();
-            existingPlayer.ActiveGame = _fakers.Game.Generate();
-            existingPlayer.ActiveGame.Id = 0;
+            Game gameInDatabase = await dbContext.Games.FirstWithIdAsync((int?)0);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-                dbContext.Players.Add(existingPlayer);
-                await dbContext.SaveChangesAsync();
-            });
+            gameInDatabase.ShouldNotBeNull();
+            gameInDatabase.Title.Should().Be(newTitle);
+        });
+    }
 
-            var requestBody = new
-            {
-                data = (object?)null
-            };
+    [Fact]
+    public async Task Can_clear_ToOne_relationship_with_zero_ID()
+    {
+        // Arrange
+        Player existingPlayer = _fakers.Player.Generate();
+        existingPlayer.ActiveGame = _fakers.Game.Generate();
+        existingPlayer.ActiveGame.Id = 0;
 
-            string route = $"/players/{existingPlayer.StringId}/relationships/activeGame";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Game>();
+            dbContext.Players.Add(existingPlayer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        var requestBody = new
+        {
+            data = (object?)null
+        };
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        string route = $"/players/{existingPlayer.StringId}/relationships/activeGame";
 
-            responseDocument.Should().BeEmpty();
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Player playerInDatabase = await dbContext.Players.Include(player => player.ActiveGame).FirstWithIdAsync(existingPlayer.Id);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                playerInDatabase.ShouldNotBeNull();
-                playerInDatabase.ActiveGame.Should().BeNull();
-            });
-        }
+        responseDocument.Should().BeEmpty();
 
-        [Fact]
-        public async Task Can_assign_ToOne_relationship_with_zero_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Player existingPlayer = _fakers.Player.Generate();
+            Player playerInDatabase = await dbContext.Players.Include(player => player.ActiveGame).FirstWithIdAsync(existingPlayer.Id);
 
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.Id = 0;
+            playerInDatabase.ShouldNotBeNull();
+            playerInDatabase.ActiveGame.Should().BeNull();
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-                dbContext.AddInRange(existingPlayer, existingGame);
-                await dbContext.SaveChangesAsync();
-            });
+    [Fact]
+    public async Task Can_assign_ToOne_relationship_with_zero_ID()
+    {
+        // Arrange
+        Player existingPlayer = _fakers.Player.Generate();
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "games",
-                    id = "0"
-                }
-            };
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.Id = 0;
 
-            string route = $"/players/{existingPlayer.StringId}/relationships/activeGame";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Game>();
+            dbContext.AddInRange(existingPlayer, existingGame);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        var requestBody = new
+        {
+            data = new
+            {
+                type = "games",
+                id = "0"
+            }
+        };
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        string route = $"/players/{existingPlayer.StringId}/relationships/activeGame";
 
-            responseDocument.Should().BeEmpty();
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Player playerInDatabase = await dbContext.Players.Include(player => player.ActiveGame).FirstWithIdAsync(existingPlayer.Id);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                playerInDatabase.ShouldNotBeNull();
-                playerInDatabase.ActiveGame.ShouldNotBeNull();
-                playerInDatabase.ActiveGame.Id.Should().Be(0);
-            });
-        }
+        responseDocument.Should().BeEmpty();
 
-        [Fact]
-        public async Task Can_replace_ToOne_relationship_with_zero_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Player existingPlayer = _fakers.Player.Generate();
-            existingPlayer.ActiveGame = _fakers.Game.Generate();
+            Player playerInDatabase = await dbContext.Players.Include(player => player.ActiveGame).FirstWithIdAsync(existingPlayer.Id);
 
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.Id = 0;
+            playerInDatabase.ShouldNotBeNull();
+            playerInDatabase.ActiveGame.ShouldNotBeNull();
+            playerInDatabase.ActiveGame.Id.Should().Be(0);
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-                dbContext.AddInRange(existingPlayer, existingGame);
-                await dbContext.SaveChangesAsync();
-            });
+    [Fact]
+    public async Task Can_replace_ToOne_relationship_with_zero_ID()
+    {
+        // Arrange
+        Player existingPlayer = _fakers.Player.Generate();
+        existingPlayer.ActiveGame = _fakers.Game.Generate();
 
-            var requestBody = new
-            {
-                data = new
-                {
-                    type = "games",
-                    id = "0"
-                }
-            };
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.Id = 0;
 
-            string route = $"/players/{existingPlayer.StringId}/relationships/activeGame";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Game>();
+            dbContext.AddInRange(existingPlayer, existingGame);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        var requestBody = new
+        {
+            data = new
+            {
+                type = "games",
+                id = "0"
+            }
+        };
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        string route = $"/players/{existingPlayer.StringId}/relationships/activeGame";
 
-            responseDocument.Should().BeEmpty();
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Player playerInDatabase = await dbContext.Players.Include(player => player.ActiveGame).FirstWithIdAsync(existingPlayer.Id);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                playerInDatabase.ShouldNotBeNull();
-                playerInDatabase.ActiveGame.ShouldNotBeNull();
-                playerInDatabase.ActiveGame.Id.Should().Be(0);
-            });
-        }
+        responseDocument.Should().BeEmpty();
 
-        [Fact]
-        public async Task Can_clear_ToMany_relationship_with_zero_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Player existingPlayer = _fakers.Player.Generate();
-            existingPlayer.RecentlyPlayed = _fakers.Game.Generate(2);
-            existingPlayer.RecentlyPlayed.ElementAt(0).Id = 0;
+            Player playerInDatabase = await dbContext.Players.Include(player => player.ActiveGame).FirstWithIdAsync(existingPlayer.Id);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-                dbContext.Players.Add(existingPlayer);
-                await dbContext.SaveChangesAsync();
-            });
+            playerInDatabase.ShouldNotBeNull();
+            playerInDatabase.ActiveGame.ShouldNotBeNull();
+            playerInDatabase.ActiveGame.Id.Should().Be(0);
+        });
+    }
 
-            var requestBody = new
-            {
-                data = Array.Empty<object>()
-            };
+    [Fact]
+    public async Task Can_clear_ToMany_relationship_with_zero_ID()
+    {
+        // Arrange
+        Player existingPlayer = _fakers.Player.Generate();
+        existingPlayer.RecentlyPlayed = _fakers.Game.Generate(2);
+        existingPlayer.RecentlyPlayed.ElementAt(0).Id = 0;
 
-            string route = $"/players/{existingPlayer.StringId}/relationships/recentlyPlayed";
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Game>();
+            dbContext.Players.Add(existingPlayer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        var requestBody = new
+        {
+            data = Array.Empty<object>()
+        };
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        string route = $"/players/{existingPlayer.StringId}/relationships/recentlyPlayed";
 
-            responseDocument.Should().BeEmpty();
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Player playerInDatabase = await dbContext.Players.Include(player => player.RecentlyPlayed).FirstWithIdAsync(existingPlayer.Id);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-                playerInDatabase.ShouldNotBeNull();
-                playerInDatabase.RecentlyPlayed.Should().BeEmpty();
-            });
-        }
+        responseDocument.Should().BeEmpty();
 
-        [Fact]
-        public async Task Can_assign_ToMany_relationship_with_zero_ID()
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
         {
-            // Arrange
-            Player existingPlayer = _fakers.Player.Generate();
+            Player playerInDatabase = await dbContext.Players.Include(player => player.RecentlyPlayed).FirstWithIdAsync(existingPlayer.Id);
 
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.Id = 0;
+            playerInDatabase.ShouldNotBeNull();
+            playerInDatabase.RecentlyPlayed.Should().BeEmpty();
+        });
+    }
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-                dbContext.AddInRange(existingPlayer, existingGame);
-                await dbContext.SaveChangesAsync();
-            });
+    [Fact]
+    public async Task Can_assign_ToMany_relationship_with_zero_ID()
+    {
+        // Arrange
+        Player existingPlayer = _fakers.Player.Generate();
+
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.Id = 0;
+
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Game>();
+            dbContext.AddInRange(existingPlayer, existingGame);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "games",
-                        id = "0"
-                    }
+                    type = "games",
+                    id = "0"
                 }
-            };
+            }
+        };
 
-            string route = $"/players/{existingPlayer.StringId}/relationships/recentlyPlayed";
+        string route = $"/players/{existingPlayer.StringId}/relationships/recentlyPlayed";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Player playerInDatabase = await dbContext.Players.Include(player => player.RecentlyPlayed).FirstWithIdAsync(existingPlayer.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Player playerInDatabase = await dbContext.Players.Include(player => player.RecentlyPlayed).FirstWithIdAsync(existingPlayer.Id);
 
-                playerInDatabase.ShouldNotBeNull();
-                playerInDatabase.RecentlyPlayed.ShouldHaveCount(1);
-                playerInDatabase.RecentlyPlayed.ElementAt(0).Id.Should().Be(0);
-            });
-        }
+            playerInDatabase.ShouldNotBeNull();
+            playerInDatabase.RecentlyPlayed.ShouldHaveCount(1);
+            playerInDatabase.RecentlyPlayed.ElementAt(0).Id.Should().Be(0);
+        });
+    }
 
-        [Fact]
-        public async Task Can_replace_ToMany_relationship_with_zero_ID()
-        {
-            // Arrange
-            Player existingPlayer = _fakers.Player.Generate();
-            existingPlayer.RecentlyPlayed = _fakers.Game.Generate(2);
+    [Fact]
+    public async Task Can_replace_ToMany_relationship_with_zero_ID()
+    {
+        // Arrange
+        Player existingPlayer = _fakers.Player.Generate();
+        existingPlayer.RecentlyPlayed = _fakers.Game.Generate(2);
 
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.Id = 0;
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.Id = 0;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-                dbContext.AddInRange(existingPlayer, existingGame);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Game>();
+            dbContext.AddInRange(existingPlayer, existingGame);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "games",
-                        id = "0"
-                    }
+                    type = "games",
+                    id = "0"
                 }
-            };
+            }
+        };
 
-            string route = $"/players/{existingPlayer.StringId}/relationships/recentlyPlayed";
+        string route = $"/players/{existingPlayer.StringId}/relationships/recentlyPlayed";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePatchAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Player playerInDatabase = await dbContext.Players.Include(player => player.RecentlyPlayed).FirstWithIdAsync(existingPlayer.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Player playerInDatabase = await dbContext.Players.Include(player => player.RecentlyPlayed).FirstWithIdAsync(existingPlayer.Id);
 
-                playerInDatabase.ShouldNotBeNull();
-                playerInDatabase.RecentlyPlayed.ShouldHaveCount(1);
-                playerInDatabase.RecentlyPlayed.ElementAt(0).Id.Should().Be(0);
-            });
-        }
+            playerInDatabase.ShouldNotBeNull();
+            playerInDatabase.RecentlyPlayed.ShouldHaveCount(1);
+            playerInDatabase.RecentlyPlayed.ElementAt(0).Id.Should().Be(0);
+        });
+    }
 
-        [Fact]
-        public async Task Can_add_to_ToMany_relationship_with_zero_ID()
-        {
-            // Arrange
-            Player existingPlayer = _fakers.Player.Generate();
-            existingPlayer.RecentlyPlayed = _fakers.Game.Generate(1);
+    [Fact]
+    public async Task Can_add_to_ToMany_relationship_with_zero_ID()
+    {
+        // Arrange
+        Player existingPlayer = _fakers.Player.Generate();
+        existingPlayer.RecentlyPlayed = _fakers.Game.Generate(1);
 
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.Id = 0;
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.Id = 0;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-                dbContext.AddInRange(existingPlayer, existingGame);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Game>();
+            dbContext.AddInRange(existingPlayer, existingGame);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "games",
-                        id = "0"
-                    }
+                    type = "games",
+                    id = "0"
                 }
-            };
+            }
+        };
 
-            string route = $"/players/{existingPlayer.StringId}/relationships/recentlyPlayed";
+        string route = $"/players/{existingPlayer.StringId}/relationships/recentlyPlayed";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecutePostAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Player playerInDatabase = await dbContext.Players.Include(player => player.RecentlyPlayed).FirstWithIdAsync(existingPlayer.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Player playerInDatabase = await dbContext.Players.Include(player => player.RecentlyPlayed).FirstWithIdAsync(existingPlayer.Id);
 
-                playerInDatabase.ShouldNotBeNull();
-                playerInDatabase.RecentlyPlayed.ShouldHaveCount(2);
-                playerInDatabase.RecentlyPlayed.Should().ContainSingle(game => game.Id == 0);
-            });
-        }
+            playerInDatabase.ShouldNotBeNull();
+            playerInDatabase.RecentlyPlayed.ShouldHaveCount(2);
+            playerInDatabase.RecentlyPlayed.Should().ContainSingle(game => game.Id == 0);
+        });
+    }
 
-        [Fact]
-        public async Task Can_remove_from_ToMany_relationship_with_zero_ID()
-        {
-            // Arrange
-            Player existingPlayer = _fakers.Player.Generate();
-            existingPlayer.RecentlyPlayed = _fakers.Game.Generate(2);
-            existingPlayer.RecentlyPlayed.ElementAt(0).Id = 0;
+    [Fact]
+    public async Task Can_remove_from_ToMany_relationship_with_zero_ID()
+    {
+        // Arrange
+        Player existingPlayer = _fakers.Player.Generate();
+        existingPlayer.RecentlyPlayed = _fakers.Game.Generate(2);
+        existingPlayer.RecentlyPlayed.ElementAt(0).Id = 0;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-                dbContext.Players.Add(existingPlayer);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Game>();
+            dbContext.Players.Add(existingPlayer);
+            await dbContext.SaveChangesAsync();
+        });
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new[]
             {
-                data = new[]
+                new
                 {
-                    new
-                    {
-                        type = "games",
-                        id = "0"
-                    }
+                    type = "games",
+                    id = "0"
                 }
-            };
+            }
+        };
 
-            string route = $"/players/{existingPlayer.StringId}/relationships/recentlyPlayed";
+        string route = $"/players/{existingPlayer.StringId}/relationships/recentlyPlayed";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Player playerInDatabase = await dbContext.Players.Include(player => player.RecentlyPlayed).FirstWithIdAsync(existingPlayer.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Player playerInDatabase = await dbContext.Players.Include(player => player.RecentlyPlayed).FirstWithIdAsync(existingPlayer.Id);
 
-                playerInDatabase.ShouldNotBeNull();
-                playerInDatabase.RecentlyPlayed.ShouldHaveCount(1);
-                playerInDatabase.RecentlyPlayed.Should().ContainSingle(game => game.Id != 0);
-            });
-        }
+            playerInDatabase.ShouldNotBeNull();
+            playerInDatabase.RecentlyPlayed.ShouldHaveCount(1);
+            playerInDatabase.RecentlyPlayed.Should().ContainSingle(game => game.Id != 0);
+        });
+    }
 
-        [Fact]
-        public async Task Can_delete_resource_with_zero_ID()
-        {
-            // Arrange
-            Game existingGame = _fakers.Game.Generate();
-            existingGame.Id = 0;
+    [Fact]
+    public async Task Can_delete_resource_with_zero_ID()
+    {
+        // Arrange
+        Game existingGame = _fakers.Game.Generate();
+        existingGame.Id = 0;
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                await dbContext.ClearTableAsync<Game>();
-                dbContext.Games.Add(existingGame);
-                await dbContext.SaveChangesAsync();
-            });
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            await dbContext.ClearTableAsync<Game>();
+            dbContext.Games.Add(existingGame);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/games/0";
+        const string route = "/games/0";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await _testContext.ExecuteDeleteAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
+        responseDocument.Should().BeEmpty();
 
-            await _testContext.RunOnDatabaseAsync(async dbContext =>
-            {
-                Game? gameInDatabase = await dbContext.Games.FirstWithIdOrDefaultAsync(existingGame.Id);
+        await _testContext.RunOnDatabaseAsync(async dbContext =>
+        {
+            Game? gameInDatabase = await dbContext.Games.FirstWithIdOrDefaultAsync(existingGame.Id);
 
-                gameInDatabase.Should().BeNull();
-            });
-        }
+            gameInDatabase.Should().BeNull();
+        });
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyDbContext.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyDbContext.cs
index 051e08f4d0..bfe4fe7a3b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyDbContext.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyDbContext.cs
@@ -3,29 +3,28 @@
 
 // @formatter:wrap_chained_method_calls chop_always
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class ZeroKeyDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class ZeroKeyDbContext : DbContext
-    {
-        public DbSet<Game> Games => Set<Game>();
-        public DbSet<Player> Players => Set<Player>();
-        public DbSet<Map> Maps => Set<Map>();
+    public DbSet<Game> Games => Set<Game>();
+    public DbSet<Player> Players => Set<Player>();
+    public DbSet<Map> Maps => Set<Map>();
 
-        public ZeroKeyDbContext(DbContextOptions<ZeroKeyDbContext> options)
-            : base(options)
-        {
-        }
+    public ZeroKeyDbContext(DbContextOptions<ZeroKeyDbContext> options)
+        : base(options)
+    {
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<Game>()
-                .HasMany(game => game.Maps)
-                .WithOne(map => map.Game!);
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<Game>()
+            .HasMany(game => game.Maps)
+            .WithOne(map => map.Game!);
 
-            builder.Entity<Player>()
-                .HasOne(player => player.ActiveGame)
-                .WithMany(game => game!.ActivePlayers);
-        }
+        builder.Entity<Player>()
+            .HasOne(player => player.ActiveGame)
+            .WithMany(game => game.ActivePlayers);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyFakers.cs
index 9a6306bbfe..ea530c1b72 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyFakers.cs
@@ -1,33 +1,31 @@
-using System;
 using Bogus;
 using TestBuildingBlocks;
 
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys
+namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys;
+
+internal sealed class ZeroKeyFakers : FakerContainer
 {
-    internal sealed class ZeroKeyFakers : FakerContainer
-    {
-        private readonly Lazy<Faker<Game>> _lazyGameFaker = new(() =>
-            new Faker<Game>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(game => game.Title, faker => faker.Random.Words()));
+    private readonly Lazy<Faker<Game>> _lazyGameFaker = new(() =>
+        new Faker<Game>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(game => game.Title, faker => faker.Random.Words()));
 
-        private readonly Lazy<Faker<Player>> _lazyPlayerFaker = new(() =>
-            new Faker<Player>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(player => player.Id, faker => faker.Person.UserName)
-                .RuleFor(player => player.EmailAddress, faker => faker.Person.Email));
+    private readonly Lazy<Faker<Player>> _lazyPlayerFaker = new(() =>
+        new Faker<Player>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(player => player.Id, faker => faker.Person.UserName)
+            .RuleFor(player => player.EmailAddress, faker => faker.Person.Email));
 
-        private readonly Lazy<Faker<Map>> _lazyMapFaker = new(() =>
-            new Faker<Map>()
-                .UseSeed(GetFakerSeed())
-                .RuleFor(map => map.Id, faker => faker.Random.Guid())
-                .RuleFor(map => map.Name, faker => faker.Random.Words()));
+    private readonly Lazy<Faker<Map>> _lazyMapFaker = new(() =>
+        new Faker<Map>()
+            .UseSeed(GetFakerSeed())
+            .RuleFor(map => map.Id, faker => faker.Random.Guid())
+            .RuleFor(map => map.Name, faker => faker.Random.Words()));
 
-        public Faker<Game> Game => _lazyGameFaker.Value;
-        public Faker<Player> Player => _lazyPlayerFaker.Value;
-        public Faker<Map> Map => _lazyMapFaker.Value;
-    }
+    public Faker<Game> Game => _lazyGameFaker.Value;
+    public Faker<Player> Player => _lazyPlayerFaker.Value;
+    public Faker<Map> Map => _lazyMapFaker.Value;
 }
diff --git a/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj b/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj
index 742c8a7674..b68d9ae4a4 100644
--- a/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj
+++ b/test/JsonApiDotNetCoreTests/JsonApiDotNetCoreTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -11,12 +11,14 @@
 
   <ItemGroup>
     <ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />
+    <ProjectReference Include="..\..\src\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
+      ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
     <PackageReference Include="Macross.Json.Extensions" Version="2.0.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="$(EFCoreVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
diff --git a/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksInApiNamespaceStartup.cs b/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksInApiNamespaceStartup.cs
index 98c36e57a9..00af98c4e1 100644
--- a/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksInApiNamespaceStartup.cs
+++ b/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksInApiNamespaceStartup.cs
@@ -3,18 +3,17 @@
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 
-namespace JsonApiDotNetCoreTests.Startups
+namespace JsonApiDotNetCoreTests.Startups;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class AbsoluteLinksInApiNamespaceStartup<TDbContext> : TestableStartup<TDbContext>
+    where TDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class AbsoluteLinksInApiNamespaceStartup<TDbContext> : TestableStartup<TDbContext>
-        where TDbContext : DbContext
+    protected override void SetJsonApiOptions(JsonApiOptions options)
     {
-        protected override void SetJsonApiOptions(JsonApiOptions options)
-        {
-            base.SetJsonApiOptions(options);
+        base.SetJsonApiOptions(options);
 
-            options.Namespace = "api";
-            options.UseRelativeLinks = false;
-        }
+        options.Namespace = "api";
+        options.UseRelativeLinks = false;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksNoNamespaceStartup.cs b/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksNoNamespaceStartup.cs
index cce765bee7..392c4ad8b2 100644
--- a/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksNoNamespaceStartup.cs
+++ b/test/JsonApiDotNetCoreTests/Startups/AbsoluteLinksNoNamespaceStartup.cs
@@ -3,18 +3,17 @@
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 
-namespace JsonApiDotNetCoreTests.Startups
+namespace JsonApiDotNetCoreTests.Startups;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class AbsoluteLinksNoNamespaceStartup<TDbContext> : TestableStartup<TDbContext>
+    where TDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class AbsoluteLinksNoNamespaceStartup<TDbContext> : TestableStartup<TDbContext>
-        where TDbContext : DbContext
+    protected override void SetJsonApiOptions(JsonApiOptions options)
     {
-        protected override void SetJsonApiOptions(JsonApiOptions options)
-        {
-            base.SetJsonApiOptions(options);
+        base.SetJsonApiOptions(options);
 
-            options.Namespace = null;
-            options.UseRelativeLinks = false;
-        }
+        options.Namespace = null;
+        options.UseRelativeLinks = false;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/Startups/NoModelStateValidationStartup.cs b/test/JsonApiDotNetCoreTests/Startups/NoModelStateValidationStartup.cs
index 8ec7e856a0..e92b0301c7 100644
--- a/test/JsonApiDotNetCoreTests/Startups/NoModelStateValidationStartup.cs
+++ b/test/JsonApiDotNetCoreTests/Startups/NoModelStateValidationStartup.cs
@@ -3,17 +3,16 @@
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 
-namespace JsonApiDotNetCoreTests.Startups
+namespace JsonApiDotNetCoreTests.Startups;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class NoModelStateValidationStartup<TDbContext> : TestableStartup<TDbContext>
+    where TDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class NoModelStateValidationStartup<TDbContext> : TestableStartup<TDbContext>
-        where TDbContext : DbContext
+    protected override void SetJsonApiOptions(JsonApiOptions options)
     {
-        protected override void SetJsonApiOptions(JsonApiOptions options)
-        {
-            base.SetJsonApiOptions(options);
+        base.SetJsonApiOptions(options);
 
-            options.ValidateModelState = false;
-        }
+        options.ValidateModelState = false;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/Startups/RelativeLinksInApiNamespaceStartup.cs b/test/JsonApiDotNetCoreTests/Startups/RelativeLinksInApiNamespaceStartup.cs
index 7057ead134..ff0d5b59b5 100644
--- a/test/JsonApiDotNetCoreTests/Startups/RelativeLinksInApiNamespaceStartup.cs
+++ b/test/JsonApiDotNetCoreTests/Startups/RelativeLinksInApiNamespaceStartup.cs
@@ -3,18 +3,17 @@
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 
-namespace JsonApiDotNetCoreTests.Startups
+namespace JsonApiDotNetCoreTests.Startups;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class RelativeLinksInApiNamespaceStartup<TDbContext> : TestableStartup<TDbContext>
+    where TDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class RelativeLinksInApiNamespaceStartup<TDbContext> : TestableStartup<TDbContext>
-        where TDbContext : DbContext
+    protected override void SetJsonApiOptions(JsonApiOptions options)
     {
-        protected override void SetJsonApiOptions(JsonApiOptions options)
-        {
-            base.SetJsonApiOptions(options);
+        base.SetJsonApiOptions(options);
 
-            options.Namespace = "api";
-            options.UseRelativeLinks = true;
-        }
+        options.Namespace = "api";
+        options.UseRelativeLinks = true;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/Startups/RelativeLinksNoNamespaceStartup.cs b/test/JsonApiDotNetCoreTests/Startups/RelativeLinksNoNamespaceStartup.cs
index f6bea55b88..658b874f08 100644
--- a/test/JsonApiDotNetCoreTests/Startups/RelativeLinksNoNamespaceStartup.cs
+++ b/test/JsonApiDotNetCoreTests/Startups/RelativeLinksNoNamespaceStartup.cs
@@ -3,18 +3,17 @@
 using Microsoft.EntityFrameworkCore;
 using TestBuildingBlocks;
 
-namespace JsonApiDotNetCoreTests.Startups
+namespace JsonApiDotNetCoreTests.Startups;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class RelativeLinksNoNamespaceStartup<TDbContext> : TestableStartup<TDbContext>
+    where TDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class RelativeLinksNoNamespaceStartup<TDbContext> : TestableStartup<TDbContext>
-        where TDbContext : DbContext
+    protected override void SetJsonApiOptions(JsonApiOptions options)
     {
-        protected override void SetJsonApiOptions(JsonApiOptions options)
-        {
-            base.SetJsonApiOptions(options);
+        base.SetJsonApiOptions(options);
 
-            options.Namespace = null;
-            options.UseRelativeLinks = true;
-        }
+        options.Namespace = null;
+        options.UseRelativeLinks = true;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Configuration/DependencyContainerRegistrationTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/Configuration/DependencyContainerRegistrationTests.cs
index eb957266d3..785c2ebd5c 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/Configuration/DependencyContainerRegistrationTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Configuration/DependencyContainerRegistrationTests.cs
@@ -1,4 +1,3 @@
-using System;
 using FluentAssertions;
 using JetBrains.Annotations;
 using JsonApiDotNetCore;
@@ -11,136 +10,134 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.UnitTests.Configuration
+namespace JsonApiDotNetCoreTests.UnitTests.Configuration;
+
+public sealed class DependencyContainerRegistrationTests
 {
-    public sealed class DependencyContainerRegistrationTests
+    [Fact]
+    public void Can_resolve_registered_services_from_example_project()
     {
-        [Fact]
-        public void Can_resolve_registered_services_from_example_project()
-        {
-            // Arrange
-            IHostBuilder hostBuilder = CreateValidatingHostBuilder();
+        // Arrange
+        IHostBuilder hostBuilder = CreateValidatingHostBuilder();
 
-            // Act
-            using IHost _ = hostBuilder.Build();
-        }
+        // Act
+        using IHost _ = hostBuilder.Build();
+    }
+
+    [Fact]
+    public void Cannot_resolve_registered_services_with_conflicting_scopes()
+    {
+        // Arrange
+        IHostBuilder hostBuilder = CreateValidatingHostBuilder();
 
-        [Fact]
-        public void Cannot_resolve_registered_services_with_conflicting_scopes()
+        hostBuilder.ConfigureServices(services =>
         {
-            // Arrange
-            IHostBuilder hostBuilder = CreateValidatingHostBuilder();
+            services.AddScoped<SomeScopedService>();
+            services.AddSingleton<SomeSingletonService>();
+        });
 
-            hostBuilder.ConfigureServices(services =>
-            {
-                services.AddScoped<SomeScopedService>();
-                services.AddSingleton<SomeSingletonService>();
-            });
+        // Act
+        Action action = () =>
+        {
+            using IHost _ = hostBuilder.Build();
+        };
 
-            // Act
-            Action action = () =>
-            {
-                using IHost _ = hostBuilder.Build();
-            };
+        // Assert
+        action.Should().ThrowExactly<AggregateException>()
+            .WithMessage("Some services are not able to be constructed * Singleton * Cannot consume scoped service *");
+    }
 
-            // Assert
-            action.Should().ThrowExactly<AggregateException>()
-                .WithMessage("Some services are not able to be constructed * Singleton * Cannot consume scoped service *");
-        }
+    [Fact]
+    public void Cannot_resolve_registered_services_with_circular_dependency()
+    {
+        // Arrange
+        IHostBuilder hostBuilder = CreateValidatingHostBuilder();
 
-        [Fact]
-        public void Cannot_resolve_registered_services_with_circular_dependency()
+        hostBuilder.ConfigureServices(services =>
         {
-            // Arrange
-            IHostBuilder hostBuilder = CreateValidatingHostBuilder();
-
-            hostBuilder.ConfigureServices(services =>
-            {
-                services.AddScoped<CircularServiceA>();
-                services.AddScoped<CircularServiceB>();
-            });
+            services.AddScoped<CircularServiceA>();
+            services.AddScoped<CircularServiceB>();
+        });
 
-            // Act
-            Action action = () =>
-            {
-                using IHost _ = hostBuilder.Build();
-            };
+        // Act
+        Action action = () =>
+        {
+            using IHost _ = hostBuilder.Build();
+        };
 
-            // Assert
-            action.Should().ThrowExactly<AggregateException>()
-                .WithMessage("Some services are not able to be constructed * A circular dependency was detected *");
-        }
+        // Assert
+        action.Should().ThrowExactly<AggregateException>().WithMessage("Some services are not able to be constructed * A circular dependency was detected *");
+    }
 
-        private static IHostBuilder CreateValidatingHostBuilder()
+    private static IHostBuilder CreateValidatingHostBuilder()
+    {
+        IHostBuilder hostBuilder = Host.CreateDefaultBuilder().ConfigureWebHostDefaults(webBuilder =>
         {
-            IHostBuilder hostBuilder = Host.CreateDefaultBuilder().ConfigureWebHostDefaults(webBuilder =>
-            {
-                webBuilder.ConfigureServices(services =>
-                    services.AddDbContext<DependencyContainerRegistrationDbContext>(options => options.UseInMemoryDatabase("db")));
+            webBuilder.ConfigureServices(services =>
+                services.AddDbContext<DependencyContainerRegistrationDbContext>(options => options.UseInMemoryDatabase("db")));
 
-                webBuilder.UseStartup<TestableStartup<DependencyContainerRegistrationDbContext>>();
+            webBuilder.UseStartup<TestableStartup<DependencyContainerRegistrationDbContext>>();
 
-                webBuilder.UseDefaultServiceProvider(options =>
-                {
-                    options.ValidateScopes = true;
-                    options.ValidateOnBuild = true;
-                });
+            webBuilder.UseDefaultServiceProvider(options =>
+            {
+                options.ValidateScopes = true;
+                options.ValidateOnBuild = true;
             });
+        });
 
-            return hostBuilder;
-        }
+        return hostBuilder;
+    }
 
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class SomeSingletonService
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class SomeSingletonService
+    {
+        // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
+        public SomeSingletonService(SomeScopedService scopedService)
         {
-            // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
-            public SomeSingletonService(SomeScopedService scopedService)
-            {
-                ArgumentGuard.NotNull(scopedService, nameof(scopedService));
-            }
+            ArgumentGuard.NotNull(scopedService, nameof(scopedService));
         }
+    }
 
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class SomeScopedService
-        {
-        }
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class SomeScopedService
+    {
+    }
 
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class CircularServiceA
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class CircularServiceA
+    {
+        // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
+        public CircularServiceA(CircularServiceB serviceB)
         {
-            // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
-            public CircularServiceA(CircularServiceB serviceB)
-            {
-                ArgumentGuard.NotNull(serviceB, nameof(serviceB));
-            }
+            ArgumentGuard.NotNull(serviceB, nameof(serviceB));
         }
+    }
 
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class CircularServiceB
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class CircularServiceB
+    {
+        // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
+        public CircularServiceB(CircularServiceA serviceA)
         {
-            // ReSharper disable once ParameterOnlyUsedForPreconditionCheck.Local
-            public CircularServiceB(CircularServiceA serviceA)
-            {
-                ArgumentGuard.NotNull(serviceA, nameof(serviceA));
-            }
+            ArgumentGuard.NotNull(serviceA, nameof(serviceA));
         }
+    }
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class DependencyContainerRegistrationDbContext : DbContext
-        {
-            public DbSet<Resource> Resources => Set<Resource>();
-
-            public DependencyContainerRegistrationDbContext(DbContextOptions<DependencyContainerRegistrationDbContext> options)
-                : base(options)
-            {
-            }
-        }
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class DependencyContainerRegistrationDbContext : DbContext
+    {
+        public DbSet<Resource> Resources => Set<Resource>();
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class Resource : Identifiable<int>
+        public DependencyContainerRegistrationDbContext(DbContextOptions<DependencyContainerRegistrationDbContext> options)
+            : base(options)
         {
-            [Attr]
-            public string? Field { get; set; }
         }
     }
+
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class Resource : Identifiable<int>
+    {
+        [Attr]
+        public string? Field { get; set; }
+    }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Links/LinkInclusionTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/Links/LinkInclusionTests.cs
index d834d8e11e..6c0e9fe1a0 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/Links/LinkInclusionTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Links/LinkInclusionTests.cs
@@ -1,4 +1,3 @@
-using System;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -12,411 +11,410 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.UnitTests.Links
+namespace JsonApiDotNetCoreTests.UnitTests.Links;
+
+public sealed class LinkInclusionTests
 {
-    public sealed class LinkInclusionTests
+    [Theory]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.None)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.None)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Self)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.Related)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Paging, LinkTypes.Paging)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.All)]
+    [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Related, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Paging, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.None)]
+    [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Related, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Paging, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.Self)]
+    [InlineData(LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.None, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Self, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Related, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Paging, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.All, LinkTypes.Related)]
+    [InlineData(LinkTypes.Paging, LinkTypes.NotConfigured, LinkTypes.Paging)]
+    [InlineData(LinkTypes.Paging, LinkTypes.None, LinkTypes.Paging)]
+    [InlineData(LinkTypes.Paging, LinkTypes.Self, LinkTypes.Paging)]
+    [InlineData(LinkTypes.Paging, LinkTypes.Related, LinkTypes.Paging)]
+    [InlineData(LinkTypes.Paging, LinkTypes.Paging, LinkTypes.Paging)]
+    [InlineData(LinkTypes.Paging, LinkTypes.All, LinkTypes.Paging)]
+    [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Related, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Paging, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.All)]
+    public void Applies_cascading_settings_for_top_level_links(LinkTypes linksInResourceType, LinkTypes linksInOptions, LinkTypes expected)
     {
-        [Theory]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.None)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.None)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Self)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.Related)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Paging, LinkTypes.Paging)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.All)]
-        [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Related, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Paging, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.None)]
-        [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Related, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Paging, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.Self)]
-        [InlineData(LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.None, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Self, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Related, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Paging, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.All, LinkTypes.Related)]
-        [InlineData(LinkTypes.Paging, LinkTypes.NotConfigured, LinkTypes.Paging)]
-        [InlineData(LinkTypes.Paging, LinkTypes.None, LinkTypes.Paging)]
-        [InlineData(LinkTypes.Paging, LinkTypes.Self, LinkTypes.Paging)]
-        [InlineData(LinkTypes.Paging, LinkTypes.Related, LinkTypes.Paging)]
-        [InlineData(LinkTypes.Paging, LinkTypes.Paging, LinkTypes.Paging)]
-        [InlineData(LinkTypes.Paging, LinkTypes.All, LinkTypes.Paging)]
-        [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Related, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Paging, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.All)]
-        public void Applies_cascading_settings_for_top_level_links(LinkTypes linksInResourceType, LinkTypes linksInOptions, LinkTypes expected)
+        // Arrange
+        var exampleResourceType = new ResourceType(nameof(ExampleResource), typeof(ExampleResource), typeof(int), topLevelLinks: linksInResourceType);
+
+        var options = new JsonApiOptions
         {
-            // Arrange
-            var exampleResourceType = new ResourceType(nameof(ExampleResource), typeof(ExampleResource), typeof(int), topLevelLinks: linksInResourceType);
+            TopLevelLinks = linksInOptions
+        };
 
-            var options = new JsonApiOptions
-            {
-                TopLevelLinks = linksInOptions
-            };
+        var request = new JsonApiRequest
+        {
+            PrimaryResourceType = exampleResourceType,
+            PrimaryId = "1",
+            IsCollection = true,
+            Kind = EndpointKind.Relationship,
+            Relationship = new HasOneAttribute()
+        };
 
-            var request = new JsonApiRequest
-            {
-                PrimaryResourceType = exampleResourceType,
-                PrimaryId = "1",
-                IsCollection = true,
-                Kind = EndpointKind.Relationship,
-                Relationship = new HasOneAttribute()
-            };
-
-            var paginationContext = new PaginationContext
-            {
-                PageSize = new PageSize(1),
-                PageNumber = new PageNumber(2),
-                TotalResourceCount = 10
-            };
+        var paginationContext = new PaginationContext
+        {
+            PageSize = new PageSize(1),
+            PageNumber = new PageNumber(2),
+            TotalResourceCount = 10
+        };
+
+        var httpContextAccessor = new FakeHttpContextAccessor();
+        var linkGenerator = new FakeLinkGenerator();
+        var controllerResourceMapping = new FakeControllerResourceMapping();
+        var linkBuilder = new LinkBuilder(options, request, paginationContext, httpContextAccessor, linkGenerator, controllerResourceMapping);
 
-            var httpContextAccessor = new FakeHttpContextAccessor();
-            var linkGenerator = new FakeLinkGenerator();
-            var controllerResourceMapping = new FakeControllerResourceMapping();
-            var linkBuilder = new LinkBuilder(options, request, paginationContext, httpContextAccessor, linkGenerator, controllerResourceMapping);
+        // Act
+        TopLevelLinks? topLevelLinks = linkBuilder.GetTopLevelLinks();
 
-            // Act
-            TopLevelLinks? topLevelLinks = linkBuilder.GetTopLevelLinks();
+        // Assert
+        if (expected == LinkTypes.None)
+        {
+            topLevelLinks.Should().BeNull();
+        }
+        else
+        {
+            topLevelLinks.ShouldNotBeNull();
 
-            // Assert
-            if (expected == LinkTypes.None)
+            if (expected.HasFlag(LinkTypes.Self))
             {
-                topLevelLinks.Should().BeNull();
+                topLevelLinks.Self.ShouldNotBeNull();
             }
             else
             {
-                topLevelLinks.ShouldNotBeNull();
-
-                if (expected.HasFlag(LinkTypes.Self))
-                {
-                    topLevelLinks.Self.ShouldNotBeNull();
-                }
-                else
-                {
-                    topLevelLinks.Self.Should().BeNull();
-                }
-
-                if (expected.HasFlag(LinkTypes.Related))
-                {
-                    topLevelLinks.Related.ShouldNotBeNull();
-                }
-                else
-                {
-                    topLevelLinks.Related.Should().BeNull();
-                }
-
-                if (expected.HasFlag(LinkTypes.Paging))
-                {
-                    topLevelLinks.First.ShouldNotBeNull();
-                    topLevelLinks.Last.ShouldNotBeNull();
-                    topLevelLinks.Prev.ShouldNotBeNull();
-                    topLevelLinks.Next.ShouldNotBeNull();
-                }
-                else
-                {
-                    topLevelLinks.First.Should().BeNull();
-                    topLevelLinks.Last.Should().BeNull();
-                    topLevelLinks.Prev.Should().BeNull();
-                    topLevelLinks.Next.Should().BeNull();
-                }
+                topLevelLinks.Self.Should().BeNull();
             }
-        }
 
-        [Theory]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.None)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.None)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Self)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.Self)]
-        [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.None)]
-        [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.Self)]
-        [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.Self)]
-        [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.Self)]
-        [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.Self)]
-        [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.Self)]
-        public void Applies_cascading_settings_for_resource_links(LinkTypes linksInResourceType, LinkTypes linksInOptions, LinkTypes expected)
-        {
-            // Arrange
-            var exampleResourceType = new ResourceType(nameof(ExampleResource), typeof(ExampleResource), typeof(int), resourceLinks: linksInResourceType);
-
-            var options = new JsonApiOptions
+            if (expected.HasFlag(LinkTypes.Related))
             {
-                ResourceLinks = linksInOptions
-            };
-
-            var request = new JsonApiRequest();
-            var paginationContext = new PaginationContext();
-            var httpContextAccessor = new FakeHttpContextAccessor();
-            var linkGenerator = new FakeLinkGenerator();
-            var controllerResourceMapping = new FakeControllerResourceMapping();
-            var linkBuilder = new LinkBuilder(options, request, paginationContext, httpContextAccessor, linkGenerator, controllerResourceMapping);
-
-            // Act
-            ResourceLinks? resourceLinks = linkBuilder.GetResourceLinks(exampleResourceType, new ExampleResource());
+                topLevelLinks.Related.ShouldNotBeNull();
+            }
+            else
+            {
+                topLevelLinks.Related.Should().BeNull();
+            }
 
-            // Assert
-            if (expected == LinkTypes.Self)
+            if (expected.HasFlag(LinkTypes.Paging))
             {
-                resourceLinks.ShouldNotBeNull();
-                resourceLinks.Self.ShouldNotBeNull();
+                topLevelLinks.First.ShouldNotBeNull();
+                topLevelLinks.Last.ShouldNotBeNull();
+                topLevelLinks.Prev.ShouldNotBeNull();
+                topLevelLinks.Next.ShouldNotBeNull();
             }
             else
             {
-                resourceLinks.Should().BeNull();
+                topLevelLinks.First.Should().BeNull();
+                topLevelLinks.Last.Should().BeNull();
+                topLevelLinks.Prev.Should().BeNull();
+                topLevelLinks.Next.Should().BeNull();
             }
         }
+    }
+
+    [Theory]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.None)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.None)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Self)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.Self)]
+    [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.None)]
+    [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.Self)]
+    [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.Self)]
+    [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.Self)]
+    [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.Self)]
+    [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.Self)]
+    public void Applies_cascading_settings_for_resource_links(LinkTypes linksInResourceType, LinkTypes linksInOptions, LinkTypes expected)
+    {
+        // Arrange
+        var exampleResourceType = new ResourceType(nameof(ExampleResource), typeof(ExampleResource), typeof(int), resourceLinks: linksInResourceType);
 
-        [Theory]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.None)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.None)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Self)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.Related)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.All)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.None)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.None, LinkTypes.None)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.Self, LinkTypes.None)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.Related, LinkTypes.None)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.All, LinkTypes.None)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Self)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.None, LinkTypes.Self)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Self, LinkTypes.Self)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Related, LinkTypes.Self)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.All, LinkTypes.Self)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.Related)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.None, LinkTypes.Related)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.Self, LinkTypes.Related)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.Related, LinkTypes.Related)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.All, LinkTypes.Related)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.All)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.None, LinkTypes.All)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.Self, LinkTypes.All)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.Related, LinkTypes.All)]
-        [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.All, LinkTypes.All)]
-        [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.None, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.Self, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.Related, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.All, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.None, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.Self, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.Related, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.All, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Related, LinkTypes.None, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Related, LinkTypes.Self, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Related, LinkTypes.Related, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.Related, LinkTypes.All, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.None, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.Self, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.Related, LinkTypes.None)]
-        [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.All, LinkTypes.None)]
-        [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.None, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.Self, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.Related, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.All, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.None, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.Self, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.Related, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.All, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Related, LinkTypes.None, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Related, LinkTypes.Self, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Related, LinkTypes.Related, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.Related, LinkTypes.All, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.None, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.Self, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.Related, LinkTypes.Self)]
-        [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.All, LinkTypes.Self)]
-        [InlineData(LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.None, LinkTypes.None, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.None, LinkTypes.Self, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.None, LinkTypes.Related, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.None, LinkTypes.All, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Self, LinkTypes.None, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Self, LinkTypes.Self, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Self, LinkTypes.Related, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Self, LinkTypes.All, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Related, LinkTypes.None, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Related, LinkTypes.Self, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Related, LinkTypes.Related, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.Related, LinkTypes.All, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.All, LinkTypes.None, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.All, LinkTypes.Self, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.All, LinkTypes.Related, LinkTypes.Related)]
-        [InlineData(LinkTypes.Related, LinkTypes.All, LinkTypes.All, LinkTypes.Related)]
-        [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.None, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.Self, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.Related, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.All, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.None, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.Self, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.Related, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.All, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Related, LinkTypes.None, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Related, LinkTypes.Self, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Related, LinkTypes.Related, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.Related, LinkTypes.All, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.None, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.Self, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.Related, LinkTypes.All)]
-        [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.All, LinkTypes.All)]
-        public void Applies_cascading_settings_for_relationship_links(LinkTypes linksInRelationshipAttribute, LinkTypes linksInResourceType,
-            LinkTypes linksInOptions, LinkTypes expected)
+        var options = new JsonApiOptions
         {
-            // Arrange
-            var exampleResourceType = new ResourceType(nameof(ExampleResource), typeof(ExampleResource), typeof(int), relationshipLinks: linksInResourceType);
+            ResourceLinks = linksInOptions
+        };
 
-            var options = new JsonApiOptions
-            {
-                RelationshipLinks = linksInOptions
-            };
+        var request = new JsonApiRequest();
+        var paginationContext = new PaginationContext();
+        var httpContextAccessor = new FakeHttpContextAccessor();
+        var linkGenerator = new FakeLinkGenerator();
+        var controllerResourceMapping = new FakeControllerResourceMapping();
+        var linkBuilder = new LinkBuilder(options, request, paginationContext, httpContextAccessor, linkGenerator, controllerResourceMapping);
 
-            var request = new JsonApiRequest();
-            var paginationContext = new PaginationContext();
-            var httpContextAccessor = new FakeHttpContextAccessor();
-            var linkGenerator = new FakeLinkGenerator();
-            var controllerResourceMapping = new FakeControllerResourceMapping();
-            var linkBuilder = new LinkBuilder(options, request, paginationContext, httpContextAccessor, linkGenerator, controllerResourceMapping);
+        // Act
+        ResourceLinks? resourceLinks = linkBuilder.GetResourceLinks(exampleResourceType, new ExampleResource());
 
-            var relationship = new HasOneAttribute
-            {
-                Links = linksInRelationshipAttribute,
-                LeftType = exampleResourceType
-            };
+        // Assert
+        if (expected == LinkTypes.Self)
+        {
+            resourceLinks.ShouldNotBeNull();
+            resourceLinks.Self.ShouldNotBeNull();
+        }
+        else
+        {
+            resourceLinks.Should().BeNull();
+        }
+    }
 
-            // Act
-            RelationshipLinks? relationshipLinks = linkBuilder.GetRelationshipLinks(relationship, new ExampleResource());
+    [Theory]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.None)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.None)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Self)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.Related)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.All)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.None)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.None, LinkTypes.None)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.Self, LinkTypes.None)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.Related, LinkTypes.None)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.All, LinkTypes.None)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Self)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.None, LinkTypes.Self)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Self, LinkTypes.Self)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Related, LinkTypes.Self)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.All, LinkTypes.Self)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.Related)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.None, LinkTypes.Related)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.Self, LinkTypes.Related)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.Related, LinkTypes.Related)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.All, LinkTypes.Related)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.All)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.None, LinkTypes.All)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.Self, LinkTypes.All)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.Related, LinkTypes.All)]
+    [InlineData(LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.All, LinkTypes.All)]
+    [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.None, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.Self, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.Related, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.None, LinkTypes.All, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.None, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.Self, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.Related, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Self, LinkTypes.All, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Related, LinkTypes.None, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Related, LinkTypes.Self, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Related, LinkTypes.Related, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.Related, LinkTypes.All, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.None, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.Self, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.Related, LinkTypes.None)]
+    [InlineData(LinkTypes.None, LinkTypes.All, LinkTypes.All, LinkTypes.None)]
+    [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.None, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.Self, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.Related, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.None, LinkTypes.All, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.None, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.Self, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.Related, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Self, LinkTypes.All, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Related, LinkTypes.None, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Related, LinkTypes.Self, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Related, LinkTypes.Related, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.Related, LinkTypes.All, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.None, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.Self, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.Related, LinkTypes.Self)]
+    [InlineData(LinkTypes.Self, LinkTypes.All, LinkTypes.All, LinkTypes.Self)]
+    [InlineData(LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.None, LinkTypes.None, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.None, LinkTypes.Self, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.None, LinkTypes.Related, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.None, LinkTypes.All, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Self, LinkTypes.None, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Self, LinkTypes.Self, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Self, LinkTypes.Related, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Self, LinkTypes.All, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Related, LinkTypes.None, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Related, LinkTypes.Self, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Related, LinkTypes.Related, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.Related, LinkTypes.All, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.All, LinkTypes.None, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.All, LinkTypes.Self, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.All, LinkTypes.Related, LinkTypes.Related)]
+    [InlineData(LinkTypes.Related, LinkTypes.All, LinkTypes.All, LinkTypes.Related)]
+    [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.NotConfigured, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.None, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.Self, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.Related, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.All, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.NotConfigured, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.None, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.Self, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.Related, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.None, LinkTypes.All, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.NotConfigured, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.None, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.Self, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.Related, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Self, LinkTypes.All, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Related, LinkTypes.NotConfigured, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Related, LinkTypes.None, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Related, LinkTypes.Self, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Related, LinkTypes.Related, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.Related, LinkTypes.All, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.NotConfigured, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.None, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.Self, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.Related, LinkTypes.All)]
+    [InlineData(LinkTypes.All, LinkTypes.All, LinkTypes.All, LinkTypes.All)]
+    public void Applies_cascading_settings_for_relationship_links(LinkTypes linksInRelationshipAttribute, LinkTypes linksInResourceType,
+        LinkTypes linksInOptions, LinkTypes expected)
+    {
+        // Arrange
+        var exampleResourceType = new ResourceType(nameof(ExampleResource), typeof(ExampleResource), typeof(int), relationshipLinks: linksInResourceType);
 
-            // Assert
-            if (expected == LinkTypes.None)
-            {
-                relationshipLinks.Should().BeNull();
-            }
-            else
-            {
-                relationshipLinks.ShouldNotBeNull();
-
-                if (expected.HasFlag(LinkTypes.Self))
-                {
-                    relationshipLinks.Self.ShouldNotBeNull();
-                }
-                else
-                {
-                    relationshipLinks.Self.Should().BeNull();
-                }
-
-                if (expected.HasFlag(LinkTypes.Related))
-                {
-                    relationshipLinks.Related.ShouldNotBeNull();
-                }
-                else
-                {
-                    relationshipLinks.Related.Should().BeNull();
-                }
-            }
-        }
+        var options = new JsonApiOptions
+        {
+            RelationshipLinks = linksInOptions
+        };
 
-        private sealed class ExampleResource : Identifiable<int>
+        var request = new JsonApiRequest();
+        var paginationContext = new PaginationContext();
+        var httpContextAccessor = new FakeHttpContextAccessor();
+        var linkGenerator = new FakeLinkGenerator();
+        var controllerResourceMapping = new FakeControllerResourceMapping();
+        var linkBuilder = new LinkBuilder(options, request, paginationContext, httpContextAccessor, linkGenerator, controllerResourceMapping);
+
+        var relationship = new HasOneAttribute
         {
-        }
+            Links = linksInRelationshipAttribute,
+            LeftType = exampleResourceType
+        };
 
-        private sealed class FakeHttpContextAccessor : IHttpContextAccessor
+        // Act
+        RelationshipLinks? relationshipLinks = linkBuilder.GetRelationshipLinks(relationship, new ExampleResource());
+
+        // Assert
+        if (expected == LinkTypes.None)
         {
-            public HttpContext? HttpContext { get; set; } = new DefaultHttpContext
-            {
-                Request =
-                {
-                    Scheme = "http",
-                    Host = new HostString("localhost")
-                }
-            };
+            relationshipLinks.Should().BeNull();
         }
-
-        private sealed class FakeControllerResourceMapping : IControllerResourceMapping
+        else
         {
-            public ResourceType GetResourceTypeForController(Type? controllerType)
-            {
-                throw new NotImplementedException();
-            }
+            relationshipLinks.ShouldNotBeNull();
 
-            public string? GetControllerNameForResourceType(ResourceType? resourceType)
+            if (expected.HasFlag(LinkTypes.Self))
             {
-                return null;
+                relationshipLinks.Self.ShouldNotBeNull();
             }
-        }
-
-        private sealed class FakeLinkGenerator : LinkGenerator
-        {
-            public override string GetPathByAddress<TAddress>(HttpContext httpContext, TAddress address, RouteValueDictionary values,
-                RouteValueDictionary? ambientValues = null, PathString? pathBase = null, FragmentString fragment = new(), LinkOptions? options = null)
+            else
             {
-                throw new NotImplementedException();
+                relationshipLinks.Self.Should().BeNull();
             }
 
-            public override string GetPathByAddress<TAddress>(TAddress address, RouteValueDictionary values, PathString pathBase = new(),
-                FragmentString fragment = new(), LinkOptions? options = null)
+            if (expected.HasFlag(LinkTypes.Related))
             {
-                throw new NotImplementedException();
+                relationshipLinks.Related.ShouldNotBeNull();
             }
-
-            public override string GetUriByAddress<TAddress>(HttpContext httpContext, TAddress address, RouteValueDictionary values,
-                RouteValueDictionary? ambientValues = null, string? scheme = null, HostString? host = null, PathString? pathBase = null,
-                FragmentString fragment = new(), LinkOptions? options = null)
+            else
             {
-                return "https://domain.com/some/path";
+                relationshipLinks.Related.Should().BeNull();
             }
+        }
+    }
+
+    private sealed class ExampleResource : Identifiable<int>
+    {
+    }
 
-            public override string GetUriByAddress<TAddress>(TAddress address, RouteValueDictionary values, string? scheme, HostString host,
-                PathString pathBase = new(), FragmentString fragment = new(), LinkOptions? options = null)
+    private sealed class FakeHttpContextAccessor : IHttpContextAccessor
+    {
+        public HttpContext? HttpContext { get; set; } = new DefaultHttpContext
+        {
+            Request =
             {
-                throw new NotImplementedException();
+                Scheme = "http",
+                Host = new HostString("localhost")
             }
+        };
+    }
+
+    private sealed class FakeControllerResourceMapping : IControllerResourceMapping
+    {
+        public ResourceType GetResourceTypeForController(Type? controllerType)
+        {
+            throw new NotImplementedException();
+        }
+
+        public string? GetControllerNameForResourceType(ResourceType? resourceType)
+        {
+            return null;
+        }
+    }
+
+    private sealed class FakeLinkGenerator : LinkGenerator
+    {
+        public override string GetPathByAddress<TAddress>(HttpContext httpContext, TAddress address, RouteValueDictionary values,
+            RouteValueDictionary? ambientValues = null, PathString? pathBase = null, FragmentString fragment = new(), LinkOptions? options = null)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override string GetPathByAddress<TAddress>(TAddress address, RouteValueDictionary values, PathString pathBase = new(),
+            FragmentString fragment = new(), LinkOptions? options = null)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override string GetUriByAddress<TAddress>(HttpContext httpContext, TAddress address, RouteValueDictionary values,
+            RouteValueDictionary? ambientValues = null, string? scheme = null, HostString? host = null, PathString? pathBase = null,
+            FragmentString fragment = new(), LinkOptions? options = null)
+        {
+            return "https://domain.com/some/path";
+        }
+
+        public override string GetUriByAddress<TAddress>(TAddress address, RouteValueDictionary values, string? scheme, HostString host,
+            PathString pathBase = new(), FragmentString fragment = new(), LinkOptions? options = null)
+        {
+            throw new NotImplementedException();
         }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/ModelStateValidation/ModelStateValidationTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/ModelStateValidation/ModelStateValidationTests.cs
index efb63a856b..34bbc16d17 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/ModelStateValidation/ModelStateValidationTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/ModelStateValidation/ModelStateValidationTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using FluentAssertions;
 using JetBrains.Annotations;
@@ -12,149 +10,145 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.UnitTests.ModelStateValidation
+namespace JsonApiDotNetCoreTests.UnitTests.ModelStateValidation;
+
+public sealed class ModelStateValidationTests
 {
-    public sealed class ModelStateValidationTests
+    [Theory]
+    [InlineData("", null)]
+    [InlineData("NotMappedInParent", null)]
+    [InlineData("Id", "/data/id")]
+    [InlineData("One", "/data/attributes/publicNameOfOne")]
+    [InlineData("ComplexObject", "/data/attributes/publicNameOfComplexObject")]
+    [InlineData("ComplexObject.First", "/data/attributes/publicNameOfComplexObject/jsonFirst")]
+    [InlineData("ComplexObject.ParentObject.First", "/data/attributes/publicNameOfComplexObject/jsonParentObject/jsonFirst")]
+    [InlineData("ComplexObject.Elements[0]", "/data/attributes/publicNameOfComplexObject/jsonElements[0]")]
+    [InlineData("ComplexObject.Elements[0].First", "/data/attributes/publicNameOfComplexObject/jsonElements[0]/jsonFirst")]
+    [InlineData("[ComplexObject][Elements][0][First]", "/data/attributes/publicNameOfComplexObject/jsonElements[0]/jsonFirst")]
+    [InlineData("ComplexList", "/data/attributes/publicNameOfComplexList")]
+    [InlineData("ComplexList[0].First", "/data/attributes/publicNameOfComplexList[0]/jsonFirst")]
+    [InlineData("PrimaryChild", "/data/relationships/publicNameOfPrimaryChild/data")]
+    [InlineData("PrimaryChild.NotMappedInChild", null)]
+    [InlineData("PrimaryChild.Id", "/data/relationships/publicNameOfPrimaryChild/data/id")]
+    [InlineData("Children[0]", "/data/relationships/publicNameOfChildren/data[0]")]
+    [InlineData("Children[0].NotMappedInChild", null)]
+    [InlineData("Children[0].Id", "/data/relationships/publicNameOfChildren/data[0]/id")]
+    public void Renders_JSON_path_for_ModelState_key_in_resource_request(string modelStateKey, string? expectedJsonPath)
     {
-        [Theory]
-        [InlineData("", null)]
-        [InlineData("NotMappedInParent", null)]
-        [InlineData("Id", "/data/id")]
-        [InlineData("One", "/data/attributes/publicNameOfOne")]
-        [InlineData("ComplexObject", "/data/attributes/publicNameOfComplexObject")]
-        [InlineData("ComplexObject.First", "/data/attributes/publicNameOfComplexObject/jsonFirst")]
-        [InlineData("ComplexObject.ParentObject.First", "/data/attributes/publicNameOfComplexObject/jsonParentObject/jsonFirst")]
-        [InlineData("ComplexObject.Elements[0]", "/data/attributes/publicNameOfComplexObject/jsonElements[0]")]
-        [InlineData("ComplexObject.Elements[0].First", "/data/attributes/publicNameOfComplexObject/jsonElements[0]/jsonFirst")]
-        [InlineData("[ComplexObject][Elements][0][First]", "/data/attributes/publicNameOfComplexObject/jsonElements[0]/jsonFirst")]
-        [InlineData("ComplexList", "/data/attributes/publicNameOfComplexList")]
-        [InlineData("ComplexList[0].First", "/data/attributes/publicNameOfComplexList[0]/jsonFirst")]
-        [InlineData("PrimaryChild", "/data/relationships/publicNameOfPrimaryChild/data")]
-        [InlineData("PrimaryChild.NotMappedInChild", null)]
-        [InlineData("PrimaryChild.Id", "/data/relationships/publicNameOfPrimaryChild/data/id")]
-        [InlineData("Children[0]", "/data/relationships/publicNameOfChildren/data[0]")]
-        [InlineData("Children[0].NotMappedInChild", null)]
-        [InlineData("Children[0].Id", "/data/relationships/publicNameOfChildren/data[0]/id")]
-        public void Renders_JSON_path_for_ModelState_key_in_resource_request(string modelStateKey, string? expectedJsonPath)
+        // Arrange
+        var options = new JsonApiOptions();
+        IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<Parent, int>().Add<Child, int>().Build();
+
+        var modelState = new ModelStateDictionary();
+        modelState.AddModelError(modelStateKey, "(ignored error message)");
+
+        // Act
+        var exception = new InvalidModelStateException(modelState, typeof(Parent), false, resourceGraph);
+
+        // Assert
+        exception.Errors.ShouldHaveCount(1);
+
+        if (expectedJsonPath == null)
         {
-            // Arrange
-            var options = new JsonApiOptions();
-            IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<Parent, int>().Add<Child, int>().Build();
-
-            var modelState = new ModelStateDictionary();
-            modelState.AddModelError(modelStateKey, "(ignored error message)");
-
-            // Act
-            var exception = new InvalidModelStateException(modelState, typeof(Parent), false, resourceGraph);
-
-            // Assert
-            exception.Errors.ShouldHaveCount(1);
-
-            if (expectedJsonPath == null)
-            {
-                exception.Errors[0].Source.Should().BeNull();
-            }
-            else
-            {
-                exception.Errors[0].Source.ShouldNotBeNull().With(value => value.Pointer.Should().Be(expectedJsonPath));
-            }
+            exception.Errors[0].Source.Should().BeNull();
         }
-
-        [Theory]
-        [InlineData("[0]", "/atomic:operations[0]")]
-        [InlineData("[0].Resource", null)]
-        [InlineData("[0].Resource.NotMappedInParent", null)]
-        [InlineData("[0].Resource.Id", "/atomic:operations[0]/data/id")]
-        [InlineData("[0].Resource.One", "/atomic:operations[0]/data/attributes/publicNameOfOne")]
-        [InlineData("[0].Resource.ComplexObject", "/atomic:operations[0]/data/attributes/publicNameOfComplexObject")]
-        [InlineData("[0].Resource.ComplexObject.First", "/atomic:operations[0]/data/attributes/publicNameOfComplexObject/jsonFirst")]
-        [InlineData("[0].Resource.ComplexObject.ParentObject.First",
-            "/atomic:operations[0]/data/attributes/publicNameOfComplexObject/jsonParentObject/jsonFirst")]
-        [InlineData("[0].Resource.ComplexObject.Elements[0]", "/atomic:operations[0]/data/attributes/publicNameOfComplexObject/jsonElements[0]")]
-        [InlineData("[0].Resource.ComplexObject.Elements[0].First",
-            "/atomic:operations[0]/data/attributes/publicNameOfComplexObject/jsonElements[0]/jsonFirst")]
-        [InlineData("[0][Resource][ComplexObject][Elements][0][First]",
-            "/atomic:operations[0]/data/attributes/publicNameOfComplexObject/jsonElements[0]/jsonFirst")]
-        [InlineData("[0].Resource.ComplexList", "/atomic:operations[0]/data/attributes/publicNameOfComplexList")]
-        [InlineData("[0].Resource.ComplexList[0].First", "/atomic:operations[0]/data/attributes/publicNameOfComplexList[0]/jsonFirst")]
-        [InlineData("[0].Resource.PrimaryChild", "/atomic:operations[0]/data/relationships/publicNameOfPrimaryChild/data")]
-        [InlineData("[0].Resource.PrimaryChild.NotMappedInChild", null)]
-        [InlineData("[0].Resource.PrimaryChild.Id", "/atomic:operations[0]/data/relationships/publicNameOfPrimaryChild/data/id")]
-        [InlineData("[0].Resource.Children[0]", "/atomic:operations[0]/data/relationships/publicNameOfChildren/data[0]")]
-        [InlineData("[0].Resource.Children[0].NotMappedInChild", null)]
-        [InlineData("[0].Resource.Children[0].Id", "/atomic:operations[0]/data/relationships/publicNameOfChildren/data[0]/id")]
-        public void Renders_JSON_path_for_ModelState_key_in_operations_request(string modelStateKey, string? expectedJsonPath)
+        else
         {
-            // Arrange
-            var options = new JsonApiOptions();
-            IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<Parent, int>().Add<Child, int>().Build();
-
-            var modelState = new ModelStateDictionary();
-            modelState.AddModelError(modelStateKey, "(ignored error message)");
-
-            Func<Type, int, Type?> getOperationTypeCallback = (collectionType, _) =>
-                collectionType == typeof(IList<OperationContainer>) ? typeof(Parent) : null;
-
-            // Act
-            var exception = new InvalidModelStateException(modelState, typeof(IList<OperationContainer>), false, resourceGraph, getOperationTypeCallback);
-
-            // Assert
-            exception.Errors.ShouldHaveCount(1);
-
-            if (expectedJsonPath == null)
-            {
-                exception.Errors[0].Source.Should().BeNull();
-            }
-            else
-            {
-                exception.Errors[0].Source.ShouldNotBeNull().With(value => value.Pointer.Should().Be(expectedJsonPath));
-            }
+            exception.Errors[0].Source.ShouldNotBeNull().With(value => value.Pointer.Should().Be(expectedJsonPath));
         }
+    }
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class Parent : Identifiable<int>
-        {
-            public string? NotMappedInParent { get; set; }
+    [Theory]
+    [InlineData("[0]", "/atomic:operations[0]")]
+    [InlineData("[0].Resource", null)]
+    [InlineData("[0].Resource.NotMappedInParent", null)]
+    [InlineData("[0].Resource.Id", "/atomic:operations[0]/data/id")]
+    [InlineData("[0].Resource.One", "/atomic:operations[0]/data/attributes/publicNameOfOne")]
+    [InlineData("[0].Resource.ComplexObject", "/atomic:operations[0]/data/attributes/publicNameOfComplexObject")]
+    [InlineData("[0].Resource.ComplexObject.First", "/atomic:operations[0]/data/attributes/publicNameOfComplexObject/jsonFirst")]
+    [InlineData("[0].Resource.ComplexObject.ParentObject.First", "/atomic:operations[0]/data/attributes/publicNameOfComplexObject/jsonParentObject/jsonFirst")]
+    [InlineData("[0].Resource.ComplexObject.Elements[0]", "/atomic:operations[0]/data/attributes/publicNameOfComplexObject/jsonElements[0]")]
+    [InlineData("[0].Resource.ComplexObject.Elements[0].First", "/atomic:operations[0]/data/attributes/publicNameOfComplexObject/jsonElements[0]/jsonFirst")]
+    [InlineData("[0][Resource][ComplexObject][Elements][0][First]",
+        "/atomic:operations[0]/data/attributes/publicNameOfComplexObject/jsonElements[0]/jsonFirst")]
+    [InlineData("[0].Resource.ComplexList", "/atomic:operations[0]/data/attributes/publicNameOfComplexList")]
+    [InlineData("[0].Resource.ComplexList[0].First", "/atomic:operations[0]/data/attributes/publicNameOfComplexList[0]/jsonFirst")]
+    [InlineData("[0].Resource.PrimaryChild", "/atomic:operations[0]/data/relationships/publicNameOfPrimaryChild/data")]
+    [InlineData("[0].Resource.PrimaryChild.NotMappedInChild", null)]
+    [InlineData("[0].Resource.PrimaryChild.Id", "/atomic:operations[0]/data/relationships/publicNameOfPrimaryChild/data/id")]
+    [InlineData("[0].Resource.Children[0]", "/atomic:operations[0]/data/relationships/publicNameOfChildren/data[0]")]
+    [InlineData("[0].Resource.Children[0].NotMappedInChild", null)]
+    [InlineData("[0].Resource.Children[0].Id", "/atomic:operations[0]/data/relationships/publicNameOfChildren/data[0]/id")]
+    public void Renders_JSON_path_for_ModelState_key_in_operations_request(string modelStateKey, string? expectedJsonPath)
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<Parent, int>().Add<Child, int>().Build();
 
-            [Attr(PublicName = "publicNameOfOne")]
-            public string? One { get; set; }
+        var modelState = new ModelStateDictionary();
+        modelState.AddModelError(modelStateKey, "(ignored error message)");
 
-            [Attr(PublicName = "publicNameOfComplexObject")]
-            public ComplexObject? ComplexObject { get; set; }
+        Func<Type, int, Type?> getOperationTypeCallback = (collectionType, _) => collectionType == typeof(IList<OperationContainer>) ? typeof(Parent) : null;
 
-            [Attr(PublicName = "publicNameOfComplexList")]
-            public IList<ComplexObject> ComplexList { get; set; } = null!;
+        // Act
+        var exception = new InvalidModelStateException(modelState, typeof(IList<OperationContainer>), false, resourceGraph, getOperationTypeCallback);
 
-            [HasOne(PublicName = "publicNameOfPrimaryChild")]
-            public Child? PrimaryChild { get; set; }
+        // Assert
+        exception.Errors.ShouldHaveCount(1);
 
-            [HasMany(PublicName = "publicNameOfChildren")]
-            public ISet<Child> Children { get; set; } = null!;
+        if (expectedJsonPath == null)
+        {
+            exception.Errors[0].Source.Should().BeNull();
         }
-
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class Child : Identifiable<int>
+        else
         {
-            public string? NotMappedInChild { get; set; }
+            exception.Errors[0].Source.ShouldNotBeNull().With(value => value.Pointer.Should().Be(expectedJsonPath));
+        }
+    }
+
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class Parent : Identifiable<int>
+    {
+        public string? NotMappedInParent { get; set; }
 
-            [Attr(PublicName = "publicNameOfTwo")]
-            public string? Two { get; set; }
+        [Attr(PublicName = "publicNameOfOne")]
+        public string? One { get; set; }
 
-            [HasOne(PublicName = "publicNameOfParent")]
-            public Parent? Parent { get; set; }
-        }
+        [Attr(PublicName = "publicNameOfComplexObject")]
+        public ComplexObject? ComplexObject { get; set; }
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class ComplexObject
-        {
-            [JsonPropertyName("jsonFirst")]
-            public string? First { get; set; }
+        [Attr(PublicName = "publicNameOfComplexList")]
+        public IList<ComplexObject> ComplexList { get; set; } = null!;
 
-            [JsonPropertyName("jsonParentObject")]
-            public ComplexObject? ParentObject { get; set; }
+        [HasOne(PublicName = "publicNameOfPrimaryChild")]
+        public Child? PrimaryChild { get; set; }
 
-            [JsonPropertyName("jsonElements")]
-            public IList<ComplexObject> Elements { get; set; } = null!;
-        }
+        [HasMany(PublicName = "publicNameOfChildren")]
+        public ISet<Child> Children { get; set; } = null!;
+    }
+
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class Child : Identifiable<int>
+    {
+        public string? NotMappedInChild { get; set; }
+
+        [Attr(PublicName = "publicNameOfTwo")]
+        public string? Two { get; set; }
+
+        [HasOne(PublicName = "publicNameOfParent")]
+        public Parent? Parent { get; set; }
+    }
+
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class ComplexObject
+    {
+        [JsonPropertyName("jsonFirst")]
+        public string? First { get; set; }
+
+        [JsonPropertyName("jsonParentObject")]
+        public ComplexObject? ParentObject { get; set; }
+
+        [JsonPropertyName("jsonElements")]
+        public IList<ComplexObject> Elements { get; set; } = null!;
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/BaseParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/BaseParseTests.cs
index c0929a162f..273bb6cad8 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/BaseParseTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/BaseParseTests.cs
@@ -3,39 +3,38 @@
 using JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
 using Microsoft.Extensions.Logging.Abstractions;
 
-namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters
+namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters;
+
+public abstract class BaseParseTests
 {
-    public abstract class BaseParseTests
-    {
-        protected JsonApiOptions Options { get; }
-        protected IResourceGraph ResourceGraph { get; }
-        protected JsonApiRequest Request { get; }
+    protected JsonApiOptions Options { get; }
+    protected IResourceGraph ResourceGraph { get; }
+    protected JsonApiRequest Request { get; }
 
-        protected BaseParseTests()
-        {
-            Options = new JsonApiOptions();
+    protected BaseParseTests()
+    {
+        Options = new JsonApiOptions();
 
-            // @formatter:wrap_chained_method_calls chop_always
-            // @formatter:keep_existing_linebreaks true
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
 
-            ResourceGraph = new ResourceGraphBuilder(Options, NullLoggerFactory.Instance)
-                .Add<Blog, int>()
-                .Add<BlogPost, int>()
-                .Add<Label, int>()
-                .Add<Comment, int>()
-                .Add<WebAccount, int>()
-                .Add<AccountPreferences, int>()
-                .Add<LoginAttempt, int>()
-                .Build();
+        ResourceGraph = new ResourceGraphBuilder(Options, NullLoggerFactory.Instance)
+            .Add<Blog, int>()
+            .Add<BlogPost, int>()
+            .Add<Label, int>()
+            .Add<Comment, int>()
+            .Add<WebAccount, int>()
+            .Add<AccountPreferences, int>()
+            .Add<LoginAttempt, int>()
+            .Build();
 
-            // @formatter:wrap_chained_method_calls restore
-            // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+        // @formatter:keep_existing_linebreaks restore
 
-            Request = new JsonApiRequest
-            {
-                PrimaryResourceType = ResourceGraph.GetResourceType<Blog>(),
-                IsCollection = true
-            };
-        }
+        Request = new JsonApiRequest
+        {
+            PrimaryResourceType = ResourceGraph.GetResourceType<Blog>(),
+            IsCollection = true
+        };
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs
index 4ac19a9b68..17ee7dba92 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/FilterParseTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.Design;
-using System.Linq;
 using System.Net;
 using FluentAssertions;
 using JsonApiDotNetCore.Controllers.Annotations;
@@ -15,150 +12,148 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters
+namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters;
+
+public sealed class FilterParseTests : BaseParseTests
 {
-    public sealed class FilterParseTests : BaseParseTests
+    private readonly FilterQueryStringParameterReader _reader;
+
+    public FilterParseTests()
+    {
+        Options.EnableLegacyFilterNotation = false;
+
+        var resourceFactory = new ResourceFactory(new ServiceContainer());
+        _reader = new FilterQueryStringParameterReader(Request, ResourceGraph, resourceFactory, Options);
+    }
+
+    [Theory]
+    [InlineData("filter", true)]
+    [InlineData("filter[title]", true)]
+    [InlineData("filters", false)]
+    [InlineData("filter[", false)]
+    [InlineData("filter]", false)]
+    public void Reader_Supports_Parameter_Name(string parameterName, bool expectCanParse)
     {
-        private readonly FilterQueryStringParameterReader _reader;
-
-        public FilterParseTests()
-        {
-            Options.EnableLegacyFilterNotation = false;
-
-            var resourceFactory = new ResourceFactory(new ServiceContainer());
-            _reader = new FilterQueryStringParameterReader(Request, ResourceGraph, resourceFactory, Options);
-        }
-
-        [Theory]
-        [InlineData("filter", true)]
-        [InlineData("filter[title]", true)]
-        [InlineData("filters", false)]
-        [InlineData("filter[", false)]
-        [InlineData("filter]", false)]
-        public void Reader_Supports_Parameter_Name(string parameterName, bool expectCanParse)
-        {
-            // Act
-            bool canParse = _reader.CanRead(parameterName);
-
-            // Assert
-            canParse.Should().Be(expectCanParse);
-        }
-
-        [Theory]
-        [InlineData(JsonApiQueryStringParameters.Filter, false)]
-        [InlineData(JsonApiQueryStringParameters.All, false)]
-        [InlineData(JsonApiQueryStringParameters.None, true)]
-        [InlineData(JsonApiQueryStringParameters.Page, true)]
-        public void Reader_Is_Enabled(JsonApiQueryStringParameters parametersDisabled, bool expectIsEnabled)
-        {
-            // Act
-            bool isEnabled = _reader.IsEnabled(new DisableQueryStringAttribute(parametersDisabled));
-
-            // Assert
-            isEnabled.Should().Be(expectIsEnabled);
-        }
-
-        [Theory]
-        [InlineData("filter[", "equals(caption,'some')", "Field name expected.")]
-        [InlineData("filter[caption]", "equals(url,'some')", "Relationship 'caption' does not exist on resource type 'blogs'.")]
-        [InlineData("filter[posts.caption]", "equals(firstName,'some')",
-            "Relationship 'caption' in 'posts.caption' does not exist on resource type 'blogPosts'.")]
-        [InlineData("filter[posts.author]", "equals(firstName,'some')",
-            "Relationship 'author' in 'posts.author' must be a to-many relationship on resource type 'blogPosts'.")]
-        [InlineData("filter[posts.comments.author]", "equals(firstName,'some')",
-            "Relationship 'author' in 'posts.comments.author' must be a to-many relationship on resource type 'comments'.")]
-        [InlineData("filter[posts]", "equals(author,'some')", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
-        [InlineData("filter[posts]", "lessThan(author,null)", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
-        [InlineData("filter", " ", "Unexpected whitespace.")]
-        [InlineData("filter", "contains(owner.displayName, )", "Unexpected whitespace.")]
-        [InlineData("filter", "some", "Filter function expected.")]
-        [InlineData("filter", "equals", "( expected.")]
-        [InlineData("filter", "equals'", "Unexpected ' outside text.")]
-        [InlineData("filter", "equals(", "Count function or field name expected.")]
-        [InlineData("filter", "equals('1'", "Count function or field name expected.")]
-        [InlineData("filter", "equals(count(posts),", "Count function, value between quotes, null or field name expected.")]
-        [InlineData("filter", "equals(title,')", "' expected.")]
-        [InlineData("filter", "equals(title,null", ") expected.")]
-        [InlineData("filter", "equals(null", "Field 'null' does not exist on resource type 'blogs'.")]
-        [InlineData("filter", "equals(title,(", "Count function, value between quotes, null or field name expected.")]
-        [InlineData("filter", "equals(has(posts),'true')", "Field 'has' does not exist on resource type 'blogs'.")]
-        [InlineData("filter", "has(posts,", "Filter function expected.")]
-        [InlineData("filter", "contains)", "( expected.")]
-        [InlineData("filter", "contains(title,'a','b')", ") expected.")]
-        [InlineData("filter", "contains(title,null)", "Value between quotes expected.")]
-        [InlineData("filter[posts]", "contains(author,null)", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
-        [InlineData("filter", "any(null,'a','b')", "Attribute 'null' does not exist on resource type 'blogs'.")]
-        [InlineData("filter", "any('a','b','c')", "Field name expected.")]
-        [InlineData("filter", "any(title,'b','c',)", "Value between quotes expected.")]
-        [InlineData("filter", "any(title,'b')", ", expected.")]
-        [InlineData("filter[posts]", "any(author,'a','b')", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
-        [InlineData("filter", "and(", "Filter function expected.")]
-        [InlineData("filter", "or(equals(title,'some'),equals(title,'other')", ") expected.")]
-        [InlineData("filter", "or(equals(title,'some'),equals(title,'other')))", "End of expression expected.")]
-        [InlineData("filter", "and(equals(title,'some')", ", expected.")]
-        [InlineData("filter", "and(null", "Filter function expected.")]
-        [InlineData("filter", "expr:equals(caption,'some')", "Filter function expected.")]
-        [InlineData("filter", "expr:Equals(caption,'some')", "Filter function expected.")]
-        public void Reader_Read_Fails(string parameterName, string parameterValue, string errorMessage)
-        {
-            // Act
-            Action action = () => _reader.Read(parameterName, parameterValue);
-
-            // Assert
-            InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
-
-            exception.ParameterName.Should().Be(parameterName);
-            exception.Errors.ShouldHaveCount(1);
-
-            ErrorObject error = exception.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified filter is invalid.");
-            error.Detail.Should().Be(errorMessage);
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be(parameterName);
-        }
-
-        [Theory]
-        [InlineData("filter", "equals(title,'Brian O''Quote')", null, "equals(title,'Brian O''Quote')")]
-        [InlineData("filter", "equals(title,'!@#$%^&*()-_=+\"''[]{}<>()/|\\:;.,`~')", null, "equals(title,'!@#$%^&*()-_=+\"''[]{}<>()/|\\:;.,`~')")]
-        [InlineData("filter", "equals(title,'')", null, "equals(title,'')")]
-        [InlineData("filter", "startsWith(owner.displayName,'GivenName ')", null, "startsWith(owner.displayName,'GivenName ')")]
-        [InlineData("filter", "endsWith(owner.displayName,' Surname')", null, "endsWith(owner.displayName,' Surname')")]
-        [InlineData("filter", "contains(owner.displayName,' ')", null, "contains(owner.displayName,' ')")]
-        [InlineData("filter[posts]", "equals(caption,'this, that & more')", "posts", "equals(caption,'this, that & more')")]
-        [InlineData("filter[owner.posts]", "equals(caption,'some')", "owner.posts", "equals(caption,'some')")]
-        [InlineData("filter[posts.comments]", "equals(createdAt,'2000-01-01')", "posts.comments", "equals(createdAt,'2000-01-01')")]
-        [InlineData("filter", "equals(count(posts),'1')", null, "equals(count(posts),'1')")]
-        [InlineData("filter[posts]", "equals(caption,null)", "posts", "equals(caption,null)")]
-        [InlineData("filter[posts]", "equals(author,null)", "posts", "equals(author,null)")]
-        [InlineData("filter[posts]", "equals(author.userName,author.displayName)", "posts", "equals(author.userName,author.displayName)")]
-        [InlineData("filter[posts.comments]", "lessThan(createdAt,'2000-01-01')", "posts.comments", "lessThan(createdAt,'2000-01-01')")]
-        [InlineData("filter[posts.comments]", "lessOrEqual(createdAt,'2000-01-01')", "posts.comments", "lessOrEqual(createdAt,'2000-01-01')")]
-        [InlineData("filter[posts.comments]", "greaterThan(createdAt,'2000-01-01')", "posts.comments", "greaterThan(createdAt,'2000-01-01')")]
-        [InlineData("filter[posts.comments]", "greaterOrEqual(createdAt,'2000-01-01')", "posts.comments", "greaterOrEqual(createdAt,'2000-01-01')")]
-        [InlineData("filter", "has(posts)", null, "has(posts)")]
-        [InlineData("filter", "has(posts,not(equals(url,null)))", null, "has(posts,not(equals(url,null)))")]
-        [InlineData("filter", "contains(title,'this')", null, "contains(title,'this')")]
-        [InlineData("filter", "startsWith(title,'this')", null, "startsWith(title,'this')")]
-        [InlineData("filter", "endsWith(title,'this')", null, "endsWith(title,'this')")]
-        [InlineData("filter", "any(title,'this','that','there')", null, "any(title,'that','there','this')")]
-        [InlineData("filter", "and(contains(title,'sales'),contains(title,'marketing'),contains(title,'advertising'))", null,
-            "and(contains(title,'sales'),contains(title,'marketing'),contains(title,'advertising'))")]
-        [InlineData("filter[posts]", "or(and(not(equals(author.userName,null)),not(equals(author.displayName,null))),not(has(comments,startsWith(text,'A'))))",
-            "posts", "or(and(not(equals(author.userName,null)),not(equals(author.displayName,null))),not(has(comments,startsWith(text,'A'))))")]
-        public void Reader_Read_Succeeds(string parameterName, string parameterValue, string scopeExpected, string valueExpected)
-        {
-            // Act
-            _reader.Read(parameterName, parameterValue);
-
-            IReadOnlyCollection<ExpressionInScope> constraints = _reader.GetConstraints();
-
-            // Assert
-            ResourceFieldChainExpression? scope = constraints.Select(expressionInScope => expressionInScope.Scope).Single();
-            scope?.ToString().Should().Be(scopeExpected);
-
-            QueryExpression value = constraints.Select(expressionInScope => expressionInScope.Expression).Single();
-            value.ToString().Should().Be(valueExpected);
-        }
+        // Act
+        bool canParse = _reader.CanRead(parameterName);
+
+        // Assert
+        canParse.Should().Be(expectCanParse);
+    }
+
+    [Theory]
+    [InlineData(JsonApiQueryStringParameters.Filter, false)]
+    [InlineData(JsonApiQueryStringParameters.All, false)]
+    [InlineData(JsonApiQueryStringParameters.None, true)]
+    [InlineData(JsonApiQueryStringParameters.Page, true)]
+    public void Reader_Is_Enabled(JsonApiQueryStringParameters parametersDisabled, bool expectIsEnabled)
+    {
+        // Act
+        bool isEnabled = _reader.IsEnabled(new DisableQueryStringAttribute(parametersDisabled));
+
+        // Assert
+        isEnabled.Should().Be(expectIsEnabled);
+    }
+
+    [Theory]
+    [InlineData("filter[", "equals(caption,'some')", "Field name expected.")]
+    [InlineData("filter[caption]", "equals(url,'some')", "Relationship 'caption' does not exist on resource type 'blogs'.")]
+    [InlineData("filter[posts.caption]", "equals(firstName,'some')", "Relationship 'caption' in 'posts.caption' does not exist on resource type 'blogPosts'.")]
+    [InlineData("filter[posts.author]", "equals(firstName,'some')",
+        "Relationship 'author' in 'posts.author' must be a to-many relationship on resource type 'blogPosts'.")]
+    [InlineData("filter[posts.comments.author]", "equals(firstName,'some')",
+        "Relationship 'author' in 'posts.comments.author' must be a to-many relationship on resource type 'comments'.")]
+    [InlineData("filter[posts]", "equals(author,'some')", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
+    [InlineData("filter[posts]", "lessThan(author,null)", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
+    [InlineData("filter", " ", "Unexpected whitespace.")]
+    [InlineData("filter", "contains(owner.displayName, )", "Unexpected whitespace.")]
+    [InlineData("filter", "some", "Filter function expected.")]
+    [InlineData("filter", "equals", "( expected.")]
+    [InlineData("filter", "equals'", "Unexpected ' outside text.")]
+    [InlineData("filter", "equals(", "Count function or field name expected.")]
+    [InlineData("filter", "equals('1'", "Count function or field name expected.")]
+    [InlineData("filter", "equals(count(posts),", "Count function, value between quotes, null or field name expected.")]
+    [InlineData("filter", "equals(title,')", "' expected.")]
+    [InlineData("filter", "equals(title,null", ") expected.")]
+    [InlineData("filter", "equals(null", "Field 'null' does not exist on resource type 'blogs'.")]
+    [InlineData("filter", "equals(title,(", "Count function, value between quotes, null or field name expected.")]
+    [InlineData("filter", "equals(has(posts),'true')", "Field 'has' does not exist on resource type 'blogs'.")]
+    [InlineData("filter", "has(posts,", "Filter function expected.")]
+    [InlineData("filter", "contains)", "( expected.")]
+    [InlineData("filter", "contains(title,'a','b')", ") expected.")]
+    [InlineData("filter", "contains(title,null)", "Value between quotes expected.")]
+    [InlineData("filter[posts]", "contains(author,null)", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
+    [InlineData("filter", "any(null,'a','b')", "Attribute 'null' does not exist on resource type 'blogs'.")]
+    [InlineData("filter", "any('a','b','c')", "Field name expected.")]
+    [InlineData("filter", "any(title,'b','c',)", "Value between quotes expected.")]
+    [InlineData("filter", "any(title,'b')", ", expected.")]
+    [InlineData("filter[posts]", "any(author,'a','b')", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
+    [InlineData("filter", "and(", "Filter function expected.")]
+    [InlineData("filter", "or(equals(title,'some'),equals(title,'other')", ") expected.")]
+    [InlineData("filter", "or(equals(title,'some'),equals(title,'other')))", "End of expression expected.")]
+    [InlineData("filter", "and(equals(title,'some')", ", expected.")]
+    [InlineData("filter", "and(null", "Filter function expected.")]
+    [InlineData("filter", "expr:equals(caption,'some')", "Filter function expected.")]
+    [InlineData("filter", "expr:Equals(caption,'some')", "Filter function expected.")]
+    public void Reader_Read_Fails(string parameterName, string parameterValue, string errorMessage)
+    {
+        // Act
+        Action action = () => _reader.Read(parameterName, parameterValue);
+
+        // Assert
+        InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
+
+        exception.ParameterName.Should().Be(parameterName);
+        exception.Errors.ShouldHaveCount(1);
+
+        ErrorObject error = exception.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified filter is invalid.");
+        error.Detail.Should().Be(errorMessage);
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be(parameterName);
+    }
+
+    [Theory]
+    [InlineData("filter", "equals(title,'Brian O''Quote')", null, "equals(title,'Brian O''Quote')")]
+    [InlineData("filter", "equals(title,'!@#$%^&*()-_=+\"''[]{}<>()/|\\:;.,`~')", null, "equals(title,'!@#$%^&*()-_=+\"''[]{}<>()/|\\:;.,`~')")]
+    [InlineData("filter", "equals(title,'')", null, "equals(title,'')")]
+    [InlineData("filter", "startsWith(owner.displayName,'GivenName ')", null, "startsWith(owner.displayName,'GivenName ')")]
+    [InlineData("filter", "endsWith(owner.displayName,' Surname')", null, "endsWith(owner.displayName,' Surname')")]
+    [InlineData("filter", "contains(owner.displayName,' ')", null, "contains(owner.displayName,' ')")]
+    [InlineData("filter[posts]", "equals(caption,'this, that & more')", "posts", "equals(caption,'this, that & more')")]
+    [InlineData("filter[owner.posts]", "equals(caption,'some')", "owner.posts", "equals(caption,'some')")]
+    [InlineData("filter[posts.comments]", "equals(createdAt,'2000-01-01')", "posts.comments", "equals(createdAt,'2000-01-01')")]
+    [InlineData("filter", "equals(count(posts),'1')", null, "equals(count(posts),'1')")]
+    [InlineData("filter[posts]", "equals(caption,null)", "posts", "equals(caption,null)")]
+    [InlineData("filter[posts]", "equals(author,null)", "posts", "equals(author,null)")]
+    [InlineData("filter[posts]", "equals(author.userName,author.displayName)", "posts", "equals(author.userName,author.displayName)")]
+    [InlineData("filter[posts.comments]", "lessThan(createdAt,'2000-01-01')", "posts.comments", "lessThan(createdAt,'2000-01-01')")]
+    [InlineData("filter[posts.comments]", "lessOrEqual(createdAt,'2000-01-01')", "posts.comments", "lessOrEqual(createdAt,'2000-01-01')")]
+    [InlineData("filter[posts.comments]", "greaterThan(createdAt,'2000-01-01')", "posts.comments", "greaterThan(createdAt,'2000-01-01')")]
+    [InlineData("filter[posts.comments]", "greaterOrEqual(createdAt,'2000-01-01')", "posts.comments", "greaterOrEqual(createdAt,'2000-01-01')")]
+    [InlineData("filter", "has(posts)", null, "has(posts)")]
+    [InlineData("filter", "has(posts,not(equals(url,null)))", null, "has(posts,not(equals(url,null)))")]
+    [InlineData("filter", "contains(title,'this')", null, "contains(title,'this')")]
+    [InlineData("filter", "startsWith(title,'this')", null, "startsWith(title,'this')")]
+    [InlineData("filter", "endsWith(title,'this')", null, "endsWith(title,'this')")]
+    [InlineData("filter", "any(title,'this','that','there')", null, "any(title,'that','there','this')")]
+    [InlineData("filter", "and(contains(title,'sales'),contains(title,'marketing'),contains(title,'advertising'))", null,
+        "and(contains(title,'sales'),contains(title,'marketing'),contains(title,'advertising'))")]
+    [InlineData("filter[posts]", "or(and(not(equals(author.userName,null)),not(equals(author.displayName,null))),not(has(comments,startsWith(text,'A'))))",
+        "posts", "or(and(not(equals(author.userName,null)),not(equals(author.displayName,null))),not(has(comments,startsWith(text,'A'))))")]
+    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string scopeExpected, string valueExpected)
+    {
+        // Act
+        _reader.Read(parameterName, parameterValue);
+
+        IReadOnlyCollection<ExpressionInScope> constraints = _reader.GetConstraints();
+
+        // Assert
+        ResourceFieldChainExpression? scope = constraints.Select(expressionInScope => expressionInScope.Scope).Single();
+        scope?.ToString().Should().Be(scopeExpected);
+
+        QueryExpression value = constraints.Select(expressionInScope => expressionInScope.Expression).Single();
+        value.ToString().Should().Be(valueExpected);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs
index 1873e60e30..193600ad17 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/IncludeParseTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
@@ -14,93 +11,92 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters
+namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters;
+
+public sealed class IncludeParseTests : BaseParseTests
 {
-    public sealed class IncludeParseTests : BaseParseTests
-    {
-        private readonly IncludeQueryStringParameterReader _reader;
+    private readonly IncludeQueryStringParameterReader _reader;
 
-        public IncludeParseTests()
-        {
-            _reader = new IncludeQueryStringParameterReader(Request, ResourceGraph, new JsonApiOptions());
-        }
+    public IncludeParseTests()
+    {
+        _reader = new IncludeQueryStringParameterReader(Request, ResourceGraph, new JsonApiOptions());
+    }
 
-        [Theory]
-        [InlineData("include", true)]
-        [InlineData("include[some]", false)]
-        [InlineData("includes", false)]
-        public void Reader_Supports_Parameter_Name(string parameterName, bool expectCanParse)
-        {
-            // Act
-            bool canParse = _reader.CanRead(parameterName);
+    [Theory]
+    [InlineData("include", true)]
+    [InlineData("include[some]", false)]
+    [InlineData("includes", false)]
+    public void Reader_Supports_Parameter_Name(string parameterName, bool expectCanParse)
+    {
+        // Act
+        bool canParse = _reader.CanRead(parameterName);
 
-            // Assert
-            canParse.Should().Be(expectCanParse);
-        }
+        // Assert
+        canParse.Should().Be(expectCanParse);
+    }
 
-        [Theory]
-        [InlineData(JsonApiQueryStringParameters.Include, false)]
-        [InlineData(JsonApiQueryStringParameters.All, false)]
-        [InlineData(JsonApiQueryStringParameters.None, true)]
-        [InlineData(JsonApiQueryStringParameters.Filter, true)]
-        public void Reader_Is_Enabled(JsonApiQueryStringParameters parametersDisabled, bool expectIsEnabled)
-        {
-            // Act
-            bool isEnabled = _reader.IsEnabled(new DisableQueryStringAttribute(parametersDisabled));
+    [Theory]
+    [InlineData(JsonApiQueryStringParameters.Include, false)]
+    [InlineData(JsonApiQueryStringParameters.All, false)]
+    [InlineData(JsonApiQueryStringParameters.None, true)]
+    [InlineData(JsonApiQueryStringParameters.Filter, true)]
+    public void Reader_Is_Enabled(JsonApiQueryStringParameters parametersDisabled, bool expectIsEnabled)
+    {
+        // Act
+        bool isEnabled = _reader.IsEnabled(new DisableQueryStringAttribute(parametersDisabled));
 
-            // Assert
-            isEnabled.Should().Be(expectIsEnabled);
-        }
+        // Assert
+        isEnabled.Should().Be(expectIsEnabled);
+    }
 
-        [Theory]
-        [InlineData("includes", "", "Relationship name expected.")]
-        [InlineData("includes", " ", "Unexpected whitespace.")]
-        [InlineData("includes", ",", "Relationship name expected.")]
-        [InlineData("includes", "posts,", "Relationship name expected.")]
-        [InlineData("includes", "posts[", ", expected.")]
-        [InlineData("includes", "title", "Relationship 'title' does not exist on resource type 'blogs'.")]
-        [InlineData("includes", "posts.comments.publishTime,",
-            "Relationship 'publishTime' in 'posts.comments.publishTime' does not exist on resource type 'comments'.")]
-        public void Reader_Read_Fails(string parameterName, string parameterValue, string errorMessage)
-        {
-            // Act
-            Action action = () => _reader.Read(parameterName, parameterValue);
+    [Theory]
+    [InlineData("includes", "", "Relationship name expected.")]
+    [InlineData("includes", " ", "Unexpected whitespace.")]
+    [InlineData("includes", ",", "Relationship name expected.")]
+    [InlineData("includes", "posts,", "Relationship name expected.")]
+    [InlineData("includes", "posts[", ", expected.")]
+    [InlineData("includes", "title", "Relationship 'title' does not exist on resource type 'blogs'.")]
+    [InlineData("includes", "posts.comments.publishTime,",
+        "Relationship 'publishTime' in 'posts.comments.publishTime' does not exist on resource type 'comments'.")]
+    public void Reader_Read_Fails(string parameterName, string parameterValue, string errorMessage)
+    {
+        // Act
+        Action action = () => _reader.Read(parameterName, parameterValue);
 
-            // Assert
-            InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
+        // Assert
+        InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
 
-            exception.ParameterName.Should().Be(parameterName);
-            exception.Errors.ShouldHaveCount(1);
+        exception.ParameterName.Should().Be(parameterName);
+        exception.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = exception.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified include is invalid.");
-            error.Detail.Should().Be(errorMessage);
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be(parameterName);
-        }
+        ErrorObject error = exception.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified include is invalid.");
+        error.Detail.Should().Be(errorMessage);
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be(parameterName);
+    }
 
-        [Theory]
-        [InlineData("includes", "owner", "owner")]
-        [InlineData("includes", "posts", "posts")]
-        [InlineData("includes", "owner.posts", "owner.posts")]
-        [InlineData("includes", "posts.author", "posts.author")]
-        [InlineData("includes", "posts.comments", "posts.comments")]
-        [InlineData("includes", "posts,posts.comments", "posts.comments")]
-        [InlineData("includes", "posts,posts.labels,posts.comments", "posts.comments,posts.labels")]
-        public void Reader_Read_Succeeds(string parameterName, string parameterValue, string valueExpected)
-        {
-            // Act
-            _reader.Read(parameterName, parameterValue);
+    [Theory]
+    [InlineData("includes", "owner", "owner")]
+    [InlineData("includes", "posts", "posts")]
+    [InlineData("includes", "owner.posts", "owner.posts")]
+    [InlineData("includes", "posts.author", "posts.author")]
+    [InlineData("includes", "posts.comments", "posts.comments")]
+    [InlineData("includes", "posts,posts.comments", "posts.comments")]
+    [InlineData("includes", "posts,posts.labels,posts.comments", "posts.comments,posts.labels")]
+    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string valueExpected)
+    {
+        // Act
+        _reader.Read(parameterName, parameterValue);
 
-            IReadOnlyCollection<ExpressionInScope> constraints = _reader.GetConstraints();
+        IReadOnlyCollection<ExpressionInScope> constraints = _reader.GetConstraints();
 
-            // Assert
-            ResourceFieldChainExpression? scope = constraints.Select(expressionInScope => expressionInScope.Scope).Single();
-            scope.Should().BeNull();
+        // Assert
+        ResourceFieldChainExpression? scope = constraints.Select(expressionInScope => expressionInScope.Scope).Single();
+        scope.Should().BeNull();
 
-            QueryExpression value = constraints.Select(expressionInScope => expressionInScope.Expression).Single();
-            value.ToString().Should().Be(valueExpected);
-        }
+        QueryExpression value = constraints.Select(expressionInScope => expressionInScope.Expression).Single();
+        value.ToString().Should().Be(valueExpected);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/LegacyFilterParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/LegacyFilterParseTests.cs
index 67060a7349..f09ec08e11 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/LegacyFilterParseTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/LegacyFilterParseTests.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.Design;
-using System.Linq;
 using System.Net;
 using FluentAssertions;
 using JsonApiDotNetCore.Errors;
@@ -14,94 +11,93 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters
+namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters;
+
+public sealed class LegacyFilterParseTests : BaseParseTests
 {
-    public sealed class LegacyFilterParseTests : BaseParseTests
-    {
-        private readonly FilterQueryStringParameterReader _reader;
+    private readonly FilterQueryStringParameterReader _reader;
 
-        public LegacyFilterParseTests()
-        {
-            Options.EnableLegacyFilterNotation = true;
+    public LegacyFilterParseTests()
+    {
+        Options.EnableLegacyFilterNotation = true;
 
-            Request.PrimaryResourceType = ResourceGraph.GetResourceType<BlogPost>();
+        Request.PrimaryResourceType = ResourceGraph.GetResourceType<BlogPost>();
 
-            var resourceFactory = new ResourceFactory(new ServiceContainer());
-            _reader = new FilterQueryStringParameterReader(Request, ResourceGraph, resourceFactory, Options);
-        }
+        var resourceFactory = new ResourceFactory(new ServiceContainer());
+        _reader = new FilterQueryStringParameterReader(Request, ResourceGraph, resourceFactory, Options);
+    }
 
-        [Theory]
-        [InlineData("filter", "some", "Expected field name between brackets in filter parameter name.")]
-        [InlineData("filter[", "some", "Expected field name between brackets in filter parameter name.")]
-        [InlineData("filter[]", "some", "Expected field name between brackets in filter parameter name.")]
-        [InlineData("filter[.]", "some", "Relationship '' in '.' does not exist on resource type 'blogPosts'.")]
-        [InlineData("filter[some]", "other", "Field 'some' does not exist on resource type 'blogPosts'.")]
-        [InlineData("filter[author]", "some", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
-        [InlineData("filter[author.posts]", "some",
-            "Field 'posts' in 'author.posts' must be an attribute or a to-one relationship on resource type 'webAccounts'.")]
-        [InlineData("filter[unknown.id]", "some", "Relationship 'unknown' in 'unknown.id' does not exist on resource type 'blogPosts'.")]
-        [InlineData("filter", "expr:equals(some,'other')", "Field 'some' does not exist on resource type 'blogPosts'.")]
-        [InlineData("filter", "expr:equals(author,'Joe')", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
-        [InlineData("filter", "expr:has(author)", "Relationship 'author' must be a to-many relationship on resource type 'blogPosts'.")]
-        [InlineData("filter", "expr:equals(count(author),'1')", "Relationship 'author' must be a to-many relationship on resource type 'blogPosts'.")]
-        public void Reader_Read_Fails(string parameterName, string parameterValue, string errorMessage)
-        {
-            // Act
-            Action action = () => _reader.Read(parameterName, parameterValue);
+    [Theory]
+    [InlineData("filter", "some", "Expected field name between brackets in filter parameter name.")]
+    [InlineData("filter[", "some", "Expected field name between brackets in filter parameter name.")]
+    [InlineData("filter[]", "some", "Expected field name between brackets in filter parameter name.")]
+    [InlineData("filter[.]", "some", "Relationship '' in '.' does not exist on resource type 'blogPosts'.")]
+    [InlineData("filter[some]", "other", "Field 'some' does not exist on resource type 'blogPosts'.")]
+    [InlineData("filter[author]", "some", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
+    [InlineData("filter[author.posts]", "some",
+        "Field 'posts' in 'author.posts' must be an attribute or a to-one relationship on resource type 'webAccounts'.")]
+    [InlineData("filter[unknown.id]", "some", "Relationship 'unknown' in 'unknown.id' does not exist on resource type 'blogPosts'.")]
+    [InlineData("filter", "expr:equals(some,'other')", "Field 'some' does not exist on resource type 'blogPosts'.")]
+    [InlineData("filter", "expr:equals(author,'Joe')", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
+    [InlineData("filter", "expr:has(author)", "Relationship 'author' must be a to-many relationship on resource type 'blogPosts'.")]
+    [InlineData("filter", "expr:equals(count(author),'1')", "Relationship 'author' must be a to-many relationship on resource type 'blogPosts'.")]
+    public void Reader_Read_Fails(string parameterName, string parameterValue, string errorMessage)
+    {
+        // Act
+        Action action = () => _reader.Read(parameterName, parameterValue);
 
-            // Assert
-            InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
+        // Assert
+        InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
 
-            exception.ParameterName.Should().Be(parameterName);
-            exception.Errors.ShouldHaveCount(1);
+        exception.ParameterName.Should().Be(parameterName);
+        exception.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = exception.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified filter is invalid.");
-            error.Detail.Should().Be(errorMessage);
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be(parameterName);
-        }
+        ErrorObject error = exception.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified filter is invalid.");
+        error.Detail.Should().Be(errorMessage);
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be(parameterName);
+    }
 
-        [Theory]
-        [InlineData("filter[caption]", "Brian O'Quote", "equals(caption,'Brian O''Quote')")]
-        [InlineData("filter[caption]", "am&per-sand", "equals(caption,'am&per-sand')")]
-        [InlineData("filter[caption]", "2017-08-15T22:43:47.0156350-05:00", "equals(caption,'2017-08-15T22:43:47.0156350-05:00')")]
-        [InlineData("filter[caption]", "eq:1", "equals(caption,'1')")]
-        [InlineData("filter[caption]", "lt:2", "lessThan(caption,'2')")]
-        [InlineData("filter[caption]", "gt:3", "greaterThan(caption,'3')")]
-        [InlineData("filter[caption]", "le:4", "lessOrEqual(caption,'4')")]
-        [InlineData("filter[caption]", "le:2017-08-15T22:43:47.0156350-05:00", "lessOrEqual(caption,'2017-08-15T22:43:47.0156350-05:00')")]
-        [InlineData("filter[caption]", "ge:5", "greaterOrEqual(caption,'5')")]
-        [InlineData("filter[caption]", "like:that", "contains(caption,'that')")]
-        [InlineData("filter[caption]", "ne:1", "not(equals(caption,'1'))")]
-        [InlineData("filter[caption]", "in:first,second", "any(caption,'first','second')")]
-        [InlineData("filter[caption]", "nin:first,last", "not(any(caption,'first','last'))")]
-        [InlineData("filter[caption]", "isnull:", "equals(caption,null)")]
-        [InlineData("filter[caption]", "isnotnull:", "not(equals(caption,null))")]
-        [InlineData("filter[caption]", "unknown:some", "equals(caption,'unknown:some')")]
-        [InlineData("filter[caption]", " ", "equals(caption,' ')")]
-        [InlineData("filter[author.userName]", "Jack", "equals(author.userName,'Jack')")]
-        [InlineData("filter", "expr:equals(caption,'some')", "equals(caption,'some')")]
-        [InlineData("filter", "expr:equals(author,null)", "equals(author,null)")]
-        [InlineData("filter", "expr:has(author.posts)", "has(author.posts)")]
-        [InlineData("filter", "expr:equals(count(author.posts),'1')", "equals(count(author.posts),'1')")]
-        [InlineData("filter[caption]", "using,comma", "or(equals(caption,'using'),equals(caption,'comma'))")]
-        [InlineData("filter[caption]", "like:First,Second", "or(contains(caption,'First'),equals(caption,'Second'))")]
-        [InlineData("filter[caption]", "like:First,like:Second", "or(contains(caption,'First'),contains(caption,'Second'))")]
-        public void Reader_Read_Succeeds(string parameterName, string parameterValue, string expressionExpected)
-        {
-            // Act
-            _reader.Read(parameterName, parameterValue);
+    [Theory]
+    [InlineData("filter[caption]", "Brian O'Quote", "equals(caption,'Brian O''Quote')")]
+    [InlineData("filter[caption]", "am&per-sand", "equals(caption,'am&per-sand')")]
+    [InlineData("filter[caption]", "2017-08-15T22:43:47.0156350-05:00", "equals(caption,'2017-08-15T22:43:47.0156350-05:00')")]
+    [InlineData("filter[caption]", "eq:1", "equals(caption,'1')")]
+    [InlineData("filter[caption]", "lt:2", "lessThan(caption,'2')")]
+    [InlineData("filter[caption]", "gt:3", "greaterThan(caption,'3')")]
+    [InlineData("filter[caption]", "le:4", "lessOrEqual(caption,'4')")]
+    [InlineData("filter[caption]", "le:2017-08-15T22:43:47.0156350-05:00", "lessOrEqual(caption,'2017-08-15T22:43:47.0156350-05:00')")]
+    [InlineData("filter[caption]", "ge:5", "greaterOrEqual(caption,'5')")]
+    [InlineData("filter[caption]", "like:that", "contains(caption,'that')")]
+    [InlineData("filter[caption]", "ne:1", "not(equals(caption,'1'))")]
+    [InlineData("filter[caption]", "in:first,second", "any(caption,'first','second')")]
+    [InlineData("filter[caption]", "nin:first,last", "not(any(caption,'first','last'))")]
+    [InlineData("filter[caption]", "isnull:", "equals(caption,null)")]
+    [InlineData("filter[caption]", "isnotnull:", "not(equals(caption,null))")]
+    [InlineData("filter[caption]", "unknown:some", "equals(caption,'unknown:some')")]
+    [InlineData("filter[caption]", " ", "equals(caption,' ')")]
+    [InlineData("filter[author.userName]", "Jack", "equals(author.userName,'Jack')")]
+    [InlineData("filter", "expr:equals(caption,'some')", "equals(caption,'some')")]
+    [InlineData("filter", "expr:equals(author,null)", "equals(author,null)")]
+    [InlineData("filter", "expr:has(author.posts)", "has(author.posts)")]
+    [InlineData("filter", "expr:equals(count(author.posts),'1')", "equals(count(author.posts),'1')")]
+    [InlineData("filter[caption]", "using,comma", "or(equals(caption,'using'),equals(caption,'comma'))")]
+    [InlineData("filter[caption]", "like:First,Second", "or(contains(caption,'First'),equals(caption,'Second'))")]
+    [InlineData("filter[caption]", "like:First,like:Second", "or(contains(caption,'First'),contains(caption,'Second'))")]
+    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string expressionExpected)
+    {
+        // Act
+        _reader.Read(parameterName, parameterValue);
 
-            IReadOnlyCollection<ExpressionInScope> constraints = _reader.GetConstraints();
+        IReadOnlyCollection<ExpressionInScope> constraints = _reader.GetConstraints();
 
-            // Assert
-            ResourceFieldChainExpression? scope = constraints.Select(expressionInScope => expressionInScope.Scope).Single();
-            scope.Should().BeNull();
+        // Assert
+        ResourceFieldChainExpression? scope = constraints.Select(expressionInScope => expressionInScope.Scope).Single();
+        scope.Should().BeNull();
 
-            QueryExpression value = constraints.Select(expressionInScope => expressionInScope.Expression).Single();
-            value.ToString().Should().Be(expressionExpected);
-        }
+        QueryExpression value = constraints.Select(expressionInScope => expressionInScope.Expression).Single();
+        value.ToString().Should().Be(expressionExpected);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/PaginationParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/PaginationParseTests.cs
index 4555a27eb7..5dc6e3ab75 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/PaginationParseTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/PaginationParseTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
@@ -14,157 +11,156 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters
+namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters;
+
+public sealed class PaginationParseTests : BaseParseTests
 {
-    public sealed class PaginationParseTests : BaseParseTests
+    private readonly IPaginationQueryStringParameterReader _reader;
+
+    public PaginationParseTests()
     {
-        private readonly IPaginationQueryStringParameterReader _reader;
+        Options.DefaultPageSize = new PageSize(25);
+        _reader = new PaginationQueryStringParameterReader(Request, ResourceGraph, Options);
+    }
 
-        public PaginationParseTests()
-        {
-            Options.DefaultPageSize = new PageSize(25);
-            _reader = new PaginationQueryStringParameterReader(Request, ResourceGraph, Options);
-        }
+    [Theory]
+    [InlineData("page[size]", true)]
+    [InlineData("page[number]", true)]
+    [InlineData("page", false)]
+    [InlineData("page[", false)]
+    [InlineData("page[some]", false)]
+    public void Reader_Supports_Parameter_Name(string parameterName, bool expectCanParse)
+    {
+        // Act
+        bool canParse = _reader.CanRead(parameterName);
 
-        [Theory]
-        [InlineData("page[size]", true)]
-        [InlineData("page[number]", true)]
-        [InlineData("page", false)]
-        [InlineData("page[", false)]
-        [InlineData("page[some]", false)]
-        public void Reader_Supports_Parameter_Name(string parameterName, bool expectCanParse)
-        {
-            // Act
-            bool canParse = _reader.CanRead(parameterName);
+        // Assert
+        canParse.Should().Be(expectCanParse);
+    }
 
-            // Assert
-            canParse.Should().Be(expectCanParse);
-        }
+    [Theory]
+    [InlineData(JsonApiQueryStringParameters.Page, false)]
+    [InlineData(JsonApiQueryStringParameters.All, false)]
+    [InlineData(JsonApiQueryStringParameters.None, true)]
+    [InlineData(JsonApiQueryStringParameters.Sort, true)]
+    public void Reader_Is_Enabled(JsonApiQueryStringParameters parametersDisabled, bool expectIsEnabled)
+    {
+        // Act
+        bool isEnabled = _reader.IsEnabled(new DisableQueryStringAttribute(parametersDisabled));
 
-        [Theory]
-        [InlineData(JsonApiQueryStringParameters.Page, false)]
-        [InlineData(JsonApiQueryStringParameters.All, false)]
-        [InlineData(JsonApiQueryStringParameters.None, true)]
-        [InlineData(JsonApiQueryStringParameters.Sort, true)]
-        public void Reader_Is_Enabled(JsonApiQueryStringParameters parametersDisabled, bool expectIsEnabled)
-        {
-            // Act
-            bool isEnabled = _reader.IsEnabled(new DisableQueryStringAttribute(parametersDisabled));
+        // Assert
+        isEnabled.Should().Be(expectIsEnabled);
+    }
 
-            // Assert
-            isEnabled.Should().Be(expectIsEnabled);
-        }
+    [Theory]
+    [InlineData("", "Number or relationship name expected.")]
+    [InlineData("1,", "Number or relationship name expected.")]
+    [InlineData("(", "Number or relationship name expected.")]
+    [InlineData(" ", "Unexpected whitespace.")]
+    [InlineData("-", "Digits expected.")]
+    [InlineData("-1", "Page number cannot be negative or zero.")]
+    [InlineData("posts", ": expected.")]
+    [InlineData("posts:", "Number expected.")]
+    [InlineData("posts:abc", "Number expected.")]
+    [InlineData("1(", ", expected.")]
+    [InlineData("posts:-abc", "Digits expected.")]
+    [InlineData("posts:-1", "Page number cannot be negative or zero.")]
+    [InlineData("posts.id", "Relationship 'id' in 'posts.id' does not exist on resource type 'blogPosts'.")]
+    [InlineData("posts.comments.id", "Relationship 'id' in 'posts.comments.id' does not exist on resource type 'comments'.")]
+    [InlineData("posts.author", "Relationship 'author' in 'posts.author' must be a to-many relationship on resource type 'blogPosts'.")]
+    [InlineData("something", "Relationship 'something' does not exist on resource type 'blogs'.")]
+    public void Reader_Read_Page_Number_Fails(string parameterValue, string errorMessage)
+    {
+        // Act
+        Action action = () => _reader.Read("page[number]", parameterValue);
 
-        [Theory]
-        [InlineData("", "Number or relationship name expected.")]
-        [InlineData("1,", "Number or relationship name expected.")]
-        [InlineData("(", "Number or relationship name expected.")]
-        [InlineData(" ", "Unexpected whitespace.")]
-        [InlineData("-", "Digits expected.")]
-        [InlineData("-1", "Page number cannot be negative or zero.")]
-        [InlineData("posts", ": expected.")]
-        [InlineData("posts:", "Number expected.")]
-        [InlineData("posts:abc", "Number expected.")]
-        [InlineData("1(", ", expected.")]
-        [InlineData("posts:-abc", "Digits expected.")]
-        [InlineData("posts:-1", "Page number cannot be negative or zero.")]
-        [InlineData("posts.id", "Relationship 'id' in 'posts.id' does not exist on resource type 'blogPosts'.")]
-        [InlineData("posts.comments.id", "Relationship 'id' in 'posts.comments.id' does not exist on resource type 'comments'.")]
-        [InlineData("posts.author", "Relationship 'author' in 'posts.author' must be a to-many relationship on resource type 'blogPosts'.")]
-        [InlineData("something", "Relationship 'something' does not exist on resource type 'blogs'.")]
-        public void Reader_Read_Page_Number_Fails(string parameterValue, string errorMessage)
-        {
-            // Act
-            Action action = () => _reader.Read("page[number]", parameterValue);
+        // Assert
+        InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
 
-            // Assert
-            InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
+        exception.ParameterName.Should().Be("page[number]");
+        exception.Errors.ShouldHaveCount(1);
 
-            exception.ParameterName.Should().Be("page[number]");
-            exception.Errors.ShouldHaveCount(1);
+        ErrorObject error = exception.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified paging is invalid.");
+        error.Detail.Should().Be(errorMessage);
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[number]");
+    }
 
-            ErrorObject error = exception.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified paging is invalid.");
-            error.Detail.Should().Be(errorMessage);
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[number]");
-        }
+    [Theory]
+    [InlineData("", "Number or relationship name expected.")]
+    [InlineData("1,", "Number or relationship name expected.")]
+    [InlineData("(", "Number or relationship name expected.")]
+    [InlineData(" ", "Unexpected whitespace.")]
+    [InlineData("-", "Digits expected.")]
+    [InlineData("-1", "Page size cannot be negative.")]
+    [InlineData("posts", ": expected.")]
+    [InlineData("posts:", "Number expected.")]
+    [InlineData("posts:abc", "Number expected.")]
+    [InlineData("1(", ", expected.")]
+    [InlineData("posts:-abc", "Digits expected.")]
+    [InlineData("posts:-1", "Page size cannot be negative.")]
+    [InlineData("posts.id", "Relationship 'id' in 'posts.id' does not exist on resource type 'blogPosts'.")]
+    [InlineData("posts.comments.id", "Relationship 'id' in 'posts.comments.id' does not exist on resource type 'comments'.")]
+    [InlineData("posts.author", "Relationship 'author' in 'posts.author' must be a to-many relationship on resource type 'blogPosts'.")]
+    [InlineData("something", "Relationship 'something' does not exist on resource type 'blogs'.")]
+    public void Reader_Read_Page_Size_Fails(string parameterValue, string errorMessage)
+    {
+        // Act
+        Action action = () => _reader.Read("page[size]", parameterValue);
 
-        [Theory]
-        [InlineData("", "Number or relationship name expected.")]
-        [InlineData("1,", "Number or relationship name expected.")]
-        [InlineData("(", "Number or relationship name expected.")]
-        [InlineData(" ", "Unexpected whitespace.")]
-        [InlineData("-", "Digits expected.")]
-        [InlineData("-1", "Page size cannot be negative.")]
-        [InlineData("posts", ": expected.")]
-        [InlineData("posts:", "Number expected.")]
-        [InlineData("posts:abc", "Number expected.")]
-        [InlineData("1(", ", expected.")]
-        [InlineData("posts:-abc", "Digits expected.")]
-        [InlineData("posts:-1", "Page size cannot be negative.")]
-        [InlineData("posts.id", "Relationship 'id' in 'posts.id' does not exist on resource type 'blogPosts'.")]
-        [InlineData("posts.comments.id", "Relationship 'id' in 'posts.comments.id' does not exist on resource type 'comments'.")]
-        [InlineData("posts.author", "Relationship 'author' in 'posts.author' must be a to-many relationship on resource type 'blogPosts'.")]
-        [InlineData("something", "Relationship 'something' does not exist on resource type 'blogs'.")]
-        public void Reader_Read_Page_Size_Fails(string parameterValue, string errorMessage)
-        {
-            // Act
-            Action action = () => _reader.Read("page[size]", parameterValue);
+        // Assert
+        InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
 
-            // Assert
-            InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
+        exception.ParameterName.Should().Be("page[size]");
+        exception.Errors.ShouldHaveCount(1);
 
-            exception.ParameterName.Should().Be("page[size]");
-            exception.Errors.ShouldHaveCount(1);
+        ErrorObject error = exception.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified paging is invalid.");
+        error.Detail.Should().Be(errorMessage);
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be("page[size]");
+    }
 
-            ErrorObject error = exception.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified paging is invalid.");
-            error.Detail.Should().Be(errorMessage);
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be("page[size]");
+    [Theory]
+    [InlineData(null, "5", "", "Page number: 1, size: 5")]
+    [InlineData("2", null, "", "Page number: 2, size: 25")]
+    [InlineData("2", "5", "", "Page number: 2, size: 5")]
+    [InlineData("posts:4", "posts:2", "|posts", "Page number: 1, size: 25|Page number: 4, size: 2")]
+    [InlineData("posts:4", "5", "|posts", "Page number: 1, size: 5|Page number: 4, size: 25")]
+    [InlineData("4", "posts:5", "|posts", "Page number: 4, size: 25|Page number: 1, size: 5")]
+    [InlineData("3,owner.posts:4", "20,owner.posts:10", "|owner.posts", "Page number: 3, size: 20|Page number: 4, size: 10")]
+    [InlineData("posts:4,3", "posts:10,20", "|posts", "Page number: 3, size: 20|Page number: 4, size: 10")]
+    [InlineData("posts:4,posts.comments:5,3", "posts:10,posts.comments:15,20", "|posts|posts.comments",
+        "Page number: 3, size: 20|Page number: 4, size: 10|Page number: 5, size: 15")]
+    public void Reader_Read_Pagination_Succeeds(string? pageNumber, string? pageSize, string scopeTreesExpected, string valueTreesExpected)
+    {
+        // Act
+        if (pageNumber != null)
+        {
+            _reader.Read("page[number]", pageNumber);
         }
 
-        [Theory]
-        [InlineData(null, "5", "", "Page number: 1, size: 5")]
-        [InlineData("2", null, "", "Page number: 2, size: 25")]
-        [InlineData("2", "5", "", "Page number: 2, size: 5")]
-        [InlineData("posts:4", "posts:2", "|posts", "Page number: 1, size: 25|Page number: 4, size: 2")]
-        [InlineData("posts:4", "5", "|posts", "Page number: 1, size: 5|Page number: 4, size: 25")]
-        [InlineData("4", "posts:5", "|posts", "Page number: 4, size: 25|Page number: 1, size: 5")]
-        [InlineData("3,owner.posts:4", "20,owner.posts:10", "|owner.posts", "Page number: 3, size: 20|Page number: 4, size: 10")]
-        [InlineData("posts:4,3", "posts:10,20", "|posts", "Page number: 3, size: 20|Page number: 4, size: 10")]
-        [InlineData("posts:4,posts.comments:5,3", "posts:10,posts.comments:15,20", "|posts|posts.comments",
-            "Page number: 3, size: 20|Page number: 4, size: 10|Page number: 5, size: 15")]
-        public void Reader_Read_Pagination_Succeeds(string? pageNumber, string? pageSize, string scopeTreesExpected, string valueTreesExpected)
+        if (pageSize != null)
         {
-            // Act
-            if (pageNumber != null)
-            {
-                _reader.Read("page[number]", pageNumber);
-            }
-
-            if (pageSize != null)
-            {
-                _reader.Read("page[size]", pageSize);
-            }
+            _reader.Read("page[size]", pageSize);
+        }
 
-            IReadOnlyCollection<ExpressionInScope> constraints = _reader.GetConstraints();
+        IReadOnlyCollection<ExpressionInScope> constraints = _reader.GetConstraints();
 
-            // Assert
-            string[] scopeTreesExpectedArray = scopeTreesExpected.Split("|");
-            ResourceFieldChainExpression?[] scopeTrees = constraints.Select(expressionInScope => expressionInScope.Scope).ToArray();
+        // Assert
+        string[] scopeTreesExpectedArray = scopeTreesExpected.Split("|");
+        ResourceFieldChainExpression?[] scopeTrees = constraints.Select(expressionInScope => expressionInScope.Scope).ToArray();
 
-            scopeTrees.Should().HaveSameCount(scopeTreesExpectedArray);
-            scopeTrees.Select(tree => tree?.ToString() ?? "").Should().BeEquivalentTo(scopeTreesExpectedArray, options => options.WithStrictOrdering());
+        scopeTrees.Should().HaveSameCount(scopeTreesExpectedArray);
+        scopeTrees.Select(tree => tree?.ToString() ?? "").Should().BeEquivalentTo(scopeTreesExpectedArray, options => options.WithStrictOrdering());
 
-            string[] valueTreesExpectedArray = valueTreesExpected.Split("|");
-            QueryExpression[] valueTrees = constraints.Select(expressionInScope => expressionInScope.Expression).ToArray();
+        string[] valueTreesExpectedArray = valueTreesExpected.Split("|");
+        QueryExpression[] valueTrees = constraints.Select(expressionInScope => expressionInScope.Expression).ToArray();
 
-            valueTrees.Should().HaveSameCount(valueTreesExpectedArray);
-            valueTrees.Select(tree => tree.ToString()).Should().BeEquivalentTo(valueTreesExpectedArray, options => options.WithStrictOrdering());
-        }
+        valueTrees.Should().HaveSameCount(valueTreesExpectedArray);
+        valueTrees.Select(tree => tree.ToString()).Should().BeEquivalentTo(valueTreesExpectedArray, options => options.WithStrictOrdering());
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SortParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SortParseTests.cs
index 217a211afd..8b193aa390 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SortParseTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SortParseTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using FluentAssertions;
 using JsonApiDotNetCore.Controllers.Annotations;
@@ -13,113 +10,111 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters
+namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters;
+
+public sealed class SortParseTests : BaseParseTests
 {
-    public sealed class SortParseTests : BaseParseTests
-    {
-        private readonly SortQueryStringParameterReader _reader;
+    private readonly SortQueryStringParameterReader _reader;
 
-        public SortParseTests()
-        {
-            _reader = new SortQueryStringParameterReader(Request, ResourceGraph);
-        }
+    public SortParseTests()
+    {
+        _reader = new SortQueryStringParameterReader(Request, ResourceGraph);
+    }
 
-        [Theory]
-        [InlineData("sort", true)]
-        [InlineData("sort[posts]", true)]
-        [InlineData("sort[posts.comments]", true)]
-        [InlineData("sorting", false)]
-        [InlineData("sort[", false)]
-        [InlineData("sort]", false)]
-        public void Reader_Supports_Parameter_Name(string parameterName, bool expectCanParse)
-        {
-            // Act
-            bool canParse = _reader.CanRead(parameterName);
+    [Theory]
+    [InlineData("sort", true)]
+    [InlineData("sort[posts]", true)]
+    [InlineData("sort[posts.comments]", true)]
+    [InlineData("sorting", false)]
+    [InlineData("sort[", false)]
+    [InlineData("sort]", false)]
+    public void Reader_Supports_Parameter_Name(string parameterName, bool expectCanParse)
+    {
+        // Act
+        bool canParse = _reader.CanRead(parameterName);
 
-            // Assert
-            canParse.Should().Be(expectCanParse);
-        }
+        // Assert
+        canParse.Should().Be(expectCanParse);
+    }
 
-        [Theory]
-        [InlineData(JsonApiQueryStringParameters.Sort, false)]
-        [InlineData(JsonApiQueryStringParameters.All, false)]
-        [InlineData(JsonApiQueryStringParameters.None, true)]
-        [InlineData(JsonApiQueryStringParameters.Filter, true)]
-        public void Reader_Is_Enabled(JsonApiQueryStringParameters parametersDisabled, bool expectIsEnabled)
-        {
-            // Act
-            bool isEnabled = _reader.IsEnabled(new DisableQueryStringAttribute(parametersDisabled));
+    [Theory]
+    [InlineData(JsonApiQueryStringParameters.Sort, false)]
+    [InlineData(JsonApiQueryStringParameters.All, false)]
+    [InlineData(JsonApiQueryStringParameters.None, true)]
+    [InlineData(JsonApiQueryStringParameters.Filter, true)]
+    public void Reader_Is_Enabled(JsonApiQueryStringParameters parametersDisabled, bool expectIsEnabled)
+    {
+        // Act
+        bool isEnabled = _reader.IsEnabled(new DisableQueryStringAttribute(parametersDisabled));
 
-            // Assert
-            isEnabled.Should().Be(expectIsEnabled);
-        }
+        // Assert
+        isEnabled.Should().Be(expectIsEnabled);
+    }
 
-        [Theory]
-        [InlineData("sort[", "id", "Field name expected.")]
-        [InlineData("sort[abc.def]", "id", "Relationship 'abc' in 'abc.def' does not exist on resource type 'blogs'.")]
-        [InlineData("sort[posts.author]", "id", "Relationship 'author' in 'posts.author' must be a to-many relationship on resource type 'blogPosts'.")]
-        [InlineData("sort", "", "-, count function or field name expected.")]
-        [InlineData("sort", " ", "Unexpected whitespace.")]
-        [InlineData("sort", "-", "Count function or field name expected.")]
-        [InlineData("sort", "abc", "Attribute 'abc' does not exist on resource type 'blogs'.")]
-        [InlineData("sort[posts]", "author", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
-        [InlineData("sort[posts]", "author.livingAddress",
-            "Attribute 'livingAddress' in 'author.livingAddress' does not exist on resource type 'webAccounts'.")]
-        [InlineData("sort", "-count", "( expected.")]
-        [InlineData("sort", "count", "( expected.")]
-        [InlineData("sort", "count(posts", ") expected.")]
-        [InlineData("sort", "count(", "Field name expected.")]
-        [InlineData("sort", "count(-abc)", "Field name expected.")]
-        [InlineData("sort", "count(abc)", "Relationship 'abc' does not exist on resource type 'blogs'.")]
-        [InlineData("sort", "count(id)", "Relationship 'id' does not exist on resource type 'blogs'.")]
-        [InlineData("sort[posts]", "count(author)", "Relationship 'author' must be a to-many relationship on resource type 'blogPosts'.")]
-        [InlineData("sort[posts]", "caption,", "-, count function or field name expected.")]
-        [InlineData("sort[posts]", "caption:", ", expected.")]
-        [InlineData("sort[posts]", "caption,-", "Count function or field name expected.")]
-        public void Reader_Read_Fails(string parameterName, string parameterValue, string errorMessage)
-        {
-            // Act
-            Action action = () => _reader.Read(parameterName, parameterValue);
+    [Theory]
+    [InlineData("sort[", "id", "Field name expected.")]
+    [InlineData("sort[abc.def]", "id", "Relationship 'abc' in 'abc.def' does not exist on resource type 'blogs'.")]
+    [InlineData("sort[posts.author]", "id", "Relationship 'author' in 'posts.author' must be a to-many relationship on resource type 'blogPosts'.")]
+    [InlineData("sort", "", "-, count function or field name expected.")]
+    [InlineData("sort", " ", "Unexpected whitespace.")]
+    [InlineData("sort", "-", "Count function or field name expected.")]
+    [InlineData("sort", "abc", "Attribute 'abc' does not exist on resource type 'blogs'.")]
+    [InlineData("sort[posts]", "author", "Attribute 'author' does not exist on resource type 'blogPosts'.")]
+    [InlineData("sort[posts]", "author.livingAddress", "Attribute 'livingAddress' in 'author.livingAddress' does not exist on resource type 'webAccounts'.")]
+    [InlineData("sort", "-count", "( expected.")]
+    [InlineData("sort", "count", "( expected.")]
+    [InlineData("sort", "count(posts", ") expected.")]
+    [InlineData("sort", "count(", "Field name expected.")]
+    [InlineData("sort", "count(-abc)", "Field name expected.")]
+    [InlineData("sort", "count(abc)", "Relationship 'abc' does not exist on resource type 'blogs'.")]
+    [InlineData("sort", "count(id)", "Relationship 'id' does not exist on resource type 'blogs'.")]
+    [InlineData("sort[posts]", "count(author)", "Relationship 'author' must be a to-many relationship on resource type 'blogPosts'.")]
+    [InlineData("sort[posts]", "caption,", "-, count function or field name expected.")]
+    [InlineData("sort[posts]", "caption:", ", expected.")]
+    [InlineData("sort[posts]", "caption,-", "Count function or field name expected.")]
+    public void Reader_Read_Fails(string parameterName, string parameterValue, string errorMessage)
+    {
+        // Act
+        Action action = () => _reader.Read(parameterName, parameterValue);
 
-            // Assert
-            InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
+        // Assert
+        InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
 
-            exception.ParameterName.Should().Be(parameterName);
-            exception.Errors.ShouldHaveCount(1);
+        exception.ParameterName.Should().Be(parameterName);
+        exception.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = exception.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified sort is invalid.");
-            error.Detail.Should().Be(errorMessage);
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be(parameterName);
-        }
+        ErrorObject error = exception.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified sort is invalid.");
+        error.Detail.Should().Be(errorMessage);
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be(parameterName);
+    }
 
-        [Theory]
-        [InlineData("sort", "id", null, "id")]
-        [InlineData("sort", "count(posts),-id", null, "count(posts),-id")]
-        [InlineData("sort", "-count(posts),id", null, "-count(posts),id")]
-        [InlineData("sort[posts]", "count(comments),-id", "posts", "count(comments),-id")]
-        [InlineData("sort[owner.posts]", "-caption", "owner.posts", "-caption")]
-        [InlineData("sort[posts]", "author.userName", "posts", "author.userName")]
-        [InlineData("sort[posts]", "-caption,-author.userName", "posts", "-caption,-author.userName")]
-        [InlineData("sort[posts]", "caption,author.userName,-id", "posts", "caption,author.userName,-id")]
-        [InlineData("sort[posts.labels]", "id,name", "posts.labels", "id,name")]
-        [InlineData("sort[posts.comments]", "-createdAt,author.displayName,author.preferences.useDarkTheme", "posts.comments",
-            "-createdAt,author.displayName,author.preferences.useDarkTheme")]
-        public void Reader_Read_Succeeds(string parameterName, string parameterValue, string scopeExpected, string valueExpected)
-        {
-            // Act
-            _reader.Read(parameterName, parameterValue);
+    [Theory]
+    [InlineData("sort", "id", null, "id")]
+    [InlineData("sort", "count(posts),-id", null, "count(posts),-id")]
+    [InlineData("sort", "-count(posts),id", null, "-count(posts),id")]
+    [InlineData("sort[posts]", "count(comments),-id", "posts", "count(comments),-id")]
+    [InlineData("sort[owner.posts]", "-caption", "owner.posts", "-caption")]
+    [InlineData("sort[posts]", "author.userName", "posts", "author.userName")]
+    [InlineData("sort[posts]", "-caption,-author.userName", "posts", "-caption,-author.userName")]
+    [InlineData("sort[posts]", "caption,author.userName,-id", "posts", "caption,author.userName,-id")]
+    [InlineData("sort[posts.labels]", "id,name", "posts.labels", "id,name")]
+    [InlineData("sort[posts.comments]", "-createdAt,author.displayName,author.preferences.useDarkTheme", "posts.comments",
+        "-createdAt,author.displayName,author.preferences.useDarkTheme")]
+    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string scopeExpected, string valueExpected)
+    {
+        // Act
+        _reader.Read(parameterName, parameterValue);
 
-            IReadOnlyCollection<ExpressionInScope> constraints = _reader.GetConstraints();
+        IReadOnlyCollection<ExpressionInScope> constraints = _reader.GetConstraints();
 
-            // Assert
-            ResourceFieldChainExpression? scope = constraints.Select(expressionInScope => expressionInScope.Scope).Single();
-            scope?.ToString().Should().Be(scopeExpected);
+        // Assert
+        ResourceFieldChainExpression? scope = constraints.Select(expressionInScope => expressionInScope.Scope).Single();
+        scope?.ToString().Should().Be(scopeExpected);
 
-            QueryExpression value = constraints.Select(expressionInScope => expressionInScope.Expression).Single();
-            value.ToString().Should().Be(valueExpected);
-        }
+        QueryExpression value = constraints.Select(expressionInScope => expressionInScope.Expression).Single();
+        value.ToString().Should().Be(valueExpected);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SparseFieldSetParseTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SparseFieldSetParseTests.cs
index 0632641392..6257329e8d 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SparseFieldSetParseTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/QueryStringParameters/SparseFieldSetParseTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using FluentAssertions;
 using JsonApiDotNetCore.Controllers.Annotations;
@@ -13,98 +10,97 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters
+namespace JsonApiDotNetCoreTests.UnitTests.QueryStringParameters;
+
+public sealed class SparseFieldSetParseTests : BaseParseTests
 {
-    public sealed class SparseFieldSetParseTests : BaseParseTests
-    {
-        private readonly SparseFieldSetQueryStringParameterReader _reader;
+    private readonly SparseFieldSetQueryStringParameterReader _reader;
 
-        public SparseFieldSetParseTests()
-        {
-            _reader = new SparseFieldSetQueryStringParameterReader(Request, ResourceGraph);
-        }
+    public SparseFieldSetParseTests()
+    {
+        _reader = new SparseFieldSetQueryStringParameterReader(Request, ResourceGraph);
+    }
 
-        [Theory]
-        [InlineData("fields", false)]
-        [InlineData("fields[articles]", true)]
-        [InlineData("fields[]", true)]
-        [InlineData("fieldset", false)]
-        [InlineData("fields[", false)]
-        [InlineData("fields]", false)]
-        public void Reader_Supports_Parameter_Name(string parameterName, bool expectCanParse)
-        {
-            // Act
-            bool canParse = _reader.CanRead(parameterName);
+    [Theory]
+    [InlineData("fields", false)]
+    [InlineData("fields[articles]", true)]
+    [InlineData("fields[]", true)]
+    [InlineData("fieldset", false)]
+    [InlineData("fields[", false)]
+    [InlineData("fields]", false)]
+    public void Reader_Supports_Parameter_Name(string parameterName, bool expectCanParse)
+    {
+        // Act
+        bool canParse = _reader.CanRead(parameterName);
 
-            // Assert
-            canParse.Should().Be(expectCanParse);
-        }
+        // Assert
+        canParse.Should().Be(expectCanParse);
+    }
 
-        [Theory]
-        [InlineData(JsonApiQueryStringParameters.Fields, false)]
-        [InlineData(JsonApiQueryStringParameters.All, false)]
-        [InlineData(JsonApiQueryStringParameters.None, true)]
-        [InlineData(JsonApiQueryStringParameters.Filter, true)]
-        public void Reader_Is_Enabled(JsonApiQueryStringParameters parametersDisabled, bool expectIsEnabled)
-        {
-            // Act
-            bool isEnabled = _reader.IsEnabled(new DisableQueryStringAttribute(parametersDisabled));
+    [Theory]
+    [InlineData(JsonApiQueryStringParameters.Fields, false)]
+    [InlineData(JsonApiQueryStringParameters.All, false)]
+    [InlineData(JsonApiQueryStringParameters.None, true)]
+    [InlineData(JsonApiQueryStringParameters.Filter, true)]
+    public void Reader_Is_Enabled(JsonApiQueryStringParameters parametersDisabled, bool expectIsEnabled)
+    {
+        // Act
+        bool isEnabled = _reader.IsEnabled(new DisableQueryStringAttribute(parametersDisabled));
 
-            // Assert
-            isEnabled.Should().Be(expectIsEnabled);
-        }
+        // Assert
+        isEnabled.Should().Be(expectIsEnabled);
+    }
 
-        [Theory]
-        [InlineData("fields", "", "[ expected.")]
-        [InlineData("fields]", "", "[ expected.")]
-        [InlineData("fields[", "", "Resource type expected.")]
-        [InlineData("fields[]", "", "Resource type expected.")]
-        [InlineData("fields[ ]", "", "Unexpected whitespace.")]
-        [InlineData("fields[owner]", "", "Resource type 'owner' does not exist.")]
-        [InlineData("fields[owner.posts]", "id", "Resource type 'owner.posts' does not exist.")]
-        [InlineData("fields[blogPosts]", " ", "Unexpected whitespace.")]
-        [InlineData("fields[blogPosts]", "some", "Field 'some' does not exist on resource type 'blogPosts'.")]
-        [InlineData("fields[blogPosts]", "id,owner.name", "Field 'owner.name' does not exist on resource type 'blogPosts'.")]
-        [InlineData("fields[blogPosts]", "id(", ", expected.")]
-        [InlineData("fields[blogPosts]", "id,", "Field name expected.")]
-        [InlineData("fields[blogPosts]", "author.id,", "Field 'author.id' does not exist on resource type 'blogPosts'.")]
-        public void Reader_Read_Fails(string parameterName, string parameterValue, string errorMessage)
-        {
-            // Act
-            Action action = () => _reader.Read(parameterName, parameterValue);
+    [Theory]
+    [InlineData("fields", "", "[ expected.")]
+    [InlineData("fields]", "", "[ expected.")]
+    [InlineData("fields[", "", "Resource type expected.")]
+    [InlineData("fields[]", "", "Resource type expected.")]
+    [InlineData("fields[ ]", "", "Unexpected whitespace.")]
+    [InlineData("fields[owner]", "", "Resource type 'owner' does not exist.")]
+    [InlineData("fields[owner.posts]", "id", "Resource type 'owner.posts' does not exist.")]
+    [InlineData("fields[blogPosts]", " ", "Unexpected whitespace.")]
+    [InlineData("fields[blogPosts]", "some", "Field 'some' does not exist on resource type 'blogPosts'.")]
+    [InlineData("fields[blogPosts]", "id,owner.name", "Field 'owner.name' does not exist on resource type 'blogPosts'.")]
+    [InlineData("fields[blogPosts]", "id(", ", expected.")]
+    [InlineData("fields[blogPosts]", "id,", "Field name expected.")]
+    [InlineData("fields[blogPosts]", "author.id,", "Field 'author.id' does not exist on resource type 'blogPosts'.")]
+    public void Reader_Read_Fails(string parameterName, string parameterValue, string errorMessage)
+    {
+        // Act
+        Action action = () => _reader.Read(parameterName, parameterValue);
 
-            // Assert
-            InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
+        // Assert
+        InvalidQueryStringParameterException exception = action.Should().ThrowExactly<InvalidQueryStringParameterException>().And;
 
-            exception.ParameterName.Should().Be(parameterName);
-            exception.Errors.ShouldHaveCount(1);
+        exception.ParameterName.Should().Be(parameterName);
+        exception.Errors.ShouldHaveCount(1);
 
-            ErrorObject error = exception.Errors[0];
-            error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-            error.Title.Should().Be("The specified fieldset is invalid.");
-            error.Detail.Should().Be(errorMessage);
-            error.Source.ShouldNotBeNull();
-            error.Source.Parameter.Should().Be(parameterName);
-        }
+        ErrorObject error = exception.Errors[0];
+        error.StatusCode.Should().Be(HttpStatusCode.BadRequest);
+        error.Title.Should().Be("The specified fieldset is invalid.");
+        error.Detail.Should().Be(errorMessage);
+        error.Source.ShouldNotBeNull();
+        error.Source.Parameter.Should().Be(parameterName);
+    }
 
-        [Theory]
-        [InlineData("fields[blogPosts]", "caption,url,author", "blogPosts(author,caption,url)")]
-        [InlineData("fields[blogPosts]", "author,comments,labels", "blogPosts(author,comments,labels)")]
-        [InlineData("fields[blogs]", "id", "blogs(id)")]
-        [InlineData("fields[blogs]", "", "blogs(id)")]
-        public void Reader_Read_Succeeds(string parameterName, string parameterValue, string valueExpected)
-        {
-            // Act
-            _reader.Read(parameterName, parameterValue);
+    [Theory]
+    [InlineData("fields[blogPosts]", "caption,url,author", "blogPosts(author,caption,url)")]
+    [InlineData("fields[blogPosts]", "author,comments,labels", "blogPosts(author,comments,labels)")]
+    [InlineData("fields[blogs]", "id", "blogs(id)")]
+    [InlineData("fields[blogs]", "", "blogs(id)")]
+    public void Reader_Read_Succeeds(string parameterName, string parameterValue, string valueExpected)
+    {
+        // Act
+        _reader.Read(parameterName, parameterValue);
 
-            IReadOnlyCollection<ExpressionInScope> constraints = _reader.GetConstraints();
+        IReadOnlyCollection<ExpressionInScope> constraints = _reader.GetConstraints();
 
-            // Assert
-            ResourceFieldChainExpression? scope = constraints.Select(expressionInScope => expressionInScope.Scope).Single();
-            scope.Should().BeNull();
+        // Assert
+        ResourceFieldChainExpression? scope = constraints.Select(expressionInScope => expressionInScope.Scope).Single();
+        scope.Should().BeNull();
 
-            QueryExpression value = constraints.Select(expressionInScope => expressionInScope.Expression).Single();
-            value.ToString().Should().Be(valueExpected);
-        }
+        QueryExpression value = constraints.Select(expressionInScope => expressionInScope.Expression).Single();
+        value.ToString().Should().Be(valueExpected);
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/ResourceGraph/ResourceGraphBuilderTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/ResourceGraph/ResourceGraphBuilderTests.cs
index 6092dc2113..6b762fb2ef 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/ResourceGraph/ResourceGraphBuilderTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/ResourceGraph/ResourceGraphBuilderTests.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using Castle.DynamicProxy;
 using FluentAssertions;
 using JetBrains.Annotations;
@@ -13,351 +10,399 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.UnitTests.ResourceGraph
+namespace JsonApiDotNetCoreTests.UnitTests.ResourceGraph;
+
+public sealed class ResourceGraphBuilderTests
 {
-    public sealed class ResourceGraphBuilderTests
+    [Fact]
+    public void Resource_without_public_name_gets_pluralized_with_naming_convention_applied()
     {
-        [Fact]
-        public void Resource_without_public_name_gets_pluralized_with_naming_convention_applied()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+        // Arrange
+        var options = new JsonApiOptions();
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
 
-            // Act
-            builder.Add<ResourceWithAttribute, int>();
+        // Act
+        builder.Add<ResourceWithAttribute, int>();
 
-            // Assert
-            IResourceGraph resourceGraph = builder.Build();
-            ResourceType resourceType = resourceGraph.GetResourceType<ResourceWithAttribute>();
+        // Assert
+        IResourceGraph resourceGraph = builder.Build();
+        ResourceType resourceType = resourceGraph.GetResourceType<ResourceWithAttribute>();
 
-            resourceType.PublicName.Should().Be("resourceWithAttributes");
-        }
+        resourceType.PublicName.Should().Be("resourceWithAttributes");
+    }
 
-        [Fact]
-        public void Attribute_without_public_name_gets_naming_convention_applied()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+    [Fact]
+    public void Attribute_without_public_name_gets_naming_convention_applied()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
 
-            // Act
-            builder.Add<ResourceWithAttribute, int>();
+        // Act
+        builder.Add<ResourceWithAttribute, int>();
 
-            // Assert
-            IResourceGraph resourceGraph = builder.Build();
-            ResourceType resourceType = resourceGraph.GetResourceType<ResourceWithAttribute>();
+        // Assert
+        IResourceGraph resourceGraph = builder.Build();
+        ResourceType resourceType = resourceGraph.GetResourceType<ResourceWithAttribute>();
 
-            AttrAttribute attribute = resourceType.GetAttributeByPropertyName(nameof(ResourceWithAttribute.PrimaryValue));
-            attribute.PublicName.Should().Be("primaryValue");
-        }
+        AttrAttribute attribute = resourceType.GetAttributeByPropertyName(nameof(ResourceWithAttribute.PrimaryValue));
+        attribute.PublicName.Should().Be("primaryValue");
+    }
 
-        [Fact]
-        public void HasOne_relationship_without_public_name_gets_naming_convention_applied()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+    [Fact]
+    public void HasOne_relationship_without_public_name_gets_naming_convention_applied()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
 
-            // Act
-            builder.Add<ResourceWithAttribute, int>();
+        // Act
+        builder.Add<ResourceWithAttribute, int>();
 
-            // Assert
-            IResourceGraph resourceGraph = builder.Build();
-            ResourceType resourceType = resourceGraph.GetResourceType<ResourceWithAttribute>();
+        // Assert
+        IResourceGraph resourceGraph = builder.Build();
+        ResourceType resourceType = resourceGraph.GetResourceType<ResourceWithAttribute>();
 
-            RelationshipAttribute relationship = resourceType.GetRelationshipByPropertyName(nameof(ResourceWithAttribute.PrimaryChild));
-            relationship.PublicName.Should().Be("primaryChild");
-        }
+        RelationshipAttribute relationship = resourceType.GetRelationshipByPropertyName(nameof(ResourceWithAttribute.PrimaryChild));
+        relationship.PublicName.Should().Be("primaryChild");
+    }
 
-        [Fact]
-        public void HasMany_relationship_without_public_name_gets_naming_convention_applied()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+    [Fact]
+    public void HasMany_relationship_without_public_name_gets_naming_convention_applied()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
 
-            // Act
-            builder.Add<ResourceWithAttribute, int>();
+        // Act
+        builder.Add<ResourceWithAttribute, int>();
 
-            // Assert
-            IResourceGraph resourceGraph = builder.Build();
-            ResourceType resourceType = resourceGraph.GetResourceType<ResourceWithAttribute>();
+        // Assert
+        IResourceGraph resourceGraph = builder.Build();
+        ResourceType resourceType = resourceGraph.GetResourceType<ResourceWithAttribute>();
 
-            RelationshipAttribute relationship = resourceType.GetRelationshipByPropertyName(nameof(ResourceWithAttribute.TopLevelChildren));
-            relationship.PublicName.Should().Be("topLevelChildren");
-        }
+        RelationshipAttribute relationship = resourceType.GetRelationshipByPropertyName(nameof(ResourceWithAttribute.TopLevelChildren));
+        relationship.PublicName.Should().Be("topLevelChildren");
+    }
 
-        [Fact]
-        public void Cannot_use_duplicate_resource_name()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
-            builder.Add<ResourceWithHasOneRelationship, int>("duplicate");
+    [Fact]
+    public void Cannot_use_duplicate_resource_name()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+        builder.Add<ResourceWithHasOneRelationship, int>("duplicate");
 
-            // Act
-            Action action = () => builder.Add<ResourceWithAttribute, int>("duplicate");
+        // Act
+        Action action = () => builder.Add<ResourceWithAttribute, int>("duplicate");
 
-            // Assert
-            action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage(
-                $"Resource '{typeof(ResourceWithHasOneRelationship)}' and '{typeof(ResourceWithAttribute)}' both use public name 'duplicate'.");
-        }
+        // Assert
+        action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage(
+            $"Resource '{typeof(ResourceWithHasOneRelationship)}' and '{typeof(ResourceWithAttribute)}' both use public name 'duplicate'.");
+    }
 
-        [Fact]
-        public void Cannot_use_duplicate_attribute_name()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+    [Fact]
+    public void Cannot_use_duplicate_attribute_name()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
 
-            // Act
-            Action action = () => builder.Add<ResourceWithDuplicateAttrPublicName, int>();
+        // Act
+        Action action = () => builder.Add<ResourceWithDuplicateAttrPublicName, int>();
 
-            // Assert
-            action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage(
-                $"Properties '{typeof(ResourceWithDuplicateAttrPublicName)}.Value1' and " +
-                $"'{typeof(ResourceWithDuplicateAttrPublicName)}.Value2' both use public name 'duplicate'.");
-        }
+        // Assert
+        action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage($"Properties '{typeof(ResourceWithDuplicateAttrPublicName)}.Value1' and " +
+            $"'{typeof(ResourceWithDuplicateAttrPublicName)}.Value2' both use public name 'duplicate'.");
+    }
 
-        [Fact]
-        public void Cannot_use_duplicate_relationship_name()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+    [Fact]
+    public void Cannot_use_duplicate_relationship_name()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
 
-            // Act
-            Action action = () => builder.Add<ResourceWithDuplicateRelationshipPublicName, int>();
+        // Act
+        Action action = () => builder.Add<ResourceWithDuplicateRelationshipPublicName, int>();
 
-            // Assert
-            action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage(
-                $"Properties '{typeof(ResourceWithDuplicateRelationshipPublicName)}.PrimaryChild' and " +
-                $"'{typeof(ResourceWithDuplicateRelationshipPublicName)}.Children' both use public name 'duplicate'.");
-        }
+        // Assert
+        action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage(
+            $"Properties '{typeof(ResourceWithDuplicateRelationshipPublicName)}.PrimaryChild' and " +
+            $"'{typeof(ResourceWithDuplicateRelationshipPublicName)}.Children' both use public name 'duplicate'.");
+    }
 
-        [Fact]
-        public void Cannot_use_duplicate_attribute_and_relationship_name()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+    [Fact]
+    public void Cannot_use_duplicate_attribute_and_relationship_name()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
 
-            // Act
-            Action action = () => builder.Add<ResourceWithDuplicateAttrRelationshipPublicName, int>();
+        // Act
+        Action action = () => builder.Add<ResourceWithDuplicateAttrRelationshipPublicName, int>();
 
-            // Assert
-            action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage(
-                $"Properties '{typeof(ResourceWithDuplicateAttrRelationshipPublicName)}.Value' and " +
-                $"'{typeof(ResourceWithDuplicateAttrRelationshipPublicName)}.Children' both use public name 'duplicate'.");
-        }
+        // Assert
+        action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage(
+            $"Properties '{typeof(ResourceWithDuplicateAttrRelationshipPublicName)}.Value' and " +
+            $"'{typeof(ResourceWithDuplicateAttrRelationshipPublicName)}.Children' both use public name 'duplicate'.");
+    }
 
-        [Fact]
-        public void Cannot_add_resource_that_implements_only_non_generic_IIdentifiable()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+    [Fact]
+    public void Cannot_add_resource_that_implements_only_non_generic_IIdentifiable()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
 
-            // Act
-            Action action = () => builder.Add(typeof(ResourceWithoutId));
+        // Act
+        Action action = () => builder.Add(typeof(ResourceWithoutId));
 
-            // Assert
-            action.Should().ThrowExactly<InvalidConfigurationException>()
-                .WithMessage($"Resource type '{typeof(ResourceWithoutId)}' implements 'IIdentifiable', but not 'IIdentifiable<TId>'.");
-        }
+        // Assert
+        action.Should().ThrowExactly<InvalidConfigurationException>()
+            .WithMessage($"Resource type '{typeof(ResourceWithoutId)}' implements 'IIdentifiable', but not 'IIdentifiable<TId>'.");
+    }
 
-        [Fact]
-        public void Cannot_build_graph_with_missing_related_HasOne_resource()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+    [Fact]
+    public void Cannot_build_graph_with_missing_related_HasOne_resource()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
 
-            builder.Add<ResourceWithHasOneRelationship, int>();
+        builder.Add<ResourceWithHasOneRelationship, int>();
 
-            // Act
-            Action action = () => builder.Build();
+        // Act
+        Action action = () => builder.Build();
 
-            // Assert
-            action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage($"Resource type '{typeof(ResourceWithHasOneRelationship)}' " +
-                $"depends on '{typeof(ResourceWithAttribute)}', which was not added to the resource graph.");
-        }
+        // Assert
+        action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage($"Resource type '{typeof(ResourceWithHasOneRelationship)}' " +
+            $"depends on '{typeof(ResourceWithAttribute)}', which was not added to the resource graph.");
+    }
 
-        [Fact]
-        public void Cannot_build_graph_with_missing_related_HasMany_resource()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+    [Fact]
+    public void Cannot_build_graph_with_missing_related_HasMany_resource()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
 
-            builder.Add<ResourceWithHasManyRelationship, int>();
+        builder.Add<ResourceWithHasManyRelationship, int>();
 
-            // Act
-            Action action = () => builder.Build();
+        // Act
+        Action action = () => builder.Build();
 
-            // Assert
-            action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage($"Resource type '{typeof(ResourceWithHasManyRelationship)}' " +
-                $"depends on '{typeof(ResourceWithAttribute)}', which was not added to the resource graph.");
-        }
+        // Assert
+        action.Should().ThrowExactly<InvalidConfigurationException>().WithMessage($"Resource type '{typeof(ResourceWithHasManyRelationship)}' " +
+            $"depends on '{typeof(ResourceWithAttribute)}', which was not added to the resource graph.");
+    }
 
-        [Fact]
-        public void Logs_warning_when_adding_non_resource_type()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var loggerFactory = new FakeLoggerFactory(LogLevel.Warning);
-            var builder = new ResourceGraphBuilder(options, loggerFactory);
+    [Fact]
+    public void Logs_warning_when_adding_non_resource_type()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var loggerFactory = new FakeLoggerFactory(LogLevel.Warning);
+        var builder = new ResourceGraphBuilder(options, loggerFactory);
 
-            // Act
-            builder.Add(typeof(NonResource));
+        // Act
+        builder.Add(typeof(NonResource));
 
-            // Assert
-            loggerFactory.Logger.Messages.ShouldHaveCount(1);
+        // Assert
+        loggerFactory.Logger.Messages.ShouldHaveCount(1);
 
-            FakeLoggerFactory.FakeLogMessage message = loggerFactory.Logger.Messages.ElementAt(0);
-            message.LogLevel.Should().Be(LogLevel.Warning);
-            message.Text.Should().Be($"Skipping: Type '{typeof(NonResource)}' does not implement 'IIdentifiable'.");
-        }
+        FakeLoggerFactory.FakeLogMessage message = loggerFactory.Logger.Messages.ElementAt(0);
+        message.LogLevel.Should().Be(LogLevel.Warning);
+        message.Text.Should().Be($"Skipping: Type '{typeof(NonResource)}' does not implement 'IIdentifiable'. Add [NoResource] to suppress this warning.");
+    }
 
-        [Fact]
-        public void Logs_warning_when_adding_resource_without_attributes()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var loggerFactory = new FakeLoggerFactory(LogLevel.Warning);
-            var builder = new ResourceGraphBuilder(options, loggerFactory);
+    [Fact]
+    public void Logs_no_warning_when_adding_non_resource_type_with_suppression()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var loggerFactory = new FakeLoggerFactory(LogLevel.Warning);
+        var builder = new ResourceGraphBuilder(options, loggerFactory);
 
-            // Act
-            builder.Add<ResourceWithHasOneRelationship, int>();
+        // Act
+        builder.Add(typeof(NonResourceWithSuppression));
 
-            // Assert
-            loggerFactory.Logger.Messages.ShouldHaveCount(1);
+        // Assert
+        loggerFactory.Logger.Messages.Should().BeEmpty();
+    }
 
-            FakeLoggerFactory.FakeLogMessage message = loggerFactory.Logger.Messages.ElementAt(0);
-            message.LogLevel.Should().Be(LogLevel.Warning);
-            message.Text.Should().Be($"Type '{typeof(ResourceWithHasOneRelationship)}' does not contain any attributes.");
-        }
+    [Fact]
+    public void Logs_warning_when_adding_resource_without_attributes()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var loggerFactory = new FakeLoggerFactory(LogLevel.Warning);
+        var builder = new ResourceGraphBuilder(options, loggerFactory);
 
-        [Fact]
-        public void Logs_warning_on_empty_graph()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var loggerFactory = new FakeLoggerFactory(LogLevel.Warning);
-            var builder = new ResourceGraphBuilder(options, loggerFactory);
+        // Act
+        builder.Add<ResourceWithHasOneRelationship, int>();
 
-            // Act
-            builder.Build();
+        // Assert
+        loggerFactory.Logger.Messages.ShouldHaveCount(1);
 
-            // Assert
-            loggerFactory.Logger.Messages.ShouldHaveCount(1);
+        FakeLoggerFactory.FakeLogMessage message = loggerFactory.Logger.Messages.ElementAt(0);
+        message.LogLevel.Should().Be(LogLevel.Warning);
+        message.Text.Should().Be($"Type '{typeof(ResourceWithHasOneRelationship)}' does not contain any attributes.");
+    }
 
-            FakeLoggerFactory.FakeLogMessage message = loggerFactory.Logger.Messages.ElementAt(0);
-            message.LogLevel.Should().Be(LogLevel.Warning);
-            message.Text.Should().Be("The resource graph is empty.");
-        }
+    [Fact]
+    public void Logs_warning_on_empty_graph()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
+        var loggerFactory = new FakeLoggerFactory(LogLevel.Warning);
+        var builder = new ResourceGraphBuilder(options, loggerFactory);
 
-        [Fact]
-        public void Resolves_correct_type_for_lazy_loading_proxy()
-        {
-            // Arrange
-            var options = new JsonApiOptions();
+        // Act
+        builder.Build();
 
-            var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
-            builder.Add<ResourceOfInt32, int>();
-            IResourceGraph resourceGraph = builder.Build();
+        // Assert
+        loggerFactory.Logger.Messages.ShouldHaveCount(1);
 
-            var proxyGenerator = new ProxyGenerator();
-            var proxy = proxyGenerator.CreateClassProxy<ResourceOfInt32>();
+        FakeLoggerFactory.FakeLogMessage message = loggerFactory.Logger.Messages.ElementAt(0);
+        message.LogLevel.Should().Be(LogLevel.Warning);
+        message.Text.Should().Be("The resource graph is empty.");
+    }
 
-            // Act
-            ResourceType resourceType = resourceGraph.GetResourceType(proxy.GetType());
+    [Fact]
+    public void Resolves_correct_type_for_lazy_loading_proxy()
+    {
+        // Arrange
+        var options = new JsonApiOptions();
 
-            // Assert
-            resourceType.ClrType.Should().Be(typeof(ResourceOfInt32));
-        }
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
+        builder.Add<ResourceOfInt32, int>();
+        IResourceGraph resourceGraph = builder.Build();
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class ResourceWithHasOneRelationship : Identifiable<int>
-        {
-            [HasOne]
-            public ResourceWithAttribute? PrimaryChild { get; set; }
-        }
+        var proxyGenerator = new ProxyGenerator();
+        var proxy = proxyGenerator.CreateClassProxy<ResourceOfInt32>();
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class ResourceWithHasManyRelationship : Identifiable<int>
-        {
-            [HasMany]
-            public ISet<ResourceWithAttribute> Children { get; set; } = new HashSet<ResourceWithAttribute>();
-        }
+        // Act
+        ResourceType resourceType = resourceGraph.GetResourceType(proxy.GetType());
+
+        // Assert
+        resourceType.ClrType.Should().Be(typeof(ResourceOfInt32));
+    }
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class ResourceWithAttribute : Identifiable<int>
+    [Fact]
+    public void Can_override_capabilities_on_Id_property()
+    {
+        // Arrange
+        var options = new JsonApiOptions
         {
-            [Attr]
-            public string? PrimaryValue { get; set; }
+            DefaultAttrCapabilities = AttrCapabilities.None
+        };
 
-            [HasOne]
-            public ResourceWithAttribute? PrimaryChild { get; set; }
+        var builder = new ResourceGraphBuilder(options, NullLoggerFactory.Instance);
 
-            [HasMany]
-            public ISet<ResourceWithAttribute> TopLevelChildren { get; set; } = new HashSet<ResourceWithAttribute>();
-        }
+        // Act
+        builder.Add<ResourceWithIdOverride, long>();
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class ResourceWithDuplicateAttrPublicName : Identifiable<int>
-        {
-            [Attr(PublicName = "duplicate")]
-            public string? Value1 { get; set; }
+        // Assert
+        IResourceGraph resourceGraph = builder.Build();
+        ResourceType resourceType = resourceGraph.GetResourceType<ResourceWithIdOverride>();
 
-            [Attr(PublicName = "duplicate")]
-            public string? Value2 { get; set; }
-        }
+        AttrAttribute idAttribute = resourceType.Attributes.Single(attr => attr.Property.Name == nameof(Identifiable<object>.Id));
+        idAttribute.Capabilities.Should().Be(AttrCapabilities.AllowFilter);
+    }
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class ResourceWithDuplicateRelationshipPublicName : Identifiable<int>
-        {
-            [HasOne(PublicName = "duplicate")]
-            public ResourceWithHasOneRelationship? PrimaryChild { get; set; }
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class ResourceWithHasOneRelationship : Identifiable<int>
+    {
+        [HasOne]
+        public ResourceWithAttribute? PrimaryChild { get; set; }
+    }
 
-            [HasMany(PublicName = "duplicate")]
-            public ISet<ResourceWithAttribute> Children { get; set; } = new HashSet<ResourceWithAttribute>();
-        }
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class ResourceWithHasManyRelationship : Identifiable<int>
+    {
+        [HasMany]
+        public ISet<ResourceWithAttribute> Children { get; set; } = new HashSet<ResourceWithAttribute>();
+    }
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class ResourceWithDuplicateAttrRelationshipPublicName : Identifiable<int>
-        {
-            [Attr(PublicName = "duplicate")]
-            public string? Value { get; set; }
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class ResourceWithAttribute : Identifiable<int>
+    {
+        [Attr]
+        public string? PrimaryValue { get; set; }
 
-            [HasMany(PublicName = "duplicate")]
-            public ISet<ResourceWithAttribute> Children { get; set; } = new HashSet<ResourceWithAttribute>();
-        }
+        [HasOne]
+        public ResourceWithAttribute? PrimaryChild { get; set; }
 
-        private sealed class ResourceWithoutId : IIdentifiable
-        {
-            public string? StringId { get; set; }
-            public string? LocalId { get; set; }
-        }
+        [HasMany]
+        public ISet<ResourceWithAttribute> TopLevelChildren { get; set; } = new HashSet<ResourceWithAttribute>();
+    }
 
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class NonResource
-        {
-        }
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class ResourceWithDuplicateAttrPublicName : Identifiable<int>
+    {
+        [Attr(PublicName = "duplicate")]
+        public string? Value1 { get; set; }
 
-        // ReSharper disable once ClassCanBeSealed.Global
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        public class ResourceOfInt32 : Identifiable<int>
-        {
-            [Attr]
-            public string? StringValue { get; set; }
+        [Attr(PublicName = "duplicate")]
+        public string? Value2 { get; set; }
+    }
 
-            [HasOne]
-            public ResourceOfInt32? PrimaryChild { get; set; }
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class ResourceWithDuplicateRelationshipPublicName : Identifiable<int>
+    {
+        [HasOne(PublicName = "duplicate")]
+        public ResourceWithHasOneRelationship? PrimaryChild { get; set; }
+
+        [HasMany(PublicName = "duplicate")]
+        public ISet<ResourceWithAttribute> Children { get; set; } = new HashSet<ResourceWithAttribute>();
+    }
+
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class ResourceWithDuplicateAttrRelationshipPublicName : Identifiable<int>
+    {
+        [Attr(PublicName = "duplicate")]
+        public string? Value { get; set; }
+
+        [HasMany(PublicName = "duplicate")]
+        public ISet<ResourceWithAttribute> Children { get; set; } = new HashSet<ResourceWithAttribute>();
+    }
+
+    private sealed class ResourceWithoutId : IIdentifiable
+    {
+        public string? StringId { get; set; }
+        public string? LocalId { get; set; }
+    }
+
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class NonResource
+    {
+    }
+
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    [NoResource]
+    private sealed class NonResourceWithSuppression
+    {
+    }
 
-            [HasMany]
-            public IList<ResourceOfInt32> Children { get; set; } = new List<ResourceOfInt32>();
-        }
+    // ReSharper disable once ClassCanBeSealed.Global
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    public class ResourceOfInt32 : Identifiable<int>
+    {
+        [Attr]
+        public string? StringValue { get; set; }
+
+        [HasOne]
+        public ResourceOfInt32? PrimaryChild { get; set; }
+
+        [HasMany]
+        public IList<ResourceOfInt32> Children { get; set; } = new List<ResourceOfInt32>();
+    }
+
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    public sealed class ResourceWithIdOverride : Identifiable<long>
+    {
+        [Attr(Capabilities = AttrCapabilities.AllowFilter)]
+        public override long Id { get; set; }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/InputConversionTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/InputConversionTests.cs
index add26ddb19..b16d29e28f 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/InputConversionTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/InputConversionTests.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.Design;
 using FluentAssertions;
 using FluentAssertions.Extensions;
@@ -15,348 +13,347 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.UnitTests.Serialization
+namespace JsonApiDotNetCoreTests.UnitTests.Serialization;
+
+public sealed class InputConversionTests
 {
-    public sealed class InputConversionTests
+    [Fact]
+    public void Converts_various_data_types_with_values()
     {
-        [Fact]
-        public void Converts_various_data_types_with_values()
+        // Arrange
+        DocumentAdapter documentAdapter = CreateDocumentAdapter<ResourceWithVariousDataTypes>(resourceGraph => new JsonApiRequest
+        {
+            Kind = EndpointKind.Primary,
+            PrimaryResourceType = resourceGraph.GetResourceType<ResourceWithVariousDataTypes>(),
+            WriteOperation = WriteOperationKind.CreateResource
+        });
+
+        const bool booleanValue = true;
+        const bool nullableBooleanValue = false;
+        const char charValue = 'A';
+        const char nullableCharValue = '?';
+        const ulong unsignedLongValue = ulong.MaxValue;
+        const ulong nullableUnsignedLongValue = 9_000_000_000UL;
+        const decimal decimalValue = 19.95m;
+        const decimal nullableDecimalValue = 12.50m;
+        const float floatValue = (float)1 / 3;
+        const float nullableFloatValue = (float)3 / 5;
+        const string stringValue = "text";
+        const string? nullableStringValue = "nullable";
+        var guidValue = Guid.NewGuid();
+        var nullableGuidValue = Guid.NewGuid();
+        DateTime dateTimeValue = 12.July(1982);
+        DateTime nullableDateTimeValue = 18.October(2028);
+        DateTimeOffset dateTimeOffsetValue = 3.March(1999).WithOffset(7.Hours());
+        DateTimeOffset nullableDateTimeOffsetValue = 28.February(2009).WithOffset(-2.Hours());
+        TimeSpan timeSpanValue = 4.Hours().And(58.Minutes());
+        TimeSpan nullableTimeSpanValue = 35.Seconds().And(44.Milliseconds());
+        const DayOfWeek enumValue = DayOfWeek.Wednesday;
+        const DayOfWeek nullableEnumValue = DayOfWeek.Sunday;
+
+        var complexObject = new ComplexObject
+        {
+            Value = "Single"
+        };
+
+        var complexObjectList = new List<ComplexObject>
         {
-            // Arrange
-            DocumentAdapter documentAdapter = CreateDocumentAdapter<ResourceWithVariousDataTypes>(resourceGraph => new JsonApiRequest
+            new()
             {
-                Kind = EndpointKind.Primary,
-                PrimaryResourceType = resourceGraph.GetResourceType<ResourceWithVariousDataTypes>(),
-                WriteOperation = WriteOperationKind.CreateResource
-            });
-
-            const bool booleanValue = true;
-            const bool nullableBooleanValue = false;
-            const char charValue = 'A';
-            const char nullableCharValue = '?';
-            const ulong unsignedLongValue = ulong.MaxValue;
-            const ulong nullableUnsignedLongValue = 9_000_000_000UL;
-            const decimal decimalValue = 19.95m;
-            const decimal nullableDecimalValue = 12.50m;
-            const float floatValue = (float)1 / 3;
-            const float nullableFloatValue = (float)3 / 5;
-            const string stringValue = "text";
-            const string? nullableStringValue = "nullable";
-            var guidValue = Guid.NewGuid();
-            var nullableGuidValue = Guid.NewGuid();
-            DateTime dateTimeValue = 12.July(1982);
-            DateTime nullableDateTimeValue = 18.October(2028);
-            DateTimeOffset dateTimeOffsetValue = 3.March(1999).WithOffset(7.Hours());
-            DateTimeOffset nullableDateTimeOffsetValue = 28.February(2009).WithOffset(-2.Hours());
-            TimeSpan timeSpanValue = 4.Hours().And(58.Minutes());
-            TimeSpan nullableTimeSpanValue = 35.Seconds().And(44.Milliseconds());
-            const DayOfWeek enumValue = DayOfWeek.Wednesday;
-            const DayOfWeek nullableEnumValue = DayOfWeek.Sunday;
-
-            var complexObject = new ComplexObject
+                Value = "One"
+            },
+            new()
             {
-                Value = "Single"
-            };
+                Value = "Two"
+            }
+        };
 
-            var complexObjectList = new List<ComplexObject>
+        var document = new Document
+        {
+            Data = new SingleOrManyData<ResourceObject>(new ResourceObject
             {
-                new()
-                {
-                    Value = "One"
-                },
-                new()
+                Type = "resourceWithVariousDataTypes",
+                Attributes = new Dictionary<string, object?>
                 {
-                    Value = "Two"
+                    ["boolean"] = booleanValue,
+                    ["nullableBoolean"] = nullableBooleanValue,
+                    ["char"] = charValue,
+                    ["nullableChar"] = nullableCharValue,
+                    ["unsignedLong"] = unsignedLongValue,
+                    ["nullableUnsignedLong"] = nullableUnsignedLongValue,
+                    ["decimal"] = decimalValue,
+                    ["nullableDecimal"] = nullableDecimalValue,
+                    ["float"] = floatValue,
+                    ["nullableFloat"] = nullableFloatValue,
+                    ["string"] = stringValue,
+                    ["nullableString"] = nullableStringValue,
+                    ["guid"] = guidValue,
+                    ["nullableGuid"] = nullableGuidValue,
+                    ["dateTime"] = dateTimeValue,
+                    ["nullableDateTime"] = nullableDateTimeValue,
+                    ["dateTimeOffset"] = dateTimeOffsetValue,
+                    ["nullableDateTimeOffset"] = nullableDateTimeOffsetValue,
+                    ["timeSpan"] = timeSpanValue,
+                    ["nullableTimeSpan"] = nullableTimeSpanValue,
+                    ["enum"] = enumValue,
+                    ["nullableEnum"] = nullableEnumValue,
+                    ["complexObject"] = complexObject,
+                    ["complexObjectList"] = complexObjectList
                 }
-            };
+            })
+        };
+
+        // Act
+        var model = (ResourceWithVariousDataTypes?)documentAdapter.Convert(document);
+
+        // Assert
+        model.ShouldNotBeNull();
+
+        model.Boolean.Should().Be(booleanValue);
+        model.NullableBoolean.Should().Be(nullableBooleanValue);
+        model.Char.Should().Be(charValue);
+        model.NullableChar.Should().Be(nullableCharValue);
+        model.UnsignedLong.Should().Be(unsignedLongValue);
+        model.NullableUnsignedLong.Should().Be(nullableUnsignedLongValue);
+        model.Decimal.Should().Be(decimalValue);
+        model.NullableDecimal.Should().Be(nullableDecimalValue);
+        model.Float.Should().Be(floatValue);
+        model.NullableFloat.Should().Be(nullableFloatValue);
+        model.String.Should().Be(stringValue);
+        model.NullableString.Should().Be(nullableStringValue);
+        model.Guid.Should().Be(guidValue);
+        model.NullableGuid.Should().Be(nullableGuidValue);
+        model.DateTime.Should().Be(dateTimeValue);
+        model.NullableDateTime.Should().Be(nullableDateTimeValue);
+        model.DateTimeOffset.Should().Be(dateTimeOffsetValue);
+        model.NullableDateTimeOffset.Should().Be(nullableDateTimeOffsetValue);
+        model.TimeSpan.Should().Be(timeSpanValue);
+        model.NullableTimeSpan.Should().Be(nullableTimeSpanValue);
+        model.Enum.Should().Be(enumValue);
+        model.NullableEnum.Should().Be(nullableEnumValue);
+
+        model.ComplexObject.ShouldNotBeNull();
+        model.ComplexObject.Value.Should().Be(complexObject.Value);
+
+        model.ComplexObjectList.ShouldHaveCount(2);
+        model.ComplexObjectList[0].Value.Should().Be(complexObjectList[0].Value);
+        model.ComplexObjectList[1].Value.Should().Be(complexObjectList[1].Value);
+    }
 
-            var document = new Document
-            {
-                Data = new SingleOrManyData<ResourceObject>(new ResourceObject
-                {
-                    Type = "resourceWithVariousDataTypes",
-                    Attributes = new Dictionary<string, object?>
-                    {
-                        ["boolean"] = booleanValue,
-                        ["nullableBoolean"] = nullableBooleanValue,
-                        ["char"] = charValue,
-                        ["nullableChar"] = nullableCharValue,
-                        ["unsignedLong"] = unsignedLongValue,
-                        ["nullableUnsignedLong"] = nullableUnsignedLongValue,
-                        ["decimal"] = decimalValue,
-                        ["nullableDecimal"] = nullableDecimalValue,
-                        ["float"] = floatValue,
-                        ["nullableFloat"] = nullableFloatValue,
-                        ["string"] = stringValue,
-                        ["nullableString"] = nullableStringValue,
-                        ["guid"] = guidValue,
-                        ["nullableGuid"] = nullableGuidValue,
-                        ["dateTime"] = dateTimeValue,
-                        ["nullableDateTime"] = nullableDateTimeValue,
-                        ["dateTimeOffset"] = dateTimeOffsetValue,
-                        ["nullableDateTimeOffset"] = nullableDateTimeOffsetValue,
-                        ["timeSpan"] = timeSpanValue,
-                        ["nullableTimeSpan"] = nullableTimeSpanValue,
-                        ["enum"] = enumValue,
-                        ["nullableEnum"] = nullableEnumValue,
-                        ["complexObject"] = complexObject,
-                        ["complexObjectList"] = complexObjectList
-                    }
-                })
-            };
-
-            // Act
-            var model = (ResourceWithVariousDataTypes?)documentAdapter.Convert(document);
-
-            // Assert
-            model.ShouldNotBeNull();
-
-            model.Boolean.Should().Be(booleanValue);
-            model.NullableBoolean.Should().Be(nullableBooleanValue);
-            model.Char.Should().Be(charValue);
-            model.NullableChar.Should().Be(nullableCharValue);
-            model.UnsignedLong.Should().Be(unsignedLongValue);
-            model.NullableUnsignedLong.Should().Be(nullableUnsignedLongValue);
-            model.Decimal.Should().Be(decimalValue);
-            model.NullableDecimal.Should().Be(nullableDecimalValue);
-            model.Float.Should().Be(floatValue);
-            model.NullableFloat.Should().Be(nullableFloatValue);
-            model.String.Should().Be(stringValue);
-            model.NullableString.Should().Be(nullableStringValue);
-            model.Guid.Should().Be(guidValue);
-            model.NullableGuid.Should().Be(nullableGuidValue);
-            model.DateTime.Should().Be(dateTimeValue);
-            model.NullableDateTime.Should().Be(nullableDateTimeValue);
-            model.DateTimeOffset.Should().Be(dateTimeOffsetValue);
-            model.NullableDateTimeOffset.Should().Be(nullableDateTimeOffsetValue);
-            model.TimeSpan.Should().Be(timeSpanValue);
-            model.NullableTimeSpan.Should().Be(nullableTimeSpanValue);
-            model.Enum.Should().Be(enumValue);
-            model.NullableEnum.Should().Be(nullableEnumValue);
-
-            model.ComplexObject.ShouldNotBeNull();
-            model.ComplexObject.Value.Should().Be(complexObject.Value);
-
-            model.ComplexObjectList.ShouldHaveCount(2);
-            model.ComplexObjectList[0].Value.Should().Be(complexObjectList[0].Value);
-            model.ComplexObjectList[1].Value.Should().Be(complexObjectList[1].Value);
-        }
-
-        [Fact]
-        public void Converts_various_data_types_with_defaults()
+    [Fact]
+    public void Converts_various_data_types_with_defaults()
+    {
+        // Arrange
+        DocumentAdapter documentAdapter = CreateDocumentAdapter<ResourceWithVariousDataTypes>(resourceGraph => new JsonApiRequest
         {
-            // Arrange
-            DocumentAdapter documentAdapter = CreateDocumentAdapter<ResourceWithVariousDataTypes>(resourceGraph => new JsonApiRequest
-            {
-                Kind = EndpointKind.Primary,
-                PrimaryResourceType = resourceGraph.GetResourceType<ResourceWithVariousDataTypes>(),
-                WriteOperation = WriteOperationKind.CreateResource
-            });
-
-            const bool booleanValue = default;
-            const bool nullableBooleanValue = default;
-            const char charValue = default;
-            const char nullableCharValue = default;
-            const ulong unsignedLongValue = default;
-            const ulong nullableUnsignedLongValue = default;
-            const decimal decimalValue = default;
-            const decimal nullableDecimalValue = default;
-            const float floatValue = default;
-            const float nullableFloatValue = default;
-            const string stringValue = default!;
-            const string? nullableStringValue = default;
-            Guid guidValue = default;
-            Guid nullableGuidValue = default;
-            DateTime dateTimeValue = default;
-            DateTime nullableDateTimeValue = default;
-            DateTimeOffset dateTimeOffsetValue = default;
-            DateTimeOffset nullableDateTimeOffsetValue = default;
-            TimeSpan timeSpanValue = default;
-            TimeSpan nullableTimeSpanValue = default;
-            const DayOfWeek enumValue = default;
-            const DayOfWeek nullableEnumValue = default;
-
-            var document = new Document
+            Kind = EndpointKind.Primary,
+            PrimaryResourceType = resourceGraph.GetResourceType<ResourceWithVariousDataTypes>(),
+            WriteOperation = WriteOperationKind.CreateResource
+        });
+
+        const bool booleanValue = default;
+        const bool nullableBooleanValue = default;
+        const char charValue = default;
+        const char nullableCharValue = default;
+        const ulong unsignedLongValue = default;
+        const ulong nullableUnsignedLongValue = default;
+        const decimal decimalValue = default;
+        const decimal nullableDecimalValue = default;
+        const float floatValue = default;
+        const float nullableFloatValue = default;
+        const string stringValue = default!;
+        const string? nullableStringValue = default;
+        Guid guidValue = default;
+        Guid nullableGuidValue = default;
+        DateTime dateTimeValue = default;
+        DateTime nullableDateTimeValue = default;
+        DateTimeOffset dateTimeOffsetValue = default;
+        DateTimeOffset nullableDateTimeOffsetValue = default;
+        TimeSpan timeSpanValue = default;
+        TimeSpan nullableTimeSpanValue = default;
+        const DayOfWeek enumValue = default;
+        const DayOfWeek nullableEnumValue = default;
+
+        var document = new Document
+        {
+            Data = new SingleOrManyData<ResourceObject>(new ResourceObject
             {
-                Data = new SingleOrManyData<ResourceObject>(new ResourceObject
+                Type = "resourceWithVariousDataTypes",
+                Attributes = new Dictionary<string, object?>
                 {
-                    Type = "resourceWithVariousDataTypes",
-                    Attributes = new Dictionary<string, object?>
-                    {
-                        ["boolean"] = booleanValue,
-                        ["nullableBoolean"] = nullableBooleanValue,
-                        ["char"] = charValue,
-                        ["nullableChar"] = nullableCharValue,
-                        ["unsignedLong"] = unsignedLongValue,
-                        ["nullableUnsignedLong"] = nullableUnsignedLongValue,
-                        ["decimal"] = decimalValue,
-                        ["nullableDecimal"] = nullableDecimalValue,
-                        ["float"] = floatValue,
-                        ["nullableFloat"] = nullableFloatValue,
-                        ["string"] = stringValue,
-                        ["nullableString"] = nullableStringValue,
-                        ["guid"] = guidValue,
-                        ["nullableGuid"] = nullableGuidValue,
-                        ["dateTime"] = dateTimeValue,
-                        ["nullableDateTime"] = nullableDateTimeValue,
-                        ["dateTimeOffset"] = dateTimeOffsetValue,
-                        ["nullableDateTimeOffset"] = nullableDateTimeOffsetValue,
-                        ["timeSpan"] = timeSpanValue,
-                        ["nullableTimeSpan"] = nullableTimeSpanValue,
-                        ["enum"] = enumValue,
-                        ["nullableEnum"] = nullableEnumValue,
-                        ["complexObject"] = null,
-                        ["complexObjectList"] = null
-                    }
-                })
-            };
-
-            // Act
-            var model = (ResourceWithVariousDataTypes?)documentAdapter.Convert(document);
-
-            // Assert
-            model.ShouldNotBeNull();
-
-            model.Boolean.Should().Be(booleanValue);
-            model.NullableBoolean.Should().Be(nullableBooleanValue);
-            model.Char.Should().Be(charValue);
-            model.NullableChar.Should().Be(nullableCharValue);
-            model.UnsignedLong.Should().Be(unsignedLongValue);
-            model.NullableUnsignedLong.Should().Be(nullableUnsignedLongValue);
-            model.Decimal.Should().Be(decimalValue);
-            model.NullableDecimal.Should().Be(nullableDecimalValue);
-            model.Float.Should().Be(floatValue);
-            model.NullableFloat.Should().Be(nullableFloatValue);
-            model.String.Should().Be(stringValue);
-            model.NullableString.Should().Be(nullableStringValue);
-            model.Guid.Should().Be(guidValue);
-            model.NullableGuid.Should().Be(nullableGuidValue);
-            model.DateTime.Should().Be(dateTimeValue);
-            model.NullableDateTime.Should().Be(nullableDateTimeValue);
-            model.DateTimeOffset.Should().Be(dateTimeOffsetValue);
-            model.NullableDateTimeOffset.Should().Be(nullableDateTimeOffsetValue);
-            model.TimeSpan.Should().Be(timeSpanValue);
-            model.NullableTimeSpan.Should().Be(nullableTimeSpanValue);
-            model.Enum.Should().Be(enumValue);
-            model.NullableEnum.Should().Be(nullableEnumValue);
-            model.ComplexObject.Should().BeNull();
-            model.ComplexObjectList.Should().BeNull();
-        }
-
-        private static DocumentAdapter CreateDocumentAdapter<TResource>(Func<IResourceGraph, JsonApiRequest> createRequest)
-            where TResource : Identifiable<int>
-        {
-            var options = new JsonApiOptions();
-            IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<TResource, int>().Build();
-            options.SerializerOptions.Converters.Add(new ResourceObjectConverter(resourceGraph));
+                    ["boolean"] = booleanValue,
+                    ["nullableBoolean"] = nullableBooleanValue,
+                    ["char"] = charValue,
+                    ["nullableChar"] = nullableCharValue,
+                    ["unsignedLong"] = unsignedLongValue,
+                    ["nullableUnsignedLong"] = nullableUnsignedLongValue,
+                    ["decimal"] = decimalValue,
+                    ["nullableDecimal"] = nullableDecimalValue,
+                    ["float"] = floatValue,
+                    ["nullableFloat"] = nullableFloatValue,
+                    ["string"] = stringValue,
+                    ["nullableString"] = nullableStringValue,
+                    ["guid"] = guidValue,
+                    ["nullableGuid"] = nullableGuidValue,
+                    ["dateTime"] = dateTimeValue,
+                    ["nullableDateTime"] = nullableDateTimeValue,
+                    ["dateTimeOffset"] = dateTimeOffsetValue,
+                    ["nullableDateTimeOffset"] = nullableDateTimeOffsetValue,
+                    ["timeSpan"] = timeSpanValue,
+                    ["nullableTimeSpan"] = nullableTimeSpanValue,
+                    ["enum"] = enumValue,
+                    ["nullableEnum"] = nullableEnumValue,
+                    ["complexObject"] = null,
+                    ["complexObjectList"] = null
+                }
+            })
+        };
+
+        // Act
+        var model = (ResourceWithVariousDataTypes?)documentAdapter.Convert(document);
+
+        // Assert
+        model.ShouldNotBeNull();
+
+        model.Boolean.Should().Be(booleanValue);
+        model.NullableBoolean.Should().Be(nullableBooleanValue);
+        model.Char.Should().Be(charValue);
+        model.NullableChar.Should().Be(nullableCharValue);
+        model.UnsignedLong.Should().Be(unsignedLongValue);
+        model.NullableUnsignedLong.Should().Be(nullableUnsignedLongValue);
+        model.Decimal.Should().Be(decimalValue);
+        model.NullableDecimal.Should().Be(nullableDecimalValue);
+        model.Float.Should().Be(floatValue);
+        model.NullableFloat.Should().Be(nullableFloatValue);
+        model.String.Should().Be(stringValue);
+        model.NullableString.Should().Be(nullableStringValue);
+        model.Guid.Should().Be(guidValue);
+        model.NullableGuid.Should().Be(nullableGuidValue);
+        model.DateTime.Should().Be(dateTimeValue);
+        model.NullableDateTime.Should().Be(nullableDateTimeValue);
+        model.DateTimeOffset.Should().Be(dateTimeOffsetValue);
+        model.NullableDateTimeOffset.Should().Be(nullableDateTimeOffsetValue);
+        model.TimeSpan.Should().Be(timeSpanValue);
+        model.NullableTimeSpan.Should().Be(nullableTimeSpanValue);
+        model.Enum.Should().Be(enumValue);
+        model.NullableEnum.Should().Be(nullableEnumValue);
+        model.ComplexObject.Should().BeNull();
+        model.ComplexObjectList.Should().BeNull();
+    }
 
-            var serviceContainer = new ServiceContainer();
-            var resourceFactory = new ResourceFactory(serviceContainer);
-            var resourceDefinitionAccessor = new ResourceDefinitionAccessor(resourceGraph, serviceContainer);
+    private static DocumentAdapter CreateDocumentAdapter<TResource>(Func<IResourceGraph, JsonApiRequest> createRequest)
+        where TResource : Identifiable<int>
+    {
+        var options = new JsonApiOptions();
+        IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance).Add<TResource, int>().Build();
+        options.SerializerOptions.Converters.Add(new ResourceObjectConverter(resourceGraph));
 
-            serviceContainer.AddService(typeof(IResourceDefinitionAccessor), resourceDefinitionAccessor);
-            serviceContainer.AddService(typeof(IResourceDefinition<TResource, int>), new JsonApiResourceDefinition<TResource, int>(resourceGraph));
+        var serviceContainer = new ServiceContainer();
+        var resourceFactory = new ResourceFactory(serviceContainer);
+        var resourceDefinitionAccessor = new ResourceDefinitionAccessor(resourceGraph, serviceContainer);
 
-            JsonApiRequest request = createRequest(resourceGraph);
-            var targetedFields = new TargetedFields();
+        serviceContainer.AddService(typeof(IResourceDefinitionAccessor), resourceDefinitionAccessor);
+        serviceContainer.AddService(typeof(IResourceDefinition<TResource, int>), new JsonApiResourceDefinition<TResource, int>(resourceGraph));
 
-            var resourceIdentifierObjectAdapter = new ResourceIdentifierObjectAdapter(resourceGraph, resourceFactory);
-            var relationshipDataAdapter = new RelationshipDataAdapter(resourceIdentifierObjectAdapter);
-            var resourceObjectAdapter = new ResourceObjectAdapter(resourceGraph, resourceFactory, options, relationshipDataAdapter);
-            var resourceDataAdapter = new ResourceDataAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
+        JsonApiRequest request = createRequest(resourceGraph);
+        var targetedFields = new TargetedFields();
 
-            var atomicReferenceAdapter = new AtomicReferenceAdapter(resourceGraph, resourceFactory);
-            var atomicOperationResourceDataAdapter = new ResourceDataInOperationsRequestAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
+        var resourceIdentifierObjectAdapter = new ResourceIdentifierObjectAdapter(resourceGraph, resourceFactory);
+        var relationshipDataAdapter = new RelationshipDataAdapter(resourceIdentifierObjectAdapter);
+        var resourceObjectAdapter = new ResourceObjectAdapter(resourceGraph, resourceFactory, options, relationshipDataAdapter);
+        var resourceDataAdapter = new ResourceDataAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
 
-            var atomicOperationObjectAdapter = new AtomicOperationObjectAdapter(options, atomicReferenceAdapter,
-                atomicOperationResourceDataAdapter, relationshipDataAdapter);
+        var atomicReferenceAdapter = new AtomicReferenceAdapter(resourceGraph, resourceFactory);
+        var atomicOperationResourceDataAdapter = new ResourceDataInOperationsRequestAdapter(resourceDefinitionAccessor, resourceObjectAdapter);
 
-            var resourceDocumentAdapter = new DocumentInResourceOrRelationshipRequestAdapter(options, resourceDataAdapter, relationshipDataAdapter);
-            var operationsDocumentAdapter = new DocumentInOperationsRequestAdapter(options, atomicOperationObjectAdapter);
+        var atomicOperationObjectAdapter = new AtomicOperationObjectAdapter(options, atomicReferenceAdapter,
+            atomicOperationResourceDataAdapter, relationshipDataAdapter);
 
-            return new DocumentAdapter(request, targetedFields, resourceDocumentAdapter, operationsDocumentAdapter);
-        }
+        var resourceDocumentAdapter = new DocumentInResourceOrRelationshipRequestAdapter(options, resourceDataAdapter, relationshipDataAdapter);
+        var operationsDocumentAdapter = new DocumentInOperationsRequestAdapter(options, atomicOperationObjectAdapter);
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        public sealed class ResourceWithVariousDataTypes : Identifiable<int>
-        {
-            [Attr]
-            public bool Boolean { get; set; }
+        return new DocumentAdapter(request, targetedFields, resourceDocumentAdapter, operationsDocumentAdapter);
+    }
 
-            [Attr]
-            public bool? NullableBoolean { get; set; }
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    public sealed class ResourceWithVariousDataTypes : Identifiable<int>
+    {
+        [Attr]
+        public bool Boolean { get; set; }
 
-            [Attr]
-            public char Char { get; set; }
+        [Attr]
+        public bool? NullableBoolean { get; set; }
 
-            [Attr]
-            public char? NullableChar { get; set; }
+        [Attr]
+        public char Char { get; set; }
 
-            [Attr]
-            public ulong UnsignedLong { get; set; }
+        [Attr]
+        public char? NullableChar { get; set; }
 
-            [Attr]
-            public ulong? NullableUnsignedLong { get; set; }
+        [Attr]
+        public ulong UnsignedLong { get; set; }
 
-            [Attr]
-            public decimal Decimal { get; set; }
+        [Attr]
+        public ulong? NullableUnsignedLong { get; set; }
 
-            [Attr]
-            public decimal? NullableDecimal { get; set; }
+        [Attr]
+        public decimal Decimal { get; set; }
 
-            [Attr]
-            public float Float { get; set; }
+        [Attr]
+        public decimal? NullableDecimal { get; set; }
 
-            [Attr]
-            public float? NullableFloat { get; set; }
+        [Attr]
+        public float Float { get; set; }
 
-            [Attr]
-            public string String { get; set; } = string.Empty;
+        [Attr]
+        public float? NullableFloat { get; set; }
 
-            [Attr]
-            public string? NullableString { get; set; }
+        [Attr]
+        public string String { get; set; } = string.Empty;
 
-            [Attr]
-            public Guid Guid { get; set; }
+        [Attr]
+        public string? NullableString { get; set; }
 
-            [Attr]
-            public Guid? NullableGuid { get; set; }
+        [Attr]
+        public Guid Guid { get; set; }
 
-            [Attr]
-            public DateTime DateTime { get; set; }
+        [Attr]
+        public Guid? NullableGuid { get; set; }
 
-            [Attr]
-            public DateTime? NullableDateTime { get; set; }
+        [Attr]
+        public DateTime DateTime { get; set; }
 
-            [Attr]
-            public DateTimeOffset DateTimeOffset { get; set; }
+        [Attr]
+        public DateTime? NullableDateTime { get; set; }
 
-            [Attr]
-            public DateTimeOffset? NullableDateTimeOffset { get; set; }
+        [Attr]
+        public DateTimeOffset DateTimeOffset { get; set; }
 
-            [Attr]
-            public TimeSpan TimeSpan { get; set; }
+        [Attr]
+        public DateTimeOffset? NullableDateTimeOffset { get; set; }
 
-            [Attr]
-            public TimeSpan? NullableTimeSpan { get; set; }
+        [Attr]
+        public TimeSpan TimeSpan { get; set; }
 
-            [Attr]
-            public DayOfWeek Enum { get; set; }
+        [Attr]
+        public TimeSpan? NullableTimeSpan { get; set; }
 
-            [Attr]
-            public DayOfWeek? NullableEnum { get; set; }
+        [Attr]
+        public DayOfWeek Enum { get; set; }
 
-            [Attr]
-            public ComplexObject? ComplexObject { get; set; }
+        [Attr]
+        public DayOfWeek? NullableEnum { get; set; }
 
-            [Attr]
-            public IList<ComplexObject>? ComplexObjectList { get; set; }
-        }
+        [Attr]
+        public ComplexObject? ComplexObject { get; set; }
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        public sealed class ComplexObject
-        {
-            public string? Value { get; set; }
-        }
+        [Attr]
+        public IList<ComplexObject>? ComplexObjectList { get; set; }
+    }
+
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    public sealed class ComplexObject
+    {
+        public string? Value { get; set; }
     }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Article.cs b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Article.cs
index bd26236d75..6f1a362d08 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Article.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Article.cs
@@ -2,18 +2,17 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response.Models
+namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class Article : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Article : Identifiable<int>
-    {
-        [Attr]
-        public string Title { get; set; } = null!;
+    [Attr]
+    public string Title { get; set; } = null!;
 
-        [HasOne]
-        public Person? Reviewer { get; set; }
+    [HasOne]
+    public Person? Reviewer { get; set; }
 
-        [HasOne]
-        public Person Author { get; set; } = null!;
-    }
+    [HasOne]
+    public Person Author { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Blog.cs b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Blog.cs
index 61a323c240..ec2b476a2e 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Blog.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Blog.cs
@@ -2,18 +2,17 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response.Models
+namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class Blog : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Blog : Identifiable<int>
-    {
-        [Attr]
-        public string Title { get; set; } = null!;
+    [Attr]
+    public string Title { get; set; } = null!;
 
-        [HasOne]
-        public Person Reviewer { get; set; } = null!;
+    [HasOne]
+    public Person Reviewer { get; set; } = null!;
 
-        [HasOne]
-        public Person Author { get; set; } = null!;
-    }
+    [HasOne]
+    public Person Author { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Food.cs b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Food.cs
index 18f3b8b1c6..084f7f5469 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Food.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Food.cs
@@ -2,12 +2,11 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response.Models
+namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class Food : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Food : Identifiable<int>
-    {
-        [Attr]
-        public string Dish { get; set; } = null!;
-    }
+    [Attr]
+    public string Dish { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Person.cs b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Person.cs
index e35526c4d8..9f36aebd3e 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Person.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Person.cs
@@ -1,23 +1,21 @@
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response.Models
+namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class Person : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Person : Identifiable<int>
-    {
-        [Attr]
-        public string Name { get; set; } = null!;
+    [Attr]
+    public string Name { get; set; } = null!;
 
-        [HasMany]
-        public ISet<Blog> Blogs { get; set; } = new HashSet<Blog>();
+    [HasMany]
+    public ISet<Blog> Blogs { get; set; } = new HashSet<Blog>();
 
-        [HasOne]
-        public Food FavoriteFood { get; set; } = null!;
+    [HasOne]
+    public Food FavoriteFood { get; set; } = null!;
 
-        [HasOne]
-        public Song FavoriteSong { get; set; } = null!;
-    }
+    [HasOne]
+    public Song FavoriteSong { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Song.cs b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Song.cs
index 3546aaf226..89475b40d6 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Song.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/Models/Song.cs
@@ -2,12 +2,11 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response.Models
+namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class Song : Identifiable<int>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Song : Identifiable<int>
-    {
-        [Attr]
-        public string Title { get; set; } = null!;
-    }
+    [Attr]
+    public string Title { get; set; } = null!;
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/ResponseModelAdapterTests.cs b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/ResponseModelAdapterTests.cs
index 6419c675e0..79ab5a85cf 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/ResponseModelAdapterTests.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/ResponseModelAdapterTests.cs
@@ -1,10 +1,5 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Linq;
 using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Middleware;
@@ -23,34 +18,34 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response
+namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response;
+
+public sealed class ResponseModelAdapterTests
 {
-    public sealed class ResponseModelAdapterTests
+    [Fact]
+    public void Resources_in_deeply_nested_circular_chain_are_written_in_relationship_declaration_order()
     {
-        [Fact]
-        public void Resources_in_deeply_nested_circular_chain_are_written_in_relationship_declaration_order()
-        {
-            // Arrange
-            var fakers = new ResponseSerializationFakers();
+        // Arrange
+        var fakers = new ResponseSerializationFakers();
 
-            Article article = fakers.Article.Generate();
-            article.Author = fakers.Person.Generate();
-            article.Author.Blogs = fakers.Blog.Generate(2).ToHashSet();
-            article.Author.Blogs.ElementAt(0).Reviewer = article.Author;
-            article.Author.Blogs.ElementAt(1).Reviewer = fakers.Person.Generate();
-            article.Author.FavoriteFood = fakers.Food.Generate();
-            article.Author.Blogs.ElementAt(1).Reviewer.FavoriteFood = fakers.Food.Generate();
+        Article article = fakers.Article.Generate();
+        article.Author = fakers.Person.Generate();
+        article.Author.Blogs = fakers.Blog.Generate(2).ToHashSet();
+        article.Author.Blogs.ElementAt(0).Reviewer = article.Author;
+        article.Author.Blogs.ElementAt(1).Reviewer = fakers.Person.Generate();
+        article.Author.FavoriteFood = fakers.Food.Generate();
+        article.Author.Blogs.ElementAt(1).Reviewer.FavoriteFood = fakers.Food.Generate();
 
-            IJsonApiOptions options = new JsonApiOptions();
-            ResponseModelAdapter responseModelAdapter = CreateAdapter(options, article.StringId, "author.blogs.reviewer.favoriteFood");
+        IJsonApiOptions options = new JsonApiOptions();
+        ResponseModelAdapter responseModelAdapter = CreateAdapter(options, article.StringId, "author.blogs.reviewer.favoriteFood");
 
-            // Act
-            Document document = responseModelAdapter.Convert(article);
+        // Act
+        Document document = responseModelAdapter.Convert(article);
 
-            // Assert
-            string text = JsonSerializer.Serialize(document, new JsonSerializerOptions(options.SerializerWriteOptions));
+        // Assert
+        string text = JsonSerializer.Serialize(document, new JsonSerializerOptions(options.SerializerWriteOptions));
 
-            text.Should().BeJson(@"{
+        text.Should().BeJson(@"{
   ""data"": {
     ""type"": ""articles"",
     ""id"": ""1"",
@@ -155,39 +150,39 @@ public void Resources_in_deeply_nested_circular_chain_are_written_in_relationshi
     }
   ]
 }");
-        }
+    }
 
-        [Fact]
-        public void Resources_in_deeply_nested_circular_chains_are_written_in_relationship_declaration_order_without_duplicates()
-        {
-            // Arrange
-            var fakers = new ResponseSerializationFakers();
+    [Fact]
+    public void Resources_in_deeply_nested_circular_chains_are_written_in_relationship_declaration_order_without_duplicates()
+    {
+        // Arrange
+        var fakers = new ResponseSerializationFakers();
 
-            Article article1 = fakers.Article.Generate();
-            article1.Author = fakers.Person.Generate();
-            article1.Author.Blogs = fakers.Blog.Generate(2).ToHashSet();
-            article1.Author.Blogs.ElementAt(0).Reviewer = article1.Author;
-            article1.Author.Blogs.ElementAt(1).Reviewer = fakers.Person.Generate();
-            article1.Author.FavoriteFood = fakers.Food.Generate();
-            article1.Author.Blogs.ElementAt(1).Reviewer.FavoriteFood = fakers.Food.Generate();
+        Article article1 = fakers.Article.Generate();
+        article1.Author = fakers.Person.Generate();
+        article1.Author.Blogs = fakers.Blog.Generate(2).ToHashSet();
+        article1.Author.Blogs.ElementAt(0).Reviewer = article1.Author;
+        article1.Author.Blogs.ElementAt(1).Reviewer = fakers.Person.Generate();
+        article1.Author.FavoriteFood = fakers.Food.Generate();
+        article1.Author.Blogs.ElementAt(1).Reviewer.FavoriteFood = fakers.Food.Generate();
 
-            Article article2 = fakers.Article.Generate();
-            article2.Author = article1.Author;
+        Article article2 = fakers.Article.Generate();
+        article2.Author = article1.Author;
 
-            IJsonApiOptions options = new JsonApiOptions();
-            ResponseModelAdapter responseModelAdapter = CreateAdapter(options, article1.StringId, "author.blogs.reviewer.favoriteFood");
+        IJsonApiOptions options = new JsonApiOptions();
+        ResponseModelAdapter responseModelAdapter = CreateAdapter(options, article1.StringId, "author.blogs.reviewer.favoriteFood");
 
-            // Act
-            Document document = responseModelAdapter.Convert(new[]
-            {
-                article1,
-                article2
-            });
+        // Act
+        Document document = responseModelAdapter.Convert(new[]
+        {
+            article1,
+            article2
+        });
 
-            // Assert
-            string text = JsonSerializer.Serialize(document, new JsonSerializerOptions(options.SerializerWriteOptions));
+        // Assert
+        string text = JsonSerializer.Serialize(document, new JsonSerializerOptions(options.SerializerWriteOptions));
 
-            text.Should().BeJson(@"{
+        text.Should().BeJson(@"{
   ""data"": [
     {
       ""type"": ""articles"",
@@ -309,43 +304,43 @@ public void Resources_in_deeply_nested_circular_chains_are_written_in_relationsh
     }
   ]
 }");
-        }
+    }
 
-        [Fact]
-        public void Resources_in_overlapping_deeply_nested_circular_chains_are_written_in_relationship_declaration_order()
-        {
-            // Arrange
-            var fakers = new ResponseSerializationFakers();
+    [Fact]
+    public void Resources_in_overlapping_deeply_nested_circular_chains_are_written_in_relationship_declaration_order()
+    {
+        // Arrange
+        var fakers = new ResponseSerializationFakers();
 
-            Article article = fakers.Article.Generate();
-            article.Author = fakers.Person.Generate();
-            article.Author.Blogs = fakers.Blog.Generate(2).ToHashSet();
-            article.Author.Blogs.ElementAt(0).Reviewer = article.Author;
-            article.Author.Blogs.ElementAt(1).Reviewer = fakers.Person.Generate();
-            article.Author.FavoriteFood = fakers.Food.Generate();
-            article.Author.Blogs.ElementAt(1).Reviewer.FavoriteFood = fakers.Food.Generate();
+        Article article = fakers.Article.Generate();
+        article.Author = fakers.Person.Generate();
+        article.Author.Blogs = fakers.Blog.Generate(2).ToHashSet();
+        article.Author.Blogs.ElementAt(0).Reviewer = article.Author;
+        article.Author.Blogs.ElementAt(1).Reviewer = fakers.Person.Generate();
+        article.Author.FavoriteFood = fakers.Food.Generate();
+        article.Author.Blogs.ElementAt(1).Reviewer.FavoriteFood = fakers.Food.Generate();
 
-            article.Reviewer = fakers.Person.Generate();
-            article.Reviewer.Blogs = fakers.Blog.Generate(1).ToHashSet();
-            article.Reviewer.Blogs.Add(article.Author.Blogs.ElementAt(0));
-            article.Reviewer.Blogs.ElementAt(0).Author = article.Reviewer;
+        article.Reviewer = fakers.Person.Generate();
+        article.Reviewer.Blogs = fakers.Blog.Generate(1).ToHashSet();
+        article.Reviewer.Blogs.Add(article.Author.Blogs.ElementAt(0));
+        article.Reviewer.Blogs.ElementAt(0).Author = article.Reviewer;
 
-            article.Reviewer.Blogs.ElementAt(1).Author = article.Author.Blogs.ElementAt(1).Reviewer;
-            article.Author.Blogs.ElementAt(1).Reviewer.FavoriteSong = fakers.Song.Generate();
-            article.Reviewer.FavoriteSong = fakers.Song.Generate();
+        article.Reviewer.Blogs.ElementAt(1).Author = article.Author.Blogs.ElementAt(1).Reviewer;
+        article.Author.Blogs.ElementAt(1).Reviewer.FavoriteSong = fakers.Song.Generate();
+        article.Reviewer.FavoriteSong = fakers.Song.Generate();
 
-            IJsonApiOptions options = new JsonApiOptions();
+        IJsonApiOptions options = new JsonApiOptions();
 
-            ResponseModelAdapter responseModelAdapter =
-                CreateAdapter(options, article.StringId, "author.blogs.reviewer.favoriteFood,reviewer.blogs.author.favoriteSong");
+        ResponseModelAdapter responseModelAdapter =
+            CreateAdapter(options, article.StringId, "author.blogs.reviewer.favoriteFood,reviewer.blogs.author.favoriteSong");
 
-            // Act
-            Document document = responseModelAdapter.Convert(article);
+        // Act
+        Document document = responseModelAdapter.Convert(article);
 
-            // Assert
-            string text = JsonSerializer.Serialize(document, new JsonSerializerOptions(options.SerializerWriteOptions));
+        // Assert
+        string text = JsonSerializer.Serialize(document, new JsonSerializerOptions(options.SerializerWriteOptions));
 
-            text.Should().BeJson(@"{
+        text.Should().BeJson(@"{
   ""data"": {
     ""type"": ""articles"",
     ""id"": ""1"",
@@ -524,195 +519,194 @@ public void Resources_in_overlapping_deeply_nested_circular_chains_are_written_i
     }
   ]
 }");
-        }
-
-        [Fact]
-        public void Duplicate_children_in_multiple_chains_occur_once_in_output()
-        {
-            // Arrange
-            var fakers = new ResponseSerializationFakers();
+    }
 
-            Person person = fakers.Person.Generate();
-            List<Article> articles = fakers.Article.Generate(5);
-            articles.ForEach(article => article.Author = person);
-            articles.ForEach(article => article.Reviewer = person);
+    [Fact]
+    public void Duplicate_children_in_multiple_chains_occur_once_in_output()
+    {
+        // Arrange
+        var fakers = new ResponseSerializationFakers();
 
-            IJsonApiOptions options = new JsonApiOptions();
-            ResponseModelAdapter responseModelAdapter = CreateAdapter(options, null, "author,reviewer");
+        Person person = fakers.Person.Generate();
+        List<Article> articles = fakers.Article.Generate(5);
+        articles.ForEach(article => article.Author = person);
+        articles.ForEach(article => article.Reviewer = person);
 
-            // Act
-            Document document = responseModelAdapter.Convert(articles);
+        IJsonApiOptions options = new JsonApiOptions();
+        ResponseModelAdapter responseModelAdapter = CreateAdapter(options, null, "author,reviewer");
 
-            // Assert
-            document.Included.ShouldHaveCount(1);
+        // Act
+        Document document = responseModelAdapter.Convert(articles);
 
-            document.Included[0].Attributes.ShouldContainKey("name").With(value => value.Should().Be(person.Name));
-            document.Included[0].Id.Should().Be(person.StringId);
-        }
+        // Assert
+        document.Included.ShouldHaveCount(1);
 
-        private ResponseModelAdapter CreateAdapter(IJsonApiOptions options, string? primaryId, string includeChains)
-        {
-            // @formatter:wrap_chained_method_calls chop_always
-            // @formatter:keep_existing_linebreaks true
-
-            IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance)
-                .Add<Article, int>()
-                .Add<Person, int>()
-                .Add<Blog, int>()
-                .Add<Food, int>()
-                .Add<Song, int>()
-                .Build();
+        document.Included[0].Attributes.ShouldContainKey("name").With(value => value.Should().Be(person.Name));
+        document.Included[0].Id.Should().Be(person.StringId);
+    }
 
-            // @formatter:wrap_chained_method_calls restore
-            // @formatter:keep_existing_linebreaks restore
+    private ResponseModelAdapter CreateAdapter(IJsonApiOptions options, string? primaryId, string includeChains)
+    {
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
 
-            var request = new JsonApiRequest
-            {
-                Kind = EndpointKind.Primary,
-                PrimaryResourceType = resourceGraph.GetResourceType<Article>(),
-                PrimaryId = primaryId
-            };
+        IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance)
+            .Add<Article, int>()
+            .Add<Person, int>()
+            .Add<Blog, int>()
+            .Add<Food, int>()
+            .Add<Song, int>()
+            .Build();
 
-            var evaluatedIncludeCache = new EvaluatedIncludeCache();
-            var linkBuilder = new FakeLinkBuilder();
-            var metaBuilder = new FakeMetaBuilder();
-            var resourceDefinitionAccessor = new FakeResourceDefinitionAccessor();
-            var sparseFieldSetCache = new SparseFieldSetCache(Array.Empty<IQueryConstraintProvider>(), resourceDefinitionAccessor);
-            var requestQueryStringAccessor = new FakeRequestQueryStringAccessor();
+        // @formatter:wrap_chained_method_calls restore
+        // @formatter:keep_existing_linebreaks restore
 
-            var parser = new IncludeParser();
-            IncludeExpression include = parser.Parse(includeChains, request.PrimaryResourceType, null);
-            evaluatedIncludeCache.Set(include);
+        var request = new JsonApiRequest
+        {
+            Kind = EndpointKind.Primary,
+            PrimaryResourceType = resourceGraph.GetResourceType<Article>(),
+            PrimaryId = primaryId
+        };
+
+        var evaluatedIncludeCache = new EvaluatedIncludeCache();
+        var linkBuilder = new FakeLinkBuilder();
+        var metaBuilder = new FakeMetaBuilder();
+        var resourceDefinitionAccessor = new FakeResourceDefinitionAccessor();
+        var sparseFieldSetCache = new SparseFieldSetCache(Array.Empty<IQueryConstraintProvider>(), resourceDefinitionAccessor);
+        var requestQueryStringAccessor = new FakeRequestQueryStringAccessor();
+
+        var parser = new IncludeParser();
+        IncludeExpression include = parser.Parse(includeChains, request.PrimaryResourceType, null);
+        evaluatedIncludeCache.Set(include);
+
+        return new ResponseModelAdapter(request, options, linkBuilder, metaBuilder, resourceDefinitionAccessor, evaluatedIncludeCache, sparseFieldSetCache,
+            requestQueryStringAccessor);
+    }
 
-            return new ResponseModelAdapter(request, options, linkBuilder, metaBuilder, resourceDefinitionAccessor, evaluatedIncludeCache, sparseFieldSetCache,
-                requestQueryStringAccessor);
+    private sealed class FakeLinkBuilder : ILinkBuilder
+    {
+        public TopLevelLinks? GetTopLevelLinks()
+        {
+            return null;
         }
 
-        private sealed class FakeLinkBuilder : ILinkBuilder
+        public ResourceLinks? GetResourceLinks(ResourceType resourceType, IIdentifiable resource)
         {
-            public TopLevelLinks? GetTopLevelLinks()
-            {
-                return null;
-            }
-
-            public ResourceLinks? GetResourceLinks(ResourceType resourceType, IIdentifiable resource)
-            {
-                return null;
-            }
-
-            public RelationshipLinks? GetRelationshipLinks(RelationshipAttribute relationship, IIdentifiable leftResource)
-            {
-                return null;
-            }
+            return null;
         }
 
-        private sealed class FakeMetaBuilder : IMetaBuilder
+        public RelationshipLinks? GetRelationshipLinks(RelationshipAttribute relationship, IIdentifiable leftResource)
         {
-            public void Add(IReadOnlyDictionary<string, object?> values)
-            {
-            }
+            return null;
+        }
+    }
 
-            public IDictionary<string, object?>? Build()
-            {
-                return null;
-            }
+    private sealed class FakeMetaBuilder : IMetaBuilder
+    {
+        public void Add(IReadOnlyDictionary<string, object?> values)
+        {
         }
 
-        private sealed class FakeResourceDefinitionAccessor : IResourceDefinitionAccessor
+        public IDictionary<string, object?>? Build()
         {
-            public IImmutableSet<IncludeElementExpression> OnApplyIncludes(ResourceType resourceType, IImmutableSet<IncludeElementExpression> existingIncludes)
-            {
-                return existingIncludes;
-            }
+            return null;
+        }
+    }
 
-            public FilterExpression? OnApplyFilter(ResourceType resourceType, FilterExpression? existingFilter)
-            {
-                return existingFilter;
-            }
+    private sealed class FakeResourceDefinitionAccessor : IResourceDefinitionAccessor
+    {
+        public IImmutableSet<IncludeElementExpression> OnApplyIncludes(ResourceType resourceType, IImmutableSet<IncludeElementExpression> existingIncludes)
+        {
+            return existingIncludes;
+        }
 
-            public SortExpression? OnApplySort(ResourceType resourceType, SortExpression? existingSort)
-            {
-                return existingSort;
-            }
+        public FilterExpression? OnApplyFilter(ResourceType resourceType, FilterExpression? existingFilter)
+        {
+            return existingFilter;
+        }
 
-            public PaginationExpression? OnApplyPagination(ResourceType resourceType, PaginationExpression? existingPagination)
-            {
-                return existingPagination;
-            }
+        public SortExpression? OnApplySort(ResourceType resourceType, SortExpression? existingSort)
+        {
+            return existingSort;
+        }
 
-            public SparseFieldSetExpression? OnApplySparseFieldSet(ResourceType resourceType, SparseFieldSetExpression? existingSparseFieldSet)
-            {
-                return existingSparseFieldSet;
-            }
+        public PaginationExpression? OnApplyPagination(ResourceType resourceType, PaginationExpression? existingPagination)
+        {
+            return existingPagination;
+        }
 
-            public object? GetQueryableHandlerForQueryStringParameter(Type resourceClrType, string parameterName)
-            {
-                return null;
-            }
+        public SparseFieldSetExpression? OnApplySparseFieldSet(ResourceType resourceType, SparseFieldSetExpression? existingSparseFieldSet)
+        {
+            return existingSparseFieldSet;
+        }
 
-            public IDictionary<string, object?>? GetMeta(ResourceType resourceType, IIdentifiable resourceInstance)
-            {
-                return null;
-            }
+        public object? GetQueryableHandlerForQueryStringParameter(Type resourceClrType, string parameterName)
+        {
+            return null;
+        }
 
-            public Task OnPrepareWriteAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable
-            {
-                return Task.CompletedTask;
-            }
+        public IDictionary<string, object?>? GetMeta(ResourceType resourceType, IIdentifiable resourceInstance)
+        {
+            return null;
+        }
 
-            public Task<IIdentifiable?> OnSetToOneRelationshipAsync<TResource>(TResource leftResource, HasOneAttribute hasOneRelationship,
-                IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable
-            {
-                return Task.FromResult(rightResourceId);
-            }
+        public Task OnPrepareWriteAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable
+        {
+            return Task.CompletedTask;
+        }
 
-            public Task OnSetToManyRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship,
-                ISet<IIdentifiable> rightResourceIds, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable
-            {
-                return Task.CompletedTask;
-            }
+        public Task<IIdentifiable?> OnSetToOneRelationshipAsync<TResource>(TResource leftResource, HasOneAttribute hasOneRelationship,
+            IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable
+        {
+            return Task.FromResult(rightResourceId);
+        }
 
-            public Task OnAddToRelationshipAsync<TResource, TId>(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable<TId>
-            {
-                return Task.CompletedTask;
-            }
+        public Task OnSetToManyRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            WriteOperationKind writeOperation, CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable
+        {
+            return Task.CompletedTask;
+        }
 
-            public Task OnRemoveFromRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship,
-                ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable
-            {
-                return Task.CompletedTask;
-            }
+        public Task OnAddToRelationshipAsync<TResource, TId>(TId leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable<TId>
+        {
+            return Task.CompletedTask;
+        }
 
-            public Task OnWritingAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable
-            {
-                return Task.CompletedTask;
-            }
+        public Task OnRemoveFromRelationshipAsync<TResource>(TResource leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable
+        {
+            return Task.CompletedTask;
+        }
 
-            public Task OnWriteSucceededAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-                where TResource : class, IIdentifiable
-            {
-                return Task.CompletedTask;
-            }
+        public Task OnWritingAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable
+        {
+            return Task.CompletedTask;
+        }
 
-            public void OnDeserialize(IIdentifiable resource)
-            {
-            }
+        public Task OnWriteSucceededAsync<TResource>(TResource resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+            where TResource : class, IIdentifiable
+        {
+            return Task.CompletedTask;
+        }
 
-            public void OnSerialize(IIdentifiable resource)
-            {
-            }
+        public void OnDeserialize(IIdentifiable resource)
+        {
         }
 
-        private sealed class FakeRequestQueryStringAccessor : IRequestQueryStringAccessor
+        public void OnSerialize(IIdentifiable resource)
         {
-            public IQueryCollection Query { get; } = new QueryCollection(0);
         }
     }
+
+    private sealed class FakeRequestQueryStringAccessor : IRequestQueryStringAccessor
+    {
+        public IQueryCollection Query { get; } = new QueryCollection(0);
+    }
 }
diff --git a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/ResponseSerializationFakers.cs b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/ResponseSerializationFakers.cs
index acc001a16b..a7f194a88e 100644
--- a/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/ResponseSerializationFakers.cs
+++ b/test/JsonApiDotNetCoreTests/UnitTests/Serialization/Response/ResponseSerializationFakers.cs
@@ -5,45 +5,44 @@
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response
+namespace JsonApiDotNetCoreTests.UnitTests.Serialization.Response;
+
+internal sealed class ResponseSerializationFakers
 {
-    internal sealed class ResponseSerializationFakers
+    private const int FakerSeed = 0;
+    private int _index;
+
+    public Faker<Food> Food { get; }
+    public Faker<Song> Song { get; }
+    public Faker<Article> Article { get; }
+    public Faker<Blog> Blog { get; }
+    public Faker<Person> Person { get; }
+
+    public ResponseSerializationFakers()
     {
-        private const int FakerSeed = 0;
-        private int _index;
-
-        public Faker<Food> Food { get; }
-        public Faker<Song> Song { get; }
-        public Faker<Article> Article { get; }
-        public Faker<Blog> Blog { get; }
-        public Faker<Person> Person { get; }
-
-        public ResponseSerializationFakers()
-        {
-            Article = new Faker<Article>()
-                .UseSeed(FakerSeed)
-                .RuleFor(article => article.Title, faker => faker.Hacker.Phrase())
-                .RuleFor(article => article.Id, _ => ++_index);
-
-            Person = new Faker<Person>()
-                .UseSeed(FakerSeed)
-                .RuleFor(person => person.Name, faker => faker.Person.FullName)
-                .RuleFor(person => person.Id, _ => ++_index);
-
-            Blog = new Faker<Blog>()
-                .UseSeed(FakerSeed)
-                .RuleFor(blog => blog.Title, faker => faker.Hacker.Phrase())
-                .RuleFor(blog => blog.Id, _ => ++_index);
-
-            Song = new Faker<Song>()
-                .UseSeed(FakerSeed)
-                .RuleFor(song => song.Title, faker => faker.Lorem.Sentence())
-                .RuleFor(song => song.Id, _ => ++_index);
-
-            Food = new Faker<Food>()
-                .UseSeed(FakerSeed)
-                .RuleFor(food => food.Dish, faker => faker.Lorem.Sentence())
-                .RuleFor(food => food.Id, _ => ++_index);
-        }
+        Article = new Faker<Article>()
+            .UseSeed(FakerSeed)
+            .RuleFor(article => article.Title, faker => faker.Hacker.Phrase())
+            .RuleFor(article => article.Id, _ => ++_index);
+
+        Person = new Faker<Person>()
+            .UseSeed(FakerSeed)
+            .RuleFor(person => person.Name, faker => faker.Person.FullName)
+            .RuleFor(person => person.Id, _ => ++_index);
+
+        Blog = new Faker<Blog>()
+            .UseSeed(FakerSeed)
+            .RuleFor(blog => blog.Title, faker => faker.Hacker.Phrase())
+            .RuleFor(blog => blog.Id, _ => ++_index);
+
+        Song = new Faker<Song>()
+            .UseSeed(FakerSeed)
+            .RuleFor(song => song.Title, faker => faker.Lorem.Sentence())
+            .RuleFor(song => song.Id, _ => ++_index);
+
+        Food = new Faker<Food>()
+            .UseSeed(FakerSeed)
+            .RuleFor(food => food.Dish, faker => faker.Lorem.Sentence())
+            .RuleFor(food => food.Id, _ => ++_index);
     }
 }
diff --git a/test/MultiDbContextTests/MultiDbContextTests.csproj b/test/MultiDbContextTests/MultiDbContextTests.csproj
index 9631607273..a5d0715a2a 100644
--- a/test/MultiDbContextTests/MultiDbContextTests.csproj
+++ b/test/MultiDbContextTests/MultiDbContextTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,7 +16,7 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
   </ItemGroup>
diff --git a/test/MultiDbContextTests/ResourceTests.cs b/test/MultiDbContextTests/ResourceTests.cs
index d8661a1996..519c975d2a 100644
--- a/test/MultiDbContextTests/ResourceTests.cs
+++ b/test/MultiDbContextTests/ResourceTests.cs
@@ -1,71 +1,68 @@
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.DependencyInjection;
-using MultiDbContextExample;
+using MultiDbContextExample.Models;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace MultiDbContextTests
+namespace MultiDbContextTests;
+
+public sealed class ResourceTests : IntegrationTest, IClassFixture<WebApplicationFactory<ResourceA>>
 {
-    public sealed class ResourceTests : IntegrationTest, IClassFixture<WebApplicationFactory<Startup>>
-    {
-        private readonly WebApplicationFactory<Startup> _factory;
+    private readonly WebApplicationFactory<ResourceA> _factory;
 
-        protected override JsonSerializerOptions SerializerOptions
+    protected override JsonSerializerOptions SerializerOptions
+    {
+        get
         {
-            get
-            {
-                var options = _factory.Services.GetRequiredService<IJsonApiOptions>();
-                return options.SerializerOptions;
-            }
+            var options = _factory.Services.GetRequiredService<IJsonApiOptions>();
+            return options.SerializerOptions;
         }
+    }
 
-        public ResourceTests(WebApplicationFactory<Startup> factory)
-        {
-            _factory = factory;
-        }
+    public ResourceTests(WebApplicationFactory<ResourceA> factory)
+    {
+        _factory = factory;
+    }
 
-        [Fact]
-        public async Task Can_get_ResourceAs()
-        {
-            // Arrange
-            const string route = "/resourceAs";
+    [Fact]
+    public async Task Can_get_ResourceAs()
+    {
+        // Arrange
+        const string route = "/resourceAs";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("nameA").With(value => value.Should().Be("SampleA"));
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("nameA").With(value => value.Should().Be("SampleA"));
+    }
 
-        [Fact]
-        public async Task Can_get_ResourceBs()
-        {
-            // Arrange
-            const string route = "/resourceBs";
+    [Fact]
+    public async Task Can_get_ResourceBs()
+    {
+        // Arrange
+        const string route = "/resourceBs";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldHaveCount(1);
-            responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("nameB").With(value => value.Should().Be("SampleB"));
-        }
+        responseDocument.Data.ManyValue.ShouldHaveCount(1);
+        responseDocument.Data.ManyValue[0].Attributes.ShouldContainKey("nameB").With(value => value.Should().Be("SampleB"));
+    }
 
-        protected override HttpClient CreateClient()
-        {
-            return _factory.CreateClient();
-        }
+    protected override HttpClient CreateClient()
+    {
+        return _factory.CreateClient();
     }
 }
diff --git a/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj b/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj
index 7f9fab09ac..d9d8b80ad8 100644
--- a/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj
+++ b/test/NoEntityFrameworkTests/NoEntityFrameworkTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Moq" Version="$(MoqVersion)" />
   </ItemGroup>
diff --git a/test/NoEntityFrameworkTests/WorkItemTests.cs b/test/NoEntityFrameworkTests/WorkItemTests.cs
index 881314da30..74119ed2b9 100644
--- a/test/NoEntityFrameworkTests/WorkItemTests.cs
+++ b/test/NoEntityFrameworkTests/WorkItemTests.cs
@@ -1,172 +1,167 @@
-using System;
 using System.Net;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Serialization.Objects;
 using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.Extensions.DependencyInjection;
-using NoEntityFrameworkExample;
 using NoEntityFrameworkExample.Data;
 using NoEntityFrameworkExample.Models;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace NoEntityFrameworkTests
+namespace NoEntityFrameworkTests;
+
+public sealed class WorkItemTests : IntegrationTest, IClassFixture<WebApplicationFactory<WorkItem>>
 {
-    public sealed class WorkItemTests : IntegrationTest, IClassFixture<WebApplicationFactory<Startup>>
-    {
-        private readonly WebApplicationFactory<Startup> _factory;
+    private readonly WebApplicationFactory<WorkItem> _factory;
 
-        protected override JsonSerializerOptions SerializerOptions
+    protected override JsonSerializerOptions SerializerOptions
+    {
+        get
         {
-            get
-            {
-                var options = _factory.Services.GetRequiredService<IJsonApiOptions>();
-                return options.SerializerOptions;
-            }
+            var options = _factory.Services.GetRequiredService<IJsonApiOptions>();
+            return options.SerializerOptions;
         }
+    }
 
-        public WorkItemTests(WebApplicationFactory<Startup> factory)
-        {
-            _factory = factory;
-        }
+    public WorkItemTests(WebApplicationFactory<WorkItem> factory)
+    {
+        _factory = factory;
+    }
 
-        [Fact]
-        public async Task Can_get_WorkItems()
+    [Fact]
+    public async Task Can_get_WorkItems()
+    {
+        var workItem = new WorkItem
         {
-            var workItem = new WorkItem
-            {
-                Title = "Write some code."
-            };
+            Title = "Write some code."
+        };
 
-            // Arrange
-            await RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+        // Arrange
+        await RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            const string route = "/api/v1/workItems";
+        const string route = "/api/v1/workItems";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.ManyValue.ShouldNotBeEmpty();
-        }
+        responseDocument.Data.ManyValue.ShouldNotBeEmpty();
+    }
 
-        [Fact]
-        public async Task Can_get_WorkItem_by_ID()
+    [Fact]
+    public async Task Can_get_WorkItem_by_ID()
+    {
+        // Arrange
+        var workItem = new WorkItem
         {
-            // Arrange
-            var workItem = new WorkItem
-            {
-                Title = "Write some code."
-            };
+            Title = "Write some code."
+        };
 
-            await RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/api/v1/workItems/{workItem.StringId}";
+        string route = $"/api/v1/workItems/{workItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await ExecuteGetAsync<Document>(route);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await ExecuteGetAsync<Document>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.OK);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Id.Should().Be(workItem.StringId);
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Id.Should().Be(workItem.StringId);
+    }
 
-        [Fact]
-        public async Task Can_create_WorkItem()
+    [Fact]
+    public async Task Can_create_WorkItem()
+    {
+        // Arrange
+        var newWorkItem = new WorkItem
         {
-            // Arrange
-            var newWorkItem = new WorkItem
-            {
-                IsBlocked = true,
-                Title = "Some",
-                DurationInHours = 2,
-                ProjectId = Guid.NewGuid()
-            };
+            IsBlocked = true,
+            Title = "Some",
+            DurationInHours = 2,
+            ProjectId = Guid.NewGuid()
+        };
 
-            var requestBody = new
+        var requestBody = new
+        {
+            data = new
             {
-                data = new
+                type = "workItems",
+                attributes = new
                 {
-                    type = "workItems",
-                    attributes = new
-                    {
-                        isBlocked = newWorkItem.IsBlocked,
-                        title = newWorkItem.Title,
-                        durationInHours = newWorkItem.DurationInHours,
-                        projectId = newWorkItem.ProjectId
-                    }
+                    isBlocked = newWorkItem.IsBlocked,
+                    title = newWorkItem.Title,
+                    durationInHours = newWorkItem.DurationInHours,
+                    projectId = newWorkItem.ProjectId
                 }
-            };
+            }
+        };
 
-            const string route = "/api/v1/workItems/";
+        const string route = "/api/v1/workItems/";
 
-            // Act
-            (HttpResponseMessage httpResponse, Document responseDocument) = await ExecutePostAsync<Document>(route, requestBody);
+        // Act
+        (HttpResponseMessage httpResponse, Document responseDocument) = await ExecutePostAsync<Document>(route, requestBody);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.Created);
 
-            responseDocument.Data.SingleValue.ShouldNotBeNull();
-            responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isBlocked").With(value => value.Should().Be(newWorkItem.IsBlocked));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newWorkItem.Title));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("durationInHours").With(value => value.Should().Be(newWorkItem.DurationInHours));
-            responseDocument.Data.SingleValue.Attributes.ShouldContainKey("projectId").With(value => value.Should().Be(newWorkItem.ProjectId));
-        }
+        responseDocument.Data.SingleValue.ShouldNotBeNull();
+        responseDocument.Data.SingleValue.Attributes.ShouldNotBeEmpty();
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("isBlocked").With(value => value.Should().Be(newWorkItem.IsBlocked));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("title").With(value => value.Should().Be(newWorkItem.Title));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("durationInHours").With(value => value.Should().Be(newWorkItem.DurationInHours));
+        responseDocument.Data.SingleValue.Attributes.ShouldContainKey("projectId").With(value => value.Should().Be(newWorkItem.ProjectId));
+    }
 
-        [Fact]
-        public async Task Can_delete_WorkItem()
+    [Fact]
+    public async Task Can_delete_WorkItem()
+    {
+        // Arrange
+        var workItem = new WorkItem
         {
-            // Arrange
-            var workItem = new WorkItem
-            {
-                Title = "Write some code."
-            };
+            Title = "Write some code."
+        };
 
-            await RunOnDatabaseAsync(async dbContext =>
-            {
-                dbContext.WorkItems.Add(workItem);
-                await dbContext.SaveChangesAsync();
-            });
+        await RunOnDatabaseAsync(async dbContext =>
+        {
+            dbContext.WorkItems.Add(workItem);
+            await dbContext.SaveChangesAsync();
+        });
 
-            string route = $"/api/v1/workItems/{workItem.StringId}";
+        string route = $"/api/v1/workItems/{workItem.StringId}";
 
-            // Act
-            (HttpResponseMessage httpResponse, string responseDocument) = await ExecuteDeleteAsync<string>(route);
+        // Act
+        (HttpResponseMessage httpResponse, string responseDocument) = await ExecuteDeleteAsync<string>(route);
 
-            // Assert
-            httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
+        // Assert
+        httpResponse.Should().HaveStatusCode(HttpStatusCode.NoContent);
 
-            responseDocument.Should().BeEmpty();
-        }
+        responseDocument.Should().BeEmpty();
+    }
 
-        protected override HttpClient CreateClient()
-        {
-            return _factory.CreateClient();
-        }
+    protected override HttpClient CreateClient()
+    {
+        return _factory.CreateClient();
+    }
 
-        private async Task RunOnDatabaseAsync(Func<AppDbContext, Task> asyncAction)
-        {
-            using IServiceScope scope = _factory.Services.CreateScope();
-            var dbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
+    private async Task RunOnDatabaseAsync(Func<AppDbContext, Task> asyncAction)
+    {
+        await using AsyncServiceScope scope = _factory.Services.CreateAsyncScope();
+        var dbContext = scope.ServiceProvider.GetRequiredService<AppDbContext>();
 
-            await asyncAction(dbContext);
-        }
+        await asyncAction(dbContext);
     }
 }
diff --git a/test/OpenApiClientTests/LegacyClient/ApiResponse.cs b/test/OpenApiClientTests/LegacyClient/ApiResponse.cs
index 585212f12f..cb00e862a4 100644
--- a/test/OpenApiClientTests/LegacyClient/ApiResponse.cs
+++ b/test/OpenApiClientTests/LegacyClient/ApiResponse.cs
@@ -1,34 +1,31 @@
-using System;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.OpenApi.Client;
 using OpenApiClientTests.LegacyClient.GeneratedCode;
 
 #pragma warning disable AV1008 // Class should not be static
 
-namespace OpenApiClientTests.LegacyClient
+namespace OpenApiClientTests.LegacyClient;
+
+internal static class ApiResponse
 {
-    internal static class ApiResponse
+    public static async Task<TResponse?> TranslateAsync<TResponse>(Func<Task<TResponse>> operation)
+        where TResponse : class
     {
-        public static async Task<TResponse?> TranslateAsync<TResponse>(Func<Task<TResponse>> operation)
-            where TResponse : class
-        {
-            // Workaround for https://github.com/RicoSuter/NSwag/issues/2499
+        // Workaround for https://github.com/RicoSuter/NSwag/issues/2499
 
-            ArgumentGuard.NotNull(operation, nameof(operation));
+        ArgumentGuard.NotNull(operation, nameof(operation));
 
-            try
+        try
+        {
+            return await operation();
+        }
+        catch (ApiException exception)
+        {
+            if (exception.StatusCode != 204)
             {
-                return await operation();
+                throw;
             }
-            catch (ApiException exception)
-            {
-                if (exception.StatusCode != 204)
-                {
-                    throw;
-                }
 
-                return null;
-            }
+            return null;
         }
     }
 }
diff --git a/test/OpenApiClientTests/LegacyClient/ClientAttributeRegistrationLifeTimeTests.cs b/test/OpenApiClientTests/LegacyClient/ClientAttributeRegistrationLifeTimeTests.cs
index f9e48c5da0..c164aafd0f 100644
--- a/test/OpenApiClientTests/LegacyClient/ClientAttributeRegistrationLifeTimeTests.cs
+++ b/test/OpenApiClientTests/LegacyClient/ClientAttributeRegistrationLifeTimeTests.cs
@@ -1,46 +1,45 @@
 using System.Net;
-using System.Threading.Tasks;
 using FluentAssertions;
 using OpenApiClientTests.LegacyClient.GeneratedCode;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace OpenApiClientTests.LegacyClient
+namespace OpenApiClientTests.LegacyClient;
+
+public sealed class ClientAttributeRegistrationLifetimeTests
 {
-    public sealed class ClientAttributeRegistrationLifetimeTests
+    [Fact]
+    public async Task Disposed_attribute_registration_for_document_does_not_affect_request()
     {
-        [Fact]
-        public async Task Disposed_attribute_registration_for_document_does_not_affect_request()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
-
-            const string airplaneId = "XUuiP";
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            var requestDocument = new AirplanePatchRequestDocument
-            {
-                Data = new AirplaneDataInPatchRequest
-                {
-                    Id = airplaneId,
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest()
-                }
-            };
+        const string airplaneId = "XUuiP";
 
-            using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument,
-                airplane => airplane.AirtimeInHours))
+        var requestDocument = new AirplanePatchRequestDocument
+        {
+            Data = new AirplaneDataInPatchRequest
             {
-                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));
+                Id = airplaneId,
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPatchRequest()
             }
+        };
 
-            wrapper.ChangeResponse(HttpStatusCode.NoContent, null);
-
-            // Act
+        using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument,
+            airplane => airplane.AirtimeInHours))
+        {
             _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));
+        }
+
+        wrapper.ChangeResponse(HttpStatusCode.NoContent, null);
+
+        // Act
+        _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));
 
-            // Assert
-            wrapper.RequestBody.Should().BeJson(@"{
+        // Assert
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": {
     ""type"": ""airplanes"",
     ""id"": """ + airplaneId + @""",
@@ -49,45 +48,45 @@ public async Task Disposed_attribute_registration_for_document_does_not_affect_r
     }
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Attribute_registration_can_be_used_for_multiple_requests()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Attribute_registration_can_be_used_for_multiple_requests()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            const string airplaneId = "XUuiP";
+        const string airplaneId = "XUuiP";
 
-            var requestDocument = new AirplanePatchRequestDocument
+        var requestDocument = new AirplanePatchRequestDocument
+        {
+            Data = new AirplaneDataInPatchRequest
             {
-                Data = new AirplaneDataInPatchRequest
+                Id = airplaneId,
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPatchRequest
                 {
-                    Id = airplaneId,
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest
-                    {
-                        AirtimeInHours = 100
-                    }
+                    AirtimeInHours = 100
                 }
-            };
+            }
+        };
 
-            using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument,
-                airplane => airplane.AirtimeInHours))
-            {
-                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));
+        using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument,
+            airplane => airplane.AirtimeInHours))
+        {
+            _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));
 
-                wrapper.ChangeResponse(HttpStatusCode.NoContent, null);
+            wrapper.ChangeResponse(HttpStatusCode.NoContent, null);
 
-                requestDocument.Data.Attributes.AirtimeInHours = null;
+            requestDocument.Data.Attributes.AirtimeInHours = null;
 
-                // Act
-                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));
-            }
+            // Act
+            _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));
+        }
 
-            // Assert
-            wrapper.RequestBody.Should().BeJson(@"{
+        // Assert
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": {
     ""type"": ""airplanes"",
     ""id"": """ + airplaneId + @""",
@@ -96,53 +95,53 @@ public async Task Attribute_registration_can_be_used_for_multiple_requests()
     }
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Request_is_unaffected_by_attribute_registration_for_different_document_of_same_type()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Request_is_unaffected_by_attribute_registration_for_different_document_of_same_type()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            const string airplaneId1 = "XUuiP";
+        const string airplaneId1 = "XUuiP";
 
-            var requestDocument1 = new AirplanePatchRequestDocument
+        var requestDocument1 = new AirplanePatchRequestDocument
+        {
+            Data = new AirplaneDataInPatchRequest
             {
-                Data = new AirplaneDataInPatchRequest
-                {
-                    Id = airplaneId1,
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest()
-                }
-            };
+                Id = airplaneId1,
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPatchRequest()
+            }
+        };
 
-            const string airplaneId2 = "DJy1u";
+        const string airplaneId2 = "DJy1u";
 
-            var requestDocument2 = new AirplanePatchRequestDocument
+        var requestDocument2 = new AirplanePatchRequestDocument
+        {
+            Data = new AirplaneDataInPatchRequest
             {
-                Data = new AirplaneDataInPatchRequest
-                {
-                    Id = airplaneId2,
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest()
-                }
-            };
+                Id = airplaneId2,
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPatchRequest()
+            }
+        };
 
-            using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument1,
-                airplane => airplane.AirtimeInHours))
+        using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument1,
+            airplane => airplane.AirtimeInHours))
+        {
+            using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument2,
+                airplane => airplane.SerialNumber))
             {
-                using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument2,
-                    airplane => airplane.SerialNumber))
-                {
-                }
-
-                // Act
-                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId2, requestDocument2));
             }
 
-            // Assert
-            wrapper.RequestBody.Should().BeJson(@"{
+            // Act
+            _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId2, requestDocument2));
+        }
+
+        // Assert
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": {
     ""type"": ""airplanes"",
     ""id"": """ + airplaneId2 + @""",
@@ -151,41 +150,41 @@ public async Task Request_is_unaffected_by_attribute_registration_for_different_
     }
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Attribute_values_can_be_changed_after_attribute_registration()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Attribute_values_can_be_changed_after_attribute_registration()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            const string airplaneId = "XUuiP";
+        const string airplaneId = "XUuiP";
 
-            var requestDocument = new AirplanePatchRequestDocument
+        var requestDocument = new AirplanePatchRequestDocument
+        {
+            Data = new AirplaneDataInPatchRequest
             {
-                Data = new AirplaneDataInPatchRequest
+                Id = airplaneId,
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPatchRequest
                 {
-                    Id = airplaneId,
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest
-                    {
-                        IsInMaintenance = true
-                    }
+                    IsInMaintenance = true
                 }
-            };
+            }
+        };
 
-            using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument,
-                airplane => airplane.IsInMaintenance))
-            {
-                requestDocument.Data.Attributes.IsInMaintenance = false;
+        using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument,
+            airplane => airplane.IsInMaintenance))
+        {
+            requestDocument.Data.Attributes.IsInMaintenance = false;
 
-                // Act
-                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));
-            }
+            // Act
+            _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));
+        }
 
-            // Assert
-            wrapper.RequestBody.Should().BeJson(@"{
+        // Assert
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": {
     ""type"": ""airplanes"",
     ""id"": """ + airplaneId + @""",
@@ -194,49 +193,49 @@ public async Task Attribute_values_can_be_changed_after_attribute_registration()
     }
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Attribute_registration_is_unaffected_by_successive_attribute_registration_for_document_of_different_type()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Attribute_registration_is_unaffected_by_successive_attribute_registration_for_document_of_different_type()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            const string airplaneId1 = "XUuiP";
+        const string airplaneId1 = "XUuiP";
 
-            var requestDocument1 = new AirplanePatchRequestDocument
+        var requestDocument1 = new AirplanePatchRequestDocument
+        {
+            Data = new AirplaneDataInPatchRequest
             {
-                Data = new AirplaneDataInPatchRequest
-                {
-                    Id = airplaneId1,
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest()
-                }
-            };
+                Id = airplaneId1,
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPatchRequest()
+            }
+        };
 
-            var requestDocument2 = new AirplanePostRequestDocument
+        var requestDocument2 = new AirplanePostRequestDocument
+        {
+            Data = new AirplaneDataInPostRequest
             {
-                Data = new AirplaneDataInPostRequest
-                {
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPostRequest()
-                }
-            };
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPostRequest()
+            }
+        };
 
-            using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument1,
-                airplane => airplane.IsInMaintenance))
+        using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument1,
+            airplane => airplane.IsInMaintenance))
+        {
+            using (apiClient.RegisterAttributesForRequestDocument<AirplanePostRequestDocument, AirplaneAttributesInPostRequest>(requestDocument2,
+                airplane => airplane.AirtimeInHours))
             {
-                using (apiClient.RegisterAttributesForRequestDocument<AirplanePostRequestDocument, AirplaneAttributesInPostRequest>(requestDocument2,
-                    airplane => airplane.AirtimeInHours))
-                {
-                    // Act
-                    _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId1, requestDocument1));
-                }
+                // Act
+                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId1, requestDocument1));
             }
+        }
 
-            // Assert
-            wrapper.RequestBody.Should().BeJson(@"{
+        // Assert
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": {
     ""type"": ""airplanes"",
     ""id"": """ + airplaneId1 + @""",
@@ -245,59 +244,59 @@ public async Task Attribute_registration_is_unaffected_by_successive_attribute_r
     }
   }
 }");
-        }
-
-        [Fact]
-        public async Task Attribute_registration_is_unaffected_by_preceding_disposed_attribute_registration_for_different_document_of_same_type()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    }
 
-            const string airplaneId1 = "XUuiP";
+    [Fact]
+    public async Task Attribute_registration_is_unaffected_by_preceding_disposed_attribute_registration_for_different_document_of_same_type()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            var requestDocument1 = new AirplanePatchRequestDocument
-            {
-                Data = new AirplaneDataInPatchRequest
-                {
-                    Id = airplaneId1,
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest()
-                }
-            };
+        const string airplaneId1 = "XUuiP";
 
-            using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument1,
-                airplane => airplane.AirtimeInHours))
+        var requestDocument1 = new AirplanePatchRequestDocument
+        {
+            Data = new AirplaneDataInPatchRequest
             {
-                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId1, requestDocument1));
+                Id = airplaneId1,
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPatchRequest()
             }
+        };
+
+        using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument1,
+            airplane => airplane.AirtimeInHours))
+        {
+            _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId1, requestDocument1));
+        }
 
-            const string airplaneId2 = "DJy1u";
+        const string airplaneId2 = "DJy1u";
 
-            var requestDocument2 = new AirplanePatchRequestDocument
+        var requestDocument2 = new AirplanePatchRequestDocument
+        {
+            Data = new AirplaneDataInPatchRequest
             {
-                Data = new AirplaneDataInPatchRequest
+                Id = airplaneId2,
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPatchRequest
                 {
-                    Id = airplaneId2,
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest
-                    {
-                        ManufacturedInCity = "Everett"
-                    }
+                    ManufacturedInCity = "Everett"
                 }
-            };
+            }
+        };
 
-            wrapper.ChangeResponse(HttpStatusCode.NoContent, null);
+        wrapper.ChangeResponse(HttpStatusCode.NoContent, null);
 
-            using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument2,
-                airplane => airplane.SerialNumber))
-            {
-                // Act
-                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId2, requestDocument2));
-            }
+        using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument2,
+            airplane => airplane.SerialNumber))
+        {
+            // Act
+            _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId2, requestDocument2));
+        }
 
-            // Assert
-            wrapper.RequestBody.Should().BeJson(@"{
+        // Assert
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": {
     ""type"": ""airplanes"",
     ""id"": """ + airplaneId2 + @""",
@@ -307,56 +306,56 @@ public async Task Attribute_registration_is_unaffected_by_preceding_disposed_att
     }
   }
 }");
-        }
-
-        [Fact]
-        public async Task Attribute_registration_is_unaffected_by_preceding_disposed_attribute_registration_for_document_of_different_type()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    }
 
-            var requestDocument1 = new AirplanePostRequestDocument
-            {
-                Data = new AirplaneDataInPostRequest
-                {
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPostRequest()
-                }
-            };
+    [Fact]
+    public async Task Attribute_registration_is_unaffected_by_preceding_disposed_attribute_registration_for_document_of_different_type()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            using (apiClient.RegisterAttributesForRequestDocument<AirplanePostRequestDocument, AirplaneAttributesInPostRequest>(requestDocument1,
-                airplane => airplane.AirtimeInHours))
+        var requestDocument1 = new AirplanePostRequestDocument
+        {
+            Data = new AirplaneDataInPostRequest
             {
-                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PostAirplaneAsync(requestDocument1));
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPostRequest()
             }
+        };
+
+        using (apiClient.RegisterAttributesForRequestDocument<AirplanePostRequestDocument, AirplaneAttributesInPostRequest>(requestDocument1,
+            airplane => airplane.AirtimeInHours))
+        {
+            _ = await ApiResponse.TranslateAsync(async () => await apiClient.PostAirplaneAsync(requestDocument1));
+        }
 
-            const string airplaneId = "DJy1u";
+        const string airplaneId = "DJy1u";
 
-            var requestDocument2 = new AirplanePatchRequestDocument
+        var requestDocument2 = new AirplanePatchRequestDocument
+        {
+            Data = new AirplaneDataInPatchRequest
             {
-                Data = new AirplaneDataInPatchRequest
+                Id = airplaneId,
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPatchRequest
                 {
-                    Id = airplaneId,
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest
-                    {
-                        ManufacturedInCity = "Everett"
-                    }
+                    ManufacturedInCity = "Everett"
                 }
-            };
+            }
+        };
 
-            wrapper.ChangeResponse(HttpStatusCode.NoContent, null);
+        wrapper.ChangeResponse(HttpStatusCode.NoContent, null);
 
-            using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument2,
-                airplane => airplane.SerialNumber))
-            {
-                // Act
-                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument2));
-            }
+        using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument2,
+            airplane => airplane.SerialNumber))
+        {
+            // Act
+            _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument2));
+        }
 
-            // Assert
-            wrapper.RequestBody.Should().BeJson(@"{
+        // Assert
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": {
     ""type"": ""airplanes"",
     ""id"": """ + airplaneId + @""",
@@ -366,52 +365,52 @@ public async Task Attribute_registration_is_unaffected_by_preceding_disposed_att
     }
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Attribute_registration_is_unaffected_by_preceding_attribute_registration_for_different_document_of_same_type()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Attribute_registration_is_unaffected_by_preceding_attribute_registration_for_different_document_of_same_type()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            const string airplaneId1 = "XUuiP";
+        const string airplaneId1 = "XUuiP";
 
-            var requestDocument1 = new AirplanePatchRequestDocument
+        var requestDocument1 = new AirplanePatchRequestDocument
+        {
+            Data = new AirplaneDataInPatchRequest
             {
-                Data = new AirplaneDataInPatchRequest
-                {
-                    Id = airplaneId1,
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest()
-                }
-            };
+                Id = airplaneId1,
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPatchRequest()
+            }
+        };
 
-            const string airplaneId2 = "DJy1u";
+        const string airplaneId2 = "DJy1u";
 
-            var requestDocument2 = new AirplanePatchRequestDocument
+        var requestDocument2 = new AirplanePatchRequestDocument
+        {
+            Data = new AirplaneDataInPatchRequest
             {
-                Data = new AirplaneDataInPatchRequest
-                {
-                    Id = airplaneId2,
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest()
-                }
-            };
+                Id = airplaneId2,
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPatchRequest()
+            }
+        };
 
-            using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument1,
-                airplane => airplane.SerialNumber))
+        using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument1,
+            airplane => airplane.SerialNumber))
+        {
+            using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument2,
+                airplane => airplane.IsInMaintenance, airplane => airplane.AirtimeInHours))
             {
-                using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument2,
-                    airplane => airplane.IsInMaintenance, airplane => airplane.AirtimeInHours))
-                {
-                    // Act
-                    _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId2, requestDocument2));
-                }
+                // Act
+                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId2, requestDocument2));
             }
+        }
 
-            // Assert
-            wrapper.RequestBody.Should().BeJson(@"{
+        // Assert
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": {
     ""type"": ""airplanes"",
     ""id"": """ + airplaneId2 + @""",
@@ -421,6 +420,5 @@ public async Task Attribute_registration_is_unaffected_by_preceding_attribute_re
     }
   }
 }");
-        }
     }
 }
diff --git a/test/OpenApiClientTests/LegacyClient/FakeHttpClientWrapper.cs b/test/OpenApiClientTests/LegacyClient/FakeHttpClientWrapper.cs
index 4857a300e0..254f7f31cd 100644
--- a/test/OpenApiClientTests/LegacyClient/FakeHttpClientWrapper.cs
+++ b/test/OpenApiClientTests/LegacyClient/FakeHttpClientWrapper.cs
@@ -1,110 +1,104 @@
-using System;
-using System.IO;
 using System.Net;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.OpenApi.Client;
 
-namespace OpenApiClientTests.LegacyClient
+namespace OpenApiClientTests.LegacyClient;
+
+/// <summary>
+/// Enables to inject an outgoing response body and inspect the incoming request.
+/// </summary>
+internal sealed class FakeHttpClientWrapper : IDisposable
 {
-    /// <summary>
-    /// Enables to inject an outgoing response body and inspect the incoming request.
-    /// </summary>
-    internal sealed class FakeHttpClientWrapper : IDisposable
+    private readonly FakeHttpMessageHandler _handler;
+
+    public HttpClient HttpClient { get; }
+    public HttpRequestMessage? Request => _handler.Request;
+    public string? RequestBody => _handler.RequestBody;
+
+    private FakeHttpClientWrapper(HttpClient httpClient, FakeHttpMessageHandler handler)
     {
-        private readonly FakeHttpMessageHandler _handler;
+        HttpClient = httpClient;
+        _handler = handler;
+    }
 
-        public HttpClient HttpClient { get; }
-        public HttpRequestMessage? Request => _handler.Request;
-        public string? RequestBody => _handler.RequestBody;
+    public static FakeHttpClientWrapper Create(HttpStatusCode statusCode, string? responseBody)
+    {
+        HttpResponseMessage response = CreateResponse(statusCode, responseBody);
+        var handler = new FakeHttpMessageHandler(response);
 
-        private FakeHttpClientWrapper(HttpClient httpClient, FakeHttpMessageHandler handler)
+        var httpClient = new HttpClient(handler)
         {
-            HttpClient = httpClient;
-            _handler = handler;
-        }
+            BaseAddress = new Uri("http://localhost")
+        };
 
-        public static FakeHttpClientWrapper Create(HttpStatusCode statusCode, string? responseBody)
-        {
-            HttpResponseMessage response = CreateResponse(statusCode, responseBody);
-            var handler = new FakeHttpMessageHandler(response);
+        return new FakeHttpClientWrapper(httpClient, handler);
+    }
 
-            var httpClient = new HttpClient(handler)
-            {
-                BaseAddress = new Uri("http://localhost")
-            };
+    public void ChangeResponse(HttpStatusCode statusCode, string? responseBody)
+    {
+        HttpResponseMessage response = CreateResponse(statusCode, responseBody);
 
-            return new FakeHttpClientWrapper(httpClient, handler);
-        }
+        _handler.SetResponse(response);
+    }
 
-        public void ChangeResponse(HttpStatusCode statusCode, string? responseBody)
-        {
-            HttpResponseMessage response = CreateResponse(statusCode, responseBody);
+    private static HttpResponseMessage CreateResponse(HttpStatusCode statusCode, string? responseBody)
+    {
+        var response = new HttpResponseMessage(statusCode);
 
-            _handler.SetResponse(response);
+        if (!string.IsNullOrEmpty(responseBody))
+        {
+            response.Content = new StringContent(responseBody, Encoding.UTF8);
+            response.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/vnd.api+json");
         }
 
-        private static HttpResponseMessage CreateResponse(HttpStatusCode statusCode, string? responseBody)
-        {
-            var response = new HttpResponseMessage(statusCode);
+        return response;
+    }
 
-            if (!string.IsNullOrEmpty(responseBody))
-            {
-                response.Content = new StringContent(responseBody, Encoding.UTF8);
-                response.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/vnd.api+json");
-            }
+    public void Dispose()
+    {
+        HttpClient.Dispose();
+        _handler.Dispose();
+    }
 
-            return response;
-        }
+    private sealed class FakeHttpMessageHandler : HttpMessageHandler
+    {
+        private HttpResponseMessage _response;
+
+        public HttpRequestMessage? Request { get; private set; }
+        public string? RequestBody { get; private set; }
 
-        public void Dispose()
+        public FakeHttpMessageHandler(HttpResponseMessage response)
         {
-            HttpClient.Dispose();
-            _handler.Dispose();
+            _response = response;
         }
 
-        private sealed class FakeHttpMessageHandler : HttpMessageHandler
+        public void SetResponse(HttpResponseMessage response)
         {
-            private HttpResponseMessage _response;
+            ArgumentGuard.NotNull(response, nameof(response));
 
-            public HttpRequestMessage? Request { get; private set; }
-            public string? RequestBody { get; private set; }
+            _response = response;
+        }
 
-            public FakeHttpMessageHandler(HttpResponseMessage response)
-            {
-                _response = response;
-            }
+        protected override HttpResponseMessage Send(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            Request = request;
 
-            public void SetResponse(HttpResponseMessage response)
+            // Capture the request body here, before it becomes inaccessible because the request has been disposed.
+            if (request.Content != null)
             {
-                ArgumentGuard.NotNull(response, nameof(response));
-
-                _response = response;
+                using Stream stream = request.Content.ReadAsStream();
+                using var reader = new StreamReader(stream, Encoding.UTF8);
+                RequestBody = reader.ReadToEnd();
             }
 
-            protected override HttpResponseMessage Send(HttpRequestMessage request, CancellationToken cancellationToken)
-            {
-                Request = request;
-
-                // Capture the request body here, before it becomes inaccessible because the request has been disposed.
-                if (request.Content != null)
-                {
-                    using Stream stream = request.Content.ReadAsStream();
-                    using var reader = new StreamReader(stream, Encoding.UTF8);
-                    RequestBody = reader.ReadToEnd();
-                }
-
-                return _response;
-            }
+            return _response;
+        }
 
-            protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
-            {
-                HttpResponseMessage response = Send(request, cancellationToken);
-                return Task.FromResult(response);
-            }
+        protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
+        {
+            HttpResponseMessage response = Send(request, cancellationToken);
+            return Task.FromResult(response);
         }
     }
 }
diff --git a/test/OpenApiClientTests/LegacyClient/GeneratedCode/IOpenApiClient.cs b/test/OpenApiClientTests/LegacyClient/GeneratedCode/IOpenApiClient.cs
index 55cf1e855f..77c4e9a0a9 100644
--- a/test/OpenApiClientTests/LegacyClient/GeneratedCode/IOpenApiClient.cs
+++ b/test/OpenApiClientTests/LegacyClient/GeneratedCode/IOpenApiClient.cs
@@ -1,9 +1,8 @@
 using JsonApiDotNetCore.OpenApi.Client;
 
-namespace OpenApiClientTests.LegacyClient.GeneratedCode
+namespace OpenApiClientTests.LegacyClient.GeneratedCode;
+
+// ReSharper disable once MemberCanBeInternal
+public partial interface IOpenApiClient : IJsonApiClient
 {
-    // ReSharper disable once MemberCanBeInternal
-    public partial interface IOpenApiClient : IJsonApiClient
-    {
-    }
 }
diff --git a/test/OpenApiClientTests/LegacyClient/GeneratedCode/OpenApiClient.cs b/test/OpenApiClientTests/LegacyClient/GeneratedCode/OpenApiClient.cs
index 500d1354d2..c8592a563c 100644
--- a/test/OpenApiClientTests/LegacyClient/GeneratedCode/OpenApiClient.cs
+++ b/test/OpenApiClientTests/LegacyClient/GeneratedCode/OpenApiClient.cs
@@ -1,15 +1,14 @@
 using JsonApiDotNetCore.OpenApi.Client;
 using Newtonsoft.Json;
 
-namespace OpenApiClientTests.LegacyClient.GeneratedCode
+namespace OpenApiClientTests.LegacyClient.GeneratedCode;
+
+internal partial class OpenApiClient : JsonApiClient
 {
-    internal partial class OpenApiClient : JsonApiClient
+    partial void UpdateJsonSerializerSettings(JsonSerializerSettings settings)
     {
-        partial void UpdateJsonSerializerSettings(JsonSerializerSettings settings)
-        {
-            SetSerializerSettingsForJsonApi(settings);
+        SetSerializerSettingsForJsonApi(settings);
 
-            settings.Formatting = Formatting.Indented;
-        }
+        settings.Formatting = Formatting.Indented;
     }
 }
diff --git a/test/OpenApiClientTests/LegacyClient/RequestTests.cs b/test/OpenApiClientTests/LegacyClient/RequestTests.cs
index f5a0244525..831dfda3f7 100644
--- a/test/OpenApiClientTests/LegacyClient/RequestTests.cs
+++ b/test/OpenApiClientTests/LegacyClient/RequestTests.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
 using System.Net;
-using System.Net.Http;
-using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Common;
 using FluentAssertions.Extensions;
@@ -11,97 +8,97 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace OpenApiClientTests.LegacyClient
+namespace OpenApiClientTests.LegacyClient;
+
+public sealed class RequestTests
 {
-    public sealed class RequestTests
+    private const string HostPrefix = "http://localhost/api/v1/";
+
+    [Fact]
+    public async Task Getting_resource_collection_produces_expected_request()
     {
-        private const string HostPrefix = "http://localhost/api/v1/";
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+
+        // Act
+        _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCollectionAsync());
+
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
+        wrapper.Request.Method.Should().Be(HttpMethod.Get);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + "flights");
+        wrapper.RequestBody.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Getting_resource_collection_produces_expected_request()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Getting_resource_produces_expected_request()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            // Act
-            _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCollectionAsync());
-
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
-            wrapper.Request.Method.Should().Be(HttpMethod.Get);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + "flights");
-            wrapper.RequestBody.Should().BeNull();
-        }
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-        [Fact]
-        public async Task Getting_resource_produces_expected_request()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+        // Act
+        _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightAsync(flightId));
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
+        wrapper.Request.Method.Should().Be(HttpMethod.Get);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}");
+        wrapper.RequestBody.Should().BeNull();
+    }
 
-            // Act
-            _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightAsync(flightId));
-
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
-            wrapper.Request.Method.Should().Be(HttpMethod.Get);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}");
-            wrapper.RequestBody.Should().BeNull();
-        }
+    [Fact]
+    public async Task Partial_posting_resource_with_selected_relationships_produces_expected_request()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-        [Fact]
-        public async Task Partial_posting_resource_with_selected_relationships_produces_expected_request()
+        var requestDocument = new FlightPostRequestDocument
         {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
-
-            var requestDocument = new FlightPostRequestDocument
+            Data = new FlightDataInPostRequest
             {
-                Data = new FlightDataInPostRequest
+                Type = FlightsResourceType.Flights,
+                Relationships = new FlightRelationshipsInPostRequest
                 {
-                    Type = FlightsResourceType.Flights,
-                    Relationships = new FlightRelationshipsInPostRequest
+                    Purser = new ToOneFlightAttendantInRequest
                     {
-                        Purser = new ToOneFlightAttendantInRequest
+                        Data = new FlightAttendantIdentifier
                         {
-                            Data = new FlightAttendantIdentifier
-                            {
-                                Id = "bBJHu",
-                                Type = FlightAttendantsResourceType.FlightAttendants
-                            }
-                        },
-                        BackupPurser = new NullableToOneFlightAttendantInRequest
+                            Id = "bBJHu",
+                            Type = FlightAttendantsResourceType.FlightAttendants
+                        }
+                    },
+                    BackupPurser = new NullableToOneFlightAttendantInRequest
+                    {
+                        Data = new FlightAttendantIdentifier
                         {
-                            Data = new FlightAttendantIdentifier
-                            {
-                                Id = "NInmX",
-                                Type = FlightAttendantsResourceType.FlightAttendants
-                            }
+                            Id = "NInmX",
+                            Type = FlightAttendantsResourceType.FlightAttendants
                         }
                     }
                 }
-            };
+            }
+        };
 
-            // Act
-            _ = await ApiResponse.TranslateAsync(async () => await apiClient.PostFlightAsync(requestDocument));
-
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
-            wrapper.Request.Method.Should().Be(HttpMethod.Post);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + "flights");
-            wrapper.Request.Content.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
-
-            wrapper.RequestBody.Should().BeJson(@"{
+        // Act
+        _ = await ApiResponse.TranslateAsync(async () => await apiClient.PostFlightAsync(requestDocument));
+
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
+        wrapper.Request.Method.Should().Be(HttpMethod.Post);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + "flights");
+        wrapper.Request.Content.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
+
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": {
     ""type"": ""flights"",
     ""relationships"": {
@@ -120,58 +117,58 @@ public async Task Partial_posting_resource_with_selected_relationships_produces_
     }
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Partial_posting_resource_produces_expected_request()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Partial_posting_resource_produces_expected_request()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            const char euroSign = '\x20AC';
-            const char checkMark = '\x2713';
-            const char capitalLWithStroke = '\x0141';
+        const char euroSign = '\x20AC';
+        const char checkMark = '\x2713';
+        const char capitalLWithStroke = '\x0141';
 
-            string specialCharacters = new(new[]
-            {
-                euroSign,
-                checkMark,
-                capitalLWithStroke
-            });
+        string specialCharacters = new(new[]
+        {
+            euroSign,
+            checkMark,
+            capitalLWithStroke
+        });
 
-            string name = "anAirplaneName " + specialCharacters;
+        string name = "anAirplaneName " + specialCharacters;
 
-            var requestDocument = new AirplanePostRequestDocument
+        var requestDocument = new AirplanePostRequestDocument
+        {
+            Data = new AirplaneDataInPostRequest
             {
-                Data = new AirplaneDataInPostRequest
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPostRequest
                 {
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPostRequest
-                    {
-                        Name = name,
-                        AirtimeInHours = 800
-                    }
+                    Name = name,
+                    AirtimeInHours = 800
                 }
-            };
-
-            using (apiClient.RegisterAttributesForRequestDocument<AirplanePostRequestDocument, AirplaneAttributesInPostRequest>(requestDocument,
-                airplane => airplane.SerialNumber))
-            {
-                // Act
-                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PostAirplaneAsync(requestDocument));
             }
+        };
+
+        using (apiClient.RegisterAttributesForRequestDocument<AirplanePostRequestDocument, AirplaneAttributesInPostRequest>(requestDocument,
+            airplane => airplane.SerialNumber))
+        {
+            // Act
+            _ = await ApiResponse.TranslateAsync(async () => await apiClient.PostAirplaneAsync(requestDocument));
+        }
 
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
-            wrapper.Request.Method.Should().Be(HttpMethod.Post);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + "airplanes");
-            wrapper.Request.Content.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
+        wrapper.Request.Method.Should().Be(HttpMethod.Post);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + "airplanes");
+        wrapper.Request.Content.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
 
-            wrapper.RequestBody.Should().BeJson(@"{
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": {
     ""type"": ""airplanes"",
     ""attributes"": {
@@ -181,49 +178,48 @@ public async Task Partial_posting_resource_produces_expected_request()
     }
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Partial_patching_resource_produces_expected_request()
-        {
-            // Arrange
-            const string airplaneId = "XUuiP";
-            var lastServicedAt = 1.January(2021).At(15, 23, 5, 33).ToDateTimeOffset(4.Hours());
+    [Fact]
+    public async Task Partial_patching_resource_produces_expected_request()
+    {
+        // Arrange
+        const string airplaneId = "XUuiP";
+        var lastServicedAt = 1.January(2021).At(15, 23, 5, 33).ToDateTimeOffset(4.Hours());
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            var requestDocument = new AirplanePatchRequestDocument
+        var requestDocument = new AirplanePatchRequestDocument
+        {
+            Data = new AirplaneDataInPatchRequest
             {
-                Data = new AirplaneDataInPatchRequest
+                Id = airplaneId,
+                Type = AirplanesResourceType.Airplanes,
+                Attributes = new AirplaneAttributesInPatchRequest
                 {
-                    Id = airplaneId,
-                    Type = AirplanesResourceType.Airplanes,
-                    Attributes = new AirplaneAttributesInPatchRequest
-                    {
-                        LastServicedAt = lastServicedAt
-                    }
+                    LastServicedAt = lastServicedAt
                 }
-            };
-
-            using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument,
-                airplane => airplane.SerialNumber, airplane => airplane.LastServicedAt, airplane => airplane.IsInMaintenance,
-                airplane => airplane.AirtimeInHours))
-            {
-                // Act
-                _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));
             }
+        };
+
+        using (apiClient.RegisterAttributesForRequestDocument<AirplanePatchRequestDocument, AirplaneAttributesInPatchRequest>(requestDocument,
+            airplane => airplane.SerialNumber, airplane => airplane.LastServicedAt, airplane => airplane.IsInMaintenance, airplane => airplane.AirtimeInHours))
+        {
+            // Act
+            _ = await ApiResponse.TranslateAsync(async () => await apiClient.PatchAirplaneAsync(airplaneId, requestDocument));
+        }
 
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
-            wrapper.Request.Method.Should().Be(HttpMethod.Patch);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + $"airplanes/{airplaneId}");
-            wrapper.Request.Content.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
+        wrapper.Request.Method.Should().Be(HttpMethod.Patch);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + $"airplanes/{airplaneId}");
+        wrapper.Request.Content.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
 
-            wrapper.RequestBody.Should().BeJson(@"{
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": {
     ""type"": ""airplanes"",
     ""id"": ""XUuiP"",
@@ -235,182 +231,182 @@ public async Task Partial_patching_resource_produces_expected_request()
     }
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Deleting_resource_produces_expected_request()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+    [Fact]
+    public async Task Deleting_resource_produces_expected_request()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            await apiClient.DeleteFlightAsync(flightId);
+        // Act
+        await apiClient.DeleteFlightAsync(flightId);
 
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Method.Should().Be(HttpMethod.Delete);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}");
-            wrapper.RequestBody.Should().BeNull();
-        }
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Method.Should().Be(HttpMethod.Delete);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}");
+        wrapper.RequestBody.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Getting_secondary_resource_produces_expected_request()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+    [Fact]
+    public async Task Getting_secondary_resource_produces_expected_request()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightPurserAsync(flightId));
-
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
-            wrapper.Request.Method.Should().Be(HttpMethod.Get);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/purser");
-            wrapper.RequestBody.Should().BeNull();
-        }
+        // Act
+        _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightPurserAsync(flightId));
 
-        [Fact]
-        public async Task Getting_secondary_resources_produces_expected_request()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
+        wrapper.Request.Method.Should().Be(HttpMethod.Get);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/purser");
+        wrapper.RequestBody.Should().BeNull();
+    }
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Getting_secondary_resources_produces_expected_request()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            // Act
-            _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCabinCrewMembersAsync(flightId));
-
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
-            wrapper.Request.Method.Should().Be(HttpMethod.Get);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/cabin-crew-members");
-            wrapper.RequestBody.Should().BeNull();
-        }
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-        [Fact]
-        public async Task Getting_ToOne_relationship_produces_expected_request()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+        // Act
+        _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCabinCrewMembersAsync(flightId));
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
+        wrapper.Request.Method.Should().Be(HttpMethod.Get);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/cabin-crew-members");
+        wrapper.RequestBody.Should().BeNull();
+    }
 
-            // Act
-            _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightPurserRelationshipAsync(flightId));
-
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
-            wrapper.Request.Method.Should().Be(HttpMethod.Get);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/purser");
-            wrapper.RequestBody.Should().BeNull();
-        }
+    [Fact]
+    public async Task Getting_ToOne_relationship_produces_expected_request()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-        [Fact]
-        public async Task Patching_ToOne_relationship_produces_expected_request()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+
+        // Act
+        _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightPurserRelationshipAsync(flightId));
+
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
+        wrapper.Request.Method.Should().Be(HttpMethod.Get);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/purser");
+        wrapper.RequestBody.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Patching_ToOne_relationship_produces_expected_request()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            var requestDocument = new ToOneFlightAttendantInRequest
+        var requestDocument = new ToOneFlightAttendantInRequest
+        {
+            Data = new FlightAttendantIdentifier
             {
-                Data = new FlightAttendantIdentifier
-                {
-                    Id = "bBJHu",
-                    Type = FlightAttendantsResourceType.FlightAttendants
-                }
-            };
+                Id = "bBJHu",
+                Type = FlightAttendantsResourceType.FlightAttendants
+            }
+        };
 
-            // Act
-            await apiClient.PatchFlightPurserRelationshipAsync(flightId, requestDocument);
+        // Act
+        await apiClient.PatchFlightPurserRelationshipAsync(flightId, requestDocument);
 
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Method.Should().Be(HttpMethod.Patch);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/purser");
-            wrapper.Request.Content.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Method.Should().Be(HttpMethod.Patch);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/purser");
+        wrapper.Request.Content.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
 
-            wrapper.RequestBody.Should().BeJson(@"{
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": {
     ""type"": ""flight-attendants"",
     ""id"": ""bBJHu""
   }
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Getting_ToMany_relationship_produces_expected_request()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+    [Fact]
+    public async Task Getting_ToMany_relationship_produces_expected_request()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCabinCrewMembersRelationshipAsync(flightId));
-
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
-            wrapper.Request.Method.Should().Be(HttpMethod.Get);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/cabin-crew-members");
-            wrapper.RequestBody.Should().BeNull();
-        }
+        // Act
+        _ = await ApiResponse.TranslateAsync(async () => await apiClient.GetFlightCabinCrewMembersRelationshipAsync(flightId));
 
-        [Fact]
-        public async Task Posting_ToMany_relationship_produces_expected_request()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Headers.GetValue(HeaderNames.Accept).Should().Be(HeaderConstants.MediaType);
+        wrapper.Request.Method.Should().Be(HttpMethod.Get);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/cabin-crew-members");
+        wrapper.RequestBody.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Posting_ToMany_relationship_produces_expected_request()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            var requestDocument = new ToManyFlightAttendantInRequest
+        var requestDocument = new ToManyFlightAttendantInRequest
+        {
+            Data = new List<FlightAttendantIdentifier>
             {
-                Data = new List<FlightAttendantIdentifier>
+                new()
                 {
-                    new()
-                    {
-                        Type = FlightAttendantsResourceType.FlightAttendants,
-                        Id = "bBJHu"
-                    },
-                    new()
-                    {
-                        Type = FlightAttendantsResourceType.FlightAttendants,
-                        Id = "NInmX"
-                    }
+                    Type = FlightAttendantsResourceType.FlightAttendants,
+                    Id = "bBJHu"
+                },
+                new()
+                {
+                    Type = FlightAttendantsResourceType.FlightAttendants,
+                    Id = "NInmX"
                 }
-            };
+            }
+        };
 
-            // Act
-            await apiClient.PostFlightCabinCrewMembersRelationshipAsync(flightId, requestDocument);
+        // Act
+        await apiClient.PostFlightCabinCrewMembersRelationshipAsync(flightId, requestDocument);
 
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Method.Should().Be(HttpMethod.Post);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/cabin-crew-members");
-            wrapper.Request.Content.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Method.Should().Be(HttpMethod.Post);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/cabin-crew-members");
+        wrapper.Request.Content.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
 
-            wrapper.RequestBody.Should().BeJson(@"{
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": [
     {
       ""type"": ""flight-attendants"",
@@ -422,46 +418,46 @@ public async Task Posting_ToMany_relationship_produces_expected_request()
     }
   ]
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Patching_ToMany_relationship_produces_expected_request()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+    [Fact]
+    public async Task Patching_ToMany_relationship_produces_expected_request()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            var requestDocument = new ToManyFlightAttendantInRequest
+        var requestDocument = new ToManyFlightAttendantInRequest
+        {
+            Data = new List<FlightAttendantIdentifier>
             {
-                Data = new List<FlightAttendantIdentifier>
+                new()
                 {
-                    new()
-                    {
-                        Id = "bBJHu",
-                        Type = FlightAttendantsResourceType.FlightAttendants
-                    },
-                    new()
-                    {
-                        Id = "NInmX",
-                        Type = FlightAttendantsResourceType.FlightAttendants
-                    }
+                    Id = "bBJHu",
+                    Type = FlightAttendantsResourceType.FlightAttendants
+                },
+                new()
+                {
+                    Id = "NInmX",
+                    Type = FlightAttendantsResourceType.FlightAttendants
                 }
-            };
+            }
+        };
 
-            // Act
-            await apiClient.PatchFlightCabinCrewMembersRelationshipAsync(flightId, requestDocument);
+        // Act
+        await apiClient.PatchFlightCabinCrewMembersRelationshipAsync(flightId, requestDocument);
 
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Method.Should().Be(HttpMethod.Patch);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/cabin-crew-members");
-            wrapper.Request.Content.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Method.Should().Be(HttpMethod.Patch);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/cabin-crew-members");
+        wrapper.Request.Content.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
 
-            wrapper.RequestBody.Should().BeJson(@"{
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": [
     {
       ""type"": ""flight-attendants"",
@@ -473,46 +469,46 @@ public async Task Patching_ToMany_relationship_produces_expected_request()
     }
   ]
 }");
-        }
+    }
 
-        [Fact]
-        public async Task Deleting_ToMany_relationship_produces_expected_request()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+    [Fact]
+    public async Task Deleting_ToMany_relationship_produces_expected_request()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            var requestDocument = new ToManyFlightAttendantInRequest
+        var requestDocument = new ToManyFlightAttendantInRequest
+        {
+            Data = new List<FlightAttendantIdentifier>
             {
-                Data = new List<FlightAttendantIdentifier>
+                new()
                 {
-                    new()
-                    {
-                        Id = "bBJHu",
-                        Type = FlightAttendantsResourceType.FlightAttendants
-                    },
-                    new()
-                    {
-                        Id = "NInmX",
-                        Type = FlightAttendantsResourceType.FlightAttendants
-                    }
+                    Id = "bBJHu",
+                    Type = FlightAttendantsResourceType.FlightAttendants
+                },
+                new()
+                {
+                    Id = "NInmX",
+                    Type = FlightAttendantsResourceType.FlightAttendants
                 }
-            };
+            }
+        };
 
-            // Act
-            await apiClient.DeleteFlightCabinCrewMembersRelationshipAsync(flightId, requestDocument);
+        // Act
+        await apiClient.DeleteFlightCabinCrewMembersRelationshipAsync(flightId, requestDocument);
 
-            // Assert
-            wrapper.Request.ShouldNotBeNull();
-            wrapper.Request.Method.Should().Be(HttpMethod.Delete);
-            wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/cabin-crew-members");
-            wrapper.Request.Content.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
-            wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
+        // Assert
+        wrapper.Request.ShouldNotBeNull();
+        wrapper.Request.Method.Should().Be(HttpMethod.Delete);
+        wrapper.Request.RequestUri.Should().Be(HostPrefix + $"flights/{flightId}/relationships/cabin-crew-members");
+        wrapper.Request.Content.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType.Should().NotBeNull();
+        wrapper.Request.Content!.Headers.ContentType!.ToString().Should().Be(HeaderConstants.MediaType);
 
-            wrapper.RequestBody.Should().BeJson(@"{
+        wrapper.RequestBody.Should().BeJson(@"{
   ""data"": [
     {
       ""type"": ""flight-attendants"",
@@ -524,6 +520,5 @@ public async Task Deleting_ToMany_relationship_produces_expected_request()
     }
   ]
 }");
-        }
     }
 }
diff --git a/test/OpenApiClientTests/LegacyClient/ResponseTests.cs b/test/OpenApiClientTests/LegacyClient/ResponseTests.cs
index 1b6b00faf6..ee782c0adf 100644
--- a/test/OpenApiClientTests/LegacyClient/ResponseTests.cs
+++ b/test/OpenApiClientTests/LegacyClient/ResponseTests.cs
@@ -1,37 +1,33 @@
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
 using System.Net;
-using System.Threading.Tasks;
 using FluentAssertions;
 using FluentAssertions.Specialized;
 using OpenApiClientTests.LegacyClient.GeneratedCode;
 using Xunit;
 
-namespace OpenApiClientTests.LegacyClient
+namespace OpenApiClientTests.LegacyClient;
+
+public sealed class ResponseTests
 {
-    public sealed class ResponseTests
-    {
-        private const string HostPrefix = "http://localhost/api/v1/";
+    private const string HostPrefix = "http://localhost/api/v1/";
 
-        [Fact]
-        public async Task Getting_resource_collection_translates_response()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
-            const string flightDestination = "Amsterdam";
-            const string flightServiceOnBoard = "Movies";
-            const string flightDepartsAt = "2014-11-25T00:00:00";
-            const string documentMetaValue = "1";
-            const string flightMetaValue = "https://api.jsonapi.net/docs/#get-flights";
-            const string purserMetaValue = "https://api.jsonapi.net/docs/#get-flight-purser";
-            const string cabinCrewMembersMetaValue = "https://api.jsonapi.net/docs/#get-flight-cabin-crew-members";
-            const string passengersMetaValue = "https://api.jsonapi.net/docs/#get-flight-passengers";
-            const string topLevelLink = HostPrefix + "flights";
-            const string flightResourceLink = topLevelLink + "/" + flightId;
-
-            const string responseBody = @"{
+    [Fact]
+    public async Task Getting_resource_collection_translates_response()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
+        const string flightDestination = "Amsterdam";
+        const string flightServiceOnBoard = "Movies";
+        const string flightDepartsAt = "2014-11-25T00:00:00";
+        const string documentMetaValue = "1";
+        const string flightMetaValue = "https://api.jsonapi.net/docs/#get-flights";
+        const string purserMetaValue = "https://api.jsonapi.net/docs/#get-flight-purser";
+        const string cabinCrewMembersMetaValue = "https://api.jsonapi.net/docs/#get-flight-cabin-crew-members";
+        const string passengersMetaValue = "https://api.jsonapi.net/docs/#get-flight-passengers";
+        const string topLevelLink = HostPrefix + "flights";
+        const string flightResourceLink = topLevelLink + "/" + flightId;
+
+        const string responseBody = @"{
   ""meta"": {
     ""total-resources"": """ + documentMetaValue + @"""
   },
@@ -95,66 +91,66 @@ public async Task Getting_resource_collection_translates_response()
   ]
 }";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
-
-            // Act
-            FlightCollectionResponseDocument document = await apiClient.GetFlightCollectionAsync();
-
-            // Assert
-            document.Jsonapi.Should().BeNull();
-            document.Meta.Should().HaveCount(1);
-            document.Meta["total-resources"].Should().Be(documentMetaValue);
-            document.Links.Self.Should().Be(topLevelLink);
-            document.Links.First.Should().Be(topLevelLink);
-            document.Links.Last.Should().Be(topLevelLink);
-            document.Data.Should().HaveCount(1);
-
-            FlightDataInResponse flight = document.Data.First();
-            flight.Id.Should().Be(flightId);
-            flight.Type.Should().Be(FlightsResourceType.Flights);
-            flight.Links.Self.Should().Be(flightResourceLink);
-            flight.Meta.Should().HaveCount(1);
-            flight.Meta["docs"].Should().Be(flightMetaValue);
-
-            flight.Attributes.FinalDestination.Should().Be(flightDestination);
-            flight.Attributes.StopOverDestination.Should().BeNull();
-            flight.Attributes.ServicesOnBoard.Should().HaveCount(3);
-            flight.Attributes.ServicesOnBoard.ElementAt(0).Should().Be(flightServiceOnBoard);
-            flight.Attributes.ServicesOnBoard.ElementAt(1).Should().Be(string.Empty);
-            flight.Attributes.ServicesOnBoard.ElementAt(2).Should().BeNull();
-            flight.Attributes.OperatedBy.Should().Be(Airline.DeltaAirLines);
-            flight.Attributes.DepartsAt.Should().Be(DateTimeOffset.Parse(flightDepartsAt, new CultureInfo("en-GB")));
-            flight.Attributes.ArrivesAt.Should().BeNull();
-
-            flight.Relationships.Purser.Data.Should().BeNull();
-            flight.Relationships.Purser.Links.Self.Should().Be(flightResourceLink + "/relationships/purser");
-            flight.Relationships.Purser.Links.Related.Should().Be(flightResourceLink + "/purser");
-            flight.Relationships.Purser.Meta.Should().HaveCount(1);
-            flight.Relationships.Purser.Meta["docs"].Should().Be(purserMetaValue);
-
-            flight.Relationships.CabinCrewMembers.Data.Should().BeNull();
-            flight.Relationships.CabinCrewMembers.Links.Self.Should().Be(flightResourceLink + "/relationships/cabin-crew-members");
-            flight.Relationships.CabinCrewMembers.Links.Related.Should().Be(flightResourceLink + "/cabin-crew-members");
-            flight.Relationships.CabinCrewMembers.Meta.Should().HaveCount(1);
-            flight.Relationships.CabinCrewMembers.Meta["docs"].Should().Be(cabinCrewMembersMetaValue);
-
-            flight.Relationships.Passengers.Data.Should().BeNull();
-            flight.Relationships.Passengers.Links.Self.Should().Be(flightResourceLink + "/relationships/passengers");
-            flight.Relationships.Passengers.Links.Related.Should().Be(flightResourceLink + "/passengers");
-            flight.Relationships.Passengers.Meta.Should().HaveCount(1);
-            flight.Relationships.Passengers.Meta["docs"].Should().Be(passengersMetaValue);
-        }
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+
+        // Act
+        FlightCollectionResponseDocument document = await apiClient.GetFlightCollectionAsync();
+
+        // Assert
+        document.Jsonapi.Should().BeNull();
+        document.Meta.Should().HaveCount(1);
+        document.Meta["total-resources"].Should().Be(documentMetaValue);
+        document.Links.Self.Should().Be(topLevelLink);
+        document.Links.First.Should().Be(topLevelLink);
+        document.Links.Last.Should().Be(topLevelLink);
+        document.Data.Should().HaveCount(1);
+
+        FlightDataInResponse flight = document.Data.First();
+        flight.Id.Should().Be(flightId);
+        flight.Type.Should().Be(FlightsResourceType.Flights);
+        flight.Links.Self.Should().Be(flightResourceLink);
+        flight.Meta.Should().HaveCount(1);
+        flight.Meta["docs"].Should().Be(flightMetaValue);
+
+        flight.Attributes.FinalDestination.Should().Be(flightDestination);
+        flight.Attributes.StopOverDestination.Should().BeNull();
+        flight.Attributes.ServicesOnBoard.Should().HaveCount(3);
+        flight.Attributes.ServicesOnBoard.ElementAt(0).Should().Be(flightServiceOnBoard);
+        flight.Attributes.ServicesOnBoard.ElementAt(1).Should().Be(string.Empty);
+        flight.Attributes.ServicesOnBoard.ElementAt(2).Should().BeNull();
+        flight.Attributes.OperatedBy.Should().Be(Airline.DeltaAirLines);
+        flight.Attributes.DepartsAt.Should().Be(DateTimeOffset.Parse(flightDepartsAt, new CultureInfo("en-GB")));
+        flight.Attributes.ArrivesAt.Should().BeNull();
+
+        flight.Relationships.Purser.Data.Should().BeNull();
+        flight.Relationships.Purser.Links.Self.Should().Be(flightResourceLink + "/relationships/purser");
+        flight.Relationships.Purser.Links.Related.Should().Be(flightResourceLink + "/purser");
+        flight.Relationships.Purser.Meta.Should().HaveCount(1);
+        flight.Relationships.Purser.Meta["docs"].Should().Be(purserMetaValue);
+
+        flight.Relationships.CabinCrewMembers.Data.Should().BeNull();
+        flight.Relationships.CabinCrewMembers.Links.Self.Should().Be(flightResourceLink + "/relationships/cabin-crew-members");
+        flight.Relationships.CabinCrewMembers.Links.Related.Should().Be(flightResourceLink + "/cabin-crew-members");
+        flight.Relationships.CabinCrewMembers.Meta.Should().HaveCount(1);
+        flight.Relationships.CabinCrewMembers.Meta["docs"].Should().Be(cabinCrewMembersMetaValue);
+
+        flight.Relationships.Passengers.Data.Should().BeNull();
+        flight.Relationships.Passengers.Links.Self.Should().Be(flightResourceLink + "/relationships/passengers");
+        flight.Relationships.Passengers.Links.Related.Should().Be(flightResourceLink + "/passengers");
+        flight.Relationships.Passengers.Meta.Should().HaveCount(1);
+        flight.Relationships.Passengers.Meta["docs"].Should().Be(passengersMetaValue);
+    }
 
-        [Fact]
-        public async Task Getting_resource_translates_response()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
-            const string departsAtInZuluTime = "2021-06-08T12:53:30.554Z";
-            const string arrivesAtWithUtcOffset = "2019-02-20T11:56:33.0721266+01:00";
+    [Fact]
+    public async Task Getting_resource_translates_response()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
+        const string departsAtInZuluTime = "2021-06-08T12:53:30.554Z";
+        const string arrivesAtWithUtcOffset = "2019-02-20T11:56:33.0721266+01:00";
 
-            const string responseBody = @"{
+        const string responseBody = @"{
   ""links"": {
     ""self"": """ + HostPrefix + @"flights/" + flightId + @"&fields[flights]=departs-at,arrives-at""
   },
@@ -171,32 +167,32 @@ public async Task Getting_resource_translates_response()
     }
 }";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
-
-            // Act
-            FlightPrimaryResponseDocument document = await apiClient.GetFlightAsync(flightId);
-
-            // Assert
-            document.Jsonapi.Should().BeNull();
-            document.Meta.Should().BeNull();
-            document.Data.Meta.Should().BeNull();
-            document.Data.Relationships.Should().BeNull();
-            document.Data.Attributes.DepartsAt.Should().Be(DateTimeOffset.Parse(departsAtInZuluTime));
-            document.Data.Attributes.ArrivesAt.Should().Be(DateTimeOffset.Parse(arrivesAtWithUtcOffset));
-            document.Data.Attributes.ServicesOnBoard.Should().BeNull();
-            document.Data.Attributes.FinalDestination.Should().BeNull();
-            document.Data.Attributes.StopOverDestination.Should().BeNull();
-            document.Data.Attributes.OperatedBy.Should().Be(default);
-        }
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+
+        // Act
+        FlightPrimaryResponseDocument document = await apiClient.GetFlightAsync(flightId);
+
+        // Assert
+        document.Jsonapi.Should().BeNull();
+        document.Meta.Should().BeNull();
+        document.Data.Meta.Should().BeNull();
+        document.Data.Relationships.Should().BeNull();
+        document.Data.Attributes.DepartsAt.Should().Be(DateTimeOffset.Parse(departsAtInZuluTime));
+        document.Data.Attributes.ArrivesAt.Should().Be(DateTimeOffset.Parse(arrivesAtWithUtcOffset));
+        document.Data.Attributes.ServicesOnBoard.Should().BeNull();
+        document.Data.Attributes.FinalDestination.Should().BeNull();
+        document.Data.Attributes.StopOverDestination.Should().BeNull();
+        document.Data.Attributes.OperatedBy.Should().Be(default);
+    }
 
-        [Fact]
-        public async Task Getting_unknown_resource_translates_error_response()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+    [Fact]
+    public async Task Getting_unknown_resource_translates_error_response()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            const string responseBody = @"{
+        const string responseBody = @"{
   ""errors"": [
     {
       ""id"": ""f1a520ac-02a0-466b-94ea-86cbaa86f02f"",
@@ -207,28 +203,28 @@ public async Task Getting_unknown_resource_translates_error_response()
   ]
 }";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NotFound, responseBody);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NotFound, responseBody);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            Func<Task<FlightPrimaryResponseDocument>> action = async () => await apiClient.GetFlightAsync(flightId);
+        // Act
+        Func<Task<FlightPrimaryResponseDocument>> action = async () => await apiClient.GetFlightAsync(flightId);
 
-            // Assert
-            ExceptionAssertions<ApiException> assertion = await action.Should().ThrowExactlyAsync<ApiException>();
-            ApiException exception = assertion.Subject.Single();
+        // Assert
+        ExceptionAssertions<ApiException> assertion = await action.Should().ThrowExactlyAsync<ApiException>();
+        ApiException exception = assertion.Subject.Single();
 
-            exception.StatusCode.Should().Be((int)HttpStatusCode.NotFound);
-            exception.Response.Should().Be(responseBody);
-        }
+        exception.StatusCode.Should().Be((int)HttpStatusCode.NotFound);
+        exception.Response.Should().Be(responseBody);
+    }
 
-        [Fact]
-        public async Task Posting_resource_translates_response()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
-            const string flightAttendantId = "bBJHu";
+    [Fact]
+    public async Task Posting_resource_translates_response()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
+        const string flightAttendantId = "bBJHu";
 
-            const string responseBody = @"{
+        const string responseBody = @"{
   ""links"": {
     ""self"": """ + HostPrefix + @"flights/" + flightId + @"&fields[flights]&include=purser,cabin-crew-members,passengers""
   },
@@ -272,46 +268,46 @@ public async Task Posting_resource_translates_response()
     }
 }";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.Created, responseBody);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.Created, responseBody);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            FlightPrimaryResponseDocument document = await apiClient.PostFlightAsync(new FlightPostRequestDocument
+        // Act
+        FlightPrimaryResponseDocument document = await apiClient.PostFlightAsync(new FlightPostRequestDocument
+        {
+            Data = new FlightDataInPostRequest
             {
-                Data = new FlightDataInPostRequest
+                Type = FlightsResourceType.Flights,
+                Relationships = new FlightRelationshipsInPostRequest
                 {
-                    Type = FlightsResourceType.Flights,
-                    Relationships = new FlightRelationshipsInPostRequest
+                    Purser = new ToOneFlightAttendantInRequest
                     {
-                        Purser = new ToOneFlightAttendantInRequest
+                        Data = new FlightAttendantIdentifier
                         {
-                            Data = new FlightAttendantIdentifier
-                            {
-                                Id = flightAttendantId,
-                                Type = FlightAttendantsResourceType.FlightAttendants
-                            }
+                            Id = flightAttendantId,
+                            Type = FlightAttendantsResourceType.FlightAttendants
                         }
                     }
                 }
-            });
-
-            // Assert
-            document.Data.Attributes.Should().BeNull();
-            document.Data.Relationships.Purser.Data.Should().NotBeNull();
-            document.Data.Relationships.Purser.Data.Id.Should().Be(flightAttendantId);
-            document.Data.Relationships.CabinCrewMembers.Data.Should().HaveCount(1);
-            document.Data.Relationships.CabinCrewMembers.Data.First().Id.Should().Be(flightAttendantId);
-            document.Data.Relationships.CabinCrewMembers.Data.First().Type.Should().Be(FlightAttendantsResourceType.FlightAttendants);
-            document.Data.Relationships.Passengers.Data.Should().BeEmpty();
-        }
+            }
+        });
+
+        // Assert
+        document.Data.Attributes.Should().BeNull();
+        document.Data.Relationships.Purser.Data.Should().NotBeNull();
+        document.Data.Relationships.Purser.Data.Id.Should().Be(flightAttendantId);
+        document.Data.Relationships.CabinCrewMembers.Data.Should().HaveCount(1);
+        document.Data.Relationships.CabinCrewMembers.Data.First().Id.Should().Be(flightAttendantId);
+        document.Data.Relationships.CabinCrewMembers.Data.First().Type.Should().Be(FlightAttendantsResourceType.FlightAttendants);
+        document.Data.Relationships.Passengers.Data.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Patching_resource_with_side_effects_translates_response()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+    [Fact]
+    public async Task Patching_resource_with_side_effects_translates_response()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            const string responseBody = @"{
+        const string responseBody = @"{
   ""links"": {
     ""self"": """ + HostPrefix + @"flights/" + flightId + @"&fields[flights]""
   },
@@ -324,74 +320,74 @@ public async Task Patching_resource_with_side_effects_translates_response()
     }
 }";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            FlightPrimaryResponseDocument document = await apiClient.PatchFlightAsync(flightId, new FlightPatchRequestDocument
+        // Act
+        FlightPrimaryResponseDocument document = await apiClient.PatchFlightAsync(flightId, new FlightPatchRequestDocument
+        {
+            Data = new FlightDataInPatchRequest
+            {
+                Id = flightId,
+                Type = FlightsResourceType.Flights
+            }
+        });
+
+        // Assert
+        document.Data.Type.Should().Be(FlightsResourceType.Flights);
+        document.Data.Attributes.Should().BeNull();
+        document.Data.Relationships.Should().BeNull();
+    }
+
+    [Fact]
+    public async Task Patching_resource_without_side_effects_translates_response()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+
+        // Act
+        FlightPrimaryResponseDocument? document = await ApiResponse.TranslateAsync(async () => await apiClient.PatchFlightAsync(flightId,
+            new FlightPatchRequestDocument
             {
                 Data = new FlightDataInPatchRequest
                 {
                     Id = flightId,
                     Type = FlightsResourceType.Flights
                 }
-            });
+            }));
 
-            // Assert
-            document.Data.Type.Should().Be(FlightsResourceType.Flights);
-            document.Data.Attributes.Should().BeNull();
-            document.Data.Relationships.Should().BeNull();
-        }
-
-        [Fact]
-        public async Task Patching_resource_without_side_effects_translates_response()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
-
-            // Act
-            FlightPrimaryResponseDocument? document = await ApiResponse.TranslateAsync(async () => await apiClient.PatchFlightAsync(flightId,
-                new FlightPatchRequestDocument
-                {
-                    Data = new FlightDataInPatchRequest
-                    {
-                        Id = flightId,
-                        Type = FlightsResourceType.Flights
-                    }
-                }));
-
-            // Assert
-            document.Should().BeNull();
-        }
+        // Assert
+        document.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Deleting_resource_produces_empty_response()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Deleting_resource_produces_empty_response()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            Func<Task> action = async () => await apiClient.DeleteFlightAsync("ZvuH1");
+        // Act
+        Func<Task> action = async () => await apiClient.DeleteFlightAsync("ZvuH1");
 
-            // Assert
-            await action.Should().NotThrowAsync();
-        }
+        // Assert
+        await action.Should().NotThrowAsync();
+    }
 
-        [Fact]
-        public async Task Getting_secondary_resource_translates_response()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
-            const string purserId = "bBJHu";
-            const string emailAddress = "email@example.com";
-            const string age = "20";
-            const string profileImageUrl = "www.image.com";
-            const string distanceTraveledInKilometer = "5000";
-
-            const string responseBody = @"{
+    [Fact]
+    public async Task Getting_secondary_resource_translates_response()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
+        const string purserId = "bBJHu";
+        const string emailAddress = "email@example.com";
+        const string age = "20";
+        const string profileImageUrl = "www.image.com";
+        const string distanceTraveledInKilometer = "5000";
+
+        const string responseBody = @"{
   ""links"": {
     ""self"": """ + HostPrefix + @"flights/" + flightId + @"/purser"",
     ""first"": """ + HostPrefix + @"flights/" + flightId + @"/purser"",
@@ -426,28 +422,28 @@ public async Task Getting_secondary_resource_translates_response()
   }
 }";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            FlightAttendantSecondaryResponseDocument document = await apiClient.GetFlightPurserAsync(flightId);
+        // Act
+        FlightAttendantSecondaryResponseDocument document = await apiClient.GetFlightPurserAsync(flightId);
 
-            // Assert
-            document.Data.Should().NotBeNull();
-            document.Data.Id.Should().Be(purserId);
-            document.Data.Attributes.EmailAddress.Should().Be(emailAddress);
-            document.Data.Attributes.Age.Should().Be(int.Parse(age));
-            document.Data.Attributes.ProfileImageUrl.Should().Be(profileImageUrl);
-            document.Data.Attributes.DistanceTraveledInKilometers.Should().Be(int.Parse(distanceTraveledInKilometer));
-        }
+        // Assert
+        document.Data.Should().NotBeNull();
+        document.Data.Id.Should().Be(purserId);
+        document.Data.Attributes.EmailAddress.Should().Be(emailAddress);
+        document.Data.Attributes.Age.Should().Be(int.Parse(age));
+        document.Data.Attributes.ProfileImageUrl.Should().Be(profileImageUrl);
+        document.Data.Attributes.DistanceTraveledInKilometers.Should().Be(int.Parse(distanceTraveledInKilometer));
+    }
 
-        [Fact]
-        public async Task Getting_nullable_secondary_resource_translates_response()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+    [Fact]
+    public async Task Getting_nullable_secondary_resource_translates_response()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            const string responseBody = @"{
+        const string responseBody = @"{
   ""links"": {
     ""self"": """ + HostPrefix + @"flights/" + flightId + @"/backup-purser"",
     ""first"": """ + HostPrefix + @"flights/" + flightId + @"/backup-purser"",
@@ -456,23 +452,23 @@ public async Task Getting_nullable_secondary_resource_translates_response()
   ""data"": null
 }";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            NullableFlightAttendantSecondaryResponseDocument document = await apiClient.GetFlightBackupPurserAsync(flightId);
+        // Act
+        NullableFlightAttendantSecondaryResponseDocument document = await apiClient.GetFlightBackupPurserAsync(flightId);
 
-            // Assert
-            document.Data.Should().BeNull();
-        }
+        // Assert
+        document.Data.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Getting_secondary_resources_translates_response()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+    [Fact]
+    public async Task Getting_secondary_resources_translates_response()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            const string responseBody = @"{
+        const string responseBody = @"{
   ""links"": {
     ""self"": """ + HostPrefix + @"flights/" + flightId + @"/cabin-crew-members"",
     ""first"": """ + HostPrefix + @"flights/" + flightId + @"/cabin-crew-members""
@@ -480,23 +476,23 @@ public async Task Getting_secondary_resources_translates_response()
   ""data"": [ ]
 }";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            FlightAttendantCollectionResponseDocument document = await apiClient.GetFlightCabinCrewMembersAsync(flightId);
+        // Act
+        FlightAttendantCollectionResponseDocument document = await apiClient.GetFlightCabinCrewMembersAsync(flightId);
 
-            // Assert
-            document.Data.Should().BeEmpty();
-        }
+        // Assert
+        document.Data.Should().BeEmpty();
+    }
 
-        [Fact]
-        public async Task Getting_nullable_ToOne_relationship_translates_response()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
+    [Fact]
+    public async Task Getting_nullable_ToOne_relationship_translates_response()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
 
-            const string responseBody = @"{
+        const string responseBody = @"{
   ""links"": {
     ""self"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/backup-purser"",
     ""related"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/backup-purser""
@@ -504,24 +500,24 @@ public async Task Getting_nullable_ToOne_relationship_translates_response()
   ""data"": null
 }";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            NullableFlightAttendantIdentifierResponseDocument document = await apiClient.GetFlightBackupPurserRelationshipAsync(flightId);
+        // Act
+        NullableFlightAttendantIdentifierResponseDocument document = await apiClient.GetFlightBackupPurserRelationshipAsync(flightId);
 
-            // Assert
-            document.Data.Should().BeNull();
-        }
+        // Assert
+        document.Data.Should().BeNull();
+    }
 
-        [Fact]
-        public async Task Getting_ToOne_relationship_translates_response()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
-            const string purserId = "bBJHu";
+    [Fact]
+    public async Task Getting_ToOne_relationship_translates_response()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
+        const string purserId = "bBJHu";
 
-            const string responseBody = @"{
+        const string responseBody = @"{
   ""links"": {
     ""self"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/purser"",
     ""related"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/purser""
@@ -532,45 +528,45 @@ public async Task Getting_ToOne_relationship_translates_response()
   }
 }";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            FlightAttendantIdentifierResponseDocument document = await apiClient.GetFlightPurserRelationshipAsync(flightId);
+        // Act
+        FlightAttendantIdentifierResponseDocument document = await apiClient.GetFlightPurserRelationshipAsync(flightId);
 
-            // Assert
-            document.Data.Should().NotBeNull();
-            document.Data.Id.Should().Be(purserId);
-            document.Data.Type.Should().Be(FlightAttendantsResourceType.FlightAttendants);
-        }
+        // Assert
+        document.Data.Should().NotBeNull();
+        document.Data.Id.Should().Be(purserId);
+        document.Data.Type.Should().Be(FlightAttendantsResourceType.FlightAttendants);
+    }
 
-        [Fact]
-        public async Task Patching_ToOne_relationship_translates_response()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Patching_ToOne_relationship_translates_response()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            await apiClient.PatchFlightPurserRelationshipAsync("ZvuH1", new ToOneFlightAttendantInRequest
+        // Act
+        await apiClient.PatchFlightPurserRelationshipAsync("ZvuH1", new ToOneFlightAttendantInRequest
+        {
+            Data = new FlightAttendantIdentifier
             {
-                Data = new FlightAttendantIdentifier
-                {
-                    Id = "Adk2a",
-                    Type = FlightAttendantsResourceType.FlightAttendants
-                }
-            });
-        }
+                Id = "Adk2a",
+                Type = FlightAttendantsResourceType.FlightAttendants
+            }
+        });
+    }
 
-        [Fact]
-        public async Task Getting_ToMany_relationship_translates_response()
-        {
-            // Arrange
-            const string flightId = "ZvuH1";
-            const string flightAttendantId1 = "bBJHu";
-            const string flightAttendantId2 = "ZvuHNInmX1";
+    [Fact]
+    public async Task Getting_ToMany_relationship_translates_response()
+    {
+        // Arrange
+        const string flightId = "ZvuH1";
+        const string flightAttendantId1 = "bBJHu";
+        const string flightAttendantId2 = "ZvuHNInmX1";
 
-            const string responseBody = @"{
+        const string responseBody = @"{
   ""links"": {
     ""self"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/cabin-crew-members"",
     ""related"": """ + HostPrefix + @"flights/" + flightId + @"/relationships/cabin-crew-members"",
@@ -586,105 +582,104 @@ public async Task Getting_ToMany_relationship_translates_response()
   }]
 }";
 
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.OK, responseBody);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            FlightAttendantIdentifierCollectionResponseDocument document = await apiClient.GetFlightCabinCrewMembersRelationshipAsync(flightId);
+        // Act
+        FlightAttendantIdentifierCollectionResponseDocument document = await apiClient.GetFlightCabinCrewMembersRelationshipAsync(flightId);
 
-            // Assert
-            document.Data.Should().HaveCount(2);
-            document.Data.First().Id.Should().Be(flightAttendantId1);
-            document.Data.First().Type.Should().Be(FlightAttendantsResourceType.FlightAttendants);
-            document.Data.Last().Id.Should().Be(flightAttendantId2);
-            document.Data.Last().Type.Should().Be(FlightAttendantsResourceType.FlightAttendants);
-        }
+        // Assert
+        document.Data.Should().HaveCount(2);
+        document.Data.First().Id.Should().Be(flightAttendantId1);
+        document.Data.First().Type.Should().Be(FlightAttendantsResourceType.FlightAttendants);
+        document.Data.Last().Id.Should().Be(flightAttendantId2);
+        document.Data.Last().Type.Should().Be(FlightAttendantsResourceType.FlightAttendants);
+    }
 
-        [Fact]
-        public async Task Posting_ToMany_relationship_produces_empty_response()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Posting_ToMany_relationship_produces_empty_response()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            Func<Task> action = async () => await apiClient.PostFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
+        // Act
+        Func<Task> action = async () => await apiClient.PostFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
+        {
+            Data = new List<FlightAttendantIdentifier>
             {
-                Data = new List<FlightAttendantIdentifier>
+                new()
                 {
-                    new()
-                    {
-                        Id = "Adk2a",
-                        Type = FlightAttendantsResourceType.FlightAttendants
-                    },
-                    new()
-                    {
-                        Id = "Un37k",
-                        Type = FlightAttendantsResourceType.FlightAttendants
-                    }
+                    Id = "Adk2a",
+                    Type = FlightAttendantsResourceType.FlightAttendants
+                },
+                new()
+                {
+                    Id = "Un37k",
+                    Type = FlightAttendantsResourceType.FlightAttendants
                 }
-            });
+            }
+        });
 
-            // Assert
-            await action.Should().NotThrowAsync();
-        }
+        // Assert
+        await action.Should().NotThrowAsync();
+    }
 
-        [Fact]
-        public async Task Patching_ToMany_relationship_produces_empty_response()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Patching_ToMany_relationship_produces_empty_response()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            Func<Task> action = async () => await apiClient.PatchFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
+        // Act
+        Func<Task> action = async () => await apiClient.PatchFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
+        {
+            Data = new List<FlightAttendantIdentifier>
             {
-                Data = new List<FlightAttendantIdentifier>
+                new()
                 {
-                    new()
-                    {
-                        Id = "Adk2a",
-                        Type = FlightAttendantsResourceType.FlightAttendants
-                    },
-                    new()
-                    {
-                        Id = "Un37k",
-                        Type = FlightAttendantsResourceType.FlightAttendants
-                    }
+                    Id = "Adk2a",
+                    Type = FlightAttendantsResourceType.FlightAttendants
+                },
+                new()
+                {
+                    Id = "Un37k",
+                    Type = FlightAttendantsResourceType.FlightAttendants
                 }
-            });
+            }
+        });
 
-            // Assert
-            await action.Should().NotThrowAsync();
-        }
+        // Assert
+        await action.Should().NotThrowAsync();
+    }
 
-        [Fact]
-        public async Task Deleting_ToMany_relationship_produces_empty_response()
-        {
-            // Arrange
-            using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
-            IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
+    [Fact]
+    public async Task Deleting_ToMany_relationship_produces_empty_response()
+    {
+        // Arrange
+        using var wrapper = FakeHttpClientWrapper.Create(HttpStatusCode.NoContent, null);
+        IOpenApiClient apiClient = new OpenApiClient(wrapper.HttpClient);
 
-            // Act
-            Func<Task> action = async () => await apiClient.DeleteFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
+        // Act
+        Func<Task> action = async () => await apiClient.DeleteFlightCabinCrewMembersRelationshipAsync("ZvuH1", new ToManyFlightAttendantInRequest
+        {
+            Data = new List<FlightAttendantIdentifier>
             {
-                Data = new List<FlightAttendantIdentifier>
+                new()
                 {
-                    new()
-                    {
-                        Id = "Adk2a",
-                        Type = FlightAttendantsResourceType.FlightAttendants
-                    },
-                    new()
-                    {
-                        Id = "Un37k",
-                        Type = FlightAttendantsResourceType.FlightAttendants
-                    }
+                    Id = "Adk2a",
+                    Type = FlightAttendantsResourceType.FlightAttendants
+                },
+                new()
+                {
+                    Id = "Un37k",
+                    Type = FlightAttendantsResourceType.FlightAttendants
                 }
-            });
+            }
+        });
 
-            // Assert
-            await action.Should().NotThrowAsync();
-        }
+        // Assert
+        await action.Should().NotThrowAsync();
     }
 }
diff --git a/test/OpenApiClientTests/OpenApiClientTests.csproj b/test/OpenApiClientTests/OpenApiClientTests.csproj
index 3bd3b5da2d..005d70d251 100644
--- a/test/OpenApiClientTests/OpenApiClientTests.csproj
+++ b/test/OpenApiClientTests/OpenApiClientTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NSwag.ApiDescription.Client" Version="13.10.9">
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/AircraftKind.cs b/test/OpenApiTests/LegacyOpenApiIntegration/AircraftKind.cs
index 463499110f..6babe08323 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/AircraftKind.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/AircraftKind.cs
@@ -1,13 +1,12 @@
 using JetBrains.Annotations;
 
-namespace OpenApiTests.LegacyOpenApiIntegration
+namespace OpenApiTests.LegacyOpenApiIntegration;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public enum AircraftKind
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public enum AircraftKind
-    {
-        Turboprops,
-        LightJet,
-        MidSizeJet,
-        JumboJet
-    }
+    Turboprops,
+    LightJet,
+    MidSizeJet,
+    JumboJet
 }
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/Airline.cs b/test/OpenApiTests/LegacyOpenApiIntegration/Airline.cs
index 959aec6fbc..f6004400c1 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/Airline.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/Airline.cs
@@ -1,12 +1,11 @@
 using JetBrains.Annotations;
 
-namespace OpenApiTests.LegacyOpenApiIntegration
+namespace OpenApiTests.LegacyOpenApiIntegration;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public enum Airline : byte
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public enum Airline : byte
-    {
-        DeltaAirLines,
-        LufthansaGroup,
-        AirFranceKlm
-    }
+    DeltaAirLines,
+    LufthansaGroup,
+    AirFranceKlm
 }
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/Airplane.cs b/test/OpenApiTests/LegacyOpenApiIntegration/Airplane.cs
index 2503cadf89..c084edf5ee 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/Airplane.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/Airplane.cs
@@ -1,43 +1,41 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace OpenApiTests.LegacyOpenApiIntegration
+namespace OpenApiTests.LegacyOpenApiIntegration;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "OpenApiTests.LegacyOpenApiIntegration")]
+public sealed class Airplane : Identifiable<string>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Airplane : Identifiable<string>
-    {
-        [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange)]
-        [MaxLength(255)]
-        public string Name { get; set; } = null!;
+    [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange)]
+    [MaxLength(255)]
+    public string Name { get; set; } = null!;
 
-        [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange)]
-        [MaxLength(16)]
-        public string? SerialNumber { get; set; }
+    [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange)]
+    [MaxLength(16)]
+    public string? SerialNumber { get; set; }
 
-        [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange)]
-        public int? AirtimeInHours { get; set; }
+    [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange)]
+    public int? AirtimeInHours { get; set; }
 
-        [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange)]
-        public DateTime? LastServicedAt { get; set; }
+    [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange)]
+    public DateTime? LastServicedAt { get; set; }
 
-        [Attr]
-        public DateTime ManufacturedAt { get; set; }
+    [Attr]
+    public DateTime ManufacturedAt { get; set; }
 
-        [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
-        public bool IsInMaintenance { get; set; }
+    [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
+    public bool IsInMaintenance { get; set; }
 
-        [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
-        [MaxLength(85)]
-        public string? ManufacturedInCity { get; set; }
+    [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
+    [MaxLength(85)]
+    public string? ManufacturedInCity { get; set; }
 
-        [Attr(Capabilities = AttrCapabilities.AllowView)]
-        public AircraftKind Kind { get; set; }
+    [Attr(Capabilities = AttrCapabilities.AllowView)]
+    public AircraftKind Kind { get; set; }
 
-        [HasMany]
-        public ISet<Flight> Flights { get; set; } = new HashSet<Flight>();
-    }
+    [HasMany]
+    public ISet<Flight> Flights { get; set; } = new HashSet<Flight>();
 }
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/AirplanesController.cs b/test/OpenApiTests/LegacyOpenApiIntegration/AirplanesController.cs
deleted file mode 100644
index 1f72395054..0000000000
--- a/test/OpenApiTests/LegacyOpenApiIntegration/AirplanesController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace OpenApiTests.LegacyOpenApiIntegration
-{
-    public sealed class AirplanesController : JsonApiController<Airplane, string>
-    {
-        public AirplanesController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Airplane, string> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/CabinArea.cs b/test/OpenApiTests/LegacyOpenApiIntegration/CabinArea.cs
index fdee6cd686..8119a94aa1 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/CabinArea.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/CabinArea.cs
@@ -1,12 +1,11 @@
 using JetBrains.Annotations;
 
-namespace OpenApiTests.LegacyOpenApiIntegration
+namespace OpenApiTests.LegacyOpenApiIntegration;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public enum CabinArea
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public enum CabinArea
-    {
-        FirstClass,
-        BusinessClass,
-        EconomyClass
-    }
+    FirstClass,
+    BusinessClass,
+    EconomyClass
 }
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/Flight.cs b/test/OpenApiTests/LegacyOpenApiIntegration/Flight.cs
index d5608d45ce..f216eee497 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/Flight.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/Flight.cs
@@ -1,47 +1,45 @@
-using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace OpenApiTests.LegacyOpenApiIntegration
+namespace OpenApiTests.LegacyOpenApiIntegration;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "OpenApiTests.LegacyOpenApiIntegration")]
+public sealed class Flight : Identifiable<string>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Flight : Identifiable<string>
-    {
-        [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
-        [MaxLength(40)]
-        public string FinalDestination { get; set; } = null!;
+    [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
+    [MaxLength(40)]
+    public string FinalDestination { get; set; } = null!;
 
-        [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
-        [MaxLength(2000)]
-        public string? StopOverDestination { get; set; }
+    [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
+    [MaxLength(2000)]
+    public string? StopOverDestination { get; set; }
 
-        [Attr(PublicName = "operated-by", Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
-        public Airline Airline { get; set; }
+    [Attr(PublicName = "operated-by", Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowChange)]
+    public Airline Airline { get; set; }
 
-        [Attr]
-        public DateTime? DepartsAt { get; set; }
+    [Attr]
+    public DateTime? DepartsAt { get; set; }
 
-        [Attr]
-        public DateTime? ArrivesAt { get; set; }
+    [Attr]
+    public DateTime? ArrivesAt { get; set; }
 
-        [HasMany]
-        public ISet<FlightAttendant> CabinCrewMembers { get; set; } = new HashSet<FlightAttendant>();
+    [HasMany]
+    public ISet<FlightAttendant> CabinCrewMembers { get; set; } = new HashSet<FlightAttendant>();
 
-        [HasOne]
-        public FlightAttendant Purser { get; set; } = null!;
+    [HasOne]
+    public FlightAttendant Purser { get; set; } = null!;
 
-        [HasOne]
-        public FlightAttendant? BackupPurser { get; set; }
+    [HasOne]
+    public FlightAttendant? BackupPurser { get; set; }
 
-        [Attr]
-        [NotMapped]
-        public ICollection<string> ServicesOnBoard { get; set; } = new HashSet<string>();
+    [Attr]
+    [NotMapped]
+    public ICollection<string> ServicesOnBoard { get; set; } = new HashSet<string>();
 
-        [HasMany]
-        public ICollection<Passenger> Passengers { get; set; } = new HashSet<Passenger>();
-    }
+    [HasMany]
+    public ICollection<Passenger> Passengers { get; set; } = new HashSet<Passenger>();
 }
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/FlightAttendant.cs b/test/OpenApiTests/LegacyOpenApiIntegration/FlightAttendant.cs
index 1cf2de622d..26d110ed3c 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/FlightAttendant.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/FlightAttendant.cs
@@ -1,40 +1,39 @@
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace OpenApiTests.LegacyOpenApiIntegration
+namespace OpenApiTests.LegacyOpenApiIntegration;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "OpenApiTests.LegacyOpenApiIntegration")]
+public sealed class FlightAttendant : Identifiable<string>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class FlightAttendant : Identifiable<string>
-    {
-        [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowFilter)]
-        public override string Id { get; set; } = null!;
+    [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowFilter)]
+    public override string Id { get; set; } = null!;
 
-        [Attr(Capabilities = AttrCapabilities.None)]
-        public FlightAttendantExpertiseLevel ExpertiseLevel { get; set; }
+    [Attr(Capabilities = AttrCapabilities.None)]
+    public FlightAttendantExpertiseLevel ExpertiseLevel { get; set; }
 
-        [Attr(Capabilities = AttrCapabilities.All)]
-        [Required]
-        [EmailAddress]
-        public string? EmailAddress { get; set; }
+    [Attr(Capabilities = AttrCapabilities.All)]
+    [Required]
+    [EmailAddress]
+    public string? EmailAddress { get; set; }
 
-        [Attr(Capabilities = AttrCapabilities.All)]
-        [Range(18, 75)]
-        public int Age { get; set; }
+    [Attr(Capabilities = AttrCapabilities.All)]
+    [Range(18, 75)]
+    public int Age { get; set; }
 
-        [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowCreate)]
-        [Url]
-        public string ProfileImageUrl { get; set; } = null!;
+    [Attr(Capabilities = AttrCapabilities.AllowView | AttrCapabilities.AllowCreate)]
+    [Url]
+    public string ProfileImageUrl { get; set; } = null!;
 
-        [Attr]
-        public long DistanceTraveledInKilometers { get; set; }
+    [Attr]
+    public long DistanceTraveledInKilometers { get; set; }
 
-        [HasMany]
-        public ISet<Flight> ScheduledForFlights { get; set; } = new HashSet<Flight>();
+    [HasMany]
+    public ISet<Flight> ScheduledForFlights { get; set; } = new HashSet<Flight>();
 
-        [HasMany]
-        public ISet<Flight> PurserOnFlights { get; set; } = new HashSet<Flight>();
-    }
+    [HasMany]
+    public ISet<Flight> PurserOnFlights { get; set; } = new HashSet<Flight>();
 }
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/FlightAttendantExpertiseLevel.cs b/test/OpenApiTests/LegacyOpenApiIntegration/FlightAttendantExpertiseLevel.cs
index c5ffe7cb49..b5e799eb4b 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/FlightAttendantExpertiseLevel.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/FlightAttendantExpertiseLevel.cs
@@ -1,13 +1,12 @@
 using JetBrains.Annotations;
 
-namespace OpenApiTests.LegacyOpenApiIntegration
+namespace OpenApiTests.LegacyOpenApiIntegration;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public enum FlightAttendantExpertiseLevel
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public enum FlightAttendantExpertiseLevel
-    {
-        Junior,
-        Intermediate,
-        Senior,
-        Purser
-    }
+    Junior,
+    Intermediate,
+    Senior,
+    Purser
 }
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/FlightAttendantsController.cs b/test/OpenApiTests/LegacyOpenApiIntegration/FlightAttendantsController.cs
deleted file mode 100644
index acaceb54ad..0000000000
--- a/test/OpenApiTests/LegacyOpenApiIntegration/FlightAttendantsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace OpenApiTests.LegacyOpenApiIntegration
-{
-    public sealed class FlightAttendantsController : JsonApiController<FlightAttendant, string>
-    {
-        public FlightAttendantsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<FlightAttendant, string> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/FlightsController.cs b/test/OpenApiTests/LegacyOpenApiIntegration/FlightsController.cs
deleted file mode 100644
index af331adea1..0000000000
--- a/test/OpenApiTests/LegacyOpenApiIntegration/FlightsController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace OpenApiTests.LegacyOpenApiIntegration
-{
-    public sealed class FlightsController : JsonApiController<Flight, string>
-    {
-        public FlightsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Flight, string> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/JsonKebabCaseNamingPolicy.cs b/test/OpenApiTests/LegacyOpenApiIntegration/JsonKebabCaseNamingPolicy.cs
index bd98c17e22..0e0d76afe5 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/JsonKebabCaseNamingPolicy.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/JsonKebabCaseNamingPolicy.cs
@@ -1,83 +1,81 @@
-using System;
 using System.Text;
 using System.Text.Json;
 
-namespace OpenApiTests.LegacyOpenApiIntegration
+namespace OpenApiTests.LegacyOpenApiIntegration;
+
+// Based on https://github.com/J0rgeSerran0/JsonNamingPolicy
+internal sealed class JsonKebabCaseNamingPolicy : JsonNamingPolicy
 {
-    // Based on https://github.com/J0rgeSerran0/JsonNamingPolicy
-    internal sealed class JsonKebabCaseNamingPolicy : JsonNamingPolicy
-    {
-        private const char Separator = '-';
+    private const char Separator = '-';
 
-        public static readonly JsonKebabCaseNamingPolicy Instance = new();
+    public static readonly JsonKebabCaseNamingPolicy Instance = new();
 
-        public override string ConvertName(string name)
+    public override string ConvertName(string name)
+    {
+        if (string.IsNullOrWhiteSpace(name))
         {
-            if (string.IsNullOrWhiteSpace(name))
-            {
-                return string.Empty;
-            }
+            return string.Empty;
+        }
 
-            ReadOnlySpan<char> spanName = name.Trim();
+        ReadOnlySpan<char> spanName = name.Trim();
 
-            var stringBuilder = new StringBuilder();
-            bool addCharacter = true;
+        var stringBuilder = new StringBuilder();
+        bool addCharacter = true;
 
-            bool isNextLower = false;
-            bool isNextUpper = false;
-            bool isNextSpace = false;
+        bool isNextLower = false;
+        bool isNextUpper = false;
+        bool isNextSpace = false;
 
-            for (int position = 0; position < spanName.Length; position++)
+        for (int position = 0; position < spanName.Length; position++)
+        {
+            if (position != 0)
             {
-                if (position != 0)
+                bool isCurrentSpace = spanName[position] == 32;
+                bool isPreviousSpace = spanName[position - 1] == 32;
+                bool isPreviousSeparator = spanName[position - 1] == 95;
+
+                if (position + 1 != spanName.Length)
                 {
-                    bool isCurrentSpace = spanName[position] == 32;
-                    bool isPreviousSpace = spanName[position - 1] == 32;
-                    bool isPreviousSeparator = spanName[position - 1] == 95;
+                    isNextLower = spanName[position + 1] > 96 && spanName[position + 1] < 123;
+                    isNextUpper = spanName[position + 1] > 64 && spanName[position + 1] < 91;
+                    isNextSpace = spanName[position + 1] == 32;
+                }
 
-                    if (position + 1 != spanName.Length)
-                    {
-                        isNextLower = spanName[position + 1] > 96 && spanName[position + 1] < 123;
-                        isNextUpper = spanName[position + 1] > 64 && spanName[position + 1] < 91;
-                        isNextSpace = spanName[position + 1] == 32;
-                    }
+                if (isCurrentSpace && (isPreviousSpace || isPreviousSeparator || isNextUpper || isNextSpace))
+                {
+                    addCharacter = false;
+                }
+                else
+                {
+                    bool isCurrentUpper = spanName[position] > 64 && spanName[position] < 91;
+                    bool isPreviousLower = spanName[position - 1] > 96 && spanName[position - 1] < 123;
+                    bool isPreviousNumber = spanName[position - 1] > 47 && spanName[position - 1] < 58;
 
-                    if (isCurrentSpace && (isPreviousSpace || isPreviousSeparator || isNextUpper || isNextSpace))
+                    if (isCurrentUpper && (isPreviousLower || isPreviousNumber || isNextLower || isNextSpace))
                     {
-                        addCharacter = false;
+                        stringBuilder.Append(Separator);
                     }
                     else
                     {
-                        bool isCurrentUpper = spanName[position] > 64 && spanName[position] < 91;
-                        bool isPreviousLower = spanName[position - 1] > 96 && spanName[position - 1] < 123;
-                        bool isPreviousNumber = spanName[position - 1] > 47 && spanName[position - 1] < 58;
-
-                        if (isCurrentUpper && (isPreviousLower || isPreviousNumber || isNextLower || isNextSpace))
+                        if (isCurrentSpace)
                         {
                             stringBuilder.Append(Separator);
-                        }
-                        else
-                        {
-                            if (isCurrentSpace)
-                            {
-                                stringBuilder.Append(Separator);
-                                addCharacter = false;
-                            }
+                            addCharacter = false;
                         }
                     }
                 }
-
-                if (addCharacter)
-                {
-                    stringBuilder.Append(spanName[position]);
-                }
-                else
-                {
-                    addCharacter = true;
-                }
             }
 
-            return stringBuilder.ToString().ToLower();
+            if (addCharacter)
+            {
+                stringBuilder.Append(spanName[position]);
+            }
+            else
+            {
+                addCharacter = true;
+            }
         }
+
+        return stringBuilder.ToString().ToLower();
     }
 }
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs b/test/OpenApiTests/LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs
index 32617a2224..b6a1ce7f34 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/LegacyIntegrationDbContext.cs
@@ -4,33 +4,32 @@
 // @formatter:wrap_chained_method_calls chop_always
 // @formatter:keep_existing_linebreaks true
 
-namespace OpenApiTests.LegacyOpenApiIntegration
+namespace OpenApiTests.LegacyOpenApiIntegration;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class LegacyIntegrationDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class LegacyIntegrationDbContext : DbContext
-    {
-        public DbSet<Airplane> Airplanes => Set<Airplane>();
-        public DbSet<Flight> Flights => Set<Flight>();
-        public DbSet<FlightAttendant> FlightAttendants => Set<FlightAttendant>();
+    public DbSet<Airplane> Airplanes => Set<Airplane>();
+    public DbSet<Flight> Flights => Set<Flight>();
+    public DbSet<FlightAttendant> FlightAttendants => Set<FlightAttendant>();
 
-        public LegacyIntegrationDbContext(DbContextOptions<LegacyIntegrationDbContext> options)
-            : base(options)
-        {
-        }
+    public LegacyIntegrationDbContext(DbContextOptions<LegacyIntegrationDbContext> options)
+        : base(options)
+    {
+    }
 
-        protected override void OnModelCreating(ModelBuilder builder)
-        {
-            builder.Entity<Flight>()
-                .HasMany(flight => flight.CabinCrewMembers)
-                .WithMany(flightAttendant => flightAttendant.ScheduledForFlights);
+    protected override void OnModelCreating(ModelBuilder builder)
+    {
+        builder.Entity<Flight>()
+            .HasMany(flight => flight.CabinCrewMembers)
+            .WithMany(flightAttendant => flightAttendant.ScheduledForFlights);
 
-            builder.Entity<Flight>()
-                .HasOne(flight => flight.Purser)
-                .WithMany(flightAttendant => flightAttendant.PurserOnFlights);
+        builder.Entity<Flight>()
+            .HasOne(flight => flight.Purser)
+            .WithMany(flightAttendant => flightAttendant.PurserOnFlights);
 
-            builder.Entity<Flight>()
-                .HasOne(flight => flight.BackupPurser)
-                .WithMany();
-        }
+        builder.Entity<Flight>()
+            .HasOne(flight => flight.BackupPurser)
+            .WithMany();
     }
 }
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/LegacyOpenApiIntegrationStartup.cs b/test/OpenApiTests/LegacyOpenApiIntegration/LegacyOpenApiIntegrationStartup.cs
index 916a40fa4d..6dbbba3521 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/LegacyOpenApiIntegrationStartup.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/LegacyOpenApiIntegrationStartup.cs
@@ -4,21 +4,20 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Microsoft.EntityFrameworkCore;
 
-namespace OpenApiTests.LegacyOpenApiIntegration
+namespace OpenApiTests.LegacyOpenApiIntegration;
+
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public sealed class LegacyOpenApiIntegrationStartup<TDbContext> : OpenApiStartup<TDbContext>
+    where TDbContext : DbContext
 {
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public sealed class LegacyOpenApiIntegrationStartup<TDbContext> : OpenApiStartup<TDbContext>
-        where TDbContext : DbContext
+    protected override void SetJsonApiOptions(JsonApiOptions options)
     {
-        protected override void SetJsonApiOptions(JsonApiOptions options)
-        {
-            base.SetJsonApiOptions(options);
+        base.SetJsonApiOptions(options);
 
-            options.Namespace = "api/v1";
-            options.DefaultAttrCapabilities = AttrCapabilities.AllowView;
-            options.SerializerOptions.PropertyNamingPolicy = JsonKebabCaseNamingPolicy.Instance;
-            options.SerializerOptions.DictionaryKeyPolicy = JsonKebabCaseNamingPolicy.Instance;
-            options.SerializerOptions.Converters.Add(new JsonStringEnumConverter());
-        }
+        options.Namespace = "api/v1";
+        options.DefaultAttrCapabilities = AttrCapabilities.AllowView;
+        options.SerializerOptions.PropertyNamingPolicy = JsonKebabCaseNamingPolicy.Instance;
+        options.SerializerOptions.DictionaryKeyPolicy = JsonKebabCaseNamingPolicy.Instance;
+        options.SerializerOptions.Converters.Add(new JsonStringEnumConverter());
     }
 }
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/LegacyOpenApiIntegrationTests.cs b/test/OpenApiTests/LegacyOpenApiIntegration/LegacyOpenApiIntegrationTests.cs
index d461552bcc..3d253e2dc9 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/LegacyOpenApiIntegrationTests.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/LegacyOpenApiIntegrationTests.cs
@@ -1,61 +1,56 @@
-using System;
-using System.IO;
-using System.Net.Http;
 using System.Reflection;
-using System.Threading.Tasks;
 using FluentAssertions;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace OpenApiTests.LegacyOpenApiIntegration
+namespace OpenApiTests.LegacyOpenApiIntegration;
+
+public sealed class LegacyOpenApiIntegrationTests
+    : IntegrationTestContext<LegacyOpenApiIntegrationStartup<LegacyIntegrationDbContext>, LegacyIntegrationDbContext>
 {
-    public sealed class LegacyOpenApiIntegrationTests
-        : IntegrationTestContext<LegacyOpenApiIntegrationStartup<LegacyIntegrationDbContext>, LegacyIntegrationDbContext>
+    public LegacyOpenApiIntegrationTests()
     {
-        public LegacyOpenApiIntegrationTests()
-        {
-            UseController<AirplanesController>();
-            UseController<FlightsController>();
-            UseController<FlightAttendantsController>();
-        }
-
-        [Fact]
-        public async Task Retrieved_document_matches_expected_document()
-        {
-            // Arrange
-            string embeddedResourceName = $"{nameof(OpenApiTests)}.{nameof(LegacyOpenApiIntegration)}.swagger.json";
-            string expectedDocument = await LoadEmbeddedResourceAsync(embeddedResourceName);
-            const string requestUrl = "swagger/v1/swagger.json";
+        UseController<AirplanesController>();
+        UseController<FlightsController>();
+        UseController<FlightAttendantsController>();
+    }
 
-            // Act
-            string actualDocument = await GetAsync(requestUrl);
+    [Fact]
+    public async Task Retrieved_document_matches_expected_document()
+    {
+        // Arrange
+        const string embeddedResourceName = $"{nameof(OpenApiTests)}.{nameof(LegacyOpenApiIntegration)}.swagger.json";
+        string expectedDocument = await LoadEmbeddedResourceAsync(embeddedResourceName);
+        const string requestUrl = "swagger/v1/swagger.json";
 
-            // Assert
-            actualDocument.Should().BeJson(expectedDocument);
-        }
+        // Act
+        string actualDocument = await GetAsync(requestUrl);
 
-        private async Task<string> GetAsync(string requestUrl)
-        {
-            var request = new HttpRequestMessage(HttpMethod.Get, requestUrl);
+        // Assert
+        actualDocument.Should().BeJson(expectedDocument);
+    }
 
-            using HttpClient client = Factory.CreateClient();
-            HttpResponseMessage responseMessage = await client.SendAsync(request);
+    private async Task<string> GetAsync(string requestUrl)
+    {
+        var request = new HttpRequestMessage(HttpMethod.Get, requestUrl);
 
-            return await responseMessage.Content.ReadAsStringAsync();
-        }
+        using HttpClient client = Factory.CreateClient();
+        HttpResponseMessage responseMessage = await client.SendAsync(request);
 
-        private static async Task<string> LoadEmbeddedResourceAsync(string name)
-        {
-            var assembly = Assembly.GetExecutingAssembly();
-            await using Stream? stream = assembly.GetManifestResourceStream(name);
+        return await responseMessage.Content.ReadAsStringAsync();
+    }
 
-            if (stream == null)
-            {
-                throw new Exception($"Failed to load embedded resource '{name}'. Set Build Action to Embedded Resource in properties.");
-            }
+    private static async Task<string> LoadEmbeddedResourceAsync(string name)
+    {
+        var assembly = Assembly.GetExecutingAssembly();
+        await using Stream? stream = assembly.GetManifestResourceStream(name);
 
-            using var reader = new StreamReader(stream);
-            return await reader.ReadToEndAsync();
+        if (stream == null)
+        {
+            throw new Exception($"Failed to load embedded resource '{name}'. Set Build Action to Embedded Resource in properties.");
         }
+
+        using var reader = new StreamReader(stream);
+        return await reader.ReadToEndAsync();
     }
 }
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/Passenger.cs b/test/OpenApiTests/LegacyOpenApiIntegration/Passenger.cs
index f115afca10..2a8e142d41 100644
--- a/test/OpenApiTests/LegacyOpenApiIntegration/Passenger.cs
+++ b/test/OpenApiTests/LegacyOpenApiIntegration/Passenger.cs
@@ -3,19 +3,19 @@
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Resources.Annotations;
 
-namespace OpenApiTests.LegacyOpenApiIntegration
+namespace OpenApiTests.LegacyOpenApiIntegration;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(ControllerNamespace = "OpenApiTests.LegacyOpenApiIntegration")]
+public sealed class Passenger : Identifiable<string>
 {
-    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-    public sealed class Passenger : Identifiable<string>
-    {
-        [Attr(PublicName = "document-number", Capabilities = AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange)]
-        [MaxLength(9)]
-        public string PassportNumber { get; set; } = null!;
+    [Attr(PublicName = "document-number", Capabilities = AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange)]
+    [MaxLength(9)]
+    public string PassportNumber { get; set; } = null!;
 
-        [Attr]
-        public string? FullName { get; set; }
+    [Attr]
+    public string? FullName { get; set; }
 
-        [Attr]
-        public CabinArea CabinArea { get; set; }
-    }
+    [Attr]
+    public CabinArea CabinArea { get; set; }
 }
diff --git a/test/OpenApiTests/LegacyOpenApiIntegration/PassengersController.cs b/test/OpenApiTests/LegacyOpenApiIntegration/PassengersController.cs
deleted file mode 100644
index 4ff6842381..0000000000
--- a/test/OpenApiTests/LegacyOpenApiIntegration/PassengersController.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using JsonApiDotNetCore.Configuration;
-using JsonApiDotNetCore.Controllers;
-using JsonApiDotNetCore.Services;
-using Microsoft.Extensions.Logging;
-
-namespace OpenApiTests.LegacyOpenApiIntegration
-{
-    public sealed class PassengersController : JsonApiController<Passenger, string>
-    {
-        public PassengersController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
-            IResourceService<Passenger, string> resourceService)
-            : base(options, resourceGraph, loggerFactory, resourceService)
-        {
-        }
-    }
-}
diff --git a/test/OpenApiTests/OpenApiStartup.cs b/test/OpenApiTests/OpenApiStartup.cs
index 992ea57218..e7cd0b97f1 100644
--- a/test/OpenApiTests/OpenApiStartup.cs
+++ b/test/OpenApiTests/OpenApiStartup.cs
@@ -7,26 +7,25 @@
 using Microsoft.Extensions.Logging;
 using TestBuildingBlocks;
 
-namespace OpenApiTests
+namespace OpenApiTests;
+
+public abstract class OpenApiStartup<TDbContext> : TestableStartup<TDbContext>
+    where TDbContext : DbContext
 {
-    public abstract class OpenApiStartup<TDbContext> : TestableStartup<TDbContext>
-        where TDbContext : DbContext
+    public override void ConfigureServices(IServiceCollection services)
     {
-        public override void ConfigureServices(IServiceCollection services)
-        {
-            IMvcCoreBuilder mvcBuilder = services.AddMvcCore();
+        IMvcCoreBuilder mvcBuilder = services.AddMvcCore();
 
-            services.AddJsonApi<TDbContext>(SetJsonApiOptions, mvcBuilder: mvcBuilder);
+        services.AddJsonApi<TDbContext>(SetJsonApiOptions, mvcBuilder: mvcBuilder);
 
-            services.AddOpenApi(mvcBuilder);
-        }
+        services.AddOpenApi(mvcBuilder);
+    }
 
-        public override void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)
-        {
-            app.UseRouting();
-            app.UseJsonApi();
-            app.UseSwagger();
-            app.UseEndpoints(endpoints => endpoints.MapControllers());
-        }
+    public override void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)
+    {
+        app.UseRouting();
+        app.UseJsonApi();
+        app.UseSwagger();
+        app.UseEndpoints(endpoints => endpoints.MapControllers());
     }
 }
diff --git a/test/OpenApiTests/OpenApiTests.csproj b/test/OpenApiTests/OpenApiTests.csproj
index 712134cb82..e85a2fb288 100644
--- a/test/OpenApiTests/OpenApiTests.csproj
+++ b/test/OpenApiTests/OpenApiTests.csproj
@@ -1,27 +1,22 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\src\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
+      ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\..\src\JsonApiDotNetCore.OpenApi\JsonApiDotNetCore.OpenApi.csproj" />
     <ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
   </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="LegacyOpenApiIntegration\swagger.json" />
   </ItemGroup>
-
-  <!-- Fixes IntelliSense errors on openapi.json in Visual Studio 2019, which uses the schema for OpenAPI 3.1 by default. -->
-  <ProjectExtensions>
-    <VisualStudio>
-      <UserProperties swagger_1json__JsonSchema="https://raw.githubusercontent.com/OAI/OpenAPI-Specification/main/schemas/v3.0/schema.json" />
-    </VisualStudio>
-  </ProjectExtensions>
 </Project>
diff --git a/test/SourceGeneratorDebugger/Controllers/ArticlesController.cs b/test/SourceGeneratorDebugger/Controllers/ArticlesController.cs
new file mode 100644
index 0000000000..1ceafa5d02
--- /dev/null
+++ b/test/SourceGeneratorDebugger/Controllers/ArticlesController.cs
@@ -0,0 +1,16 @@
+using JetBrains.Annotations;
+
+namespace SourceGeneratorDebugger.Controllers;
+
+// Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028
+public partial class ArticlesController
+{
+}
+
+[PublicAPI]
+partial class ArticlesController
+{
+    public void ExtraMethod()
+    {
+    }
+}
diff --git a/test/SourceGeneratorDebugger/Controllers/CustomersController.cs b/test/SourceGeneratorDebugger/Controllers/CustomersController.cs
new file mode 100644
index 0000000000..a10de41483
--- /dev/null
+++ b/test/SourceGeneratorDebugger/Controllers/CustomersController.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Services;
+using Microsoft.Extensions.Logging;
+using SourceGeneratorDebugger.Models;
+
+namespace SourceGeneratorDebugger.Controllers;
+
+[PublicAPI]
+public sealed class CustomersController : JsonApiController<Customer, long>
+{
+    public CustomersController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<Customer, long> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
+    {
+    }
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/ArgumentGuard.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/ArgumentGuard.cs
new file mode 100644
index 0000000000..e806a3caa1
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/ArgumentGuard.cs
@@ -0,0 +1,19 @@
+using JetBrains.Annotations;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+#pragma warning disable AV1008 // Class should not be static
+
+namespace JsonApiDotNetCore;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+internal static class ArgumentGuard
+{
+    public static void NotNullNorEmpty(string? value, string name)
+    {
+    }
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/AttrAttribute.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/AttrAttribute.cs
new file mode 100644
index 0000000000..d8201a0a59
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/AttrAttribute.cs
@@ -0,0 +1,15 @@
+using JetBrains.Annotations;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Resources.Annotations;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public sealed class AttrAttribute : Attribute
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/BaseJsonApiController.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/BaseJsonApiController.cs
new file mode 100644
index 0000000000..2cd3fd0cd6
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/BaseJsonApiController.cs
@@ -0,0 +1,41 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Services;
+using Microsoft.Extensions.Logging;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Controllers;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public abstract class BaseJsonApiController<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
+{
+    protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<TResource, TId> resourceService)
+        : this(options, resourceGraph, loggerFactory, resourceService, resourceService)
+    {
+    }
+
+    protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceQueryService<TResource, TId>? queryService = null, IResourceCommandService<TResource, TId>? commandService = null)
+        : this(options, resourceGraph, loggerFactory, queryService, queryService, queryService, queryService, commandService, commandService, commandService,
+            commandService, commandService, commandService)
+    {
+    }
+
+    protected BaseJsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IGetAllService<TResource, TId>? getAll = null, IGetByIdService<TResource, TId>? getById = null,
+        IGetSecondaryService<TResource, TId>? getSecondary = null, IGetRelationshipService<TResource, TId>? getRelationship = null,
+        ICreateService<TResource, TId>? create = null, IAddToRelationshipService<TResource, TId>? addToRelationship = null,
+        IUpdateService<TResource, TId>? update = null, ISetRelationshipService<TResource, TId>? setRelationship = null,
+        IDeleteService<TResource, TId>? delete = null, IRemoveFromRelationshipService<TResource, TId>? removeFromRelationship = null)
+    {
+    }
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IAddToRelationshipService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IAddToRelationshipService.cs
new file mode 100644
index 0000000000..4bdfbe99ab
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IAddToRelationshipService.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable UnusedTypeParameter
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IAddToRelationshipService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/ICreateService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/ICreateService.cs
new file mode 100644
index 0000000000..3e1d7525a3
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/ICreateService.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable UnusedTypeParameter
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface ICreateService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IDeleteService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IDeleteService.cs
new file mode 100644
index 0000000000..10a1092bd9
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IDeleteService.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable UnusedTypeParameter
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IDeleteService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetAllService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetAllService.cs
new file mode 100644
index 0000000000..9a6644e428
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetAllService.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable UnusedTypeParameter
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IGetAllService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetByIdService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetByIdService.cs
new file mode 100644
index 0000000000..f59885af15
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetByIdService.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable UnusedTypeParameter
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IGetByIdService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetRelationshipService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetRelationshipService.cs
new file mode 100644
index 0000000000..7e28fe1cb1
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetRelationshipService.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable UnusedTypeParameter
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IGetRelationshipService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetSecondaryService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetSecondaryService.cs
new file mode 100644
index 0000000000..3d2d0fd381
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IGetSecondaryService.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable UnusedTypeParameter
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IGetSecondaryService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IIdentifiable.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IIdentifiable.cs
new file mode 100644
index 0000000000..a5a857cf3e
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IIdentifiable.cs
@@ -0,0 +1,23 @@
+using JetBrains.Annotations;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Resources;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IIdentifiable
+{
+    string? StringId { get; set; }
+    string? LocalId { get; set; }
+}
+
+[PublicAPI]
+public interface IIdentifiable<TId> : IIdentifiable
+{
+    TId Id { get; set; }
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IJsonApiOptions.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IJsonApiOptions.cs
new file mode 100644
index 0000000000..5d076dd4ca
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IJsonApiOptions.cs
@@ -0,0 +1,15 @@
+using JetBrains.Annotations;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IJsonApiOptions
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IRemoveFromRelationshipService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IRemoveFromRelationshipService.cs
new file mode 100644
index 0000000000..dd071fdc6e
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IRemoveFromRelationshipService.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable UnusedTypeParameter
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IRemoveFromRelationshipService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IResourceCommandService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IResourceCommandService.cs
new file mode 100644
index 0000000000..e7fcebc608
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IResourceCommandService.cs
@@ -0,0 +1,19 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IResourceCommandService<TResource, in TId>
+    : ICreateService<TResource, TId>, IAddToRelationshipService<TResource, TId>, IUpdateService<TResource, TId>, ISetRelationshipService<TResource, TId>,
+        IDeleteService<TResource, TId>, IRemoveFromRelationshipService<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IResourceGraph.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IResourceGraph.cs
new file mode 100644
index 0000000000..7d1f1562ba
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IResourceGraph.cs
@@ -0,0 +1,15 @@
+using JetBrains.Annotations;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IResourceGraph
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IResourceQueryService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IResourceQueryService.cs
new file mode 100644
index 0000000000..b734963ad3
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IResourceQueryService.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IResourceQueryService<TResource, in TId>
+    : IGetAllService<TResource, TId>, IGetByIdService<TResource, TId>, IGetRelationshipService<TResource, TId>, IGetSecondaryService<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/ISetRelationshipService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/ISetRelationshipService.cs
new file mode 100644
index 0000000000..2cd43448bd
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/ISetRelationshipService.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable UnusedTypeParameter
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface ISetRelationshipService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/IUpdateService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IUpdateService.cs
new file mode 100644
index 0000000000..974335097c
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/IUpdateService.cs
@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable UnusedTypeParameter
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IUpdateService<TResource, in TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/Identifiable.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/Identifiable.cs
new file mode 100644
index 0000000000..6e78d67867
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/Identifiable.cs
@@ -0,0 +1,19 @@
+using JetBrains.Annotations;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Resources;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public abstract class Identifiable<TId> : IIdentifiable<TId>
+{
+    public virtual TId Id { get; set; } = default!;
+
+    public string? StringId { get; set; }
+    public string? LocalId { get; set; }
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiCommandController.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiCommandController.cs
new file mode 100644
index 0000000000..31736e8088
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiCommandController.cs
@@ -0,0 +1,25 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Services;
+using Microsoft.Extensions.Logging;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Controllers;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public abstract class JsonApiCommandController<TResource, TId> : BaseJsonApiController<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
+{
+    protected JsonApiCommandController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceCommandService<TResource, TId> commandService)
+        : base(options, resourceGraph, loggerFactory, null, commandService)
+    {
+    }
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiController.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiController.cs
new file mode 100644
index 0000000000..9d7d1d6e9c
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiController.cs
@@ -0,0 +1,36 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Services;
+using Microsoft.Extensions.Logging;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Controllers;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public abstract class JsonApiController<TResource, TId> : BaseJsonApiController<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
+{
+    protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<TResource, TId> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
+    {
+    }
+
+    protected JsonApiController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IGetAllService<TResource, TId>? getAll = null, IGetByIdService<TResource, TId>? getById = null,
+        IGetSecondaryService<TResource, TId>? getSecondary = null, IGetRelationshipService<TResource, TId>? getRelationship = null,
+        ICreateService<TResource, TId>? create = null, IAddToRelationshipService<TResource, TId>? addToRelationship = null,
+        IUpdateService<TResource, TId>? update = null, ISetRelationshipService<TResource, TId>? setRelationship = null,
+        IDeleteService<TResource, TId>? delete = null, IRemoveFromRelationshipService<TResource, TId>? removeFromRelationship = null)
+        : base(options, resourceGraph, loggerFactory, getAll, getById, getSecondary, getRelationship, create, addToRelationship, update, setRelationship,
+            delete, removeFromRelationship)
+    {
+    }
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiOptions.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiOptions.cs
new file mode 100644
index 0000000000..bad4ca2a28
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiOptions.cs
@@ -0,0 +1,16 @@
+// ReSharper disable CheckNamespace
+
+using JetBrains.Annotations;
+
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public sealed class JsonApiOptions : IJsonApiOptions
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiQueryController.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiQueryController.cs
new file mode 100644
index 0000000000..cebb57e7bc
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiQueryController.cs
@@ -0,0 +1,25 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Services;
+using Microsoft.Extensions.Logging;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Controllers;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public abstract class JsonApiQueryController<TResource, TId> : BaseJsonApiController<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
+{
+    protected JsonApiQueryController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceQueryService<TResource, TId> queryService)
+        : base(options, resourceGraph, loggerFactory, queryService)
+    {
+    }
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiResourceService.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiResourceService.cs
new file mode 100644
index 0000000000..118f5d315d
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/JsonApiResourceService.cs
@@ -0,0 +1,17 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public sealed class JsonApiResourceService<TResource, TId> : IResourceService<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/ResourceGraph.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/ResourceGraph.cs
new file mode 100644
index 0000000000..5be951c9f4
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/ResourceGraph.cs
@@ -0,0 +1,15 @@
+using JetBrains.Annotations;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Configuration;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public sealed class ResourceGraph : IResourceGraph
+{
+}
diff --git a/test/SourceGeneratorDebugger/JsonApiDotNetCore/ResourceServiceInterfaces.cs b/test/SourceGeneratorDebugger/JsonApiDotNetCore/ResourceServiceInterfaces.cs
new file mode 100644
index 0000000000..72cd018d77
--- /dev/null
+++ b/test/SourceGeneratorDebugger/JsonApiDotNetCore/ResourceServiceInterfaces.cs
@@ -0,0 +1,17 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace JsonApiDotNetCore.Services;
+
+/// <summary>
+/// Represents a stripped-down copy of this type in the JsonApiDotNetCore project. It exists solely to fulfill the dependency needs for successfully
+/// compiling the source-generated controllers in this project.
+/// </summary>
+[PublicAPI]
+public interface IResourceService<TResource, in TId> : IResourceCommandService<TResource, TId>, IResourceQueryService<TResource, TId>
+    where TResource : class, IIdentifiable<TId>
+{
+}
diff --git a/test/SourceGeneratorDebugger/Models/Account.cs b/test/SourceGeneratorDebugger/Models/Account.cs
new file mode 100644
index 0000000000..360f6f837f
--- /dev/null
+++ b/test/SourceGeneratorDebugger/Models/Account.cs
@@ -0,0 +1,14 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace SourceGeneratorDebugger.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(GenerateControllerEndpoints = JsonApiEndpoints.Query, ControllerNamespace = "Some.Namespace.To.Place.Controllers")]
+public sealed class Account : Identifiable<string>
+{
+    [Attr]
+    public string? DisplayName { get; set; }
+}
diff --git a/test/SourceGeneratorDebugger/Models/Article.cs b/test/SourceGeneratorDebugger/Models/Article.cs
new file mode 100644
index 0000000000..fd28b80494
--- /dev/null
+++ b/test/SourceGeneratorDebugger/Models/Article.cs
@@ -0,0 +1,14 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace SourceGeneratorDebugger.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(GenerateControllerEndpoints = JsonApiEndpoints.GetCollection | JsonApiEndpoints.GetSingle | JsonApiEndpoints.GetSecondary)]
+public sealed class Article : Identifiable<Guid>
+{
+    [Attr]
+    public string? DisplayName { get; set; }
+}
diff --git a/test/SourceGeneratorDebugger/Models/Customer.cs b/test/SourceGeneratorDebugger/Models/Customer.cs
new file mode 100644
index 0000000000..26d869c550
--- /dev/null
+++ b/test/SourceGeneratorDebugger/Models/Customer.cs
@@ -0,0 +1,12 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace SourceGeneratorDebugger.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+public sealed class Customer : Identifiable<long>
+{
+    [Attr]
+    public string Name { get; set; } = null!;
+}
diff --git a/test/SourceGeneratorDebugger/Models/Global.cs b/test/SourceGeneratorDebugger/Models/Global.cs
new file mode 100644
index 0000000000..ef62b974ca
--- /dev/null
+++ b/test/SourceGeneratorDebugger/Models/Global.cs
@@ -0,0 +1,14 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+
+// ReSharper disable CheckNamespace
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource]
+public sealed class Global : Identifiable<int>
+{
+    [Attr]
+    public string? Value { get; set; }
+}
diff --git a/test/SourceGeneratorDebugger/Models/Login.cs b/test/SourceGeneratorDebugger/Models/Login.cs
new file mode 100644
index 0000000000..334a395a21
--- /dev/null
+++ b/test/SourceGeneratorDebugger/Models/Login.cs
@@ -0,0 +1,28 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+
+#pragma warning disable AV1505 // Namespace should match with assembly name
+
+namespace SourceGeneratorDebugger.Models
+{
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    [Resource(GenerateControllerEndpoints = JsonApiEndpoints.Command)]
+    public sealed class Login : Identifiable<int>
+    {
+        [Attr]
+        public DateTimeOffset Time { get; set; }
+    }
+}
+
+namespace Some.Other.Path
+{
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    [Resource(GenerateControllerEndpoints = JsonApiEndpoints.Command)]
+    public sealed class Login : Identifiable<int>
+    {
+        [Attr]
+        public DateTimeOffset Time { get; set; }
+    }
+}
diff --git a/test/SourceGeneratorDebugger/Models/Order.cs b/test/SourceGeneratorDebugger/Models/Order.cs
new file mode 100644
index 0000000000..40d5582ff1
--- /dev/null
+++ b/test/SourceGeneratorDebugger/Models/Order.cs
@@ -0,0 +1,14 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace SourceGeneratorDebugger.Models;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource(GenerateControllerEndpoints = JsonApiEndpoints.All)]
+public sealed class Order : Identifiable<long>
+{
+    [Attr]
+    public decimal TotalAmount { get; set; }
+}
diff --git a/test/SourceGeneratorDebugger/Models/SimpleNamespace.cs b/test/SourceGeneratorDebugger/Models/SimpleNamespace.cs
new file mode 100644
index 0000000000..ea02d20413
--- /dev/null
+++ b/test/SourceGeneratorDebugger/Models/SimpleNamespace.cs
@@ -0,0 +1,15 @@
+using JetBrains.Annotations;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+
+// ReSharper disable CheckNamespace
+
+namespace SourceGeneratorDebugger;
+
+[UsedImplicitly(ImplicitUseTargetFlags.Members)]
+[Resource]
+public sealed class SimpleNamespace : Identifiable<int>
+{
+    [Attr]
+    public string? Value { get; set; }
+}
diff --git a/test/SourceGeneratorDebugger/Program.cs b/test/SourceGeneratorDebugger/Program.cs
new file mode 100644
index 0000000000..b237a86f68
--- /dev/null
+++ b/test/SourceGeneratorDebugger/Program.cs
@@ -0,0 +1,58 @@
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Services;
+using Microsoft.Extensions.Logging.Abstractions;
+using SourceGeneratorDebugger.Controllers;
+using SourceGeneratorDebugger.Models;
+
+namespace SourceGeneratorDebugger;
+
+// Until https://github.com/dotnet/roslyn/issues/55802 is fixed, this project enables us to debug the ASP.NET Controller source generator.
+// In Visual Studio, set JsonApiDotNetCore.SourceGenerators as startup project, add a breakpoint at the start of ControllerSourceGenerator and press F5.
+internal static class Program
+{
+    public static void Main()
+    {
+        JsonApiOptions options = new();
+        ResourceGraph resourceGraph = new();
+
+        // Built-in
+        IResourceService<Customer, long> customerResourceService = new JsonApiResourceService<Customer, long>();
+        CustomersController customersController = new(options, resourceGraph, NullLoggerFactory.Instance, customerResourceService);
+        GC.KeepAlive(customersController);
+
+        // Generated
+        IResourceService<Order, long> orderResourceService = new JsonApiResourceService<Order, long>();
+        OrdersController ordersController = new(options, resourceGraph, NullLoggerFactory.Instance, orderResourceService);
+        GC.KeepAlive(ordersController);
+
+        // Generated Query
+        IResourceQueryService<Account, string> accountQueryService = new JsonApiResourceService<Account, string>();
+        AccountsController accountsController = new(options, resourceGraph, NullLoggerFactory.Instance, accountQueryService);
+        GC.KeepAlive(accountsController);
+
+        // Generated Command
+        IResourceCommandService<Login, int> loginCommandService = new JsonApiResourceService<Login, int>();
+        LoginsController loginsController = new(options, resourceGraph, NullLoggerFactory.Instance, loginCommandService);
+        GC.KeepAlive(loginsController);
+
+        // Generated mix
+        IGetAllService<Article, Guid> articleGetAllResourceService = new JsonApiResourceService<Article, Guid>();
+        IGetByIdService<Article, Guid> articleGetByIdResourceService = new JsonApiResourceService<Article, Guid>();
+        IGetSecondaryService<Article, Guid> articleGetSecondaryResourceService = new JsonApiResourceService<Article, Guid>();
+
+        ArticlesController articlesController = new(options, resourceGraph, NullLoggerFactory.Instance, articleGetAllResourceService,
+            articleGetByIdResourceService, articleGetSecondaryResourceService);
+
+        articlesController.ExtraMethod();
+
+        // Generated in global namespace
+        IResourceService<Global, int> globalResourceService = new JsonApiResourceService<Global, int>();
+        GlobalsController globalsController = new(options, resourceGraph, NullLoggerFactory.Instance, globalResourceService);
+        GC.KeepAlive(globalsController);
+
+        // Generated in non-nested namespace
+        IResourceService<SimpleNamespace, int> singleNamespaceResourceService = new JsonApiResourceService<SimpleNamespace, int>();
+        SimpleNamespacesController singleNamespacesController = new(options, resourceGraph, NullLoggerFactory.Instance, singleNamespaceResourceService);
+        GC.KeepAlive(singleNamespacesController);
+    }
+}
diff --git a/test/SourceGeneratorDebugger/SourceGeneratorDebugger.csproj b/test/SourceGeneratorDebugger/SourceGeneratorDebugger.csproj
new file mode 100644
index 0000000000..2909905e2b
--- /dev/null
+++ b/test/SourceGeneratorDebugger/SourceGeneratorDebugger.csproj
@@ -0,0 +1,28 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)\GeneratedFiles</CompilerGeneratedFilesOutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Workaround for https://youtrack.jetbrains.com/issue/RSRP-487028 -->
+    <Using Include="Controllers" />
+    <Using Include="Some.Namespace.To.Place.Controllers" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\..\src\JsonApiDotNetCore.Annotations\Controllers\JsonApiEndpoints.cs" Link="JsonApiDotNetCore\JsonApiEndpoints.cs" />
+    <Compile Include="..\..\src\JsonApiDotNetCore.Annotations\Resources\Annotations\ResourceAttribute.cs" Link="JsonApiDotNetCore\ResourceAttribute.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" OutputItemType="Analyzer"
+      ReferenceOutputAssembly="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(AspNetVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/test/SourceGeneratorTests/CompilationBuilder.cs b/test/SourceGeneratorTests/CompilationBuilder.cs
new file mode 100644
index 0000000000..6029b68eae
--- /dev/null
+++ b/test/SourceGeneratorTests/CompilationBuilder.cs
@@ -0,0 +1,78 @@
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Resources.Annotations;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.Extensions.Logging;
+
+namespace SourceGeneratorTests;
+
+internal sealed class CompilationBuilder
+{
+    private static readonly CSharpCompilationOptions DefaultOptions = new(OutputKind.DynamicallyLinkedLibrary);
+
+    private readonly HashSet<SyntaxTree> _syntaxTrees = new();
+    private readonly HashSet<MetadataReference> _references = new();
+
+    public Compilation Build()
+    {
+        return CSharpCompilation.Create("compilation", _syntaxTrees, _references, DefaultOptions);
+    }
+
+    public CompilationBuilder WithDefaultReferences()
+    {
+        WithSystemReferences();
+        WithLoggerFactoryReference();
+        WithJsonApiDotNetCoreReferences();
+        return this;
+    }
+
+    public CompilationBuilder WithSystemReferences()
+    {
+        string objectLocation = typeof(object).Assembly.Location;
+
+        PortableExecutableReference systemRuntimeReference =
+            MetadataReference.CreateFromFile(Path.Combine(Path.GetDirectoryName(objectLocation)!, "System.Runtime.dll"));
+
+        foreach (PortableExecutableReference reference in new[]
+        {
+            MetadataReference.CreateFromFile(objectLocation),
+            systemRuntimeReference
+        })
+        {
+            _references.Add(reference);
+        }
+
+        return this;
+    }
+
+    public CompilationBuilder WithLoggerFactoryReference()
+    {
+        PortableExecutableReference loggerFactoryReference = MetadataReference.CreateFromFile(typeof(ILoggerFactory).Assembly.Location);
+        _references.Add(loggerFactoryReference);
+
+        return this;
+    }
+
+    public CompilationBuilder WithJsonApiDotNetCoreReferences()
+    {
+        foreach (PortableExecutableReference reference in new[]
+        {
+            MetadataReference.CreateFromFile(typeof(ControllerBase).Assembly.Location),
+            MetadataReference.CreateFromFile(typeof(AttrAttribute).Assembly.Location),
+            MetadataReference.CreateFromFile(typeof(JsonApiController<,>).Assembly.Location)
+        })
+        {
+            _references.Add(reference);
+        }
+
+        return this;
+    }
+
+    public CompilationBuilder WithSourceCode(string source)
+    {
+        SyntaxTree syntaxTree = CSharpSyntaxTree.ParseText(source);
+        _syntaxTrees.Add(syntaxTree);
+        return this;
+    }
+}
diff --git a/test/SourceGeneratorTests/ControllerGenerationTests.cs b/test/SourceGeneratorTests/ControllerGenerationTests.cs
new file mode 100644
index 0000000000..614b4d316c
--- /dev/null
+++ b/test/SourceGeneratorTests/ControllerGenerationTests.cs
@@ -0,0 +1,769 @@
+using FluentAssertions;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+using JsonApiDotNetCore.SourceGenerators;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
+using Xunit;
+
+namespace SourceGeneratorTests;
+
+public sealed class ControllerGenerationTests
+{
+    [Fact]
+    public void Can_generate_for_default_controller()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .InNamespace("ExampleApi.Models")
+            .WithCode(@"
+                    [Resource]
+                    public sealed class Item : Identifiable<long>
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+
+        runResult.Should().HaveProducedSourceCode(@"using Microsoft.Extensions.Logging;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Services;
+using ExampleApi.Models;
+
+namespace ExampleApi.Controllers;
+
+public sealed partial class ItemsController : JsonApiController<Item, long>
+{
+    public ItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<Item, long> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
+    {
+    }
+}
+");
+    }
+
+    [Fact]
+    public void Can_generate_for_read_only_controller()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .WithNamespaceImportFor(typeof(JsonApiEndpoints))
+            .InNamespace("ExampleApi.Models")
+            .WithCode(@"
+                    [Resource(GenerateControllerEndpoints = JsonApiEndpoints.Query)]
+                    public sealed class Item : Identifiable<long>
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+
+        runResult.Should().HaveProducedSourceCode(@"using Microsoft.Extensions.Logging;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Services;
+using ExampleApi.Models;
+
+namespace ExampleApi.Controllers;
+
+public sealed partial class ItemsController : JsonApiQueryController<Item, long>
+{
+    public ItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceQueryService<Item, long> queryService)
+        : base(options, resourceGraph, loggerFactory, queryService)
+    {
+    }
+}
+");
+    }
+
+    [Fact]
+    public void Can_generate_for_write_only_controller()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .WithNamespaceImportFor(typeof(JsonApiEndpoints))
+            .InNamespace("ExampleApi.Models")
+            .WithCode(@"
+                    [Resource(GenerateControllerEndpoints = JsonApiEndpoints.Command)]
+                    public sealed class Item : Identifiable<long>
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+
+        runResult.Should().HaveProducedSourceCode(@"using Microsoft.Extensions.Logging;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Services;
+using ExampleApi.Models;
+
+namespace ExampleApi.Controllers;
+
+public sealed partial class ItemsController : JsonApiCommandController<Item, long>
+{
+    public ItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceCommandService<Item, long> commandService)
+        : base(options, resourceGraph, loggerFactory, commandService)
+    {
+    }
+}
+");
+    }
+
+    [Fact]
+    public void Can_generate_for_mixed_controller()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .WithNamespaceImportFor(typeof(JsonApiEndpoints))
+            .InNamespace("ExampleApi.Models")
+            .WithCode(@"
+                    [Resource(GenerateControllerEndpoints = NoRelationshipEndpoints)]
+                    public sealed class Item : Identifiable<long>
+                    {
+                        private const JsonApiEndpoints NoRelationshipEndpoints = JsonApiEndpoints.GetCollection |
+                            JsonApiEndpoints.GetSingle | JsonApiEndpoints.Post | JsonApiEndpoints.Patch | JsonApiEndpoints.Delete;
+
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+
+        runResult.Should().HaveProducedSourceCode(@"using Microsoft.Extensions.Logging;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Services;
+using ExampleApi.Models;
+
+namespace ExampleApi.Controllers;
+
+public sealed partial class ItemsController : JsonApiController<Item, long>
+{
+    public ItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IGetAllService<Item, long> getAll,
+        IGetByIdService<Item, long> getById,
+        ICreateService<Item, long> create,
+        IUpdateService<Item, long> update,
+        IDeleteService<Item, long> delete)
+        : base(options, resourceGraph, loggerFactory,
+            getAll: getAll,
+            getById: getById,
+            create: create,
+            update: update,
+            delete: delete)
+    {
+    }
+}
+");
+    }
+
+    [Fact]
+    public void Skips_for_resource_without_ResourceAttribute()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(AttrAttribute))
+            .InNamespace("ExampleApi.Models")
+            .WithCode(@"
+                    public sealed class Item : Identifiable<long>
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+        runResult.Should().NotHaveProducedSourceCode();
+    }
+
+    [Fact]
+    public void Skips_for_resource_with_no_endpoints()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .WithNamespaceImportFor(typeof(JsonApiEndpoints))
+            .InNamespace("ExampleApi.Models")
+            .WithCode(@"
+                    [Resource(GenerateControllerEndpoints = JsonApiEndpoints.None)]
+                    public sealed class Item : Identifiable<long>
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+        runResult.Should().NotHaveProducedSourceCode();
+    }
+
+    [Fact]
+    public void Skips_for_missing_dependency_on_JsonApiDotNetCore()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .InNamespace("ExampleApi.Models")
+            .WithCode(@"
+                    public abstract class Identifiable<TId>
+                    {
+                    }
+
+                    public sealed class ResourceAttribute : System.Attribute
+                    {
+                    }
+
+                    public sealed class AttrAttribute : System.Attribute
+                    {
+                    }
+
+                    [Resource]
+                    public sealed class Item : Identifiable<long>
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithSystemReferences()
+            .WithLoggerFactoryReference()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+
+        runResult.Should().NotHaveProducedSourceCode();
+    }
+
+    [Fact]
+    public void Skips_for_missing_dependency_on_LoggerFactory()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .InNamespace("ExampleApi.Models")
+            .WithCode(@"
+                    [Resource]
+                    public sealed class Item : Identifiable<long>
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithSystemReferences()
+            .WithJsonApiDotNetCoreReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+
+        runResult.Should().NotHaveProducedSourceCode();
+    }
+
+    [Fact]
+    public void Warns_for_resource_that_does_not_implement_IIdentifiable()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .InNamespace("ExampleApi.Models")
+            .WithCode(@"
+                    [Resource]
+                    public sealed class Item
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+
+        runResult.Should()
+            .HaveSingleDiagnostic(
+                "(6,21): warning JADNC001: Type 'Item' must implement IIdentifiable<TId> when using ResourceAttribute to auto-generate ASP.NET controllers");
+
+        runResult.Should().NotHaveProducedSourceCode();
+    }
+
+    [Fact]
+    public void Adds_nullable_enable_for_nullable_reference_ID_type()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .InNamespace("ExampleApi.Models")
+            .WithCode(@"
+                    #nullable enable
+
+                    [Resource]
+                    public sealed class Item : Identifiable<string?>
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+
+        runResult.Should().HaveProducedSourceCodeContaining(@"#nullable enable");
+    }
+
+    [Fact]
+    public void Can_generate_for_custom_namespace()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .InNamespace("ExampleApi.Models")
+            .WithCode(@"
+                    [Resource(ControllerNamespace = ""Some.Path.To.Generate.Code.In"")]
+                    public sealed class Item : Identifiable<long>
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+
+        runResult.Should().HaveProducedSourceCode(@"using Microsoft.Extensions.Logging;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Services;
+using ExampleApi.Models;
+
+namespace Some.Path.To.Generate.Code.In;
+
+public sealed partial class ItemsController : JsonApiController<Item, long>
+{
+    public ItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<Item, long> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
+    {
+    }
+}
+");
+    }
+
+    [Fact]
+    public void Can_generate_for_top_level_namespace()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .InNamespace("TopLevel")
+            .WithCode(@"
+                    [Resource]
+                    public sealed class Item : Identifiable<long>
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+
+        runResult.Should().HaveProducedSourceCode(@"using Microsoft.Extensions.Logging;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Services;
+using TopLevel;
+
+namespace Controllers;
+
+public sealed partial class ItemsController : JsonApiController<Item, long>
+{
+    public ItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<Item, long> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
+    {
+    }
+}
+");
+    }
+
+    [Fact]
+    public void Can_generate_for_global_namespace()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .WithCode(@"
+                    [Resource]
+                    public sealed class Item : Identifiable<long>
+                    {
+                        [Attr]
+                        public int Value { get; set; }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+
+        runResult.Should().HaveProducedSourceCode(@"using Microsoft.Extensions.Logging;
+using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.Services;
+
+public sealed partial class ItemsController : JsonApiController<Item, long>
+{
+    public ItemsController(IJsonApiOptions options, IResourceGraph resourceGraph, ILoggerFactory loggerFactory,
+        IResourceService<Item, long> resourceService)
+        : base(options, resourceGraph, loggerFactory, resourceService)
+    {
+    }
+}
+");
+    }
+
+    [Fact]
+    public void Generates_unique_file_names_for_duplicate_resource_name_in_different_namespaces()
+    {
+        // Arrange
+        GeneratorDriver driver = CSharpGeneratorDriver.Create(new ControllerSourceGenerator());
+
+        // @formatter:wrap_chained_method_calls chop_always
+        // @formatter:keep_existing_linebreaks true
+
+        string source = new SourceCodeBuilder()
+            .WithNamespaceImportFor(typeof(IIdentifiable))
+            .WithNamespaceImportFor(typeof(ResourceAttribute))
+            .WithCode(@"
+                    namespace The.First.One
+                    {
+                        [Resource]
+                        public sealed class Item : Identifiable<long>
+                        {
+                            [Attr]
+                            public int Value { get; set; }
+                        }
+                    }
+
+                    namespace The.Second.One
+                    {
+                        [Resource]
+                        public sealed class Item : Identifiable<long>
+                        {
+                            [Attr]
+                            public int Value { get; set; }
+                        }
+                    }")
+            .Build();
+
+        Compilation inputCompilation = new CompilationBuilder()
+            .WithDefaultReferences()
+            .WithSourceCode(source)
+            .Build();
+
+        // @formatter:keep_existing_linebreaks restore
+        // @formatter:wrap_chained_method_calls restore
+
+        // Act
+        driver = driver.RunGeneratorsAndUpdateCompilation(inputCompilation, out Compilation outputCompilation, out _);
+
+        // Assert
+        inputCompilation.GetDiagnostics().Should().BeEmpty();
+        outputCompilation.GetDiagnostics().Should().BeEmpty();
+
+        GeneratorDriverRunResult runResult = driver.GetRunResult();
+        runResult.Should().NotHaveDiagnostics();
+        runResult.Results.Should().HaveCount(1);
+
+        GeneratorRunResult generatorResult = runResult.Results[0];
+        generatorResult.GeneratedSources.Should().HaveCount(2);
+
+        generatorResult.GeneratedSources[0].HintName.Should().Be("ItemsController.g.cs");
+        generatorResult.GeneratedSources[1].HintName.Should().Be("ItemsController2.g.cs");
+    }
+}
diff --git a/test/SourceGeneratorTests/GeneratorDriverRunResultExtensions.cs b/test/SourceGeneratorTests/GeneratorDriverRunResultExtensions.cs
new file mode 100644
index 0000000000..bb8e1bfd04
--- /dev/null
+++ b/test/SourceGeneratorTests/GeneratorDriverRunResultExtensions.cs
@@ -0,0 +1,76 @@
+using FluentAssertions;
+using FluentAssertions.Primitives;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Text;
+
+namespace SourceGeneratorTests;
+
+internal static class GeneratorDriverRunResultExtensions
+{
+    public static GeneratorDriverRunResultAssertions Should(this GeneratorDriverRunResult instance)
+    {
+        return new GeneratorDriverRunResultAssertions(instance);
+    }
+
+    internal sealed class GeneratorDriverRunResultAssertions : ReferenceTypeAssertions<GeneratorDriverRunResult, GeneratorDriverRunResultAssertions>
+    {
+        protected override string Identifier => nameof(GeneratorDriverRunResult);
+
+        public GeneratorDriverRunResultAssertions(GeneratorDriverRunResult subject)
+            : base(subject)
+        {
+        }
+
+        public void NotHaveDiagnostics()
+        {
+            Subject.Diagnostics.Should().BeEmpty();
+        }
+
+        public void HaveSingleDiagnostic(string message)
+        {
+            Subject.Diagnostics.Should().HaveCount(1);
+            Subject.Diagnostics[0].ToString().Should().Be(message);
+        }
+
+        public void NotHaveProducedSourceCode()
+        {
+            Subject.Results.Should().HaveCount(1);
+
+            GeneratorRunResult generatorResult = Subject.Results[0];
+            generatorResult.GeneratedSources.Should().BeEmpty();
+        }
+
+        public void HaveProducedSourceCode(string expectedCode)
+        {
+            string generatedSourceText = GetGeneratedSourceText();
+
+            string? generatedSourceTextNormalized = NormalizeLineEndings(generatedSourceText);
+            string? expectedTextNormalized = NormalizeLineEndings(expectedCode);
+
+            generatedSourceTextNormalized.Should().Be(expectedTextNormalized);
+        }
+
+        public void HaveProducedSourceCodeContaining(string expectedText)
+        {
+            string generatedSourceText = GetGeneratedSourceText();
+
+            generatedSourceText.Should().Contain(expectedText);
+        }
+
+        private string GetGeneratedSourceText()
+        {
+            Subject.Results.Should().HaveCount(1);
+
+            GeneratorRunResult generatorResult = Subject.Results[0];
+            generatorResult.GeneratedSources.Should().HaveCount(1);
+
+            SourceText generatedSource = generatorResult.GeneratedSources[0].SourceText;
+            return generatedSource.ToString();
+        }
+
+        private static string? NormalizeLineEndings(string? text)
+        {
+            return text?.Replace("\r\n", "\n").Replace("\r", "\n");
+        }
+    }
+}
diff --git a/test/SourceGeneratorTests/JsonApiEndpointsCopyTests.cs b/test/SourceGeneratorTests/JsonApiEndpointsCopyTests.cs
new file mode 100644
index 0000000000..9a613086a7
--- /dev/null
+++ b/test/SourceGeneratorTests/JsonApiEndpointsCopyTests.cs
@@ -0,0 +1,48 @@
+using System.Reflection;
+using FluentAssertions;
+using JsonApiDotNetCore.Controllers;
+using JsonApiDotNetCore.SourceGenerators;
+using Xunit;
+
+namespace SourceGeneratorTests;
+
+public sealed class JsonApiEndpointsCopyTests
+{
+    [Fact]
+    public void Enum_underlying_types_are_identical()
+    {
+        Type sourceType = Enum.GetUnderlyingType(typeof(JsonApiEndpoints));
+        Type copyType = Enum.GetUnderlyingType(typeof(JsonApiEndpointsCopy));
+
+        copyType.Should().Be(sourceType);
+    }
+
+    [Fact]
+    public void Enum_attributes_in_order_are_identical()
+    {
+        Attribute[] sourceAttributes = typeof(JsonApiEndpoints).GetCustomAttributes().ToArray();
+        Attribute[] copyAttributes = typeof(JsonApiEndpointsCopy).GetCustomAttributes().ToArray();
+
+        copyAttributes.Should().BeEquivalentTo(sourceAttributes, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public void Enum_member_names_in_order_are_identical()
+    {
+        const BindingFlags bindingFlags = BindingFlags.Public | BindingFlags.Static | BindingFlags.DeclaredOnly;
+
+        string[] sourceNames = typeof(JsonApiEndpoints).GetMembers(bindingFlags).Select(memberInfo => memberInfo.Name).ToArray();
+        string[] copyNames = typeof(JsonApiEndpointsCopy).GetMembers(bindingFlags).Select(memberInfo => memberInfo.Name).ToArray();
+
+        copyNames.Should().BeEquivalentTo(sourceNames, options => options.WithStrictOrdering());
+    }
+
+    [Fact]
+    public void Enum_member_values_are_identical()
+    {
+        IEnumerable<int> sourceValues = Enum.GetValues<JsonApiEndpoints>().Select(value => (int)value).ToArray();
+        int[] copyValues = Enum.GetValues<JsonApiEndpointsCopy>().Select(value => (int)value).ToArray();
+
+        copyValues.Should().BeEquivalentTo(sourceValues, options => options.WithStrictOrdering());
+    }
+}
diff --git a/test/SourceGeneratorTests/SourceCodeBuilder.cs b/test/SourceGeneratorTests/SourceCodeBuilder.cs
new file mode 100644
index 0000000000..e734604e31
--- /dev/null
+++ b/test/SourceGeneratorTests/SourceCodeBuilder.cs
@@ -0,0 +1,56 @@
+using System.Text;
+
+namespace SourceGeneratorTests;
+
+internal sealed class SourceCodeBuilder
+{
+    private readonly HashSet<string> _namespaceImports = new();
+    private string? _namespace;
+    private string? _code;
+
+    public string Build()
+    {
+        StringBuilder builder = new();
+
+        if (_namespaceImports.Any())
+        {
+            foreach (string namespaceImport in _namespaceImports)
+            {
+                builder.AppendLine($"using {namespaceImport};");
+            }
+
+            builder.AppendLine();
+        }
+
+        if (_namespace != null)
+        {
+            builder.AppendLine($"namespace {_namespace};");
+            builder.AppendLine();
+        }
+
+        if (_code != null)
+        {
+            builder.Append(_code);
+        }
+
+        return builder.ToString();
+    }
+
+    public SourceCodeBuilder WithNamespaceImportFor(Type type)
+    {
+        _namespaceImports.Add(type.Namespace!);
+        return this;
+    }
+
+    public SourceCodeBuilder InNamespace(string @namespace)
+    {
+        _namespace = @namespace;
+        return this;
+    }
+
+    public SourceCodeBuilder WithCode(string code)
+    {
+        _code = code;
+        return this;
+    }
+}
diff --git a/test/SourceGeneratorTests/SourceGeneratorTests.csproj b/test/SourceGeneratorTests/SourceGeneratorTests.csproj
new file mode 100644
index 0000000000..fd0fb92262
--- /dev/null
+++ b/test/SourceGeneratorTests/SourceGeneratorTests.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\TestBuildingBlocks\TestBuildingBlocks.csproj" />
+    <ProjectReference Include="..\..\src\JsonApiDotNetCore\JsonApiDotNetCore.csproj" />
+    <ProjectReference Include="..\..\src\JsonApiDotNetCore.SourceGenerators\JsonApiDotNetCore.SourceGenerators.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisVersion)" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
+    <PackageReference Include="Moq" Version="$(MoqVersion)" />
+  </ItemGroup>
+</Project>
diff --git a/test/TestBuildingBlocks/DateTimeExtensions.cs b/test/TestBuildingBlocks/DateTimeExtensions.cs
index e6678995da..bf7e1325ce 100644
--- a/test/TestBuildingBlocks/DateTimeExtensions.cs
+++ b/test/TestBuildingBlocks/DateTimeExtensions.cs
@@ -1,34 +1,26 @@
-using System;
+namespace TestBuildingBlocks;
 
-namespace TestBuildingBlocks
+public static class DateTimeExtensions
 {
-    public static class DateTimeExtensions
-    {
-        // The milliseconds precision in DateTime/DateTimeOffset values that fakers produce is higher
-        // than what PostgreSQL can store. This results in our resource change tracker to detect
-        // that the time stored in database differs from the time in the request body.
-        // While that's technically correct, we don't want such side effects influencing our tests everywhere.
-
-        public static DateTimeOffset TruncateToWholeMilliseconds(this DateTimeOffset value)
-        {
-            DateTime dateTime = TruncateToWholeMilliseconds(value.DateTime);
+    // The milliseconds precision in DateTime/DateTimeOffset values that fakers produce is higher
+    // than what PostgreSQL can store. This results in our resource change tracker to detect
+    // that the time stored in the database differs from the time in the request body. While that's
+    // technically correct, we don't want such side effects influencing our tests everywhere.
 
-            // PostgreSQL is unable to store the timezone in the database, so it always uses the local zone.
-            // See https://www.npgsql.org/doc/types/datetime.html.
-            // We're taking the local zone here, to prevent our change tracker to detect that the time
-            // stored in database differs from the time in the request body. While that's technically
-            // correct, we don't want such side effects influencing our tests everywhere.
-            TimeSpan offset = TimeZoneInfo.Local.GetUtcOffset(dateTime);
+    public static DateTimeOffset TruncateToWholeMilliseconds(this DateTimeOffset value)
+    {
+        // Because PostgreSQL does not store the UTC offset in the database, it cannot round-trip
+        // values with a non-zero UTC offset, and therefore always rejects such values.
 
-            return new DateTimeOffset(dateTime, offset);
-        }
+        DateTime dateTime = TruncateToWholeMilliseconds(value.DateTime);
+        return new DateTimeOffset(dateTime, TimeSpan.Zero);
+    }
 
-        public static DateTime TruncateToWholeMilliseconds(this DateTime value)
-        {
-            long ticksToSubtract = value.Ticks % TimeSpan.TicksPerMillisecond;
-            long ticksInWholeMilliseconds = value.Ticks - ticksToSubtract;
+    public static DateTime TruncateToWholeMilliseconds(this DateTime value)
+    {
+        long ticksToSubtract = value.Ticks % TimeSpan.TicksPerMillisecond;
+        long ticksInWholeMilliseconds = value.Ticks - ticksToSubtract;
 
-            return new DateTime(ticksInWholeMilliseconds, value.Kind);
-        }
+        return new DateTime(ticksInWholeMilliseconds, value.Kind);
     }
 }
diff --git a/test/TestBuildingBlocks/DbContextExtensions.cs b/test/TestBuildingBlocks/DbContextExtensions.cs
index ef1fdfa1ce..134d1118c8 100644
--- a/test/TestBuildingBlocks/DbContextExtensions.cs
+++ b/test/TestBuildingBlocks/DbContextExtensions.cs
@@ -1,62 +1,59 @@
-using System;
-using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Npgsql;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+public static class DbContextExtensions
 {
-    public static class DbContextExtensions
+    public static void AddInRange(this DbContext dbContext, params object[] entities)
     {
-        public static void AddInRange(this DbContext dbContext, params object[] entities)
-        {
-            dbContext.AddRange(entities);
-        }
+        dbContext.AddRange(entities);
+    }
 
-        public static async Task ClearTableAsync<TEntity>(this DbContext dbContext)
-            where TEntity : class
-        {
-            await ClearTablesAsync(dbContext, typeof(TEntity));
-        }
+    public static async Task ClearTableAsync<TEntity>(this DbContext dbContext)
+        where TEntity : class
+    {
+        await ClearTablesAsync(dbContext, typeof(TEntity));
+    }
 
-        public static async Task ClearTablesAsync<TEntity1, TEntity2>(this DbContext dbContext)
-            where TEntity1 : class
-            where TEntity2 : class
-        {
-            await ClearTablesAsync(dbContext, typeof(TEntity1), typeof(TEntity2));
-        }
+    public static async Task ClearTablesAsync<TEntity1, TEntity2>(this DbContext dbContext)
+        where TEntity1 : class
+        where TEntity2 : class
+    {
+        await ClearTablesAsync(dbContext, typeof(TEntity1), typeof(TEntity2));
+    }
 
-        public static async Task ClearTablesAsync<TEntity1, TEntity2, TEntity3>(this DbContext dbContext)
-            where TEntity1 : class
-            where TEntity2 : class
-            where TEntity3 : class
-        {
-            await ClearTablesAsync(dbContext, typeof(TEntity1), typeof(TEntity2), typeof(TEntity3));
-        }
+    public static async Task ClearTablesAsync<TEntity1, TEntity2, TEntity3>(this DbContext dbContext)
+        where TEntity1 : class
+        where TEntity2 : class
+        where TEntity3 : class
+    {
+        await ClearTablesAsync(dbContext, typeof(TEntity1), typeof(TEntity2), typeof(TEntity3));
+    }
 
-        private static async Task ClearTablesAsync(this DbContext dbContext, params Type[] models)
+    private static async Task ClearTablesAsync(this DbContext dbContext, params Type[] models)
+    {
+        foreach (Type model in models)
         {
-            foreach (Type model in models)
+            IEntityType? entityType = dbContext.Model.FindEntityType(model);
+
+            if (entityType == null)
+            {
+                throw new InvalidOperationException($"Table for '{model.Name}' not found.");
+            }
+
+            string tableName = entityType.GetTableName()!;
+
+            // PERF: We first try to clear the table, which is fast and usually succeeds, unless foreign key constraints are violated.
+            // In that case, we recursively delete all related data, which is slow.
+            try
+            {
+                await dbContext.Database.ExecuteSqlRawAsync($"delete from \"{tableName}\"");
+            }
+            catch (PostgresException)
             {
-                IEntityType? entityType = dbContext.Model.FindEntityType(model);
-
-                if (entityType == null)
-                {
-                    throw new InvalidOperationException($"Table for '{model.Name}' not found.");
-                }
-
-                string tableName = entityType.GetTableName()!;
-
-                // PERF: We first try to clear the table, which is fast and usually succeeds, unless foreign key constraints are violated.
-                // In that case, we recursively delete all related data, which is slow.
-                try
-                {
-                    await dbContext.Database.ExecuteSqlRawAsync($"delete from \"{tableName}\"");
-                }
-                catch (PostgresException)
-                {
-                    await dbContext.Database.ExecuteSqlRawAsync($"truncate table \"{tableName}\" cascade");
-                }
+                await dbContext.Database.ExecuteSqlRawAsync($"truncate table \"{tableName}\" cascade");
             }
         }
     }
diff --git a/test/TestBuildingBlocks/DummyTest.cs b/test/TestBuildingBlocks/DummyTest.cs
index 82313a7f29..94c8e33ad4 100644
--- a/test/TestBuildingBlocks/DummyTest.cs
+++ b/test/TestBuildingBlocks/DummyTest.cs
@@ -1,14 +1,13 @@
 using Xunit;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+public sealed class DummyTest
 {
-    public sealed class DummyTest
+    [Fact]
+    public void Empty()
     {
-        [Fact]
-        public void Empty()
-        {
-            // This dummy test exists solely to suppress the warning
-            // during test runs that no tests were found in this project.
-        }
+        // This dummy test exists solely to suppress the warning
+        // during test runs that no tests were found in this project.
     }
 }
diff --git a/test/TestBuildingBlocks/FakeLoggerFactory.cs b/test/TestBuildingBlocks/FakeLoggerFactory.cs
index f4257ac17e..e490cdda7b 100644
--- a/test/TestBuildingBlocks/FakeLoggerFactory.cs
+++ b/test/TestBuildingBlocks/FakeLoggerFactory.cs
@@ -1,99 +1,96 @@
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Logging;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+[PublicAPI]
+public sealed class FakeLoggerFactory : ILoggerFactory, ILoggerProvider
 {
-    [PublicAPI]
-    public sealed class FakeLoggerFactory : ILoggerFactory, ILoggerProvider
+    public FakeLogger Logger { get; }
+
+    public FakeLoggerFactory(LogLevel minimumLevel)
     {
-        public FakeLogger Logger { get; }
+        Logger = new FakeLogger(minimumLevel);
+    }
 
-        public FakeLoggerFactory(LogLevel minimumLevel)
-        {
-            Logger = new FakeLogger(minimumLevel);
-        }
+    public ILogger CreateLogger(string categoryName)
+    {
+        return Logger;
+    }
+
+    public void AddProvider(ILoggerProvider provider)
+    {
+    }
 
-        public ILogger CreateLogger(string categoryName)
+    public void Dispose()
+    {
+    }
+
+    public sealed class FakeLogger : ILogger
+    {
+        private readonly LogLevel _minimumLevel;
+        private readonly ConcurrentBag<FakeLogMessage> _messages = new();
+
+        public IReadOnlyCollection<FakeLogMessage> Messages => _messages;
+
+        public FakeLogger(LogLevel minimumLevel)
         {
-            return Logger;
+            _minimumLevel = minimumLevel;
         }
 
-        public void AddProvider(ILoggerProvider provider)
+        public bool IsEnabled(LogLevel logLevel)
         {
+            return _minimumLevel != LogLevel.None && logLevel >= _minimumLevel;
         }
 
-        public void Dispose()
+        public void Clear()
         {
+            _messages.Clear();
         }
 
-        public sealed class FakeLogger : ILogger
+        public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
         {
-            private readonly LogLevel _minimumLevel;
-            private readonly ConcurrentBag<FakeLogMessage> _messages = new();
-
-            public IReadOnlyCollection<FakeLogMessage> Messages => _messages;
-
-            public FakeLogger(LogLevel minimumLevel)
+            if (IsEnabled(logLevel))
             {
-                _minimumLevel = minimumLevel;
+                string message = formatter(state, exception);
+                _messages.Add(new FakeLogMessage(logLevel, message));
             }
+        }
 
-            public bool IsEnabled(LogLevel logLevel)
-            {
-                return _minimumLevel != LogLevel.None && logLevel >= _minimumLevel;
-            }
+        public IDisposable BeginScope<TState>(TState state)
+        {
+            return NullScope.Instance;
+        }
 
-            public void Clear()
-            {
-                _messages.Clear();
-            }
+        private sealed class NullScope : IDisposable
+        {
+            public static readonly NullScope Instance = new();
 
-            public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Exception? exception, Func<TState, Exception?, string> formatter)
+            private NullScope()
             {
-                if (IsEnabled(logLevel))
-                {
-                    string message = formatter(state, exception);
-                    _messages.Add(new FakeLogMessage(logLevel, message));
-                }
             }
 
-            public IDisposable BeginScope<TState>(TState state)
+            public void Dispose()
             {
-                return NullScope.Instance;
             }
+        }
+    }
 
-            private sealed class NullScope : IDisposable
-            {
-                public static readonly NullScope Instance = new();
-
-                private NullScope()
-                {
-                }
+    public sealed class FakeLogMessage
+    {
+        public LogLevel LogLevel { get; }
+        public string Text { get; }
 
-                public void Dispose()
-                {
-                }
-            }
+        public FakeLogMessage(LogLevel logLevel, string text)
+        {
+            LogLevel = logLevel;
+            Text = text;
         }
 
-        public sealed class FakeLogMessage
+        public override string ToString()
         {
-            public LogLevel LogLevel { get; }
-            public string Text { get; }
-
-            public FakeLogMessage(LogLevel logLevel, string text)
-            {
-                LogLevel = logLevel;
-                Text = text;
-            }
-
-            public override string ToString()
-            {
-                return $"[{LogLevel.ToString().ToUpperInvariant()}] {Text}";
-            }
+            return $"[{LogLevel.ToString().ToUpperInvariant()}] {Text}";
         }
     }
 }
diff --git a/test/TestBuildingBlocks/FakerContainer.cs b/test/TestBuildingBlocks/FakerContainer.cs
index 785eb510eb..99cce6e04c 100644
--- a/test/TestBuildingBlocks/FakerContainer.cs
+++ b/test/TestBuildingBlocks/FakerContainer.cs
@@ -1,78 +1,77 @@
-using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Reflection;
 using Bogus.DataSets;
 using FluentAssertions.Extensions;
 using Xunit;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+public abstract class FakerContainer
 {
-    public abstract class FakerContainer
+    static FakerContainer()
     {
-        static FakerContainer()
-        {
-            Date.SystemClock = () => 1.January(2020);
-        }
-
-        protected static int GetFakerSeed()
-        {
-            // The goal here is to have stable data over multiple test runs, but at the same time different data per test case.
+        // Setting the system DateTime to kind Utc, so that faker calls like PastOffset() don't depend on the system time zone.
+        // See https://docs.microsoft.com/en-us/dotnet/api/system.datetimeoffset.op_implicit?view=net-6.0#remarks
+        Date.SystemClock = () => 1.January(2020).AsUtc();
+    }
 
-            MethodBase testMethod = GetTestMethod();
-            string testName = $"{testMethod.DeclaringType?.FullName}.{testMethod.Name}";
+    protected static int GetFakerSeed()
+    {
+        // The goal here is to have stable data over multiple test runs, but at the same time different data per test case.
 
-            return GetDeterministicHashCode(testName);
-        }
+        MethodBase testMethod = GetTestMethod();
+        string testName = $"{testMethod.DeclaringType?.FullName}.{testMethod.Name}";
 
-        private static MethodBase GetTestMethod()
-        {
-            var stackTrace = new StackTrace();
+        return GetDeterministicHashCode(testName);
+    }
 
-            MethodBase? testMethod = stackTrace.GetFrames().Select(stackFrame => stackFrame.GetMethod()).FirstOrDefault(IsTestMethod);
+    private static MethodBase GetTestMethod()
+    {
+        var stackTrace = new StackTrace();
 
-            if (testMethod == null)
-            {
-                // If called after the first await statement, the test method is no longer on the stack,
-                // but has been replaced with the compiler-generated async/wait state machine.
-                throw new InvalidOperationException("Fakers can only be used from within (the start of) a test method.");
-            }
+        MethodBase? testMethod = stackTrace.GetFrames().Select(stackFrame => stackFrame.GetMethod()).FirstOrDefault(IsTestMethod);
 
-            return testMethod;
+        if (testMethod == null)
+        {
+            // If called after the first await statement, the test method is no longer on the stack,
+            // but has been replaced with the compiler-generated async/wait state machine.
+            throw new InvalidOperationException("Fakers can only be used from within (the start of) a test method.");
         }
 
-        private static bool IsTestMethod(MethodBase? method)
-        {
-            if (method == null)
-            {
-                return false;
-            }
+        return testMethod;
+    }
 
-            return method.GetCustomAttribute(typeof(FactAttribute)) != null || method.GetCustomAttribute(typeof(TheoryAttribute)) != null;
+    private static bool IsTestMethod(MethodBase? method)
+    {
+        if (method == null)
+        {
+            return false;
         }
 
-        private static int GetDeterministicHashCode(string source)
+        return method.GetCustomAttribute<FactAttribute>() != null || method.GetCustomAttribute<TheoryAttribute>() != null;
+    }
+
+    private static int GetDeterministicHashCode(string source)
+    {
+        // https://andrewlock.net/why-is-string-gethashcode-different-each-time-i-run-my-program-in-net-core/
+        unchecked
         {
-            // https://andrewlock.net/why-is-string-gethashcode-different-each-time-i-run-my-program-in-net-core/
-            unchecked
+            int hash1 = (5381 << 16) + 5381;
+            int hash2 = hash1;
+
+            for (int index = 0; index < source.Length; index += 2)
             {
-                int hash1 = (5381 << 16) + 5381;
-                int hash2 = hash1;
+                hash1 = ((hash1 << 5) + hash1) ^ source[index];
 
-                for (int index = 0; index < source.Length; index += 2)
+                if (index == source.Length - 1)
                 {
-                    hash1 = ((hash1 << 5) + hash1) ^ source[index];
-
-                    if (index == source.Length - 1)
-                    {
-                        break;
-                    }
-
-                    hash2 = ((hash2 << 5) + hash2) ^ source[index + 1];
+                    break;
                 }
 
-                return hash1 + hash2 * 1566083941;
+                hash2 = ((hash2 << 5) + hash2) ^ source[index + 1];
             }
+
+            return hash1 + hash2 * 1566083941;
         }
     }
 }
diff --git a/test/TestBuildingBlocks/FrozenSystemClock.cs b/test/TestBuildingBlocks/FrozenSystemClock.cs
index f60e00344f..0f757c63a5 100644
--- a/test/TestBuildingBlocks/FrozenSystemClock.cs
+++ b/test/TestBuildingBlocks/FrozenSystemClock.cs
@@ -1,12 +1,11 @@
-using System;
+using FluentAssertions.Extensions;
 using Microsoft.AspNetCore.Authentication;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+public sealed class FrozenSystemClock : ISystemClock
 {
-    public sealed class FrozenSystemClock : ISystemClock
-    {
-        private static readonly DateTimeOffset DefaultTime = new(new DateTime(2000, 1, 1, 1, 1, 1), TimeSpan.FromHours(1));
+    private static readonly DateTimeOffset DefaultTime = 1.January(2000).At(1, 1, 1).AsUtc();
 
-        public DateTimeOffset UtcNow { get; set; } = DefaultTime;
-    }
+    public DateTimeOffset UtcNow { get; set; } = DefaultTime;
 }
diff --git a/test/TestBuildingBlocks/HttpRequestHeadersExtensions.cs b/test/TestBuildingBlocks/HttpRequestHeadersExtensions.cs
index ff277caddd..8a784ec759 100644
--- a/test/TestBuildingBlocks/HttpRequestHeadersExtensions.cs
+++ b/test/TestBuildingBlocks/HttpRequestHeadersExtensions.cs
@@ -1,19 +1,16 @@
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http.Headers;
 using Microsoft.Extensions.Primitives;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+public static class HttpRequestHeadersExtensions
 {
-    public static class HttpRequestHeadersExtensions
+    /// <summary>
+    /// Returns the value of the specified HTTP request header, or <c>null</c> when not found. If the header occurs multiple times, their values are
+    /// collapsed into a comma-separated string, without changing any surrounding double quotes.
+    /// </summary>
+    public static string? GetValue(this HttpRequestHeaders requestHeaders, string name)
     {
-        /// <summary>
-        /// Returns the value of the specified HTTP request header, or <c>null</c> when not found. If the header occurs multiple times, their values are
-        /// collapsed into a comma-separated string, without changing any surrounding double quotes.
-        /// </summary>
-        public static string? GetValue(this HttpRequestHeaders requestHeaders, string name)
-        {
-            return requestHeaders.TryGetValues(name, out IEnumerable<string>? values) ? new StringValues(values.ToArray()).ToString() : null;
-        }
+        return requestHeaders.TryGetValues(name, out IEnumerable<string>? values) ? new StringValues(values.ToArray()).ToString() : null;
     }
 }
diff --git a/test/TestBuildingBlocks/HttpResponseMessageExtensions.cs b/test/TestBuildingBlocks/HttpResponseMessageExtensions.cs
index fe8c638e03..200bbfa308 100644
--- a/test/TestBuildingBlocks/HttpResponseMessageExtensions.cs
+++ b/test/TestBuildingBlocks/HttpResponseMessageExtensions.cs
@@ -1,40 +1,38 @@
 using System.Net;
-using System.Net.Http;
 using FluentAssertions;
 using FluentAssertions.Primitives;
 using JetBrains.Annotations;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+[PublicAPI]
+public static class HttpResponseMessageExtensions
 {
-    [PublicAPI]
-    public static class HttpResponseMessageExtensions
+    public static HttpResponseMessageAssertions Should(this HttpResponseMessage instance)
     {
-        public static HttpResponseMessageAssertions Should(this HttpResponseMessage instance)
+        return new HttpResponseMessageAssertions(instance);
+    }
+
+    public sealed class HttpResponseMessageAssertions : ReferenceTypeAssertions<HttpResponseMessage, HttpResponseMessageAssertions>
+    {
+        protected override string Identifier => "response";
+
+        public HttpResponseMessageAssertions(HttpResponseMessage instance)
+            : base(instance)
         {
-            return new HttpResponseMessageAssertions(instance);
         }
 
-        public sealed class HttpResponseMessageAssertions : ReferenceTypeAssertions<HttpResponseMessage, HttpResponseMessageAssertions>
+        // ReSharper disable once UnusedMethodReturnValue.Global
+        [CustomAssertion]
+        public AndConstraint<HttpResponseMessageAssertions> HaveStatusCode(HttpStatusCode statusCode)
         {
-            protected override string Identifier => "response";
-
-            public HttpResponseMessageAssertions(HttpResponseMessage instance)
-                : base(instance)
+            if (Subject.StatusCode != statusCode)
             {
+                string responseText = Subject.Content.ReadAsStringAsync().Result;
+                Subject.StatusCode.Should().Be(statusCode, string.IsNullOrEmpty(responseText) ? null : $"response body returned was:\n{responseText}");
             }
 
-            // ReSharper disable once UnusedMethodReturnValue.Global
-            [CustomAssertion]
-            public AndConstraint<HttpResponseMessageAssertions> HaveStatusCode(HttpStatusCode statusCode)
-            {
-                if (Subject.StatusCode != statusCode)
-                {
-                    string responseText = Subject.Content.ReadAsStringAsync().Result;
-                    Subject.StatusCode.Should().Be(statusCode, string.IsNullOrEmpty(responseText) ? null : $"response body returned was:\n{responseText}");
-                }
-
-                return new AndConstraint<HttpResponseMessageAssertions>(this);
-            }
+            return new AndConstraint<HttpResponseMessageAssertions>(this);
         }
     }
 }
diff --git a/test/TestBuildingBlocks/IntegrationTest.cs b/test/TestBuildingBlocks/IntegrationTest.cs
index 569f8046aa..99ced55b01 100644
--- a/test/TestBuildingBlocks/IntegrationTest.cs
+++ b/test/TestBuildingBlocks/IntegrationTest.cs
@@ -1,113 +1,109 @@
-using System;
-using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
 using System.Text.Json;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Middleware;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+/// <summary>
+/// A base class for tests that conveniently enables to execute HTTP requests against JSON:API endpoints.
+/// </summary>
+public abstract class IntegrationTest
 {
-    /// <summary>
-    /// A base class for tests that conveniently enables to execute HTTP requests against JSON:API endpoints.
-    /// </summary>
-    public abstract class IntegrationTest
+    protected abstract JsonSerializerOptions SerializerOptions { get; }
+
+    public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteHeadAsync<TResponseDocument>(string requestUrl,
+        Action<HttpRequestHeaders>? setRequestHeaders = null)
     {
-        protected abstract JsonSerializerOptions SerializerOptions { get; }
+        return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Head, requestUrl, null, null, setRequestHeaders);
+    }
 
-        public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteHeadAsync<TResponseDocument>(string requestUrl,
-            Action<HttpRequestHeaders>? setRequestHeaders = null)
-        {
-            return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Head, requestUrl, null, null, setRequestHeaders);
-        }
+    public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteGetAsync<TResponseDocument>(string requestUrl,
+        Action<HttpRequestHeaders>? setRequestHeaders = null)
+    {
+        return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Get, requestUrl, null, null, setRequestHeaders);
+    }
 
-        public async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteGetAsync<TResponseDocument>(string requestUrl,
-            Action<HttpRequestHeaders>? setRequestHeaders = null)
-        {
-            return await ExecuteRequestAsync<TResponseDocument>(HttpMethod.Get, requestUrl, null, null, setRequestHeaders);
-        }
+    public async 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);
+    }
 
-        public async 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);
-        }
+    public async 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);
+    }
 
-        public async 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);
-        }
+    public async 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);
+    }
 
-        public async 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);
-        }
+    public async 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);
+    }
 
-        public async 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);
-        }
+    private async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteRequestAsync<TResponseDocument>(HttpMethod method,
+        string requestUrl, object? requestBody, string? contentType, Action<HttpRequestHeaders>? setRequestHeaders)
+    {
+        using var request = new HttpRequestMessage(method, requestUrl);
+        string? requestText = SerializeRequest(requestBody);
 
-        private async Task<(HttpResponseMessage httpResponse, TResponseDocument responseDocument)> ExecuteRequestAsync<TResponseDocument>(HttpMethod method,
-            string requestUrl, object? requestBody, string? contentType, Action<HttpRequestHeaders>? setRequestHeaders)
+        if (!string.IsNullOrEmpty(requestText))
         {
-            using var request = new HttpRequestMessage(method, requestUrl);
-            string? requestText = SerializeRequest(requestBody);
+            requestText = requestText.Replace("atomic__", "atomic:");
+            request.Content = new StringContent(requestText);
+            request.Content.Headers.ContentLength = Encoding.UTF8.GetByteCount(requestText);
 
-            if (!string.IsNullOrEmpty(requestText))
+            if (contentType != null)
             {
-                requestText = requestText.Replace("atomic__", "atomic:");
-                request.Content = new StringContent(requestText);
-                request.Content.Headers.ContentLength = Encoding.UTF8.GetByteCount(requestText);
-
-                if (contentType != null)
-                {
-                    request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(contentType);
-                }
+                request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse(contentType);
             }
+        }
 
-            setRequestHeaders?.Invoke(request.Headers);
+        setRequestHeaders?.Invoke(request.Headers);
 
-            using HttpClient client = CreateClient();
-            HttpResponseMessage responseMessage = await client.SendAsync(request);
+        using HttpClient client = CreateClient();
+        HttpResponseMessage responseMessage = await client.SendAsync(request);
 
-            string responseText = await responseMessage.Content.ReadAsStringAsync();
-            var responseDocument = DeserializeResponse<TResponseDocument>(responseText);
+        string responseText = await responseMessage.Content.ReadAsStringAsync();
+        var responseDocument = DeserializeResponse<TResponseDocument>(responseText);
 
-            return (responseMessage, responseDocument!);
-        }
+        return (responseMessage, responseDocument!);
+    }
 
-        private string? SerializeRequest(object? requestBody)
-        {
-            return requestBody == null ? null :
-                requestBody is string stringRequestBody ? stringRequestBody : JsonSerializer.Serialize(requestBody, SerializerOptions);
-        }
+    private string? SerializeRequest(object? requestBody)
+    {
+        return requestBody == null ? null :
+            requestBody is string stringRequestBody ? stringRequestBody : JsonSerializer.Serialize(requestBody, SerializerOptions);
+    }
 
-        protected abstract HttpClient CreateClient();
+    protected abstract HttpClient CreateClient();
 
-        private TResponseDocument? DeserializeResponse<TResponseDocument>(string responseText)
+    private TResponseDocument? DeserializeResponse<TResponseDocument>(string responseText)
+    {
+        if (typeof(TResponseDocument) == typeof(string))
         {
-            if (typeof(TResponseDocument) == typeof(string))
-            {
-                return (TResponseDocument)(object)responseText;
-            }
+            return (TResponseDocument)(object)responseText;
+        }
 
-            if (string.IsNullOrEmpty(responseText))
-            {
-                return default;
-            }
+        if (string.IsNullOrEmpty(responseText))
+        {
+            return default;
+        }
 
-            try
-            {
-                return JsonSerializer.Deserialize<TResponseDocument>(responseText, SerializerOptions);
-            }
-            catch (JsonException exception)
-            {
-                throw new FormatException($"Failed to deserialize response body to JSON:\n{responseText}", exception);
-            }
+        try
+        {
+            return JsonSerializer.Deserialize<TResponseDocument>(responseText, SerializerOptions);
+        }
+        catch (JsonException exception)
+        {
+            throw new FormatException($"Failed to deserialize response body to JSON:\n{responseText}", exception);
         }
     }
 }
diff --git a/test/TestBuildingBlocks/IntegrationTestContext.cs b/test/TestBuildingBlocks/IntegrationTestContext.cs
index 162c2b6754..f25eb29070 100644
--- a/test/TestBuildingBlocks/IntegrationTestContext.cs
+++ b/test/TestBuildingBlocks/IntegrationTestContext.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Net.Http;
 using System.Text.Json;
-using System.Threading.Tasks;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
 using Microsoft.AspNetCore.Hosting;
@@ -13,194 +10,186 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+/// <summary>
+/// Base class for a test context that creates a new database and server instance before running tests and cleans up afterwards. You can either use this
+/// as a fixture on your tests class (init/cleanup runs once before/after all tests) or have your tests class inherit from it (init/cleanup runs once
+/// before/after each test). See <see href="https://xunit.net/docs/shared-context" /> for details on shared context usage.
+/// </summary>
+/// <typeparam name="TStartup">
+/// The server Startup class, which can be defined in the test project or API project.
+/// </typeparam>
+/// <typeparam name="TDbContext">
+/// The Entity Framework Core database context, which can be defined in the test project or API project.
+/// </typeparam>
+[UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+public class IntegrationTestContext<TStartup, TDbContext> : IntegrationTest, IDisposable
+    where TStartup : class
+    where TDbContext : DbContext
 {
-    /// <summary>
-    /// Base class for a test context that creates a new database and server instance before running tests and cleans up afterwards. You can either use this
-    /// as a fixture on your tests class (init/cleanup runs once before/after all tests) or have your tests class inherit from it (init/cleanup runs once
-    /// before/after each test). See <see href="https://xunit.net/docs/shared-context" /> for details on shared context usage.
-    /// </summary>
-    /// <typeparam name="TStartup">
-    /// The server Startup class, which can be defined in the test project or API project.
-    /// </typeparam>
-    /// <typeparam name="TDbContext">
-    /// The Entity Framework Core database context, which can be defined in the test project or API project.
-    /// </typeparam>
-    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-    public class IntegrationTestContext<TStartup, TDbContext> : IntegrationTest, IDisposable
-        where TStartup : class
-        where TDbContext : DbContext
-    {
-        private readonly Lazy<WebApplicationFactory<TStartup>> _lazyFactory;
-        private readonly TestControllerProvider _testControllerProvider = new();
-        private Action<ILoggingBuilder>? _loggingConfiguration;
-        private Action<IServiceCollection>? _beforeServicesConfiguration;
-        private Action<IServiceCollection>? _afterServicesConfiguration;
+    private readonly Lazy<WebApplicationFactory<TStartup>> _lazyFactory;
+    private readonly TestControllerProvider _testControllerProvider = new();
+    private Action<ILoggingBuilder>? _loggingConfiguration;
+    private Action<IServiceCollection>? _beforeServicesConfiguration;
+    private Action<IServiceCollection>? _afterServicesConfiguration;
 
-        protected override JsonSerializerOptions SerializerOptions
+    protected override JsonSerializerOptions SerializerOptions
+    {
+        get
         {
-            get
-            {
-                var options = Factory.Services.GetRequiredService<IJsonApiOptions>();
-                return options.SerializerOptions;
-            }
+            var options = Factory.Services.GetRequiredService<IJsonApiOptions>();
+            return options.SerializerOptions;
         }
+    }
 
-        public WebApplicationFactory<TStartup> Factory => _lazyFactory.Value;
+    public WebApplicationFactory<TStartup> Factory => _lazyFactory.Value;
 
-        public IntegrationTestContext()
-        {
-            _lazyFactory = new Lazy<WebApplicationFactory<TStartup>>(CreateFactory);
-        }
+    public IntegrationTestContext()
+    {
+        _lazyFactory = new Lazy<WebApplicationFactory<TStartup>>(CreateFactory);
+    }
 
-        public void UseController<TController>()
-            where TController : ControllerBase
-        {
-            _testControllerProvider.AddController(typeof(TController));
-        }
+    public void UseController<TController>()
+        where TController : ControllerBase
+    {
+        _testControllerProvider.AddController(typeof(TController));
+    }
 
-        protected override HttpClient CreateClient()
-        {
-            return Factory.CreateClient();
-        }
+    protected override HttpClient CreateClient()
+    {
+        return Factory.CreateClient();
+    }
 
-        private WebApplicationFactory<TStartup> CreateFactory()
-        {
-            string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
+    private WebApplicationFactory<TStartup> CreateFactory()
+    {
+        string postgresPassword = Environment.GetEnvironmentVariable("PGPASSWORD") ?? "postgres";
 
-            string dbConnectionString = $"Host=localhost;Port=5432;Database=JsonApiTest-{Guid.NewGuid():N};User ID=postgres;" +
-                $"Password={postgresPassword};Include Error Detail=true";
+        string dbConnectionString = $"Host=localhost;Port=5432;Database=JsonApiTest-{Guid.NewGuid():N};User ID=postgres;" +
+            $"Password={postgresPassword};Include Error Detail=true";
 
-            var factory = new IntegrationTestWebApplicationFactory();
+        var factory = new IntegrationTestWebApplicationFactory();
 
-            factory.ConfigureLogging(_loggingConfiguration);
+        factory.ConfigureLogging(_loggingConfiguration);
 
-            factory.ConfigureServicesBeforeStartup(services =>
-            {
-                _beforeServicesConfiguration?.Invoke(services);
+        factory.ConfigureServicesBeforeStartup(services =>
+        {
+            _beforeServicesConfiguration?.Invoke(services);
 
-                services.ReplaceControllers(_testControllerProvider);
+            services.ReplaceControllers(_testControllerProvider);
 
-                services.AddDbContext<TDbContext>(options =>
-                {
-                    options.UseNpgsql(dbConnectionString, builder =>
-                        // The next line suppresses Entity Framework Core Warning:
-                        //    "Compiling a query which loads related collections for more than one collection navigation
-                        //    either via 'Include' or through projection but no 'QuerySplittingBehavior' has been configured."
-                        // We'd like to use `QuerySplittingBehavior.SplitQuery` because of improved performance, but unfortunately
-                        // it makes Entity Framework Core 5 crash on queries that load related data in a projection without Include.
-                        // This is fixed in Entity Framework Core 6, tracked at https://github.com/dotnet/efcore/issues/21234.
-                        builder.UseQuerySplittingBehavior(QuerySplittingBehavior.SingleQuery));
+            services.AddDbContext<TDbContext>(options =>
+            {
+                options.UseNpgsql(dbConnectionString, builder => builder.UseQuerySplittingBehavior(QuerySplittingBehavior.SplitQuery));
 
 #if DEBUG
-                    options.EnableSensitiveDataLogging();
-                    options.EnableDetailedErrors();
+                options.EnableSensitiveDataLogging();
+                options.EnableDetailedErrors();
 #endif
-                });
             });
+        });
 
-            factory.ConfigureServicesAfterStartup(_afterServicesConfiguration);
+        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.
-            WebApplicationFactory<TStartup> factoryWithConfiguredContentRoot =
-                factory.WithWebHostBuilder(builder => builder.UseSolutionRelativeContentRoot($"test/{nameof(TestBuildingBlocks)}"));
+        // 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.
+        WebApplicationFactory<TStartup> factoryWithConfiguredContentRoot =
+            factory.WithWebHostBuilder(builder => builder.UseSolutionRelativeContentRoot($"test/{nameof(TestBuildingBlocks)}"));
 
-            using IServiceScope scope = factoryWithConfiguredContentRoot.Services.CreateScope();
-            var dbContext = scope.ServiceProvider.GetRequiredService<TDbContext>();
-            dbContext.Database.EnsureCreated();
+        using IServiceScope scope = factoryWithConfiguredContentRoot.Services.CreateScope();
+        var dbContext = scope.ServiceProvider.GetRequiredService<TDbContext>();
+        dbContext.Database.EnsureCreated();
 
-            return factoryWithConfiguredContentRoot;
-        }
+        return factoryWithConfiguredContentRoot;
+    }
 
-        public virtual void Dispose()
-        {
-            RunOnDatabaseAsync(async dbContext => await dbContext.Database.EnsureDeletedAsync()).Wait();
+    public virtual void Dispose()
+    {
+        RunOnDatabaseAsync(async dbContext => await dbContext.Database.EnsureDeletedAsync()).Wait();
 
-            Factory.Dispose();
-        }
+        Factory.Dispose();
+    }
+
+    public void ConfigureLogging(Action<ILoggingBuilder> loggingConfiguration)
+    {
+        _loggingConfiguration = loggingConfiguration;
+    }
 
-        public void ConfigureLogging(Action<ILoggingBuilder> loggingConfiguration)
+    public void ConfigureServicesBeforeStartup(Action<IServiceCollection> servicesConfiguration)
+    {
+        _beforeServicesConfiguration = servicesConfiguration;
+    }
+
+    public void ConfigureServicesAfterStartup(Action<IServiceCollection> servicesConfiguration)
+    {
+        _afterServicesConfiguration = servicesConfiguration;
+    }
+
+    public async Task RunOnDatabaseAsync(Func<TDbContext, Task> asyncAction)
+    {
+        await using AsyncServiceScope scope = Factory.Services.CreateAsyncScope();
+        var dbContext = scope.ServiceProvider.GetRequiredService<TDbContext>();
+
+        await asyncAction(dbContext);
+    }
+
+    private sealed class IntegrationTestWebApplicationFactory : WebApplicationFactory<TStartup>
+    {
+        private Action<ILoggingBuilder>? _loggingConfiguration;
+        private Action<IServiceCollection>? _beforeServicesConfiguration;
+        private Action<IServiceCollection>? _afterServicesConfiguration;
+
+        public void ConfigureLogging(Action<ILoggingBuilder>? loggingConfiguration)
         {
             _loggingConfiguration = loggingConfiguration;
         }
 
-        public void ConfigureServicesBeforeStartup(Action<IServiceCollection> servicesConfiguration)
+        public void ConfigureServicesBeforeStartup(Action<IServiceCollection>? servicesConfiguration)
         {
             _beforeServicesConfiguration = servicesConfiguration;
         }
 
-        public void ConfigureServicesAfterStartup(Action<IServiceCollection> servicesConfiguration)
+        public void ConfigureServicesAfterStartup(Action<IServiceCollection>? servicesConfiguration)
         {
             _afterServicesConfiguration = servicesConfiguration;
         }
 
-        public async Task RunOnDatabaseAsync(Func<TDbContext, Task> asyncAction)
-        {
-            using IServiceScope scope = Factory.Services.CreateScope();
-            var dbContext = scope.ServiceProvider.GetRequiredService<TDbContext>();
-
-            await asyncAction(dbContext);
-        }
-
-        private sealed class IntegrationTestWebApplicationFactory : WebApplicationFactory<TStartup>
+        protected override IHostBuilder CreateHostBuilder()
         {
-            private Action<ILoggingBuilder>? _loggingConfiguration;
-            private Action<IServiceCollection>? _beforeServicesConfiguration;
-            private Action<IServiceCollection>? _afterServicesConfiguration;
+            // @formatter:wrap_chained_method_calls chop_always
+            // @formatter:keep_existing_linebreaks true
 
-            public void ConfigureLogging(Action<ILoggingBuilder>? loggingConfiguration)
-            {
-                _loggingConfiguration = loggingConfiguration;
-            }
-
-            public void ConfigureServicesBeforeStartup(Action<IServiceCollection>? servicesConfiguration)
-            {
-                _beforeServicesConfiguration = servicesConfiguration;
-            }
-
-            public void ConfigureServicesAfterStartup(Action<IServiceCollection>? servicesConfiguration)
-            {
-                _afterServicesConfiguration = servicesConfiguration;
-            }
-
-            protected override IHostBuilder CreateHostBuilder()
-            {
-                // @formatter:wrap_chained_method_calls chop_always
-                // @formatter:keep_existing_linebreaks true
-
-                return Host.CreateDefaultBuilder(null)
-                    .ConfigureAppConfiguration(builder =>
+            return Host.CreateDefaultBuilder(null)
+                .ConfigureAppConfiguration(builder =>
+                {
+                    // For tests asserting on log output, we discard the logging settings from appsettings.json.
+                    // But using appsettings.json for all other tests makes it easy to quickly toggle when debugging.
+                    if (_loggingConfiguration != null)
                     {
-                        // For tests asserting on log output, we discard the logging settings from appsettings.json.
-                        // But using appsettings.json for all other tests makes it easy to quickly toggle when debugging.
-                        if (_loggingConfiguration != null)
-                        {
-                            builder.Sources.Clear();
-                        }
-                    })
-                    .ConfigureWebHostDefaults(webBuilder =>
+                        builder.Sources.Clear();
+                    }
+                })
+                .ConfigureWebHostDefaults(webBuilder =>
+                {
+                    webBuilder.ConfigureServices(services =>
                     {
-                        webBuilder.ConfigureServices(services =>
-                        {
-                            _beforeServicesConfiguration?.Invoke(services);
-                        });
-
-                        webBuilder.UseStartup<TStartup>();
-
-                        webBuilder.ConfigureServices(services =>
-                        {
-                            _afterServicesConfiguration?.Invoke(services);
-                        });
-                    })
-                    .ConfigureLogging(options =>
+                        _beforeServicesConfiguration?.Invoke(services);
+                    });
+
+                    webBuilder.UseStartup<TStartup>();
+
+                    webBuilder.ConfigureServices(services =>
                     {
-                        _loggingConfiguration?.Invoke(options);
+                        _afterServicesConfiguration?.Invoke(services);
                     });
+                })
+                .ConfigureLogging(options =>
+                {
+                    _loggingConfiguration?.Invoke(options);
+                });
 
-                // @formatter:keep_existing_linebreaks restore
-                // @formatter:wrap_chained_method_calls restore
-            }
+            // @formatter:keep_existing_linebreaks restore
+            // @formatter:wrap_chained_method_calls restore
         }
     }
 }
diff --git a/test/TestBuildingBlocks/JsonApiStringConverter.cs b/test/TestBuildingBlocks/JsonApiStringConverter.cs
index 8a6a52cd9a..faf26ef988 100644
--- a/test/TestBuildingBlocks/JsonApiStringConverter.cs
+++ b/test/TestBuildingBlocks/JsonApiStringConverter.cs
@@ -1,25 +1,22 @@
-using System;
-using System.Linq;
 using System.Text.Json;
 
 #pragma warning disable AV1008 // Class should not be static
 #pragma warning disable AV1210 // Catch a specific exception instead of Exception, SystemException or ApplicationException
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+public static class JsonApiStringConverter
 {
-    public static class JsonApiStringConverter
+    public static string ExtractErrorId(string responseBody)
     {
-        public static string ExtractErrorId(string responseBody)
+        try
+        {
+            using JsonDocument document = JsonDocument.Parse(responseBody);
+            return document.RootElement.GetProperty("errors").EnumerateArray().Single()!.GetProperty("id").GetString()!;
+        }
+        catch (Exception exception)
         {
-            try
-            {
-                using JsonDocument document = JsonDocument.Parse(responseBody);
-                return document.RootElement.GetProperty("errors").EnumerateArray().Single()!.GetProperty("id").GetString()!;
-            }
-            catch (Exception exception)
-            {
-                throw new Exception($"Failed to extract Error ID from response body '{responseBody}'.", exception);
-            }
+            throw new Exception($"Failed to extract Error ID from response body '{responseBody}'.", exception);
         }
     }
 }
diff --git a/test/TestBuildingBlocks/NeverSameResourceChangeTracker.cs b/test/TestBuildingBlocks/NeverSameResourceChangeTracker.cs
index 16ae8e1454..c92494c165 100644
--- a/test/TestBuildingBlocks/NeverSameResourceChangeTracker.cs
+++ b/test/TestBuildingBlocks/NeverSameResourceChangeTracker.cs
@@ -1,28 +1,27 @@
 using JsonApiDotNetCore.Resources;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+/// <summary>
+/// Ensures the resource attributes are returned when creating/updating a resource.
+/// </summary>
+public sealed class NeverSameResourceChangeTracker<TResource> : IResourceChangeTracker<TResource>
+    where TResource : class, IIdentifiable
 {
-    /// <summary>
-    /// Ensures the resource attributes are returned when creating/updating a resource.
-    /// </summary>
-    public sealed class NeverSameResourceChangeTracker<TResource> : IResourceChangeTracker<TResource>
-        where TResource : class, IIdentifiable
+    public void SetInitiallyStoredAttributeValues(TResource resource)
     {
-        public void SetInitiallyStoredAttributeValues(TResource resource)
-        {
-        }
+    }
 
-        public void SetRequestAttributeValues(TResource resource)
-        {
-        }
+    public void SetRequestAttributeValues(TResource resource)
+    {
+    }
 
-        public void SetFinallyStoredAttributeValues(TResource resource)
-        {
-        }
+    public void SetFinallyStoredAttributeValues(TResource resource)
+    {
+    }
 
-        public bool HasImplicitChanges()
-        {
-            return true;
-        }
+    public bool HasImplicitChanges()
+    {
+        return true;
     }
 }
diff --git a/test/TestBuildingBlocks/NullabilityAssertionExtensions.cs b/test/TestBuildingBlocks/NullabilityAssertionExtensions.cs
index 58815a3786..1ef3172446 100644
--- a/test/TestBuildingBlocks/NullabilityAssertionExtensions.cs
+++ b/test/TestBuildingBlocks/NullabilityAssertionExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-using System.Collections.Generic;
 using FluentAssertions;
 using JetBrains.Annotations;
 using SysNotNull = System.Diagnostics.CodeAnalysis.NotNullAttribute;
@@ -7,52 +5,51 @@
 // ReSharper disable PossibleMultipleEnumeration
 #pragma warning disable CS8777 // Parameter must have a non-null value when exiting.
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+public static class NullabilityAssertionExtensions
 {
-    public static class NullabilityAssertionExtensions
+    [CustomAssertion]
+    public static T ShouldNotBeNull<T>([SysNotNull] this T? subject)
+    {
+        subject.Should().NotBeNull();
+        return subject!;
+    }
+
+    [CustomAssertion]
+    public static void ShouldNotBeEmpty([SysNotNull] this string? subject)
+    {
+        subject.Should().NotBeEmpty();
+    }
+
+    [CustomAssertion]
+    public static void ShouldNotBeEmpty<T>([SysNotNull] this IEnumerable<T>? subject)
+    {
+        subject.Should().NotBeEmpty();
+    }
+
+    [CustomAssertion]
+    public static void ShouldNotBeNullOrEmpty([SysNotNull] this string? subject)
+    {
+        subject.Should().NotBeNullOrEmpty();
+    }
+
+    [CustomAssertion]
+    public static void ShouldHaveCount<T>([SysNotNull] this IEnumerable<T>? subject, int expected)
+    {
+        subject.Should().HaveCount(expected);
+    }
+
+    [CustomAssertion]
+    public static TValue? ShouldContainKey<TKey, TValue>([SysNotNull] this IDictionary<TKey, TValue?>? subject, TKey expected)
+    {
+        subject.Should().ContainKey(expected);
+
+        return subject![expected];
+    }
+
+    public static void With<T>(this T subject, [InstantHandle] Action<T> continuation)
     {
-        [CustomAssertion]
-        public static T ShouldNotBeNull<T>([SysNotNull] this T? subject)
-        {
-            subject.Should().NotBeNull();
-            return subject!;
-        }
-
-        [CustomAssertion]
-        public static void ShouldNotBeEmpty([SysNotNull] this string? subject)
-        {
-            subject.Should().NotBeEmpty();
-        }
-
-        [CustomAssertion]
-        public static void ShouldNotBeEmpty<T>([SysNotNull] this IEnumerable<T>? subject)
-        {
-            subject.Should().NotBeEmpty();
-        }
-
-        [CustomAssertion]
-        public static void ShouldNotBeNullOrEmpty([SysNotNull] this string? subject)
-        {
-            subject.Should().NotBeNullOrEmpty();
-        }
-
-        [CustomAssertion]
-        public static void ShouldHaveCount<T>([SysNotNull] this IEnumerable<T>? subject, int expected)
-        {
-            subject.Should().HaveCount(expected);
-        }
-
-        [CustomAssertion]
-        public static TValue? ShouldContainKey<TKey, TValue>([SysNotNull] this IDictionary<TKey, TValue?>? subject, TKey expected)
-        {
-            subject.Should().ContainKey(expected);
-
-            return subject![expected];
-        }
-
-        public static void With<T>(this T subject, [InstantHandle] Action<T> continuation)
-        {
-            continuation(subject);
-        }
+        continuation(subject);
     }
 }
diff --git a/test/TestBuildingBlocks/ObjectAssertionsExtensions.cs b/test/TestBuildingBlocks/ObjectAssertionsExtensions.cs
index 320a28cda0..a295e1eaf9 100644
--- a/test/TestBuildingBlocks/ObjectAssertionsExtensions.cs
+++ b/test/TestBuildingBlocks/ObjectAssertionsExtensions.cs
@@ -1,5 +1,3 @@
-using System;
-using System.IO;
 using System.Text;
 using System.Text.Encodings.Web;
 using System.Text.Json;
@@ -8,87 +6,63 @@
 using FluentAssertions.Primitives;
 using JetBrains.Annotations;
 
-namespace TestBuildingBlocks
-{
-    [PublicAPI]
-    public static class ObjectAssertionsExtensions
-    {
-        private const decimal NumericPrecision = 0.00000000001M;
-        private static readonly TimeSpan TimePrecision = TimeSpan.FromMilliseconds(20);
-
-        private static readonly JsonWriterOptions JsonWriterOptions = new()
-        {
-            Indented = true,
-            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-        };
+namespace TestBuildingBlocks;
 
-        /// <summary>
-        /// Same as <see cref="DateTimeAssertions{TAssertions}.BeCloseTo(DateTime, TimeSpan, string, object[])" />, but with default precision.
-        /// </summary>
-        [CustomAssertion]
-        public static AndConstraint<TAssertions> BeCloseTo<TAssertions>(this DateTimeAssertions<TAssertions> parent, DateTime nearbyTime, string because = "",
-            params object[] becauseArgs)
-            where TAssertions : DateTimeAssertions<TAssertions>
-        {
-            return parent.BeCloseTo(nearbyTime, TimePrecision, because, becauseArgs);
-        }
+[PublicAPI]
+public static class ObjectAssertionsExtensions
+{
+    private const decimal NumericPrecision = 0.00000000001M;
 
-        /// <summary>
-        /// Same as <see cref="DateTimeOffsetAssertions{TAssertions}.BeCloseTo(DateTimeOffset, TimeSpan, string, object[])" />, but with default precision.
-        /// </summary>
-        [CustomAssertion]
-        public static AndConstraint<TAssertions> BeCloseTo<TAssertions>(this DateTimeOffsetAssertions<TAssertions> parent, DateTimeOffset nearbyTime,
-            string because = "", params object[] becauseArgs)
-            where TAssertions : DateTimeOffsetAssertions<TAssertions>
-        {
-            return parent.BeCloseTo(nearbyTime, TimePrecision, because, becauseArgs);
-        }
+    private static readonly JsonWriterOptions JsonWriterOptions = new()
+    {
+        Indented = true,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+    };
 
-        /// <summary>
-        /// Same as <see cref="NumericAssertionsExtensions.BeApproximately(NumericAssertions{decimal}, decimal, decimal, string, object[])" />, but with default
-        /// precision.
-        /// </summary>
-        [CustomAssertion]
-        public static AndConstraint<NumericAssertions<decimal>> BeApproximately(this NumericAssertions<decimal> parent, decimal expectedValue,
-            string because = "", params object[] becauseArgs)
-        {
-            return parent.BeApproximately(expectedValue, NumericPrecision, because, becauseArgs);
-        }
+    /// <summary>
+    /// Same as <see cref="NumericAssertionsExtensions.BeApproximately(NumericAssertions{decimal}, decimal, decimal, string, object[])" />, but with default
+    /// precision.
+    /// </summary>
+    [CustomAssertion]
+    public static AndConstraint<NumericAssertions<decimal>> BeApproximately(this NumericAssertions<decimal> parent, decimal expectedValue, string because = "",
+        params object[] becauseArgs)
+    {
+        return parent.BeApproximately(expectedValue, NumericPrecision, because, becauseArgs);
+    }
 
-        /// <summary>
-        /// Same as <see cref="NumericAssertionsExtensions.BeApproximately(NullableNumericAssertions{decimal}, decimal?, decimal, string, object[])" />, but with
-        /// default precision.
-        /// </summary>
-        [CustomAssertion]
-        public static AndConstraint<NullableNumericAssertions<decimal>> BeApproximately(this NullableNumericAssertions<decimal> parent, decimal? expectedValue,
-            string because = "", params object[] becauseArgs)
-        {
-            return parent.BeApproximately(expectedValue, NumericPrecision, because, becauseArgs);
-        }
+    /// <summary>
+    /// Same as <see cref="NumericAssertionsExtensions.BeApproximately(NullableNumericAssertions{decimal}, decimal?, decimal, string, object[])" />, but with
+    /// default precision.
+    /// </summary>
+    [CustomAssertion]
+    public static AndConstraint<NullableNumericAssertions<decimal>> BeApproximately(this NullableNumericAssertions<decimal> parent, decimal? expectedValue,
+        string because = "", params object[] becauseArgs)
+    {
+        return parent.BeApproximately(expectedValue, NumericPrecision, because, becauseArgs);
+    }
 
-        /// <summary>
-        /// Asserts that a JSON-formatted string matches the specified expected one, ignoring differences in insignificant whitespace and line endings.
-        /// </summary>
-        [CustomAssertion]
-        public static void BeJson(this StringAssertions source, string expected, string because = "", params object[] becauseArgs)
-        {
-            using JsonDocument sourceJson = JsonDocument.Parse(source.Subject);
-            using JsonDocument expectedJson = JsonDocument.Parse(expected);
+    /// <summary>
+    /// Asserts that a JSON-formatted string matches the specified expected one, ignoring differences in insignificant whitespace and line endings.
+    /// </summary>
+    [CustomAssertion]
+    public static void BeJson(this StringAssertions source, string expected, string because = "", params object[] becauseArgs)
+    {
+        using JsonDocument sourceJson = JsonDocument.Parse(source.Subject);
+        using JsonDocument expectedJson = JsonDocument.Parse(expected);
 
-            string sourceText = ToJsonString(sourceJson);
-            string expectedText = ToJsonString(expectedJson);
+        string sourceText = ToJsonString(sourceJson);
+        string expectedText = ToJsonString(expectedJson);
 
-            sourceText.Should().Be(expectedText, because, becauseArgs);
-        }
+        sourceText.Should().Be(expectedText, because, becauseArgs);
+    }
 
-        private static string ToJsonString(JsonDocument document)
-        {
-            using var stream = new MemoryStream();
-            var writer = new Utf8JsonWriter(stream, JsonWriterOptions);
+    private static string ToJsonString(JsonDocument document)
+    {
+        using var stream = new MemoryStream();
+        var writer = new Utf8JsonWriter(stream, JsonWriterOptions);
 
-            document.WriteTo(writer);
-            writer.Flush();
-            return Encoding.UTF8.GetString(stream.ToArray());
-        }
+        document.WriteTo(writer);
+        writer.Flush();
+        return Encoding.UTF8.GetString(stream.ToArray());
     }
 }
diff --git a/test/TestBuildingBlocks/QueryableExtensions.cs b/test/TestBuildingBlocks/QueryableExtensions.cs
index 941a5f733e..71538f13c0 100644
--- a/test/TestBuildingBlocks/QueryableExtensions.cs
+++ b/test/TestBuildingBlocks/QueryableExtensions.cs
@@ -1,25 +1,20 @@
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
 using JsonApiDotNetCore.Resources;
 using Microsoft.EntityFrameworkCore;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+public static class QueryableExtensions
 {
-    public static class QueryableExtensions
+    public static Task<TResource> FirstWithIdAsync<TResource, TId>(this IQueryable<TResource> resources, TId id, CancellationToken cancellationToken = default)
+        where TResource : IIdentifiable<TId>
     {
-        public static Task<TResource> FirstWithIdAsync<TResource, TId>(this IQueryable<TResource> resources, TId id,
-            CancellationToken cancellationToken = default)
-            where TResource : IIdentifiable<TId>
-        {
-            return resources.FirstAsync(resource => Equals(resource.Id, id), cancellationToken);
-        }
+        return resources.FirstAsync(resource => Equals(resource.Id, id), cancellationToken);
+    }
 
-        public static async Task<TResource?> FirstWithIdOrDefaultAsync<TResource, TId>(this IQueryable<TResource> resources, TId id,
-            CancellationToken cancellationToken = default)
-            where TResource : IIdentifiable<TId>
-        {
-            return await resources.FirstOrDefaultAsync(resource => Equals(resource.Id, id), cancellationToken);
-        }
+    public static async Task<TResource?> FirstWithIdOrDefaultAsync<TResource, TId>(this IQueryable<TResource> resources, TId id,
+        CancellationToken cancellationToken = default)
+        where TResource : IIdentifiable<TId>
+    {
+        return await resources.FirstOrDefaultAsync(resource => Equals(resource.Id, id), cancellationToken);
     }
 }
diff --git a/test/TestBuildingBlocks/ServiceCollectionExtensions.cs b/test/TestBuildingBlocks/ServiceCollectionExtensions.cs
index d3ede9b68c..51430c92f8 100644
--- a/test/TestBuildingBlocks/ServiceCollectionExtensions.cs
+++ b/test/TestBuildingBlocks/ServiceCollectionExtensions.cs
@@ -1,40 +1,38 @@
-using System.Linq;
 using System.Reflection;
 using JsonApiDotNetCore;
 using Microsoft.AspNetCore.Mvc.ApplicationParts;
 using Microsoft.AspNetCore.Mvc.Controllers;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+internal static class ServiceCollectionExtensions
 {
-    internal static class ServiceCollectionExtensions
+    public static void ReplaceControllers(this IServiceCollection services, TestControllerProvider provider)
     {
-        public static void ReplaceControllers(this IServiceCollection services, TestControllerProvider provider)
+        ArgumentGuard.NotNull(services, nameof(services));
+
+        services.AddMvcCore().ConfigureApplicationPartManager(manager =>
         {
-            ArgumentGuard.NotNull(services, nameof(services));
+            RemoveExistingControllerFeatureProviders(manager);
 
-            services.AddMvcCore().ConfigureApplicationPartManager(manager =>
+            foreach (Assembly assembly in provider.ControllerAssemblies)
             {
-                RemoveExistingControllerFeatureProviders(manager);
+                manager.ApplicationParts.Add(new AssemblyPart(assembly));
+            }
 
-                foreach (Assembly assembly in provider.ControllerAssemblies)
-                {
-                    manager.ApplicationParts.Add(new AssemblyPart(assembly));
-                }
+            manager.FeatureProviders.Add(provider);
+        });
+    }
 
-                manager.FeatureProviders.Add(provider);
-            });
-        }
+    private static void RemoveExistingControllerFeatureProviders(ApplicationPartManager manager)
+    {
+        IApplicationFeatureProvider<ControllerFeature>[] providers = manager.FeatureProviders.OfType<IApplicationFeatureProvider<ControllerFeature>>()
+            .ToArray();
 
-        private static void RemoveExistingControllerFeatureProviders(ApplicationPartManager manager)
+        foreach (IApplicationFeatureProvider<ControllerFeature> provider in providers)
         {
-            IApplicationFeatureProvider<ControllerFeature>[] providers = manager.FeatureProviders.OfType<IApplicationFeatureProvider<ControllerFeature>>()
-                .ToArray();
-
-            foreach (IApplicationFeatureProvider<ControllerFeature> provider in providers)
-            {
-                manager.FeatureProviders.Remove(provider);
-            }
+            manager.FeatureProviders.Remove(provider);
         }
     }
 }
diff --git a/test/TestBuildingBlocks/TestBuildingBlocks.csproj b/test/TestBuildingBlocks/TestBuildingBlocks.csproj
index a4eae45836..2c8fdd1cd5 100644
--- a/test/TestBuildingBlocks/TestBuildingBlocks.csproj
+++ b/test/TestBuildingBlocks/TestBuildingBlocks.csproj
@@ -1,6 +1,6 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -8,14 +8,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Bogus" Version="$(BogusVersion)" />
+    <PackageReference Include="Bogus" Version="34.0.1" />
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
-    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(AspNetCoreVersion)" />
+    <PackageReference Include="FluentAssertions" Version="6.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(AspNetVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(AspNetVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlPostgreSQLVersion)" />
-    <PackageReference Include="xunit" Version="$(XUnitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XUnitVersion)" PrivateAssets="All" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EFCorePostgresVersion)" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/test/TestBuildingBlocks/TestControllerProvider.cs b/test/TestBuildingBlocks/TestControllerProvider.cs
index d8790269ef..664fe34be1 100644
--- a/test/TestBuildingBlocks/TestControllerProvider.cs
+++ b/test/TestBuildingBlocks/TestControllerProvider.cs
@@ -1,25 +1,22 @@
-using System;
-using System.Collections.Generic;
 using System.Reflection;
 using Microsoft.AspNetCore.Mvc.Controllers;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+internal sealed class TestControllerProvider : ControllerFeatureProvider
 {
-    internal sealed class TestControllerProvider : ControllerFeatureProvider
-    {
-        private readonly ISet<Type> _allowedControllerTypes = new HashSet<Type>();
+    private readonly ISet<Type> _allowedControllerTypes = new HashSet<Type>();
 
-        internal ISet<Assembly> ControllerAssemblies { get; } = new HashSet<Assembly>();
+    internal ISet<Assembly> ControllerAssemblies { get; } = new HashSet<Assembly>();
 
-        public void AddController(Type controller)
-        {
-            _allowedControllerTypes.Add(controller);
-            ControllerAssemblies.Add(controller.Assembly);
-        }
+    public void AddController(Type controller)
+    {
+        _allowedControllerTypes.Add(controller);
+        ControllerAssemblies.Add(controller.Assembly);
+    }
 
-        protected override bool IsController(TypeInfo typeInfo)
-        {
-            return _allowedControllerTypes.Contains(typeInfo);
-        }
+    protected override bool IsController(TypeInfo typeInfo)
+    {
+        return _allowedControllerTypes.Contains(typeInfo);
     }
 }
diff --git a/test/TestBuildingBlocks/TestableStartup.cs b/test/TestBuildingBlocks/TestableStartup.cs
index 541d9f778a..a54a317fed 100644
--- a/test/TestBuildingBlocks/TestableStartup.cs
+++ b/test/TestBuildingBlocks/TestableStartup.cs
@@ -5,30 +5,29 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+public class TestableStartup<TDbContext>
+    where TDbContext : DbContext
 {
-    public class TestableStartup<TDbContext>
-        where TDbContext : DbContext
+    public virtual void ConfigureServices(IServiceCollection services)
     {
-        public virtual void ConfigureServices(IServiceCollection services)
-        {
-            IMvcCoreBuilder mvcBuilder = services.AddMvcCore(options => options.MaxModelValidationErrors = 3);
+        IMvcCoreBuilder mvcBuilder = services.AddMvcCore(options => options.MaxModelValidationErrors = 3);
 
-            services.AddJsonApi<TDbContext>(SetJsonApiOptions, mvcBuilder: mvcBuilder);
-        }
+        services.AddJsonApi<TDbContext>(SetJsonApiOptions, mvcBuilder: mvcBuilder);
+    }
 
-        protected virtual void SetJsonApiOptions(JsonApiOptions options)
-        {
-            options.IncludeExceptionStackTraceInErrors = true;
-            options.IncludeRequestBodyInErrors = true;
-            options.SerializerOptions.WriteIndented = true;
-        }
+    protected virtual void SetJsonApiOptions(JsonApiOptions options)
+    {
+        options.IncludeExceptionStackTraceInErrors = true;
+        options.IncludeRequestBodyInErrors = true;
+        options.SerializerOptions.WriteIndented = true;
+    }
 
-        public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)
-        {
-            app.UseRouting();
-            app.UseJsonApi();
-            app.UseEndpoints(endpoints => endpoints.MapControllers());
-        }
+    public virtual void Configure(IApplicationBuilder app, IWebHostEnvironment environment, ILoggerFactory loggerFactory)
+    {
+        app.UseRouting();
+        app.UseJsonApi();
+        app.UseEndpoints(endpoints => endpoints.MapControllers());
     }
 }
diff --git a/test/TestBuildingBlocks/Unknown.cs b/test/TestBuildingBlocks/Unknown.cs
index 58ed6da14a..a777435228 100644
--- a/test/TestBuildingBlocks/Unknown.cs
+++ b/test/TestBuildingBlocks/Unknown.cs
@@ -1,87 +1,85 @@
-using System;
 using JsonApiDotNetCore.Resources;
 
 // ReSharper disable MemberCanBeInternal
 // ReSharper disable MemberCanBePrivate.Global
 #pragma warning disable AV1008 // Class should not be static
 
-namespace TestBuildingBlocks
+namespace TestBuildingBlocks;
+
+public static class Unknown
 {
-    public static class Unknown
+    public const string ResourceType = "doesNotExist1";
+    public const string Relationship = "doesNotExist2";
+    public const string LocalId = "doesNotExist3";
+
+    public static class TypedId
     {
-        public const string ResourceType = "doesNotExist1";
-        public const string Relationship = "doesNotExist2";
-        public const string LocalId = "doesNotExist3";
+        public const short Int16 = short.MaxValue;
+        public const short AltInt16 = Int16 - 1;
 
-        public static class TypedId
-        {
-            public const short Int16 = short.MaxValue;
-            public const short AltInt16 = Int16 - 1;
+        public const int Int32 = int.MaxValue;
+        public const int AltInt32 = Int32 - 1;
+
+        public const long Int64 = long.MaxValue;
+        public const long AltInt64 = Int64 - 1;
 
-            public const int Int32 = int.MaxValue;
-            public const int AltInt32 = Int32 - 1;
+        public static readonly Guid Guid = Guid.Parse("FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF");
+        public static readonly Guid AltGuid = Guid.Parse("EEEEEEEE-EEEE-EEEE-EEEE-EEEEEEEEEEEE");
+    }
+
+    public static class StringId
+    {
+        public static readonly string Int16 = TypedId.Int16.ToString();
+        public static readonly string AltInt16 = TypedId.AltInt16.ToString();
 
-            public const long Int64 = long.MaxValue;
-            public const long AltInt64 = Int64 - 1;
+        public static readonly string Int32 = TypedId.Int32.ToString();
+        public static readonly string AltInt32 = TypedId.AltInt32.ToString();
 
-            public static readonly Guid Guid = Guid.Parse("FFFFFFFF-FFFF-FFFF-FFFF-FFFFFFFFFFFF");
-            public static readonly Guid AltGuid = Guid.Parse("EEEEEEEE-EEEE-EEEE-EEEE-EEEEEEEEEEEE");
-        }
+        public static readonly string Int64 = TypedId.Int64.ToString();
+        public static readonly string AltInt64 = TypedId.AltInt64.ToString();
 
-        public static class StringId
+        public static readonly string Guid = TypedId.Guid.ToString();
+        public static readonly string AltGuid = TypedId.AltGuid.ToString();
+
+        public static string For<TResource, TId>()
+            where TResource : IIdentifiable<TId>
         {
-            public static readonly string Int16 = TypedId.Int16.ToString();
-            public static readonly string AltInt16 = TypedId.AltInt16.ToString();
+            return InnerFor<TResource, TId>(false);
+        }
 
-            public static readonly string Int32 = TypedId.Int32.ToString();
-            public static readonly string AltInt32 = TypedId.AltInt32.ToString();
+        public static string AltFor<TResource, TId>()
+            where TResource : IIdentifiable<TId>
+        {
+            return InnerFor<TResource, TId>(true);
+        }
 
-            public static readonly string Int64 = TypedId.Int64.ToString();
-            public static readonly string AltInt64 = TypedId.AltInt64.ToString();
+        private static string InnerFor<TResource, TId>(bool isAlt)
+            where TResource : IIdentifiable<TId>
+        {
+            Type type = typeof(TId);
 
-            public static readonly string Guid = TypedId.Guid.ToString();
-            public static readonly string AltGuid = TypedId.AltGuid.ToString();
+            if (type == typeof(short))
+            {
+                return isAlt ? AltInt16 : Int16;
+            }
 
-            public static string For<TResource, TId>()
-                where TResource : IIdentifiable<TId>
+            if (type == typeof(int))
             {
-                return InnerFor<TResource, TId>(false);
+                return isAlt ? AltInt32 : Int32;
             }
 
-            public static string AltFor<TResource, TId>()
-                where TResource : IIdentifiable<TId>
+            if (type == typeof(long))
             {
-                return InnerFor<TResource, TId>(true);
+                return isAlt ? AltInt64 : Int64;
             }
 
-            private static string InnerFor<TResource, TId>(bool isAlt)
-                where TResource : IIdentifiable<TId>
+            if (type == typeof(Guid))
             {
-                Type type = typeof(TId);
-
-                if (type == typeof(short))
-                {
-                    return isAlt ? AltInt16 : Int16;
-                }
-
-                if (type == typeof(int))
-                {
-                    return isAlt ? AltInt32 : Int32;
-                }
-
-                if (type == typeof(long))
-                {
-                    return isAlt ? AltInt64 : Int64;
-                }
-
-                if (type == typeof(Guid))
-                {
-                    return isAlt ? AltGuid : Guid;
-                }
-
-                throw new NotSupportedException(
-                    $"Unsupported '{nameof(Identifiable<object>.Id)}' property of type '{type}' on resource type '{typeof(TResource).Name}'.");
+                return isAlt ? AltGuid : Guid;
             }
+
+            throw new NotSupportedException(
+                $"Unsupported '{nameof(Identifiable<object>.Id)}' property of type '{type}' on resource type '{typeof(TResource).Name}'.");
         }
     }
 }
diff --git a/test/UnitTests/Extensions/ServiceCollectionExtensionsTests.cs b/test/UnitTests/Extensions/ServiceCollectionExtensionsTests.cs
index 0f5e5edfb1..c1e2e6efcf 100644
--- a/test/UnitTests/Extensions/ServiceCollectionExtensionsTests.cs
+++ b/test/UnitTests/Extensions/ServiceCollectionExtensionsTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
-using System.Threading;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
@@ -18,596 +14,592 @@
 using Microsoft.Extensions.DependencyInjection;
 using Xunit;
 
-namespace UnitTests.Extensions
+namespace UnitTests.Extensions;
+
+public sealed class ServiceCollectionExtensionsTests
 {
-    public sealed class ServiceCollectionExtensionsTests
+    [Fact]
+    public void RegisterResource_DeviatingDbContextPropertyName_RegistersCorrectly()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+        services.AddLogging();
+        services.AddDbContext<TestDbContext>(options => options.UseInMemoryDatabase("UnitTestDb"));
+
+        // Act
+        services.AddJsonApi<TestDbContext>();
+
+        // Assert
+        ServiceProvider provider = services.BuildServiceProvider();
+        var resourceGraph = provider.GetRequiredService<IResourceGraph>();
+        ResourceType personType = resourceGraph.GetResourceType<Person>();
+
+        personType.PublicName.Should().Be("people");
+    }
+
+    [Fact]
+    public void AddResourceService_Registers_Service_Interfaces_Of_Int32()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+
+        // Act
+        services.AddResourceService<ResourceServiceOfInt32>();
+
+        // Assert
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        provider.GetRequiredService(typeof(IResourceService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
+        provider.GetRequiredService(typeof(IResourceCommandService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
+        provider.GetRequiredService(typeof(IResourceQueryService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
+        provider.GetRequiredService(typeof(IGetAllService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
+        provider.GetRequiredService(typeof(IGetByIdService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
+        provider.GetRequiredService(typeof(IGetSecondaryService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
+        provider.GetRequiredService(typeof(IGetRelationshipService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
+        provider.GetRequiredService(typeof(ICreateService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
+        provider.GetRequiredService(typeof(IUpdateService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
+        provider.GetRequiredService(typeof(IDeleteService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
+    }
+
+    [Fact]
+    public void AddResourceService_Registers_Service_Interfaces_Of_Guid()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+
+        // Act
+        services.AddResourceService<ResourceServiceOfGuid>();
+
+        // Assert
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        provider.GetRequiredService(typeof(IResourceService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
+        provider.GetRequiredService(typeof(IResourceCommandService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
+        provider.GetRequiredService(typeof(IResourceQueryService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
+        provider.GetRequiredService(typeof(IGetAllService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
+        provider.GetRequiredService(typeof(IGetByIdService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
+        provider.GetRequiredService(typeof(IGetSecondaryService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
+        provider.GetRequiredService(typeof(IGetRelationshipService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
+        provider.GetRequiredService(typeof(ICreateService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
+        provider.GetRequiredService(typeof(IUpdateService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
+        provider.GetRequiredService(typeof(IDeleteService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
+    }
+
+    [Fact]
+    public void AddResourceService_Throws_If_Type_Does_Not_Implement_Any_Interfaces()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+
+        // Act
+        Action action = () => services.AddResourceService<int>();
+
+        // Assert
+        action.Should().ThrowExactly<InvalidConfigurationException>();
+    }
+
+    [Fact]
+    public void AddResourceRepository_Registers_Repository_Interfaces_Of_Int32()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+
+        // Act
+        services.AddResourceRepository<ResourceRepositoryOfInt32>();
+
+        // Assert
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        provider.GetRequiredService(typeof(IResourceRepository<ResourceOfInt32, int>)).Should().BeOfType<ResourceRepositoryOfInt32>();
+        provider.GetRequiredService(typeof(IResourceReadRepository<ResourceOfInt32, int>)).Should().BeOfType<ResourceRepositoryOfInt32>();
+        provider.GetRequiredService(typeof(IResourceWriteRepository<ResourceOfInt32, int>)).Should().BeOfType<ResourceRepositoryOfInt32>();
+    }
+
+    [Fact]
+    public void AddResourceRepository_Registers_Repository_Interfaces_Of_Guid()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+
+        // Act
+        services.AddResourceRepository<ResourceRepositoryOfGuid>();
+
+        // Assert
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        provider.GetRequiredService(typeof(IResourceRepository<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceRepositoryOfGuid>();
+        provider.GetRequiredService(typeof(IResourceReadRepository<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceRepositoryOfGuid>();
+        provider.GetRequiredService(typeof(IResourceWriteRepository<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceRepositoryOfGuid>();
+    }
+
+    [Fact]
+    public void AddResourceDefinition_Registers_Definition_Interface_Of_Int32()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+
+        // Act
+        services.AddResourceDefinition<ResourceDefinitionOfInt32>();
+
+        // Assert
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        provider.GetRequiredService(typeof(IResourceDefinition<ResourceOfInt32, int>)).Should().BeOfType<ResourceDefinitionOfInt32>();
+    }
+
+    [Fact]
+    public void AddResourceDefinition_Registers_Definition_Interface_Of_Guid()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+
+        // Act
+        services.AddResourceDefinition<ResourceDefinitionOfGuid>();
+
+        // Assert
+        ServiceProvider provider = services.BuildServiceProvider();
+
+        provider.GetRequiredService(typeof(IResourceDefinition<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceDefinitionOfGuid>();
+    }
+
+    [Fact]
+    public void AddJsonApi_With_Context_Uses_Resource_Type_Name_If_NoOtherSpecified()
+    {
+        // Arrange
+        var services = new ServiceCollection();
+        services.AddLogging();
+        services.AddDbContext<TestDbContext>(options => options.UseInMemoryDatabase(Guid.NewGuid().ToString()));
+
+        // Act
+        services.AddJsonApi<TestDbContext>();
+
+        // Assert
+        ServiceProvider provider = services.BuildServiceProvider();
+        var resourceGraph = provider.GetRequiredService<IResourceGraph>();
+        ResourceType resourceType = resourceGraph.GetResourceType(typeof(ResourceOfInt32));
+
+        resourceType.PublicName.Should().Be("resourceOfInt32s");
+    }
+
+    private sealed class ResourceOfInt32 : Identifiable<int>
+    {
+    }
+
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class ResourceOfGuid : Identifiable<Guid>
+    {
+    }
+
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class ResourceServiceOfInt32 : IResourceService<ResourceOfInt32, int>
+    {
+        public Task<IReadOnlyCollection<ResourceOfInt32>> GetAsync(CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<ResourceOfInt32> GetAsync(int id, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<object?> GetSecondaryAsync(int id, string relationshipName, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<object?> GetRelationshipAsync(int id, string relationshipName, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<ResourceOfInt32?> CreateAsync(ResourceOfInt32 resource, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task AddToToManyRelationshipAsync(int leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<ResourceOfInt32?> UpdateAsync(int id, ResourceOfInt32 resource, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task SetRelationshipAsync(int leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task DeleteAsync(int id, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task RemoveFromToManyRelationshipAsync(int leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
+            CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class ResourceServiceOfGuid : IResourceService<ResourceOfGuid, Guid>
+    {
+        public Task<IReadOnlyCollection<ResourceOfGuid>> GetAsync(CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<ResourceOfGuid> GetAsync(Guid id, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<object?> GetSecondaryAsync(Guid id, string relationshipName, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<object?> GetRelationshipAsync(Guid id, string relationshipName, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<ResourceOfGuid?> CreateAsync(ResourceOfGuid resource, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task AddToToManyRelationshipAsync(Guid leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
+            CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<ResourceOfGuid?> UpdateAsync(Guid id, ResourceOfGuid resource, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task SetRelationshipAsync(Guid leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task DeleteAsync(Guid id, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task RemoveFromToManyRelationshipAsync(Guid leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
+            CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class ResourceRepositoryOfInt32 : IResourceRepository<ResourceOfInt32, int>
     {
-        [Fact]
-        public void RegisterResource_DeviatingDbContextPropertyName_RegistersCorrectly()
+        public Task<IReadOnlyCollection<ResourceOfInt32>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
         {
-            // Arrange
-            var services = new ServiceCollection();
-            services.AddLogging();
-            services.AddDbContext<TestDbContext>(options => options.UseInMemoryDatabase("UnitTestDb"));
+            throw new NotImplementedException();
+        }
 
-            // Act
-            services.AddJsonApi<TestDbContext>();
+        public Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            // Assert
-            ServiceProvider provider = services.BuildServiceProvider();
-            var resourceGraph = provider.GetRequiredService<IResourceGraph>();
-            ResourceType personType = resourceGraph.GetResourceType<Person>();
+        public Task<ResourceOfInt32> GetForCreateAsync(int id, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            personType.PublicName.Should().Be("people");
+        public Task CreateAsync(ResourceOfInt32 resourceFromRequest, ResourceOfInt32 resourceForDatabase, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
         }
 
-        [Fact]
-        public void AddResourceService_Registers_Service_Interfaces_Of_Int32()
+        public Task<ResourceOfInt32?> GetForUpdateAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
         {
-            // Arrange
-            var services = new ServiceCollection();
+            throw new NotImplementedException();
+        }
 
-            // Act
-            services.AddResourceService<ResourceServiceOfInt32>();
+        public Task UpdateAsync(ResourceOfInt32 resourceFromRequest, ResourceOfInt32 resourceFromDatabase, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            // Assert
-            ServiceProvider provider = services.BuildServiceProvider();
+        public Task DeleteAsync(int id, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            provider.GetRequiredService(typeof(IResourceService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
-            provider.GetRequiredService(typeof(IResourceCommandService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
-            provider.GetRequiredService(typeof(IResourceQueryService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
-            provider.GetRequiredService(typeof(IGetAllService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
-            provider.GetRequiredService(typeof(IGetByIdService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
-            provider.GetRequiredService(typeof(IGetSecondaryService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
-            provider.GetRequiredService(typeof(IGetRelationshipService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
-            provider.GetRequiredService(typeof(ICreateService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
-            provider.GetRequiredService(typeof(IUpdateService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
-            provider.GetRequiredService(typeof(IDeleteService<ResourceOfInt32, int>)).Should().BeOfType<ResourceServiceOfInt32>();
+        public Task SetRelationshipAsync(ResourceOfInt32 leftResource, object? rightValue, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
         }
 
-        [Fact]
-        public void AddResourceService_Registers_Service_Interfaces_Of_Guid()
+        public Task AddToToManyRelationshipAsync(int leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
         {
-            // Arrange
-            var services = new ServiceCollection();
+            throw new NotImplementedException();
+        }
 
-            // Act
-            services.AddResourceService<ResourceServiceOfGuid>();
+        public Task RemoveFromToManyRelationshipAsync(ResourceOfInt32 leftResource, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class ResourceRepositoryOfGuid : IResourceRepository<ResourceOfGuid, Guid>
+    {
+        public Task<IReadOnlyCollection<ResourceOfGuid>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task<ResourceOfGuid> GetForCreateAsync(Guid id, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Task CreateAsync(ResourceOfGuid resourceFromRequest, ResourceOfGuid resourceForDatabase, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            // Assert
-            ServiceProvider provider = services.BuildServiceProvider();
+        public Task<ResourceOfGuid?> GetForUpdateAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            provider.GetRequiredService(typeof(IResourceService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
-            provider.GetRequiredService(typeof(IResourceCommandService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
-            provider.GetRequiredService(typeof(IResourceQueryService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
-            provider.GetRequiredService(typeof(IGetAllService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
-            provider.GetRequiredService(typeof(IGetByIdService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
-            provider.GetRequiredService(typeof(IGetSecondaryService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
-            provider.GetRequiredService(typeof(IGetRelationshipService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
-            provider.GetRequiredService(typeof(ICreateService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
-            provider.GetRequiredService(typeof(IUpdateService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
-            provider.GetRequiredService(typeof(IDeleteService<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceServiceOfGuid>();
+        public Task UpdateAsync(ResourceOfGuid resourceFromRequest, ResourceOfGuid resourceFromDatabase, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
         }
 
-        [Fact]
-        public void AddResourceService_Throws_If_Type_Does_Not_Implement_Any_Interfaces()
+        public Task DeleteAsync(Guid id, CancellationToken cancellationToken)
         {
-            // Arrange
-            var services = new ServiceCollection();
+            throw new NotImplementedException();
+        }
 
-            // Act
-            Action action = () => services.AddResourceService<int>();
+        public Task SetRelationshipAsync(ResourceOfGuid leftResource, object? rightValue, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            // Assert
-            action.Should().ThrowExactly<InvalidConfigurationException>();
+        public Task AddToToManyRelationshipAsync(Guid leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
         }
 
-        [Fact]
-        public void AddResourceRepository_Registers_Repository_Interfaces_Of_Int32()
+        public Task RemoveFromToManyRelationshipAsync(ResourceOfGuid leftResource, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
         {
-            // Arrange
-            var services = new ServiceCollection();
+            throw new NotImplementedException();
+        }
+    }
 
-            // Act
-            services.AddResourceRepository<ResourceRepositoryOfInt32>();
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class ResourceDefinitionOfInt32 : IResourceDefinition<ResourceOfInt32, int>
+    {
+        public IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes)
+        {
+            throw new NotImplementedException();
+        }
 
-            // Assert
-            ServiceProvider provider = services.BuildServiceProvider();
+        public FilterExpression OnApplyFilter(FilterExpression? existingFilter)
+        {
+            throw new NotImplementedException();
+        }
 
-            provider.GetRequiredService(typeof(IResourceRepository<ResourceOfInt32, int>)).Should().BeOfType<ResourceRepositoryOfInt32>();
-            provider.GetRequiredService(typeof(IResourceReadRepository<ResourceOfInt32, int>)).Should().BeOfType<ResourceRepositoryOfInt32>();
-            provider.GetRequiredService(typeof(IResourceWriteRepository<ResourceOfInt32, int>)).Should().BeOfType<ResourceRepositoryOfInt32>();
+        public SortExpression OnApplySort(SortExpression? existingSort)
+        {
+            throw new NotImplementedException();
         }
 
-        [Fact]
-        public void AddResourceRepository_Registers_Repository_Interfaces_Of_Guid()
+        public PaginationExpression OnApplyPagination(PaginationExpression? existingPagination)
         {
-            // Arrange
-            var services = new ServiceCollection();
+            throw new NotImplementedException();
+        }
 
-            // Act
-            services.AddResourceRepository<ResourceRepositoryOfGuid>();
+        public SparseFieldSetExpression OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet)
+        {
+            throw new NotImplementedException();
+        }
 
-            // Assert
-            ServiceProvider provider = services.BuildServiceProvider();
+        public QueryStringParameterHandlers<ResourceOfInt32> OnRegisterQueryableHandlersForQueryStringParameters()
+        {
+            throw new NotImplementedException();
+        }
 
-            provider.GetRequiredService(typeof(IResourceRepository<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceRepositoryOfGuid>();
-            provider.GetRequiredService(typeof(IResourceReadRepository<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceRepositoryOfGuid>();
-            provider.GetRequiredService(typeof(IResourceWriteRepository<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceRepositoryOfGuid>();
+        public IDictionary<string, object?> GetMeta(ResourceOfInt32 resource)
+        {
+            throw new NotImplementedException();
         }
 
-        [Fact]
-        public void AddResourceDefinition_Registers_Definition_Interface_Of_Int32()
+        public Task OnPrepareWriteAsync(ResourceOfInt32 resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
         {
-            // Arrange
-            var services = new ServiceCollection();
+            throw new NotImplementedException();
+        }
 
-            // Act
-            services.AddResourceDefinition<ResourceDefinitionOfInt32>();
+        public Task<IIdentifiable?> OnSetToOneRelationshipAsync(ResourceOfInt32 leftResource, HasOneAttribute hasOneRelationship,
+            IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            // Assert
-            ServiceProvider provider = services.BuildServiceProvider();
+        public Task OnSetToManyRelationshipAsync(ResourceOfInt32 leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            provider.GetRequiredService(typeof(IResourceDefinition<ResourceOfInt32, int>)).Should().BeOfType<ResourceDefinitionOfInt32>();
+        public Task OnAddToRelationshipAsync(int leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
         }
 
-        [Fact]
-        public void AddResourceDefinition_Registers_Definition_Interface_Of_Guid()
+        public Task OnRemoveFromRelationshipAsync(ResourceOfInt32 leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            CancellationToken cancellationToken)
         {
-            // Arrange
-            var services = new ServiceCollection();
+            throw new NotImplementedException();
+        }
 
-            // Act
-            services.AddResourceDefinition<ResourceDefinitionOfGuid>();
+        public Task OnWritingAsync(ResourceOfInt32 resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            // Assert
-            ServiceProvider provider = services.BuildServiceProvider();
+        public Task OnWriteSucceededAsync(ResourceOfInt32 resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            provider.GetRequiredService(typeof(IResourceDefinition<ResourceOfGuid, Guid>)).Should().BeOfType<ResourceDefinitionOfGuid>();
+        public void OnDeserialize(ResourceOfInt32 resource)
+        {
+            throw new NotImplementedException();
         }
 
-        [Fact]
-        public void AddJsonApi_With_Context_Uses_Resource_Type_Name_If_NoOtherSpecified()
+        public void OnSerialize(ResourceOfInt32 resource)
         {
-            // Arrange
-            var services = new ServiceCollection();
-            services.AddLogging();
-            services.AddDbContext<TestDbContext>(options => options.UseInMemoryDatabase(Guid.NewGuid().ToString()));
+            throw new NotImplementedException();
+        }
+    }
 
-            // Act
-            services.AddJsonApi<TestDbContext>();
+    [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
+    private sealed class ResourceDefinitionOfGuid : IResourceDefinition<ResourceOfGuid, Guid>
+    {
+        public IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes)
+        {
+            throw new NotImplementedException();
+        }
 
-            // Assert
-            ServiceProvider provider = services.BuildServiceProvider();
-            var resourceGraph = provider.GetRequiredService<IResourceGraph>();
-            ResourceType resourceType = resourceGraph.GetResourceType(typeof(ResourceOfInt32));
+        public FilterExpression OnApplyFilter(FilterExpression? existingFilter)
+        {
+            throw new NotImplementedException();
+        }
 
-            resourceType.PublicName.Should().Be("resourceOfInt32s");
+        public SortExpression OnApplySort(SortExpression? existingSort)
+        {
+            throw new NotImplementedException();
         }
 
-        private sealed class ResourceOfInt32 : Identifiable<int>
+        public PaginationExpression OnApplyPagination(PaginationExpression? existingPagination)
         {
+            throw new NotImplementedException();
         }
 
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class ResourceOfGuid : Identifiable<Guid>
+        public SparseFieldSetExpression OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet)
         {
+            throw new NotImplementedException();
         }
 
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class ResourceServiceOfInt32 : IResourceService<ResourceOfInt32, int>
+        public QueryStringParameterHandlers<ResourceOfGuid> OnRegisterQueryableHandlersForQueryStringParameters()
         {
-            public Task<IReadOnlyCollection<ResourceOfInt32>> GetAsync(CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
+        }
 
-            public Task<ResourceOfInt32> GetAsync(int id, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
+        public IDictionary<string, object?> GetMeta(ResourceOfGuid resource)
+        {
+            throw new NotImplementedException();
+        }
 
-            public Task<object?> GetSecondaryAsync(int id, string relationshipName, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
+        public Task OnPrepareWriteAsync(ResourceOfGuid resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            public Task<object?> GetRelationshipAsync(int id, string relationshipName, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
+        public Task<IIdentifiable?> OnSetToOneRelationshipAsync(ResourceOfGuid leftResource, HasOneAttribute hasOneRelationship, IIdentifiable? rightResourceId,
+            WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            public Task<ResourceOfInt32?> CreateAsync(ResourceOfInt32 resource, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
+        public Task OnSetToManyRelationshipAsync(ResourceOfGuid leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            public Task AddToToManyRelationshipAsync(int leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
+        public Task OnAddToRelationshipAsync(Guid leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            public Task<ResourceOfInt32?> UpdateAsync(int id, ResourceOfInt32 resource, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
+        public Task OnRemoveFromRelationshipAsync(ResourceOfGuid leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
+            CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            public Task SetRelationshipAsync(int leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
+        public Task OnWritingAsync(ResourceOfGuid resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            public Task DeleteAsync(int id, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
+        public Task OnWriteSucceededAsync(ResourceOfGuid resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
 
-            public Task RemoveFromToManyRelationshipAsync(int leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
+        public void OnDeserialize(ResourceOfGuid resource)
+        {
+            throw new NotImplementedException();
         }
 
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class ResourceServiceOfGuid : IResourceService<ResourceOfGuid, Guid>
+        public void OnSerialize(ResourceOfGuid resource)
         {
-            public Task<IReadOnlyCollection<ResourceOfGuid>> GetAsync(CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
+            throw new NotImplementedException();
+        }
+    }
 
-            public Task<ResourceOfGuid> GetAsync(Guid id, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class TestDbContext : DbContext
+    {
+        public DbSet<ResourceOfInt32> ResourcesOfInt32 => Set<ResourceOfInt32>();
+        public DbSet<ResourceOfGuid> ResourcesOfGuid => Set<ResourceOfGuid>();
+        public DbSet<Person> People => Set<Person>();
 
-            public Task<object?> GetSecondaryAsync(Guid id, string relationshipName, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<object?> GetRelationshipAsync(Guid id, string relationshipName, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<ResourceOfGuid?> CreateAsync(ResourceOfGuid resource, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task AddToToManyRelationshipAsync(Guid leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<ResourceOfGuid?> UpdateAsync(Guid id, ResourceOfGuid resource, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task SetRelationshipAsync(Guid leftId, string relationshipName, object? rightValue, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task DeleteAsync(Guid id, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task RemoveFromToManyRelationshipAsync(Guid leftId, string relationshipName, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class ResourceRepositoryOfInt32 : IResourceRepository<ResourceOfInt32, int>
-        {
-            public Task<IReadOnlyCollection<ResourceOfInt32>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<ResourceOfInt32> GetForCreateAsync(int id, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task CreateAsync(ResourceOfInt32 resourceFromRequest, ResourceOfInt32 resourceForDatabase, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<ResourceOfInt32?> GetForUpdateAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task UpdateAsync(ResourceOfInt32 resourceFromRequest, ResourceOfInt32 resourceFromDatabase, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task DeleteAsync(int id, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task SetRelationshipAsync(ResourceOfInt32 leftResource, object? rightValue, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task AddToToManyRelationshipAsync(int leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task RemoveFromToManyRelationshipAsync(ResourceOfInt32 leftResource, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class ResourceRepositoryOfGuid : IResourceRepository<ResourceOfGuid, Guid>
-        {
-            public Task<IReadOnlyCollection<ResourceOfGuid>> GetAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<int> CountAsync(FilterExpression? filter, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<ResourceOfGuid> GetForCreateAsync(Guid id, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task CreateAsync(ResourceOfGuid resourceFromRequest, ResourceOfGuid resourceForDatabase, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<ResourceOfGuid?> GetForUpdateAsync(QueryLayer queryLayer, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task UpdateAsync(ResourceOfGuid resourceFromRequest, ResourceOfGuid resourceFromDatabase, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task DeleteAsync(Guid id, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task SetRelationshipAsync(ResourceOfGuid leftResource, object? rightValue, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task AddToToManyRelationshipAsync(Guid leftId, ISet<IIdentifiable> rightResourceIds, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task RemoveFromToManyRelationshipAsync(ResourceOfGuid leftResource, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class ResourceDefinitionOfInt32 : IResourceDefinition<ResourceOfInt32, int>
-        {
-            public IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes)
-            {
-                throw new NotImplementedException();
-            }
-
-            public FilterExpression OnApplyFilter(FilterExpression? existingFilter)
-            {
-                throw new NotImplementedException();
-            }
-
-            public SortExpression OnApplySort(SortExpression? existingSort)
-            {
-                throw new NotImplementedException();
-            }
-
-            public PaginationExpression OnApplyPagination(PaginationExpression? existingPagination)
-            {
-                throw new NotImplementedException();
-            }
-
-            public SparseFieldSetExpression OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet)
-            {
-                throw new NotImplementedException();
-            }
-
-            public QueryStringParameterHandlers<ResourceOfInt32> OnRegisterQueryableHandlersForQueryStringParameters()
-            {
-                throw new NotImplementedException();
-            }
-
-            public IDictionary<string, object?> GetMeta(ResourceOfInt32 resource)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task OnPrepareWriteAsync(ResourceOfInt32 resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<IIdentifiable?> OnSetToOneRelationshipAsync(ResourceOfInt32 leftResource, HasOneAttribute hasOneRelationship,
-                IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task OnSetToManyRelationshipAsync(ResourceOfInt32 leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-                WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task OnAddToRelationshipAsync(int leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task OnRemoveFromRelationshipAsync(ResourceOfInt32 leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task OnWritingAsync(ResourceOfInt32 resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task OnWriteSucceededAsync(ResourceOfInt32 resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void OnDeserialize(ResourceOfInt32 resource)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void OnSerialize(ResourceOfInt32 resource)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        [UsedImplicitly(ImplicitUseKindFlags.InstantiatedNoFixedConstructorSignature)]
-        private sealed class ResourceDefinitionOfGuid : IResourceDefinition<ResourceOfGuid, Guid>
-        {
-            public IImmutableSet<IncludeElementExpression> OnApplyIncludes(IImmutableSet<IncludeElementExpression> existingIncludes)
-            {
-                throw new NotImplementedException();
-            }
-
-            public FilterExpression OnApplyFilter(FilterExpression? existingFilter)
-            {
-                throw new NotImplementedException();
-            }
-
-            public SortExpression OnApplySort(SortExpression? existingSort)
-            {
-                throw new NotImplementedException();
-            }
-
-            public PaginationExpression OnApplyPagination(PaginationExpression? existingPagination)
-            {
-                throw new NotImplementedException();
-            }
-
-            public SparseFieldSetExpression OnApplySparseFieldSet(SparseFieldSetExpression? existingSparseFieldSet)
-            {
-                throw new NotImplementedException();
-            }
-
-            public QueryStringParameterHandlers<ResourceOfGuid> OnRegisterQueryableHandlersForQueryStringParameters()
-            {
-                throw new NotImplementedException();
-            }
-
-            public IDictionary<string, object?> GetMeta(ResourceOfGuid resource)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task OnPrepareWriteAsync(ResourceOfGuid resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task<IIdentifiable?> OnSetToOneRelationshipAsync(ResourceOfGuid leftResource, HasOneAttribute hasOneRelationship,
-                IIdentifiable? rightResourceId, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task OnSetToManyRelationshipAsync(ResourceOfGuid leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-                WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task OnAddToRelationshipAsync(Guid leftResourceId, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task OnRemoveFromRelationshipAsync(ResourceOfGuid leftResource, HasManyAttribute hasManyRelationship, ISet<IIdentifiable> rightResourceIds,
-                CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task OnWritingAsync(ResourceOfGuid resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public Task OnWriteSucceededAsync(ResourceOfGuid resource, WriteOperationKind writeOperation, CancellationToken cancellationToken)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void OnDeserialize(ResourceOfGuid resource)
-            {
-                throw new NotImplementedException();
-            }
-
-            public void OnSerialize(ResourceOfGuid resource)
-            {
-                throw new NotImplementedException();
-            }
-        }
-
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class TestDbContext : DbContext
-        {
-            public DbSet<ResourceOfInt32> ResourcesOfInt32 => Set<ResourceOfInt32>();
-            public DbSet<ResourceOfGuid> ResourcesOfGuid => Set<ResourceOfGuid>();
-            public DbSet<Person> People => Set<Person>();
-
-            public TestDbContext(DbContextOptions<TestDbContext> options)
-                : base(options)
-            {
-            }
-        }
-
-        [UsedImplicitly(ImplicitUseKindFlags.Access)]
-        private sealed class Person : Identifiable<int>
+        public TestDbContext(DbContextOptions<TestDbContext> options)
+            : base(options)
         {
         }
     }
+
+    [UsedImplicitly(ImplicitUseKindFlags.Access)]
+    private sealed class Person : Identifiable<int>
+    {
+    }
 }
diff --git a/test/UnitTests/Graph/BaseType.cs b/test/UnitTests/Graph/BaseType.cs
index 5b901cabcd..8fdbe4f4ae 100644
--- a/test/UnitTests/Graph/BaseType.cs
+++ b/test/UnitTests/Graph/BaseType.cs
@@ -1,8 +1,7 @@
 // ReSharper disable UnusedTypeParameter
 
-namespace UnitTests.Graph
+namespace UnitTests.Graph;
+
+internal class BaseType<T>
 {
-    internal class BaseType<T>
-    {
-    }
 }
diff --git a/test/UnitTests/Graph/DerivedType.cs b/test/UnitTests/Graph/DerivedType.cs
index badc401e21..4453c7b56a 100644
--- a/test/UnitTests/Graph/DerivedType.cs
+++ b/test/UnitTests/Graph/DerivedType.cs
@@ -1,6 +1,5 @@
-namespace UnitTests.Graph
+namespace UnitTests.Graph;
+
+internal sealed class DerivedType : BaseType<int>
 {
-    internal sealed class DerivedType : BaseType<int>
-    {
-    }
 }
diff --git a/test/UnitTests/Graph/IGenericInterface.cs b/test/UnitTests/Graph/IGenericInterface.cs
index 9b2e6a8f78..c9fdd83e18 100644
--- a/test/UnitTests/Graph/IGenericInterface.cs
+++ b/test/UnitTests/Graph/IGenericInterface.cs
@@ -1,8 +1,7 @@
 // ReSharper disable UnusedTypeParameter
 
-namespace UnitTests.Graph
+namespace UnitTests.Graph;
+
+internal interface IGenericInterface<T>
 {
-    internal interface IGenericInterface<T>
-    {
-    }
 }
diff --git a/test/UnitTests/Graph/Implementation.cs b/test/UnitTests/Graph/Implementation.cs
index 5709063009..5e851f4afe 100644
--- a/test/UnitTests/Graph/Implementation.cs
+++ b/test/UnitTests/Graph/Implementation.cs
@@ -1,6 +1,5 @@
-namespace UnitTests.Graph
+namespace UnitTests.Graph;
+
+internal sealed class Implementation : IGenericInterface<int>
 {
-    internal sealed class Implementation : IGenericInterface<int>
-    {
-    }
 }
diff --git a/test/UnitTests/Graph/Model.cs b/test/UnitTests/Graph/Model.cs
index 8144871b2e..ad9608a946 100644
--- a/test/UnitTests/Graph/Model.cs
+++ b/test/UnitTests/Graph/Model.cs
@@ -1,8 +1,7 @@
 using JsonApiDotNetCore.Resources;
 
-namespace UnitTests.Graph
+namespace UnitTests.Graph;
+
+internal sealed class Model : Identifiable<int>
 {
-    internal sealed class Model : Identifiable<int>
-    {
-    }
 }
diff --git a/test/UnitTests/Graph/ResourceDescriptorAssemblyCacheTests.cs b/test/UnitTests/Graph/ResourceDescriptorAssemblyCacheTests.cs
index 1c5c6d21b8..8f30b584e4 100644
--- a/test/UnitTests/Graph/ResourceDescriptorAssemblyCacheTests.cs
+++ b/test/UnitTests/Graph/ResourceDescriptorAssemblyCacheTests.cs
@@ -1,48 +1,44 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Resources;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace UnitTests.Graph
+namespace UnitTests.Graph;
+
+public sealed class ResourceDescriptorAssemblyCacheTests
 {
-    public sealed class ResourceDescriptorAssemblyCacheTests
+    [Fact]
+    public void GetResourceDescriptorsPerAssembly_Locates_Identifiable_Resource()
+    {
+        // Arrange
+        Type resourceClrType = typeof(Model);
+
+        var assemblyCache = new ResourceDescriptorAssemblyCache();
+        assemblyCache.RegisterAssembly(resourceClrType.Assembly);
+
+        // Act
+        IReadOnlyCollection<ResourceDescriptor> descriptors = assemblyCache.GetResourceDescriptors();
+
+        // Assert
+        descriptors.ShouldNotBeEmpty();
+        descriptors.Should().ContainSingle(descriptor => descriptor.ResourceClrType == resourceClrType);
+    }
+
+    [Fact]
+    public void GetResourceDescriptorsPerAssembly_Only_Contains_IIdentifiable_Types()
     {
-        [Fact]
-        public void GetResourceDescriptorsPerAssembly_Locates_Identifiable_Resource()
-        {
-            // Arrange
-            Type resourceClrType = typeof(Model);
-
-            var assemblyCache = new ResourceDescriptorAssemblyCache();
-            assemblyCache.RegisterAssembly(resourceClrType.Assembly);
-
-            // Act
-            IReadOnlyCollection<ResourceDescriptor> descriptors = assemblyCache.GetResourceDescriptors();
-
-            // Assert
-            descriptors.ShouldNotBeEmpty();
-            descriptors.Should().ContainSingle(descriptor => descriptor.ResourceClrType == resourceClrType);
-        }
-
-        [Fact]
-        public void GetResourceDescriptorsPerAssembly_Only_Contains_IIdentifiable_Types()
-        {
-            // Arrange
-            Type resourceClrType = typeof(Model);
-
-            var assemblyCache = new ResourceDescriptorAssemblyCache();
-            assemblyCache.RegisterAssembly(resourceClrType.Assembly);
-
-            // Act
-            IReadOnlyCollection<ResourceDescriptor> descriptors = assemblyCache.GetResourceDescriptors();
-
-            // Assert
-            descriptors.ShouldNotBeEmpty();
-            descriptors.Select(descriptor => descriptor.ResourceClrType).Should().AllBeAssignableTo<IIdentifiable>();
-        }
+        // Arrange
+        Type resourceClrType = typeof(Model);
+
+        var assemblyCache = new ResourceDescriptorAssemblyCache();
+        assemblyCache.RegisterAssembly(resourceClrType.Assembly);
+
+        // Act
+        IReadOnlyCollection<ResourceDescriptor> descriptors = assemblyCache.GetResourceDescriptors();
+
+        // Assert
+        descriptors.ShouldNotBeEmpty();
+        descriptors.Select(descriptor => descriptor.ResourceClrType).Should().AllBeAssignableTo<IIdentifiable>();
     }
 }
diff --git a/test/UnitTests/Graph/TypeLocatorTests.cs b/test/UnitTests/Graph/TypeLocatorTests.cs
index 7c2220b27b..7f5ed820d8 100644
--- a/test/UnitTests/Graph/TypeLocatorTests.cs
+++ b/test/UnitTests/Graph/TypeLocatorTests.cs
@@ -1,118 +1,109 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
 using FluentAssertions;
 using JsonApiDotNetCore.Configuration;
 using TestBuildingBlocks;
 using Xunit;
 
-namespace UnitTests.Graph
+namespace UnitTests.Graph;
+
+public sealed class TypeLocatorTests
 {
-    public sealed class TypeLocatorTests
+    [Fact]
+    public void GetContainerRegistrationFromAssembly_Gets_Implementation()
     {
-        [Fact]
-        public void GetGenericInterfaceImplementation_Gets_Implementation()
-        {
-            // Arrange
-            Assembly assembly = GetType().Assembly;
-            Type openGeneric = typeof(IGenericInterface<>);
-            Type genericArg = typeof(int);
-
-            Type expectedImplementation = typeof(Implementation);
-            Type expectedInterface = typeof(IGenericInterface<int>);
+        // Arrange
+        Assembly assembly = GetType().Assembly;
+        Type unboundInterface = typeof(IGenericInterface<>);
+        Type typeArgument = typeof(int);
 
-            var typeLocator = new TypeLocator();
+        var typeLocator = new TypeLocator();
 
-            // Act
-            (Type implementation, Type registrationInterface)? result = typeLocator.GetGenericInterfaceImplementation(assembly, openGeneric, genericArg);
+        // Act
+        (Type implementationType, Type serviceInterface)? result = typeLocator.GetContainerRegistrationFromAssembly(assembly, unboundInterface, typeArgument);
 
-            // Assert
-            result.ShouldNotBeNull();
-            result.Value.implementation.Should().Be(expectedImplementation);
-            result.Value.registrationInterface.Should().Be(expectedInterface);
-        }
-
-        [Fact]
-        public void GetDerivedGenericTypes_Gets_Implementation()
-        {
-            // Arrange
-            Assembly assembly = GetType().Assembly;
-            Type openGeneric = typeof(BaseType<>);
-            Type genericArg = typeof(int);
+        // Assert
+        result.ShouldNotBeNull();
+        result.Value.implementationType.Should().Be(typeof(Implementation));
+        result.Value.serviceInterface.Should().Be(typeof(IGenericInterface<int>));
+    }
 
-            Type expectedImplementation = typeof(DerivedType);
+    [Fact]
+    public void GetDerivedTypesForUnboundType_Gets_Implementation()
+    {
+        // Arrange
+        Assembly assembly = GetType().Assembly;
+        Type unboundType = typeof(BaseType<>);
+        Type typeArgument = typeof(int);
 
-            var typeLocator = new TypeLocator();
+        var typeLocator = new TypeLocator();
 
-            // Act
-            IReadOnlyCollection<Type> results = typeLocator.GetDerivedGenericTypes(assembly, openGeneric, genericArg);
+        // Act
+        IReadOnlyCollection<Type> results = typeLocator.GetDerivedTypesForUnboundType(assembly, unboundType, typeArgument);
 
-            // Assert
-            results.ShouldHaveCount(1);
-            results.ElementAt(0).Should().Be(expectedImplementation);
-        }
+        // Assert
+        results.ShouldHaveCount(1);
+        results.ElementAt(0).Should().Be(typeof(DerivedType));
+    }
 
-        [Fact]
-        public void GetIdType_Correctly_Identifies_JsonApiResource()
-        {
-            // Arrange
-            Type type = typeof(Model);
+    [Fact]
+    public void GetIdType_Correctly_Identifies_JsonApiResource()
+    {
+        // Arrange
+        Type type = typeof(Model);
 
-            var typeLocator = new TypeLocator();
+        var typeLocator = new TypeLocator();
 
-            // Act
-            Type? idType = typeLocator.LookupIdType(type);
+        // Act
+        Type? idType = typeLocator.LookupIdType(type);
 
-            // Assert
-            idType.Should().Be(typeof(int));
-        }
+        // Assert
+        idType.Should().Be(typeof(int));
+    }
 
-        [Fact]
-        public void GetIdType_Correctly_Identifies_NonJsonApiResource()
-        {
-            // Arrange
-            Type type = typeof(DerivedType);
+    [Fact]
+    public void GetIdType_Correctly_Identifies_NonJsonApiResource()
+    {
+        // Arrange
+        Type type = typeof(DerivedType);
 
-            var typeLocator = new TypeLocator();
+        var typeLocator = new TypeLocator();
 
-            // Act
-            Type? idType = typeLocator.LookupIdType(type);
+        // Act
+        Type? idType = typeLocator.LookupIdType(type);
 
-            // Assert
-            idType.Should().BeNull();
-        }
+        // Assert
+        idType.Should().BeNull();
+    }
 
-        [Fact]
-        public void ResolveResourceDescriptor_Returns_Type_If_Type_Is_IIdentifiable()
-        {
-            // Arrange
-            Type resourceClrType = typeof(Model);
+    [Fact]
+    public void ResolveResourceDescriptor_Returns_Type_If_Type_Is_IIdentifiable()
+    {
+        // Arrange
+        Type resourceClrType = typeof(Model);
 
-            var typeLocator = new TypeLocator();
+        var typeLocator = new TypeLocator();
 
-            // Act
-            ResourceDescriptor? descriptor = typeLocator.ResolveResourceDescriptor(resourceClrType);
+        // Act
+        ResourceDescriptor? descriptor = typeLocator.ResolveResourceDescriptor(resourceClrType);
 
-            // Assert
-            descriptor.ShouldNotBeNull();
-            descriptor.ResourceClrType.Should().Be(resourceClrType);
-            descriptor.IdClrType.Should().Be(typeof(int));
-        }
+        // Assert
+        descriptor.ShouldNotBeNull();
+        descriptor.ResourceClrType.Should().Be(resourceClrType);
+        descriptor.IdClrType.Should().Be(typeof(int));
+    }
 
-        [Fact]
-        public void ResolveResourceDescriptor_Returns_False_If_Type_Is_IIdentifiable()
-        {
-            // Arrange
-            Type resourceClrType = typeof(string);
+    [Fact]
+    public void ResolveResourceDescriptor_Returns_False_If_Type_Is_IIdentifiable()
+    {
+        // Arrange
+        Type resourceClrType = typeof(string);
 
-            var typeLocator = new TypeLocator();
+        var typeLocator = new TypeLocator();
 
-            // Act
-            ResourceDescriptor? descriptor = typeLocator.ResolveResourceDescriptor(resourceClrType);
+        // Act
+        ResourceDescriptor? descriptor = typeLocator.ResolveResourceDescriptor(resourceClrType);
 
-            // Assert
-            descriptor.Should().BeNull();
-        }
+        // Assert
+        descriptor.Should().BeNull();
     }
 }
diff --git a/test/UnitTests/Internal/ErrorObjectTests.cs b/test/UnitTests/Internal/ErrorObjectTests.cs
index d60520df84..7deea9831c 100644
--- a/test/UnitTests/Internal/ErrorObjectTests.cs
+++ b/test/UnitTests/Internal/ErrorObjectTests.cs
@@ -1,30 +1,28 @@
-using System.Linq;
 using System.Net;
 using FluentAssertions;
 using JsonApiDotNetCore.Serialization.Objects;
 using Xunit;
 
-namespace UnitTests.Internal
+namespace UnitTests.Internal;
+
+public sealed class ErrorObjectTests
 {
-    public sealed class ErrorObjectTests
+    // @formatter:wrap_array_initializer_style wrap_if_long
+    [Theory]
+    [InlineData(new[] { HttpStatusCode.UnprocessableEntity }, HttpStatusCode.UnprocessableEntity)]
+    [InlineData(new[] { HttpStatusCode.UnprocessableEntity, HttpStatusCode.UnprocessableEntity }, HttpStatusCode.UnprocessableEntity)]
+    [InlineData(new[] { HttpStatusCode.UnprocessableEntity, HttpStatusCode.Unauthorized }, HttpStatusCode.BadRequest)]
+    [InlineData(new[] { HttpStatusCode.UnprocessableEntity, HttpStatusCode.BadGateway }, HttpStatusCode.InternalServerError)]
+    // @formatter:wrap_array_initializer_style restore
+    public void ErrorDocument_GetErrorStatusCode_IsCorrect(HttpStatusCode[] errorCodes, HttpStatusCode expected)
     {
-        // @formatter:wrap_array_initializer_style wrap_if_long
-        [Theory]
-        [InlineData(new[] { HttpStatusCode.UnprocessableEntity }, HttpStatusCode.UnprocessableEntity)]
-        [InlineData(new[] { HttpStatusCode.UnprocessableEntity, HttpStatusCode.UnprocessableEntity }, HttpStatusCode.UnprocessableEntity)]
-        [InlineData(new[] { HttpStatusCode.UnprocessableEntity, HttpStatusCode.Unauthorized }, HttpStatusCode.BadRequest)]
-        [InlineData(new[] { HttpStatusCode.UnprocessableEntity, HttpStatusCode.BadGateway }, HttpStatusCode.InternalServerError)]
-        // @formatter:wrap_array_initializer_style restore
-        public void ErrorDocument_GetErrorStatusCode_IsCorrect(HttpStatusCode[] errorCodes, HttpStatusCode expected)
-        {
-            // Arrange
-            ErrorObject[] errors = errorCodes.Select(code => new ErrorObject(code)).ToArray();
+        // Arrange
+        ErrorObject[] errors = errorCodes.Select(code => new ErrorObject(code)).ToArray();
 
-            // Act
-            HttpStatusCode status = ErrorObject.GetResponseStatusCode(errors);
+        // Act
+        HttpStatusCode status = ErrorObject.GetResponseStatusCode(errors);
 
-            // Assert
-            status.Should().Be(expected);
-        }
+        // Assert
+        status.Should().Be(expected);
     }
 }
diff --git a/test/UnitTests/Internal/RuntimeTypeConverterTests.cs b/test/UnitTests/Internal/RuntimeTypeConverterTests.cs
index 83fda36624..5bbac8fc4a 100644
--- a/test/UnitTests/Internal/RuntimeTypeConverterTests.cs
+++ b/test/UnitTests/Internal/RuntimeTypeConverterTests.cs
@@ -1,150 +1,147 @@
-using System;
-using System.Collections.Generic;
 using FluentAssertions;
 using JsonApiDotNetCore.Resources.Internal;
 using Xunit;
 
-namespace UnitTests.Internal
+namespace UnitTests.Internal;
+
+public sealed class RuntimeTypeConverterTests
 {
-    public sealed class RuntimeTypeConverterTests
+    [Fact]
+    public void Can_Convert_DateTimeOffsets()
     {
-        [Fact]
-        public void Can_Convert_DateTimeOffsets()
-        {
-            // Arrange
-            var dateTimeOffset = new DateTimeOffset(new DateTime(2002, 2, 2), TimeSpan.FromHours(4));
-            string formattedString = dateTimeOffset.ToString("O");
+        // Arrange
+        var dateTimeOffset = new DateTimeOffset(new DateTime(2002, 2, 2), TimeSpan.FromHours(4));
+        string formattedString = dateTimeOffset.ToString("O");
 
-            // Act
-            object? result = RuntimeTypeConverter.ConvertType(formattedString, typeof(DateTimeOffset));
+        // Act
+        object? result = RuntimeTypeConverter.ConvertType(formattedString, typeof(DateTimeOffset));
 
-            // Assert
-            result.Should().Be(dateTimeOffset);
-        }
+        // Assert
+        result.Should().Be(dateTimeOffset);
+    }
 
-        [Fact]
-        public void Bad_DateTimeOffset_String_Throws()
-        {
-            // Arrange
-            const string formattedString = "this_is_not_a_valid_dto";
+    [Fact]
+    public void Bad_DateTimeOffset_String_Throws()
+    {
+        // Arrange
+        const string formattedString = "this_is_not_a_valid_dto";
 
-            // Act
-            Action action = () => RuntimeTypeConverter.ConvertType(formattedString, typeof(DateTimeOffset));
+        // Act
+        Action action = () => RuntimeTypeConverter.ConvertType(formattedString, typeof(DateTimeOffset));
 
-            // Assert
-            action.Should().ThrowExactly<FormatException>();
-        }
+        // Assert
+        action.Should().ThrowExactly<FormatException>();
+    }
 
-        [Fact]
-        public void Can_Convert_Enums()
-        {
-            // Arrange
-            const string formattedString = "1";
+    [Fact]
+    public void Can_Convert_Enums()
+    {
+        // Arrange
+        const string formattedString = "1";
 
-            // Act
-            object? result = RuntimeTypeConverter.ConvertType(formattedString, typeof(TestEnum));
+        // Act
+        object? result = RuntimeTypeConverter.ConvertType(formattedString, typeof(TestEnum));
 
-            // Assert
-            result.Should().Be(TestEnum.Test);
-        }
+        // Assert
+        result.Should().Be(TestEnum.Test);
+    }
 
-        [Fact]
-        public void ConvertType_Returns_Value_If_Type_Is_Same()
-        {
-            // Arrange
-            var complexType = new ComplexType();
-            Type type = complexType.GetType();
+    [Fact]
+    public void ConvertType_Returns_Value_If_Type_Is_Same()
+    {
+        // Arrange
+        var complexType = new ComplexType();
+        Type type = complexType.GetType();
 
-            // Act
-            object? result = RuntimeTypeConverter.ConvertType(complexType, type);
+        // Act
+        object? result = RuntimeTypeConverter.ConvertType(complexType, type);
 
-            // Assert
-            result.Should().Be(complexType);
-        }
+        // Assert
+        result.Should().Be(complexType);
+    }
 
-        [Fact]
-        public void ConvertType_Returns_Value_If_Type_Is_Assignable()
-        {
-            // Arrange
-            var complexType = new ComplexType();
+    [Fact]
+    public void ConvertType_Returns_Value_If_Type_Is_Assignable()
+    {
+        // Arrange
+        var complexType = new ComplexType();
 
-            Type baseType = typeof(BaseType);
-            Type iType = typeof(IType);
+        Type baseType = typeof(BaseType);
+        Type iType = typeof(IType);
 
-            // Act
-            object? baseResult = RuntimeTypeConverter.ConvertType(complexType, baseType);
-            object? iResult = RuntimeTypeConverter.ConvertType(complexType, iType);
+        // Act
+        object? baseResult = RuntimeTypeConverter.ConvertType(complexType, baseType);
+        object? iResult = RuntimeTypeConverter.ConvertType(complexType, iType);
 
-            // Assert
-            baseResult.Should().Be(complexType);
-            iResult.Should().Be(complexType);
-        }
+        // Assert
+        baseResult.Should().Be(complexType);
+        iResult.Should().Be(complexType);
+    }
 
-        [Fact]
-        public void ConvertType_Returns_Default_Value_For_Empty_Strings()
+    [Fact]
+    public void ConvertType_Returns_Default_Value_For_Empty_Strings()
+    {
+        // Arrange
+        var data = new Dictionary<Type, object>
         {
-            // Arrange
-            var data = new Dictionary<Type, object>
-            {
-                { typeof(int), 0 },
-                { typeof(short), (short)0 },
-                { typeof(long), (long)0 },
-                { typeof(string), "" },
-                { typeof(Guid), Guid.Empty }
-            };
-
-            foreach ((Type key, object value) in data)
-            {
-                // Act
-                object? result = RuntimeTypeConverter.ConvertType(string.Empty, key);
-
-                // Assert
-                result.Should().Be(value);
-            }
-        }
-
-        [Fact]
-        public void Can_Convert_TimeSpans()
+            { typeof(int), 0 },
+            { typeof(short), (short)0 },
+            { typeof(long), (long)0 },
+            { typeof(string), "" },
+            { typeof(Guid), Guid.Empty }
+        };
+
+        foreach ((Type key, object value) in data)
         {
-            // Arrange
-            TimeSpan timeSpan = TimeSpan.FromMinutes(45);
-            string stringSpan = timeSpan.ToString();
-
             // Act
-            object? result = RuntimeTypeConverter.ConvertType(stringSpan, typeof(TimeSpan));
+            object? result = RuntimeTypeConverter.ConvertType(string.Empty, key);
 
             // Assert
-            result.Should().Be(timeSpan);
+            result.Should().Be(value);
         }
+    }
 
-        [Fact]
-        public void Bad_TimeSpanString_Throws()
-        {
-            // Arrange
-            const string formattedString = "this_is_not_a_valid_timespan";
+    [Fact]
+    public void Can_Convert_TimeSpans()
+    {
+        // Arrange
+        TimeSpan timeSpan = TimeSpan.FromMinutes(45);
+        string stringSpan = timeSpan.ToString();
 
-            // Act
-            Action action = () => RuntimeTypeConverter.ConvertType(formattedString, typeof(TimeSpan));
+        // Act
+        object? result = RuntimeTypeConverter.ConvertType(stringSpan, typeof(TimeSpan));
 
-            // Assert
-            action.Should().ThrowExactly<FormatException>();
-        }
+        // Assert
+        result.Should().Be(timeSpan);
+    }
 
-        private enum TestEnum
-        {
-            Test = 1
-        }
+    [Fact]
+    public void Bad_TimeSpanString_Throws()
+    {
+        // Arrange
+        const string formattedString = "this_is_not_a_valid_timespan";
 
-        private sealed class ComplexType : BaseType
-        {
-        }
+        // Act
+        Action action = () => RuntimeTypeConverter.ConvertType(formattedString, typeof(TimeSpan));
 
-        private class BaseType : IType
-        {
-        }
+        // Assert
+        action.Should().ThrowExactly<FormatException>();
+    }
 
-        private interface IType
-        {
-        }
+    private enum TestEnum
+    {
+        Test = 1
+    }
+
+    private sealed class ComplexType : BaseType
+    {
+    }
+
+    private class BaseType : IType
+    {
+    }
+
+    private interface IType
+    {
     }
 }
diff --git a/test/UnitTests/Internal/TypeExtensionsTests.cs b/test/UnitTests/Internal/TypeExtensionsTests.cs
index 494e91510e..2adfaecb4d 100644
--- a/test/UnitTests/Internal/TypeExtensionsTests.cs
+++ b/test/UnitTests/Internal/TypeExtensionsTests.cs
@@ -1,43 +1,41 @@
-using System;
 using FluentAssertions;
 using JsonApiDotNetCore;
 using JsonApiDotNetCore.Resources;
 using Xunit;
 
-namespace UnitTests.Internal
+namespace UnitTests.Internal;
+
+public sealed class TypeExtensionsTests
 {
-    public sealed class TypeExtensionsTests
+    [Fact]
+    public void Implements_Returns_True_If_Type_Implements_Interface()
+    {
+        // Arrange
+        Type type = typeof(Model);
+
+        // Act
+        bool result = type.IsOrImplementsInterface<IIdentifiable>();
+
+        // Assert
+        result.Should().BeTrue();
+    }
+
+    [Fact]
+    public void Implements_Returns_False_If_Type_DoesNot_Implement_Interface()
+    {
+        // Arrange
+        Type type = typeof(string);
+
+        // Act
+        bool result = type.IsOrImplementsInterface<IIdentifiable>();
+
+        // Assert
+        result.Should().BeFalse();
+    }
+
+    private sealed class Model : IIdentifiable
     {
-        [Fact]
-        public void Implements_Returns_True_If_Type_Implements_Interface()
-        {
-            // Arrange
-            Type type = typeof(Model);
-
-            // Act
-            bool result = type.IsOrImplementsInterface<IIdentifiable>();
-
-            // Assert
-            result.Should().BeTrue();
-        }
-
-        [Fact]
-        public void Implements_Returns_False_If_Type_DoesNot_Implement_Interface()
-        {
-            // Arrange
-            Type type = typeof(string);
-
-            // Act
-            bool result = type.IsOrImplementsInterface<IIdentifiable>();
-
-            // Assert
-            result.Should().BeFalse();
-        }
-
-        private sealed class Model : IIdentifiable
-        {
-            public string? StringId { get; set; }
-            public string? LocalId { get; set; }
-        }
+        public string? StringId { get; set; }
+        public string? LocalId { get; set; }
     }
 }
diff --git a/test/UnitTests/Middleware/JsonApiRequestTests.cs b/test/UnitTests/Middleware/JsonApiRequestTests.cs
index b7e35c46ea..bee1b18bf9 100644
--- a/test/UnitTests/Middleware/JsonApiRequestTests.cs
+++ b/test/UnitTests/Middleware/JsonApiRequestTests.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Reflection;
-using System.Threading.Tasks;
 using FluentAssertions;
 using JetBrains.Annotations;
 using JsonApiDotNetCore.Configuration;
@@ -19,188 +15,185 @@
 
 #pragma warning disable AV1561 // Signature contains too many parameters
 
-namespace UnitTests.Middleware
+namespace UnitTests.Middleware;
+
+public sealed class JsonApiRequestTests
 {
-    public sealed class JsonApiRequestTests
+    // @formatter:wrap_lines false
+    [Theory]
+    [InlineData("HEAD", "/todoItems", EndpointKind.Primary, null, "todoItems", null, null, IsCollection.Yes, IsReadOnly.Yes, null)]
+    [InlineData("HEAD", "/people/1", EndpointKind.Primary, "1", "people", null, null, IsCollection.No, IsReadOnly.Yes, null)]
+    [InlineData("HEAD", "/todoItems/2/owner", EndpointKind.Secondary, "2", "todoItems", "people", "owner", IsCollection.No, IsReadOnly.Yes, null)]
+    [InlineData("HEAD", "/todoItems/3/tags", EndpointKind.Secondary, "3", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.Yes, null)]
+    [InlineData("HEAD", "/todoItems/ABC/relationships/owner", EndpointKind.Relationship, "ABC", "todoItems", "people", "owner", IsCollection.No, IsReadOnly.Yes, null)]
+    [InlineData("HEAD", "/todoItems/ABC/relationships/tags", EndpointKind.Relationship, "ABC", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.Yes, null)]
+    [InlineData("GET", "/todoItems", EndpointKind.Primary, null, "todoItems", null, null, IsCollection.Yes, IsReadOnly.Yes, null)]
+    [InlineData("GET", "/todoItems/-1", EndpointKind.Primary, "-1", "todoItems", null, null, IsCollection.No, IsReadOnly.Yes, null)]
+    [InlineData("GET", "/todoItems/1/owner", EndpointKind.Secondary, "1", "todoItems", "people", "owner", IsCollection.No, IsReadOnly.Yes, null)]
+    [InlineData("GET", "/todoItems/1/tags", EndpointKind.Secondary, "1", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.Yes, null)]
+    [InlineData("GET", "/todoItems/1/relationships/owner", EndpointKind.Relationship, "1", "todoItems", "people", "owner", IsCollection.No, IsReadOnly.Yes, null)]
+    [InlineData("GET", "/todoItems/1/relationships/tags", EndpointKind.Relationship, "1", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.Yes, null)]
+    [InlineData("POST", "/todoItems", EndpointKind.Primary, null, "todoItems", null, null, IsCollection.No, IsReadOnly.No, WriteOperationKind.CreateResource)]
+    [InlineData("POST", "/todoItems/1/relationships/tags", EndpointKind.Relationship, "1", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.No, WriteOperationKind.AddToRelationship)]
+    [InlineData("PATCH", "/itemTags/1", EndpointKind.Primary, "1", "itemTags", null, null, IsCollection.No, IsReadOnly.No, WriteOperationKind.UpdateResource)]
+    [InlineData("PATCH", "/todoItems/1/relationships/owner", EndpointKind.Relationship, "1", "todoItems", "people", "owner", IsCollection.No, IsReadOnly.No, WriteOperationKind.SetRelationship)]
+    [InlineData("PATCH", "/todoItems/1/relationships/tags", EndpointKind.Relationship, "1", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.No, WriteOperationKind.SetRelationship)]
+    [InlineData("DELETE", "/todoItems/1", EndpointKind.Primary, "1", "todoItems", null, null, IsCollection.No, IsReadOnly.No, WriteOperationKind.DeleteResource)]
+    [InlineData("DELETE", "/todoItems/1/relationships/tags", EndpointKind.Relationship, "1", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.No, WriteOperationKind.RemoveFromRelationship)]
+    [InlineData("POST", "/operations", EndpointKind.AtomicOperations, null, null, null, null, IsCollection.No, IsReadOnly.No, null)]
+    // @formatter:wrap_lines restore
+    public async Task Sets_request_properties_correctly(string requestMethod, string requestPath, EndpointKind expectKind, string? expectPrimaryId,
+        string? expectPrimaryResourceType, string? expectSecondaryResourceType, string? expectRelationshipName, IsCollection expectIsCollection,
+        IsReadOnly expectIsReadOnly, WriteOperationKind? expectWriteOperation)
     {
-        // @formatter:wrap_lines false
-        [Theory]
-        [InlineData("HEAD", "/todoItems", EndpointKind.Primary, null, "todoItems", null, null, IsCollection.Yes, IsReadOnly.Yes, null)]
-        [InlineData("HEAD", "/people/1", EndpointKind.Primary, "1", "people", null, null, IsCollection.No, IsReadOnly.Yes, null)]
-        [InlineData("HEAD", "/todoItems/2/owner", EndpointKind.Secondary, "2", "todoItems", "people", "owner", IsCollection.No, IsReadOnly.Yes, null)]
-        [InlineData("HEAD", "/todoItems/3/tags", EndpointKind.Secondary, "3", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.Yes, null)]
-        [InlineData("HEAD", "/todoItems/ABC/relationships/owner", EndpointKind.Relationship, "ABC", "todoItems", "people", "owner", IsCollection.No, IsReadOnly.Yes, null)]
-        [InlineData("HEAD", "/todoItems/ABC/relationships/tags", EndpointKind.Relationship, "ABC", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.Yes, null)]
-        [InlineData("GET", "/todoItems", EndpointKind.Primary, null, "todoItems", null, null, IsCollection.Yes, IsReadOnly.Yes, null)]
-        [InlineData("GET", "/todoItems/-1", EndpointKind.Primary, "-1", "todoItems", null, null, IsCollection.No, IsReadOnly.Yes, null)]
-        [InlineData("GET", "/todoItems/1/owner", EndpointKind.Secondary, "1", "todoItems", "people", "owner", IsCollection.No, IsReadOnly.Yes, null)]
-        [InlineData("GET", "/todoItems/1/tags", EndpointKind.Secondary, "1", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.Yes, null)]
-        [InlineData("GET", "/todoItems/1/relationships/owner", EndpointKind.Relationship, "1", "todoItems", "people", "owner", IsCollection.No, IsReadOnly.Yes, null)]
-        [InlineData("GET", "/todoItems/1/relationships/tags", EndpointKind.Relationship, "1", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.Yes, null)]
-        [InlineData("POST", "/todoItems", EndpointKind.Primary, null, "todoItems", null, null, IsCollection.No, IsReadOnly.No, WriteOperationKind.CreateResource)]
-        [InlineData("POST", "/todoItems/1/relationships/tags", EndpointKind.Relationship, "1", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.No, WriteOperationKind.AddToRelationship)]
-        [InlineData("PATCH", "/itemTags/1", EndpointKind.Primary, "1", "itemTags", null, null, IsCollection.No, IsReadOnly.No, WriteOperationKind.UpdateResource)]
-        [InlineData("PATCH", "/todoItems/1/relationships/owner", EndpointKind.Relationship, "1", "todoItems", "people", "owner", IsCollection.No, IsReadOnly.No, WriteOperationKind.SetRelationship)]
-        [InlineData("PATCH", "/todoItems/1/relationships/tags", EndpointKind.Relationship, "1", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.No, WriteOperationKind.SetRelationship)]
-        [InlineData("DELETE", "/todoItems/1", EndpointKind.Primary, "1", "todoItems", null, null, IsCollection.No, IsReadOnly.No, WriteOperationKind.DeleteResource)]
-        [InlineData("DELETE", "/todoItems/1/relationships/tags", EndpointKind.Relationship, "1", "todoItems", "itemTags", "tags", IsCollection.Yes, IsReadOnly.No, WriteOperationKind.RemoveFromRelationship)]
-        [InlineData("POST", "/operations", EndpointKind.AtomicOperations, null, null, null, null, IsCollection.No, IsReadOnly.No, null)]
-        // @formatter:wrap_lines restore
-        public async Task Sets_request_properties_correctly(string requestMethod, string requestPath, EndpointKind expectKind, string? expectPrimaryId,
-            string? expectPrimaryResourceType, string? expectSecondaryResourceType, string? expectRelationshipName, IsCollection expectIsCollection,
-            IsReadOnly expectIsReadOnly, WriteOperationKind? expectWriteOperation)
-        {
-            // Arrange
-            var options = new JsonApiOptions();
-            var request = new JsonApiRequest();
-
-            // @formatter:keep_existing_linebreaks true
+        // Arrange
+        var options = new JsonApiOptions();
+        var request = new JsonApiRequest();
 
-            IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance)
-                .Add<TodoItem, int>()
-                .Add<Person, int>()
-                .Add<ItemTag, int>()
-                .Build();
+        // @formatter:keep_existing_linebreaks true
 
-            // @formatter:keep_existing_linebreaks restore
+        IResourceGraph resourceGraph = new ResourceGraphBuilder(options, NullLoggerFactory.Instance)
+            .Add<TodoItem, int>()
+            .Add<Person, int>()
+            .Add<ItemTag, int>()
+            .Build();
 
-            var httpContext = new DefaultHttpContext();
-            IControllerResourceMapping controllerResourceMapping = SetupRoutes(httpContext, resourceGraph, requestMethod, requestPath);
-
-            var middleware = new JsonApiMiddleware(_ => Task.CompletedTask, new HttpContextAccessor
-            {
-                HttpContext = httpContext
-            });
+        // @formatter:keep_existing_linebreaks restore
 
-            // Act
-            await middleware.InvokeAsync(httpContext, controllerResourceMapping, options, request, NullLogger<JsonApiMiddleware>.Instance);
+        var httpContext = new DefaultHttpContext();
+        IControllerResourceMapping controllerResourceMapping = SetupRoutes(httpContext, resourceGraph, requestMethod, requestPath);
 
-            // Assert
-            request.Kind.Should().Be(expectKind);
-            request.PrimaryId.Should().Be(expectPrimaryId);
-
-            if (expectPrimaryResourceType == null)
-            {
-                request.PrimaryResourceType.Should().BeNull();
-            }
-            else
-            {
-                request.PrimaryResourceType.ShouldNotBeNull();
-                request.PrimaryResourceType.PublicName.Should().Be(expectPrimaryResourceType);
-            }
+        var middleware = new JsonApiMiddleware(_ => Task.CompletedTask, new HttpContextAccessor
+        {
+            HttpContext = httpContext
+        });
 
-            if (expectSecondaryResourceType == null)
-            {
-                request.SecondaryResourceType.Should().BeNull();
-            }
-            else
-            {
-                request.SecondaryResourceType.ShouldNotBeNull();
-                request.SecondaryResourceType.PublicName.Should().Be(expectSecondaryResourceType);
-            }
+        // Act
+        await middleware.InvokeAsync(httpContext, controllerResourceMapping, options, request, NullLogger<JsonApiMiddleware>.Instance);
 
-            if (expectRelationshipName == null)
-            {
-                request.Relationship.Should().BeNull();
-            }
-            else
-            {
-                request.Relationship.ShouldNotBeNull();
-                request.Relationship.PublicName.Should().Be(expectRelationshipName);
-            }
+        // Assert
+        request.Kind.Should().Be(expectKind);
+        request.PrimaryId.Should().Be(expectPrimaryId);
 
-            request.IsCollection.Should().Be(expectIsCollection == IsCollection.Yes);
-            request.IsReadOnly.Should().Be(expectIsReadOnly == IsReadOnly.Yes);
-            request.WriteOperation.Should().Be(expectWriteOperation);
+        if (expectPrimaryResourceType == null)
+        {
+            request.PrimaryResourceType.Should().BeNull();
         }
-
-        private static IControllerResourceMapping SetupRoutes(HttpContext httpContext, IResourceGraph resourceGraph, string requestMethod, string requestPath)
+        else
         {
-            httpContext.Request.Method = requestMethod;
+            request.PrimaryResourceType.ShouldNotBeNull();
+            request.PrimaryResourceType.PublicName.Should().Be(expectPrimaryResourceType);
+        }
 
-            var feature = new RouteValuesFeature
-            {
-                RouteValues =
-                {
-                    ["controller"] = "theController",
-                    ["action"] = "theAction"
-                }
-            };
+        if (expectSecondaryResourceType == null)
+        {
+            request.SecondaryResourceType.Should().BeNull();
+        }
+        else
+        {
+            request.SecondaryResourceType.ShouldNotBeNull();
+            request.SecondaryResourceType.PublicName.Should().Be(expectSecondaryResourceType);
+        }
 
-            string[] pathSegments = requestPath.Split("/", StringSplitOptions.RemoveEmptyEntries);
+        if (expectRelationshipName == null)
+        {
+            request.Relationship.Should().BeNull();
+        }
+        else
+        {
+            request.Relationship.ShouldNotBeNull();
+            request.Relationship.PublicName.Should().Be(expectRelationshipName);
+        }
 
-            if (pathSegments.Length > 1)
-            {
-                feature.RouteValues["id"] = pathSegments[1];
+        request.IsCollection.Should().Be(expectIsCollection == IsCollection.Yes);
+        request.IsReadOnly.Should().Be(expectIsReadOnly == IsReadOnly.Yes);
+        request.WriteOperation.Should().Be(expectWriteOperation);
+    }
 
-                if (pathSegments.Length >= 3)
-                {
-                    feature.RouteValues["relationshipName"] = pathSegments[^1];
-                }
-            }
+    private static IControllerResourceMapping SetupRoutes(HttpContext httpContext, IResourceGraph resourceGraph, string requestMethod, string requestPath)
+    {
+        httpContext.Request.Method = requestMethod;
 
-            if (pathSegments.Contains("relationships"))
-            {
-                feature.RouteValues["action"] = "Relationship";
-            }
-            else if (pathSegments.Contains("operations"))
+        var feature = new RouteValuesFeature
+        {
+            RouteValues =
             {
-                feature.RouteValues["action"] = "PostOperations";
+                ["controller"] = "theController",
+                ["action"] = "theAction"
             }
+        };
 
-            httpContext.Features.Set<IRouteValuesFeature>(feature);
+        string[] pathSegments = requestPath.Split("/", StringSplitOptions.RemoveEmptyEntries);
 
-            var controllerActionDescriptor = new ControllerActionDescriptor
-            {
-                ControllerTypeInfo = (TypeInfo)typeof(object)
-            };
-
-            var controllerResourceMappingMock = new Mock<IControllerResourceMapping>();
+        if (pathSegments.Length > 1)
+        {
+            feature.RouteValues["id"] = pathSegments[1];
 
-            controllerResourceMappingMock.Setup(mapping => mapping.GetResourceTypeForController(It.IsAny<Type>())).Returns(() =>
+            if (pathSegments.Length >= 3)
             {
-                return pathSegments.Length > 0
-                    ? resourceGraph.GetResourceTypes().FirstOrDefault(resourceType => resourceType.PublicName == pathSegments[0])
-                    : null;
-            });
-
-            httpContext.SetEndpoint(new Endpoint(_ => Task.CompletedTask, new EndpointMetadataCollection(controllerActionDescriptor), null));
-
-            return controllerResourceMappingMock.Object;
+                feature.RouteValues["relationshipName"] = pathSegments[^1];
+            }
         }
 
-        public enum IsReadOnly
+        if (pathSegments.Contains("relationships"))
         {
-            Yes,
-            No
+            feature.RouteValues["action"] = "Relationship";
         }
-
-        public enum IsCollection
+        else if (pathSegments.Contains("operations"))
         {
-            Yes,
-            No
+            feature.RouteValues["action"] = "PostOperations";
         }
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Itself)]
-        private sealed class Person : Identifiable<int>
-        {
-        }
+        httpContext.Features.Set<IRouteValuesFeature>(feature);
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class ItemTag : Identifiable<int>
+        var controllerActionDescriptor = new ControllerActionDescriptor
         {
-            [HasMany]
-            public ISet<TodoItem> TodoItems { get; set; } = new HashSet<TodoItem>();
-        }
+            ControllerTypeInfo = (TypeInfo)typeof(object)
+        };
+
+        var controllerResourceMappingMock = new Mock<IControllerResourceMapping>();
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class TodoItem : Identifiable<int>
+        controllerResourceMappingMock.Setup(mapping => mapping.GetResourceTypeForController(It.IsAny<Type>())).Returns(() =>
         {
-            [HasOne]
-            public Person? Owner { get; set; }
+            return pathSegments.Length > 0 ? resourceGraph.GetResourceTypes().FirstOrDefault(resourceType => resourceType.PublicName == pathSegments[0]) : null;
+        });
 
-            [HasMany]
-            public ISet<ItemTag> Tags { get; set; } = new HashSet<ItemTag>();
-        }
+        httpContext.SetEndpoint(new Endpoint(_ => Task.CompletedTask, new EndpointMetadataCollection(controllerActionDescriptor), null));
+
+        return controllerResourceMappingMock.Object;
+    }
+
+    public enum IsReadOnly
+    {
+        Yes,
+        No
+    }
+
+    public enum IsCollection
+    {
+        Yes,
+        No
+    }
+
+    [UsedImplicitly(ImplicitUseTargetFlags.Itself)]
+    private sealed class Person : Identifiable<int>
+    {
+    }
+
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class ItemTag : Identifiable<int>
+    {
+        [HasMany]
+        public ISet<TodoItem> TodoItems { get; set; } = new HashSet<TodoItem>();
+    }
+
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class TodoItem : Identifiable<int>
+    {
+        [HasOne]
+        public Person? Owner { get; set; }
+
+        [HasMany]
+        public ISet<ItemTag> Tags { get; set; } = new HashSet<ItemTag>();
     }
 }
diff --git a/test/UnitTests/Models/AttributesEqualsTests.cs b/test/UnitTests/Models/AttributesEqualsTests.cs
index 3eff69ebe4..81c7ab5ceb 100644
--- a/test/UnitTests/Models/AttributesEqualsTests.cs
+++ b/test/UnitTests/Models/AttributesEqualsTests.cs
@@ -2,155 +2,154 @@
 using JsonApiDotNetCore.Resources.Annotations;
 using Xunit;
 
-namespace UnitTests.Models
+namespace UnitTests.Models;
+
+public sealed class AttributesEqualsTests
 {
-    public sealed class AttributesEqualsTests
+    [Fact]
+    public void HasManyAttribute_Equals_Returns_True_When_Same_Name()
     {
-        [Fact]
-        public void HasManyAttribute_Equals_Returns_True_When_Same_Name()
+        // Arrange
+        var attribute1 = new HasManyAttribute
+        {
+            PublicName = "test"
+        };
+
+        var attribute2 = new HasManyAttribute
         {
-            // Arrange
-            var attribute1 = new HasManyAttribute
-            {
-                PublicName = "test"
-            };
-
-            var attribute2 = new HasManyAttribute
-            {
-                PublicName = "test"
-            };
-
-            // Act
-            bool result = attribute1.Equals(attribute2);
-
-            // Assert
-            result.Should().BeTrue();
-        }
-
-        [Fact]
-        public void HasManyAttribute_Equals_Returns_False_When_Different_Name()
+            PublicName = "test"
+        };
+
+        // Act
+        bool result = attribute1.Equals(attribute2);
+
+        // Assert
+        result.Should().BeTrue();
+    }
+
+    [Fact]
+    public void HasManyAttribute_Equals_Returns_False_When_Different_Name()
+    {
+        // Arrange
+        var attribute1 = new HasManyAttribute
         {
-            // Arrange
-            var attribute1 = new HasManyAttribute
-            {
-                PublicName = "test1"
-            };
-
-            var attribute2 = new HasManyAttribute
-            {
-                PublicName = "test2"
-            };
-
-            // Act
-            bool result = attribute1.Equals(attribute2);
-
-            // Assert
-            result.Should().BeFalse();
-        }
-
-        [Fact]
-        public void HasOneAttribute_Equals_Returns_True_When_Same_Name()
+            PublicName = "test1"
+        };
+
+        var attribute2 = new HasManyAttribute
         {
-            // Arrange
-            var attribute1 = new HasOneAttribute
-            {
-                PublicName = "test"
-            };
-
-            var attribute2 = new HasOneAttribute
-            {
-                PublicName = "test"
-            };
-
-            // Act
-            bool result = attribute1.Equals(attribute2);
-
-            // Assert
-            result.Should().BeTrue();
-        }
-
-        [Fact]
-        public void HasOneAttribute_Equals_Returns_False_When_Different_Name()
+            PublicName = "test2"
+        };
+
+        // Act
+        bool result = attribute1.Equals(attribute2);
+
+        // Assert
+        result.Should().BeFalse();
+    }
+
+    [Fact]
+    public void HasOneAttribute_Equals_Returns_True_When_Same_Name()
+    {
+        // Arrange
+        var attribute1 = new HasOneAttribute
         {
-            // Arrange
-            var attribute1 = new HasOneAttribute
-            {
-                PublicName = "test1"
-            };
-
-            var attribute2 = new HasOneAttribute
-            {
-                PublicName = "test2"
-            };
-
-            // Act
-            bool result = attribute1.Equals(attribute2);
-
-            // Assert
-            result.Should().BeFalse();
-        }
-
-        [Fact]
-        public void AttrAttribute_Equals_Returns_True_When_Same_Name()
+            PublicName = "test"
+        };
+
+        var attribute2 = new HasOneAttribute
         {
-            // Arrange
-            var attribute1 = new AttrAttribute
-            {
-                PublicName = "test"
-            };
-
-            var attribute2 = new AttrAttribute
-            {
-                PublicName = "test"
-            };
-
-            // Act
-            bool result = attribute1.Equals(attribute2);
-
-            // Assert
-            result.Should().BeTrue();
-        }
-
-        [Fact]
-        public void AttrAttribute_Equals_Returns_False_When_Different_Name()
+            PublicName = "test"
+        };
+
+        // Act
+        bool result = attribute1.Equals(attribute2);
+
+        // Assert
+        result.Should().BeTrue();
+    }
+
+    [Fact]
+    public void HasOneAttribute_Equals_Returns_False_When_Different_Name()
+    {
+        // Arrange
+        var attribute1 = new HasOneAttribute
         {
-            // Arrange
-            var attribute1 = new AttrAttribute
-            {
-                PublicName = "test1"
-            };
-
-            var attribute2 = new AttrAttribute
-            {
-                PublicName = "test2"
-            };
-
-            // Act
-            bool result = attribute1.Equals(attribute2);
-
-            // Assert
-            result.Should().BeFalse();
-        }
-
-        [Fact]
-        public void HasManyAttribute_Does_Not_Equal_HasOneAttribute_With_Same_Name()
+            PublicName = "test1"
+        };
+
+        var attribute2 = new HasOneAttribute
         {
-            // Arrange
-            RelationshipAttribute attribute1 = new HasManyAttribute
-            {
-                PublicName = "test"
-            };
-
-            RelationshipAttribute attribute2 = new HasOneAttribute
-            {
-                PublicName = "test"
-            };
-
-            // Act
-            bool result = attribute1.Equals(attribute2);
-
-            // Assert
-            result.Should().BeFalse();
-        }
+            PublicName = "test2"
+        };
+
+        // Act
+        bool result = attribute1.Equals(attribute2);
+
+        // Assert
+        result.Should().BeFalse();
+    }
+
+    [Fact]
+    public void AttrAttribute_Equals_Returns_True_When_Same_Name()
+    {
+        // Arrange
+        var attribute1 = new AttrAttribute
+        {
+            PublicName = "test"
+        };
+
+        var attribute2 = new AttrAttribute
+        {
+            PublicName = "test"
+        };
+
+        // Act
+        bool result = attribute1.Equals(attribute2);
+
+        // Assert
+        result.Should().BeTrue();
+    }
+
+    [Fact]
+    public void AttrAttribute_Equals_Returns_False_When_Different_Name()
+    {
+        // Arrange
+        var attribute1 = new AttrAttribute
+        {
+            PublicName = "test1"
+        };
+
+        var attribute2 = new AttrAttribute
+        {
+            PublicName = "test2"
+        };
+
+        // Act
+        bool result = attribute1.Equals(attribute2);
+
+        // Assert
+        result.Should().BeFalse();
+    }
+
+    [Fact]
+    public void HasManyAttribute_Does_Not_Equal_HasOneAttribute_With_Same_Name()
+    {
+        // Arrange
+        RelationshipAttribute attribute1 = new HasManyAttribute
+        {
+            PublicName = "test"
+        };
+
+        RelationshipAttribute attribute2 = new HasOneAttribute
+        {
+            PublicName = "test"
+        };
+
+        // Act
+        bool result = attribute1.Equals(attribute2);
+
+        // Assert
+        result.Should().BeFalse();
     }
 }
diff --git a/test/UnitTests/Models/IdentifiableTests.cs b/test/UnitTests/Models/IdentifiableTests.cs
index 2d6b5875fe..993a3988f2 100644
--- a/test/UnitTests/Models/IdentifiableTests.cs
+++ b/test/UnitTests/Models/IdentifiableTests.cs
@@ -2,48 +2,47 @@
 using JsonApiDotNetCore.Resources;
 using Xunit;
 
-namespace UnitTests.Models
+namespace UnitTests.Models;
+
+public sealed class IdentifiableTests
 {
-    public sealed class IdentifiableTests
+    [Fact]
+    public void Can_Set_StringId_To_Value_Type()
     {
-        [Fact]
-        public void Can_Set_StringId_To_Value_Type()
+        var resource = new IntId
         {
-            var resource = new IntId
-            {
-                StringId = "1"
-            };
+            StringId = "1"
+        };
 
-            resource.Id.Should().Be(1);
-        }
+        resource.Id.Should().Be(1);
+    }
 
-        [Fact]
-        public void Setting_StringId_To_Null_Sets_Id_As_Default()
+    [Fact]
+    public void Setting_StringId_To_Null_Sets_Id_As_Default()
+    {
+        var resource = new IntId
         {
-            var resource = new IntId
-            {
-                StringId = null
-            };
+            StringId = null
+        };
 
-            resource.Id.Should().Be(0);
-        }
+        resource.Id.Should().Be(0);
+    }
 
-        [Fact]
-        public void GetStringId_Returns_Null_If_Object_Is_Default()
-        {
-            var resource = new IntId();
+    [Fact]
+    public void GetStringId_Returns_Null_If_Object_Is_Default()
+    {
+        var resource = new IntId();
 
-            string? stringId = resource.ExposedGetStringId(default);
+        string? stringId = resource.ExposedGetStringId(default);
 
-            stringId.Should().BeNull();
-        }
+        stringId.Should().BeNull();
+    }
 
-        private sealed class IntId : Identifiable<int>
+    private sealed class IntId : Identifiable<int>
+    {
+        public string? ExposedGetStringId(int value)
         {
-            public string? ExposedGetStringId(int value)
-            {
-                return GetStringId(value);
-            }
+            return GetStringId(value);
         }
     }
 }
diff --git a/test/UnitTests/Models/ResourceConstructionExpressionTests.cs b/test/UnitTests/Models/ResourceConstructionExpressionTests.cs
index df94fe23a9..d4ab3dc841 100644
--- a/test/UnitTests/Models/ResourceConstructionExpressionTests.cs
+++ b/test/UnitTests/Models/ResourceConstructionExpressionTests.cs
@@ -1,4 +1,3 @@
-using System;
 using System.ComponentModel.Design;
 using System.Linq.Expressions;
 using FluentAssertions;
@@ -8,55 +7,54 @@
 using TestBuildingBlocks;
 using Xunit;
 
-namespace UnitTests.Models
+namespace UnitTests.Models;
+
+public sealed class ResourceConstructionExpressionTests
 {
-    public sealed class ResourceConstructionExpressionTests
+    [Fact]
+    public void When_resource_has_default_constructor_it_must_succeed()
     {
-        [Fact]
-        public void When_resource_has_default_constructor_it_must_succeed()
-        {
-            // Arrange
-            var factory = new ResourceFactory(new ServiceContainer());
+        // Arrange
+        var factory = new ResourceFactory(new ServiceContainer());
 
-            // Act
-            NewExpression newExpression = factory.CreateNewExpression(typeof(ResourceWithoutConstructor));
+        // Act
+        NewExpression newExpression = factory.CreateNewExpression(typeof(ResourceWithoutConstructor));
 
-            // Assert
-            Func<ResourceWithoutConstructor> createFunction = Expression.Lambda<Func<ResourceWithoutConstructor>>(newExpression).Compile();
-            ResourceWithoutConstructor resource = createFunction();
+        // Assert
+        Func<ResourceWithoutConstructor> createFunction = Expression.Lambda<Func<ResourceWithoutConstructor>>(newExpression).Compile();
+        ResourceWithoutConstructor resource = createFunction();
 
-            resource.ShouldNotBeNull();
-        }
+        resource.ShouldNotBeNull();
+    }
 
-        [Fact]
-        public void When_resource_has_constructor_with_string_parameter_it_must_fail()
-        {
-            // Arrange
-            var factory = new ResourceFactory(new ServiceContainer());
+    [Fact]
+    public void When_resource_has_constructor_with_string_parameter_it_must_fail()
+    {
+        // Arrange
+        var factory = new ResourceFactory(new ServiceContainer());
 
-            // Act
-            Action action = () => factory.CreateNewExpression(typeof(ResourceWithStringConstructor));
+        // Act
+        Action action = () => factory.CreateNewExpression(typeof(ResourceWithStringConstructor));
 
-            // Assert
-            action.Should().ThrowExactly<InvalidOperationException>()
-                .WithMessage($"Failed to create an instance of '{typeof(ResourceWithStringConstructor).FullName}': Parameter 'text' could not be resolved.");
-        }
+        // Assert
+        action.Should().ThrowExactly<InvalidOperationException>()
+            .WithMessage($"Failed to create an instance of '{typeof(ResourceWithStringConstructor).FullName}': Parameter 'text' could not be resolved.");
+    }
 
-        private sealed class ResourceWithoutConstructor : Identifiable<int>
-        {
-        }
+    private sealed class ResourceWithoutConstructor : Identifiable<int>
+    {
+    }
 
-        [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-        private sealed class ResourceWithStringConstructor : Identifiable<int>
-        {
-            public string Text { get; }
+    [UsedImplicitly(ImplicitUseTargetFlags.Members)]
+    private sealed class ResourceWithStringConstructor : Identifiable<int>
+    {
+        public string Text { get; }
 
-            public ResourceWithStringConstructor(string text)
-            {
-                ArgumentGuard.NotNullNorEmpty(text, nameof(text));
+        public ResourceWithStringConstructor(string text)
+        {
+            ArgumentGuard.NotNullNorEmpty(text, nameof(text));
 
-                Text = text;
-            }
+            Text = text;
         }
     }
 }
diff --git a/test/UnitTests/UnitTests.csproj b/test/UnitTests/UnitTests.csproj
index 04e37a53ce..eb3383fbdf 100644
--- a/test/UnitTests/UnitTests.csproj
+++ b/test/UnitTests/UnitTests.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppVersion)</TargetFramework>
+    <TargetFramework>$(TargetFrameworkName)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Update="xunit.runner.json"> 
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 
+    <None Update="xunit.runner.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>