diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Database/Querying/IdentificationCodeCriteriaApplicatorTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Database/Querying/IdentificationCodeCriteriaApplicatorTests.cs
index 70f2a4764a..b5943ec7aa 100644
--- a/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Database/Querying/IdentificationCodeCriteriaApplicatorTests.cs
+++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Common/Database/Querying/IdentificationCodeCriteriaApplicatorTests.cs
@@ -29,7 +29,6 @@ public class IdentificationCodeAggregateRootQueryCriteriaApplicatorTests
     {
         private IResourceModel _resourceModel;
         private IResourceModelProvider _resourceModelProvider;
-        private IResourceIdentificationCodePropertiesProvider _resourceIdentificationCodePropertiesProvider;
         private readonly string identificationCodeTableAlias =
             IdentificationCodeAggregateRootQueryCriteriaApplicator.IdentificationCodeEntityTableAlias();
 
diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Features/OpenApiMetadata/Providers/OpenApiMetadataCacheProviderTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Features/OpenApiMetadata/Providers/OpenApiMetadataCacheProviderTests.cs
index 7af5a0f358..a6b658f830 100644
--- a/Application/EdFi.Ods.Tests/EdFi.Ods.Features/OpenApiMetadata/Providers/OpenApiMetadataCacheProviderTests.cs
+++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Features/OpenApiMetadata/Providers/OpenApiMetadataCacheProviderTests.cs
@@ -748,7 +748,6 @@ public void Should_be_a_valid_swagger_document_for_each_extension_schema_in_the_
         public class When_requesting_a_section_from_the_cache_for_which_no_route_was_registered : TestFixtureBase
         {
             private OpenApiMetadataCacheProvider _openApiMetadataCacheProvider;
-            private IResourceIdentificationCodePropertiesProvider _resourceIdentificationCodePropertiesProvider;
             private List<OpenApiContent> _actualMetadata;
 
             protected override void Arrange()
diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Security/Authorization/EntityAuthorization/EntityAuthorizerTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Security/Authorization/EntityAuthorization/EntityAuthorizerTests.cs
index 00e2dffcff..8460fbd98e 100644
--- a/Application/EdFi.Ods.Tests/EdFi.Ods.Security/Authorization/EntityAuthorization/EntityAuthorizerTests.cs
+++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Security/Authorization/EntityAuthorization/EntityAuthorizerTests.cs
@@ -115,7 +115,7 @@ public async Task AuthorizeEntityAsync_ShouldCallValidateOnAuthorizationValidato
     }
 
     [Test]
-    public async Task AuthorizeEntityAsync_ShouldThrowException_WhenDelegateFilterAuthorizerFailsAndResults()
+    public Task AuthorizeEntityAsync_ShouldThrowException_WhenDelegateFilterAuthorizerFailsAndResults()
     {
         // Arrange
         var actionUri = "some-action-uri";
@@ -150,6 +150,8 @@ public async Task AuthorizeEntityAsync_ShouldThrowException_WhenDelegateFilterAu
             _entityAuthorizer.AuthorizeEntityAsync(entity, actionUri, AuthorizationPhase.ExistingData, CancellationToken.None));
         
         ex.Message.ShouldBe("Authorization failed");
+
+        return Task.CompletedTask;
     }
 
     [Test]
@@ -295,7 +297,7 @@ public async Task AuthorizeEntityAsync_ShouldPerformViewBasedAuthorization_WhenP
     }
     
     [Test]
-    public async Task AuthorizeEntityAsync_ShouldThrow_WhenAllPendingExistenceChecksIsEmpty()
+    public Task AuthorizeEntityAsync_ShouldThrow_WhenAllPendingExistenceChecksIsEmpty()
     {
         // Arrange
         var actionUri = "some-action-uri";
@@ -332,10 +334,12 @@ public async Task AuthorizeEntityAsync_ShouldThrow_WhenAllPendingExistenceChecks
             _entityAuthorizer.AuthorizeEntityAsync(entity, actionUri, AuthorizationPhase.ExistingData, CancellationToken.None));
         
         ex.Message.ShouldBe("Authorization failed");
+
+        return Task.CompletedTask;
     }
     
     [Test]
-    public async Task AuthorizeEntityAsync_ShouldThrow_WhenPendingOrStrategyResultsInFailedState()
+    public Task AuthorizeEntityAsync_ShouldThrow_WhenPendingOrStrategyResultsInFailedState()
     {
         // Arrange
         var actionUri = "some-action-uri";
@@ -383,5 +387,7 @@ public async Task AuthorizeEntityAsync_ShouldThrow_WhenPendingOrStrategyResultsI
             _entityAuthorizer.AuthorizeEntityAsync(entity, actionUri, AuthorizationPhase.ExistingData, CancellationToken.None));
         
         ex.Message.ShouldBe("Authorization failed");
+
+        return Task.CompletedTask;
     }
 }
diff --git a/Application/EdFi.Ods.Tests/EdFi.Ods.Security/Authorization/EntityAuthorization/EntityInstanceViewBasedFilterAuthorizerTests.cs b/Application/EdFi.Ods.Tests/EdFi.Ods.Security/Authorization/EntityAuthorization/EntityInstanceViewBasedFilterAuthorizerTests.cs
index 36cb4735f3..fdb6874af4 100644
--- a/Application/EdFi.Ods.Tests/EdFi.Ods.Security/Authorization/EntityAuthorization/EntityInstanceViewBasedFilterAuthorizerTests.cs
+++ b/Application/EdFi.Ods.Tests/EdFi.Ods.Security/Authorization/EntityAuthorization/EntityInstanceViewBasedFilterAuthorizerTests.cs
@@ -37,7 +37,7 @@ public void SetUp()
     private EntityInstanceViewBasedFilterAuthorizer _authorizer;
 
     [Test]
-    public async Task PerformViewBasedAuthorizationAsync_ShouldNotExecuteQuery_WhenParameterValuesAreNull()
+    public Task PerformViewBasedAuthorizationAsync_ShouldNotExecuteQuery_WhenParameterValuesAreNull()
     {
         // Arrange
         var resultsWithPendingExistenceChecks = new[]
@@ -83,6 +83,8 @@ public async Task PerformViewBasedAuthorizationAsync_ShouldNotExecuteQuery_WhenP
                 resultsWithPendingExistenceChecks,
                 claimEducationOrganizationIds))
             .MustNotHaveHappened();
+        
+        return Task.CompletedTask;
     }
 
     [Test]