diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/IConfirmOrganizationUserCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/IConfirmOrganizationUserCommand.cs
index 302ee0901d..e574d29e48 100644
--- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/IConfirmOrganizationUserCommand.cs
+++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/Interfaces/IConfirmOrganizationUserCommand.cs
@@ -1,4 +1,5 @@
 using Bit.Core.Entities;
+using Bit.Core.Exceptions;
 
 namespace Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
 
diff --git a/test/Api.Test/AdminConsole/Controllers/GroupsControllerPutTests.cs b/test/Api.Test/AdminConsole/Controllers/GroupsControllerPutTests.cs
index 0e260e73e6..71dc5e5aea 100644
--- a/test/Api.Test/AdminConsole/Controllers/GroupsControllerPutTests.cs
+++ b/test/Api.Test/AdminConsole/Controllers/GroupsControllerPutTests.cs
@@ -304,7 +304,7 @@ public class GroupsControllerPutTests
         // Arrange repositories
         sutProvider.GetDependency<IGroupRepository>().GetManyUserIdsByIdAsync(group.Id).Returns(currentGroupUsers ?? []);
         sutProvider.GetDependency<IGroupRepository>().GetByIdWithCollectionsAsync(group.Id)
-            .Returns(new Tuple<Group, ICollection<CollectionAccessSelection>>(group, currentCollectionAccess ?? []));
+            .Returns(new Tuple<Group?, ICollection<CollectionAccessSelection>>(group, currentCollectionAccess ?? []));
         if (savingUser != null)
         {
             sutProvider.GetDependency<IOrganizationUserRepository>().GetByOrganizationAsync(orgId, savingUser.UserId!.Value)
diff --git a/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUserCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUserCommandTests.cs
index 0592b481d3..80ce4cf481 100644
--- a/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUserCommandTests.cs
+++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUserCommandTests.cs
@@ -677,7 +677,7 @@ public class InviteOrganizationUserCommandTests
         // Assert
         Assert.IsType<Success<ScimInviteOrganizationUsersResponse>>(result);
 
-        sutProvider.GetDependency<IMailService>().Received(1)
+        await sutProvider.GetDependency<IMailService>().Received(1)
             .SendOrganizationMaxSeatLimitReachedEmailAsync(organization, 2,
                 Arg.Is<IEnumerable<string>>(emails => emails.Any(email => email == "provider@email.com")));
     }
@@ -768,7 +768,7 @@ public class InviteOrganizationUserCommandTests
         // Assert
         Assert.IsType<Success<ScimInviteOrganizationUsersResponse>>(result);
 
-        sutProvider.GetDependency<IMailService>().Received(1)
+        await sutProvider.GetDependency<IMailService>().Received(1)
             .SendOrganizationAutoscaledEmailAsync(organization, 1,
                 Arg.Is<IEnumerable<string>>(emails => emails.Any(email => email == "provider@email.com")));
     }
diff --git a/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Validation/InviteOrganizationUsersValidatorTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Validation/InviteOrganizationUsersValidatorTests.cs
index 191ef05603..ee40fb1152 100644
--- a/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Validation/InviteOrganizationUsersValidatorTests.cs
+++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/Validation/InviteOrganizationUsersValidatorTests.cs
@@ -61,7 +61,7 @@ public class InviteOrganizationUsersValidatorTests
 
         _ = await sutProvider.Sut.ValidateAsync(request);
 
-        sutProvider.GetDependency<IUpdateSecretsManagerSubscriptionCommand>()
+        await sutProvider.GetDependency<IUpdateSecretsManagerSubscriptionCommand>()
             .Received(1)
             .ValidateUpdateAsync(Arg.Is<SecretsManagerSubscriptionUpdate>(x =>
                 x.SmSeatsChanged == true && x.SmSeats == 12));
diff --git a/test/Core.Test/AdminConsole/Services/EventRouteServiceTests.cs b/test/Core.Test/AdminConsole/Services/EventRouteServiceTests.cs
index f593a4628b..1a42d846f2 100644
--- a/test/Core.Test/AdminConsole/Services/EventRouteServiceTests.cs
+++ b/test/Core.Test/AdminConsole/Services/EventRouteServiceTests.cs
@@ -26,8 +26,8 @@ public class EventRouteServiceTests
 
         await Subject.CreateAsync(eventMessage);
 
