diff --git a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/GetUsersTest.cs b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/GetUsersTest.cs
index 66324380..23a4d080 100644
--- a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/GetUsersTest.cs
+++ b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/Auth/GetUsersTest.cs
@@ -31,7 +31,7 @@ public GetUsersTest(GetUsersFixture fixture)
         }
 
         [Fact]
-        public async void VariousIdentifiers()
+        public async Task VariousIdentifiers()
         {
             var getUsersResult = await FirebaseAuth.DefaultInstance.GetUsersAsync(
                 new List<UserIdentifier>()
@@ -56,7 +56,7 @@ public async void VariousIdentifiers()
         }
 
         [Fact]
-        public async void IgnoresNonExistingUsers()
+        public async Task IgnoresNonExistingUsers()
         {
             var doesntExistId = new UidIdentifier("uid_that_doesnt_exist");
             var getUsersResult = await FirebaseAuth.DefaultInstance.GetUsersAsync(
@@ -79,7 +79,7 @@ public async void IgnoresNonExistingUsers()
         }
 
         [Fact]
-        public async void OnlyNonExistingUsers()
+        public async Task OnlyNonExistingUsers()
         {
             var doesntExistId = new UidIdentifier("uid_that_doesnt_exist");
             var getUsersResult = await FirebaseAuth.DefaultInstance.GetUsersAsync(
@@ -93,7 +93,7 @@ public async void OnlyNonExistingUsers()
         }
 
         [Fact]
-        public async void DedupsDuplicateUsers()
+        public async Task DedupsDuplicateUsers()
         {
             var getUsersResult = await FirebaseAuth.DefaultInstance.GetUsersAsync(
                 new List<UserIdentifier>()
diff --git a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj
index 1fc444ff..b8ad1725 100644
--- a/FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj
+++ b/FirebaseAdmin/FirebaseAdmin.IntegrationTests/FirebaseAdmin.IntegrationTests.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" /> 
     <PackageReference Include="System.Text.Json" Version="8.0.5" /> 
-    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs
index 3d780f9d..d98cc355 100644
--- a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs
+++ b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/FirebaseAuthTest.cs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 using System;
+using System.Threading.Tasks;
 using FirebaseAdmin.Auth.Jwt;
 using Google.Apis.Auth.OAuth2;
 using Xunit;
@@ -171,7 +172,7 @@ public void ServiceAccountId()
         }
 
         [Fact]
-        public async void InvalidCredential()
+        public async Task InvalidCredential()
         {
             var options = new AppOptions
             {
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Users/EmailActionRequestTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Users/EmailActionRequestTest.cs
index 73778fe1..97ec2038 100644
--- a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Users/EmailActionRequestTest.cs
+++ b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Users/EmailActionRequestTest.cs
@@ -92,7 +92,7 @@ public class EmailActionRequestTest
         };
 
         [Fact]
-        public async void NoEmail()
+        public async Task NoEmail()
         {
             var handler = new MockMessageHandler() { Response = GenerateEmailLinkResponse };
             var auth = this.CreateFirebaseAuth(handler);
@@ -115,7 +115,7 @@ await Assert.ThrowsAsync<ArgumentException>(
 
         [Theory]
         [MemberData(nameof(InvalidActionCodeSettingsArgs))]
-        public async void InvalidActionCodeSettings(ActionCodeSettings settings)
+        public async Task InvalidActionCodeSettings(ActionCodeSettings settings)
         {
             var handler = new MockMessageHandler() { Response = GenerateEmailLinkResponse };
             var auth = this.CreateFirebaseAuth(handler);
@@ -264,7 +264,7 @@ public async Task PasswordResetLinkUnexpectedResponse()
         }
 
         [Fact]
-        public async void SignInWithEmailLinkNoSettings()
+        public async Task SignInWithEmailLinkNoSettings()
         {
             var handler = new MockMessageHandler() { Response = GenerateEmailLinkResponse };
             var auth = this.CreateFirebaseAuth(handler);
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Users/FirebaseUserManagerTest.cs b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Users/FirebaseUserManagerTest.cs
index 4b74fa75..198a4e78 100644
--- a/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Users/FirebaseUserManagerTest.cs
+++ b/FirebaseAdmin/FirebaseAdmin.Tests/Auth/Users/FirebaseUserManagerTest.cs
@@ -1302,7 +1302,7 @@ public async Task NullClaims(TestConfig config)
 
         [Theory]
         [MemberData(nameof(TestConfigs))]
-        public async void ReservedClaims(TestConfig config)
+        public async Task ReservedClaims(TestConfig config)
         {
             var handler = new MockMessageHandler();
             var auth = config.CreateAuth(handler);
@@ -1321,7 +1321,7 @@ await Assert.ThrowsAsync<ArgumentException>(
 
         [Theory]
         [MemberData(nameof(TestConfigs))]
-        public async void UpdateUserNoUid(TestConfig config)
+        public async Task UpdateUserNoUid(TestConfig config)
         {
             var handler = new MockMessageHandler();
             var auth = config.CreateAuth(handler);
@@ -1335,7 +1335,7 @@ public async void UpdateUserNoUid(TestConfig config)
 
         [Theory]
         [MemberData(nameof(TestConfigs))]
-        public async void UpdateUserInvalidUid(TestConfig config)
+        public async Task UpdateUserInvalidUid(TestConfig config)
         {
             var handler = new MockMessageHandler();
             var auth = config.CreateAuth(handler);
@@ -1487,7 +1487,7 @@ public async Task UpdateUserShortPassword(TestConfig config)
 
         [Theory]
         [MemberData(nameof(TestConfigs))]
-        public async void EmptyNameClaims(TestConfig config)
+        public async Task EmptyNameClaims(TestConfig config)
         {
             var handler = new MockMessageHandler();
             var auth = config.CreateAuth(handler);
@@ -1502,7 +1502,7 @@ await Assert.ThrowsAsync<ArgumentException>(
 
         [Theory]
         [MemberData(nameof(TestConfigs))]
-        public async void LargeClaimsOverLimit(TestConfig config)
+        public async Task LargeClaimsOverLimit(TestConfig config)
         {
             var handler = new MockMessageHandler();
             var auth = config.CreateAuth(handler);
@@ -1732,7 +1732,7 @@ public async Task RevokeRefreshTokens(TestConfig config)
 
         [Theory]
         [MemberData(nameof(TestConfigs))]
-        public async void RevokeRefreshTokensNoUid(TestConfig config)
+        public async Task RevokeRefreshTokensNoUid(TestConfig config)
         {
             var handler = new MockMessageHandler() { Response = CreateUserResponse };
             var auth = config.CreateAuth(handler);
@@ -1745,7 +1745,7 @@ await Assert.ThrowsAsync<ArgumentException>(
 
         [Theory]
         [MemberData(nameof(TestConfigs))]
-        public async void RevokeRefreshTokensInvalidUid(TestConfig config)
+        public async Task RevokeRefreshTokensInvalidUid(TestConfig config)
         {
             var auth = config.CreateAuth(new MockMessageHandler());
 
@@ -1756,7 +1756,7 @@ await Assert.ThrowsAsync<ArgumentException>(
 
         [Theory]
         [MemberData(nameof(MainTenantTestConfigs))]
-        public async void CreateSessionCookieNoIdToken(TestConfig config)
+        public async Task CreateSessionCookieNoIdToken(TestConfig config)
         {
             var handler = new MockMessageHandler() { Response = "{}" };
             var auth = (FirebaseAuth)config.CreateAuth(handler);
@@ -1773,7 +1773,7 @@ await Assert.ThrowsAsync<ArgumentException>(
 
         [Theory]
         [MemberData(nameof(MainTenantTestConfigs))]
-        public async void CreateSessionCookieNoOptions(TestConfig config)
+        public async Task CreateSessionCookieNoOptions(TestConfig config)
         {
             var handler = new MockMessageHandler() { Response = "{}" };
             var auth = (FirebaseAuth)config.CreateAuth(handler);
@@ -1784,7 +1784,7 @@ await Assert.ThrowsAsync<ArgumentNullException>(
 
         [Theory]
         [MemberData(nameof(MainTenantTestConfigs))]
-        public async void CreateSessionCookieNoExpiresIn(TestConfig config)
+        public async Task CreateSessionCookieNoExpiresIn(TestConfig config)
         {
             var handler = new MockMessageHandler() { Response = "{}" };
             var auth = (FirebaseAuth)config.CreateAuth(handler);
diff --git a/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj b/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj
index 65fba4a7..a7ced4e9 100644
--- a/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj
+++ b/FirebaseAdmin/FirebaseAdmin.Tests/FirebaseAdmin.Tests.csproj
@@ -18,8 +18,8 @@
     <PackageReference Include="Google.Apis.Auth" Version="1.68.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
-    <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="System.Linq.Async" Version="6.0.3" />
+    <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/README.md b/README.md
index 401bb5e4..129e5428 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-[![Build Status](https://github.com/firebase/firebase-admin-dotnet/workflows/Continuous%20Integration/badge.svg)](https://github.com/firebase/firebase-admin-dotnet/actions)
+[![Continuous Integration](https://github.com/firebase/firebase-admin-dotnet/actions/workflows/ci.yml/badge.svg)](https://github.com/firebase/firebase-admin-dotnet/actions/workflows/ci.yml)
+[![Nightly Builds](https://github.com/firebase/firebase-admin-dotnet/actions/workflows/nightly.yml/badge.svg)](https://github.com/firebase/firebase-admin-dotnet/actions/workflows/nightly.yml)
 
 # Firebase Admin .NET SDK