-        _broadcastEventWriteService.DidNotReceiveWithAnyArgs().CreateAsync(Arg.Any<EventMessage>());
-        _storageEventWriteService.Received(1).CreateAsync(eventMessage);
+        await _broadcastEventWriteService.DidNotReceiveWithAnyArgs().CreateAsync(Arg.Any<EventMessage>());
+        await _storageEventWriteService.Received(1).CreateAsync(eventMessage);
     }
 
     [Theory, BitAutoData]
@@ -37,8 +37,8 @@ public class EventRouteServiceTests
 
         await Subject.CreateAsync(eventMessage);
 
-        _broadcastEventWriteService.Received(1).CreateAsync(eventMessage);
-        _storageEventWriteService.DidNotReceiveWithAnyArgs().CreateAsync(Arg.Any<EventMessage>());
+        await _broadcastEventWriteService.Received(1).CreateAsync(eventMessage);
+        await _storageEventWriteService.DidNotReceiveWithAnyArgs().CreateAsync(Arg.Any<EventMessage>());
     }
 
     [Theory, BitAutoData]
@@ -48,8 +48,8 @@ public class EventRouteServiceTests
 
         await Subject.CreateManyAsync(eventMessages);
 
-        _broadcastEventWriteService.DidNotReceiveWithAnyArgs().CreateManyAsync(Arg.Any<IEnumerable<EventMessage>>());
-        _storageEventWriteService.Received(1).CreateManyAsync(eventMessages);
+        await _broadcastEventWriteService.DidNotReceiveWithAnyArgs().CreateManyAsync(Arg.Any<IEnumerable<EventMessage>>());
+        await _storageEventWriteService.Received(1).CreateManyAsync(eventMessages);
     }
 
     [Theory, BitAutoData]
@@ -59,7 +59,7 @@ public class EventRouteServiceTests
 
         await Subject.CreateManyAsync(eventMessages);
 
-        _broadcastEventWriteService.Received(1).CreateManyAsync(eventMessages);
-        _storageEventWriteService.DidNotReceiveWithAnyArgs().CreateManyAsync(Arg.Any<IEnumerable<EventMessage>>());
+        await _broadcastEventWriteService.Received(1).CreateManyAsync(eventMessages);
+        await _storageEventWriteService.DidNotReceiveWithAnyArgs().CreateManyAsync(Arg.Any<IEnumerable<EventMessage>>());
     }
 }
diff --git a/test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs b/test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs
index 798ba219eb..558bded8b3 100644
--- a/test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs
+++ b/test/Core.Test/AdminConsole/Services/SlackEventHandlerTests.cs
@@ -89,7 +89,7 @@ public class SlackEventHandlerTests
         var sutProvider = GetSutProvider(OneConfiguration());
 
         await sutProvider.Sut.HandleEventAsync(eventMessage);
-        sutProvider.GetDependency<ISlackService>().Received(1).SendSlackMessageByChannelIdAsync(
+        await sutProvider.GetDependency<ISlackService>().Received(1).SendSlackMessageByChannelIdAsync(
             Arg.Is(AssertHelper.AssertPropertyEqual(_token)),
             Arg.Is(AssertHelper.AssertPropertyEqual(
                 $"Date: {eventMessage.Date}, Type: {eventMessage.Type}, UserId: {eventMessage.UserId}")),
@@ -103,13 +103,13 @@ public class SlackEventHandlerTests
         var sutProvider = GetSutProvider(TwoConfigurations());
 
         await sutProvider.Sut.HandleEventAsync(eventMessage);
-        sutProvider.GetDependency<ISlackService>().Received(1).SendSlackMessageByChannelIdAsync(
+        await sutProvider.GetDependency<ISlackService>().Received(1).SendSlackMessageByChannelIdAsync(
             Arg.Is(AssertHelper.AssertPropertyEqual(_token)),
             Arg.Is(AssertHelper.AssertPropertyEqual(
                 $"Date: {eventMessage.Date}, Type: {eventMessage.Type}, UserId: {eventMessage.UserId}")),
             Arg.Is(AssertHelper.AssertPropertyEqual(_channelId))
         );
-        sutProvider.GetDependency<ISlackService>().Received(1).SendSlackMessageByChannelIdAsync(
+        await sutProvider.GetDependency<ISlackService>().Received(1).SendSlackMessageByChannelIdAsync(
             Arg.Is(AssertHelper.AssertPropertyEqual(_token2)),
             Arg.Is(AssertHelper.AssertPropertyEqual(
                 $"Date: {eventMessage.Date}, Type: {eventMessage.Type}, UserId: {eventMessage.UserId}")),