From cd1835326baf1a9099f7d1c9a3d2e3e316417fe7 Mon Sep 17 00:00:00 2001
From: Tom Longhurst <30480171+thomhurst@users.noreply.github.com>
Date: Mon, 15 Apr 2024 21:19:26 +0100
Subject: [PATCH] Fix xUnit Warnings (#2906)

* Fix xUnit Warnings

* Fix

* Fix formatting in AsyncPaginationExtensionGenerator.cs

---------

Co-authored-by: Keegan Campbell <me@kfcampbell.com>
---
 .../AsyncPaginationExtensionsGenerator.cs     | 34 ++++---
 .../Clients/CheckRunsClientTests.cs           |  4 +-
 .../CommitCommentReactionsClientTests.cs      | 16 ++--
 .../Clients/CommitStatusClientTests.cs        | 20 ++--
 .../Clients/DeploymentStatusClientTests.cs    |  4 +-
 .../Enterprise/EnterpriseLdapClientTests.cs   |  4 +-
 ...rprisePreReceiveEnvironmentsClientTests.cs |  4 +-
 .../EnterprisePreReceiveHooksClientTests.cs   |  4 +-
 .../Clients/EventsClientTests.cs              |  2 +-
 .../Clients/GitHubClientTests.cs              |  6 +-
 .../IssueCommentReactionsClientTests.cs       | 16 ++--
 .../Clients/IssueReactionsClientTests.cs      | 16 ++--
 .../Clients/IssueTimelineClientTests.cs       | 14 +--
 .../Clients/IssuesClientTests.cs              | 50 +++++-----
 .../Clients/IssuesEventsClientTests.cs        | 12 +--
 .../Clients/IssuesLabelsClientTests.cs        | 56 +++++------
 .../Clients/MigrationsClientTests.cs          | 10 +-
 .../Clients/MilestonesClientTests.cs          | 12 +--
 .../Clients/OrganizationClientTests.cs        |  2 +-
 .../Clients/OrganizationHooksClientTests.cs   |  2 +-
 .../Clients/OrganizationMembersClientTests.cs | 16 ++--
 ...nizationOutsideCollaboratorsClientTests.cs | 18 ++--
 .../Clients/OrganizationSecretsClientTests.cs |  4 +-
 .../Clients/ProjectCardsClientTests.cs        |  8 +-
 .../Clients/ProjectColumnsClientTests.cs      |  4 +-
 .../Clients/ProjectsClientTests.cs            | 12 +--
 ...equestReviewCommentReactionsClientTests.cs | 16 ++--
 .../PullRequestReviewCommentsClientTests.cs   | 12 +--
 .../Clients/PullRequestReviewsClientTests.cs  | 16 ++--
 .../Clients/PullRequestsClientTests.cs        | 46 ++++-----
 .../Clients/ReleasesClientTests.cs            | 16 ++--
 .../Clients/RepositoryBranchesClientTests.cs  | 78 +++++++--------
 .../RepositoryCollaboratorClientTests.cs      | 22 ++---
 .../Clients/RepositoryCommitsClientTests.cs   | 14 +--
 .../Clients/RepositoryContentsClientTests.cs  |  8 +-
 .../RepositoryDeployKeysClientTests.cs        | 22 ++---
 .../Clients/RepositoryForksClientTests.cs     | 16 ++--
 .../Clients/RepositoryHooksClientTests.cs     |  4 +-
 .../RepositoryInvitationsClientTests.cs       | 10 +-
 .../Clients/RespositorySecretsClientTests.cs  |  4 +-
 .../Clients/StarredClientTests.cs             | 96 +++++++++----------
 .../Clients/StatisticsClientTests.cs          |  8 +-
 .../Clients/TeamsClientTests.cs               | 16 ++--
 .../Clients/TreeClientTests.cs                |  4 +-
 .../ObservableEnterpriseLdapClientTests.cs    |  4 +-
 ...rprisePreReceiveEnvironmentsClientTests.cs |  4 +-
 ...bleEnterprisePreReceiveHooksClientTests.cs |  4 +-
 .../ObservableCheckRunsClientTests.cs         |  4 +-
 .../ObservableFollowersClientTests.cs         |  8 +-
 .../ObservableIssueTimelineClientTests.cs     | 14 +--
 ...bservableOrganizationMembersClientTests.cs |  6 +-
 ...nizationOutsideCollaboratorsClientTests.cs | 18 ++--
 ...bservableOrganizationSecretsClientTests.cs |  4 +-
 .../ObservableProjectCardsClientTests.cs      |  8 +-
 .../ObservableProjectColumnsClientTests.cs    |  4 +-
 .../Reactive/ObservableProjectsClientTests.cs | 12 +--
 ...ObservableRepositoryBranchesClientTests.cs | 32 +++----
 ...rvableRepositoryCollaboratorClientTests.cs | 10 +-
 ...servableRepositoryDeployKeysClientTests.cs |  4 +-
 .../ObservableRepositoryHooksClientTests.cs   |  2 +-
 .../ObservableRepositorySecretsClientTests.cs |  2 +-
 .../Reactive/ObservableTeamsClientTests.cs    | 12 +--
 Octokit.Tests/Clients/EventsClientTests.cs    | 30 +++---
 .../Clients/RepositoryContentsClientTests.cs  | 16 ++--
 .../Clients/StatisticsClientTests.cs          | 16 ++--
 Octokit.Tests/Exceptions/ApiErrorTests.cs     |  2 +-
 Octokit.Tests/Http/ApiConnectionTests.cs      |  2 +-
 Octokit.Tests/Http/ApiInfoParserTests.cs      |  2 +-
 Octokit.Tests/Http/ApiInfoTests.cs            |  8 +-
 Octokit.Tests/Http/ConnectionTests.cs         |  2 +-
 Octokit.Tests/Models/DeploymentStatusTests.cs |  2 +-
 Octokit.Tests/Models/InstallationTests.cs     |  5 +-
 Octokit.Tests/Models/MigrationTests.cs        |  4 +-
 .../Models/PullRequestCommitTests.cs          |  6 +-
 .../Models/RequestParametersTests.cs          | 18 ++--
 .../SearchIssuesRequestExclusionsTests.cs     |  2 +-
 .../Models/SearchIssuesRequestTests.cs        |  4 +-
 .../Models/WorkflowJobsResponseTests.cs       |  2 +-
 Octokit.Tests/Models/WorkflowRunUsageTests.cs |  2 +-
 .../ObservableIssueTimelineClientTests.cs     |  8 +-
 .../ObservableIssuesEventsClientTests.cs      | 16 ++--
 .../ObservablePullRequestsClientTests.cs      |  8 +-
 ...ObservableRepositoryContentsClientTests.cs | 16 ++--
 83 files changed, 543 insertions(+), 538 deletions(-)

diff --git a/Octokit.Generators/AsyncPaginationExtensionsGenerator.cs b/Octokit.Generators/AsyncPaginationExtensionsGenerator.cs
index d3621f047f..8407388fda 100644
--- a/Octokit.Generators/AsyncPaginationExtensionsGenerator.cs
+++ b/Octokit.Generators/AsyncPaginationExtensionsGenerator.cs
@@ -26,8 +26,8 @@ namespace Octokit.Generators
   class AsyncPaginationExtensionsGenerator
   {
 
-  private const string HEADER = (
-@"using System;
+    private const string HEADER = (
+  @"using System;
 using System.Collections.Generic;
 
 namespace Octokit.AsyncPaginationExtension
@@ -44,8 +44,8 @@ public static class Extensions
     private const int DEFAULT_PAGE_SIZE = 30;
   ");
 
-  private const string FOOTER = (
-@"
+    private const string FOOTER = (
+  @"
   }
 }");
 
@@ -63,15 +63,17 @@ public static async Task GenerateAsync(string root = "./")
       var enumOptions = new EnumerationOptions { RecurseSubdirectories = true };
       var paginatedCallRegex = new Regex(@".*Task<IReadOnlyList<(?<returnType>\w+)>>\s*(?<name>\w+)(?<template><.*>)?\((?<arg>.*?)(, )?ApiOptions \w*\);");
 
-      foreach (var file in Directory.EnumerateFiles(root, "I*.cs", enumOptions)) {
-          var type = Path.GetFileNameWithoutExtension(file);
+      foreach (var file in Directory.EnumerateFiles(root, "I*.cs", enumOptions))
+      {
+        var type = Path.GetFileNameWithoutExtension(file);
 
-          foreach (var line in File.ReadAllLines(file)) {
-              var match = paginatedCallRegex.Match(line);
+        foreach (var line in File.ReadAllLines(file))
+        {
+          var match = paginatedCallRegex.Match(line);
 
-              if (!match.Success) { continue; }
-              sb.Append(BuildBodyFromTemplate(match, type));
-          }
+          if (!match.Success) { continue; }
+          sb.Append(BuildBodyFromTemplate(match, type));
+        }
       }
 
       sb.Append(FOOTER);
@@ -101,12 +103,14 @@ private static string BuildBodyFromTemplate(Match match, string type)
           : $"options => t.{name}{templateStr}({string.Join(' ', splitArgs.Where((_, i) => i % 2 == 1))}, options)";
 
       var docArgs = string.Join(", ", splitArgs.Where((_, i) => i % 2 == 0)).Replace('<', '{').Replace('>', '}');
-      if (docArgs.Length != 0) {
-          docArgs += ", ";
+      if (docArgs.Length != 0)
+      {
+        docArgs += ", ";
       }
 
-      if (arg.Length != 0) {
-          arg += ", ";
+      if (arg.Length != 0)
+      {
+        arg += ", ";
       }
 
       return ($@"
diff --git a/Octokit.Tests.Integration/Clients/CheckRunsClientTests.cs b/Octokit.Tests.Integration/Clients/CheckRunsClientTests.cs
index 5794088d5e..c1cdc33153 100644
--- a/Octokit.Tests.Integration/Clients/CheckRunsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/CheckRunsClientTests.cs
@@ -421,7 +421,7 @@ public async Task GetsAllAnnotations()
                     var annotations = await _githubAppInstallation.Check.Run.GetAllAnnotations(repoContext.RepositoryOwner, repoContext.RepositoryName, created.Id);
 
                     // Check result
-                    Assert.Equal(1, annotations.Count);
+                    Assert.Single(annotations);
                     Assert.Equal("this is a warning", annotations.First().Message);
                     Assert.Equal(CheckAnnotationLevel.Warning, annotations.First().AnnotationLevel);
                 }
@@ -454,7 +454,7 @@ public async Task GetsAllAnnotationsWithRepositoryId()
                     var annotations = await _githubAppInstallation.Check.Run.GetAllAnnotations(repoContext.RepositoryId, created.Id);
 
                     // Check result
-                    Assert.Equal(1, annotations.Count);
+                    Assert.Single(annotations);
                     Assert.Equal("this is a warning", annotations.First().Message);
                     Assert.Equal(CheckAnnotationLevel.Warning, annotations.First().AnnotationLevel);
                 }
diff --git a/Octokit.Tests.Integration/Clients/CommitCommentReactionsClientTests.cs b/Octokit.Tests.Integration/Clients/CommitCommentReactionsClientTests.cs
index fe008cecb4..f3bd84f298 100644
--- a/Octokit.Tests.Integration/Clients/CommitCommentReactionsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/CommitCommentReactionsClientTests.cs
@@ -97,7 +97,7 @@ public async Task ReturnsCorrectCountOfReactionsWithoutStart()
             };
             var reactions = await _github.Reaction.CommitComment.GetAll(_context.RepositoryOwner, _context.RepositoryName, result.Id, options);
 
-            Assert.Equal(1, reactions.Count);
+            Assert.Single(reactions);
 
             Assert.Equal(reaction.Id, reactions[0].Id);
             Assert.Equal(reaction.Content, reactions[0].Content);
@@ -132,7 +132,7 @@ public async Task ReturnsCorrectCountOfReactionsWithStart()
             };
             var reactionsInfo = await _github.Reaction.CommitComment.GetAll(_context.RepositoryOwner, _context.RepositoryName, result.Id, options);
 
-            Assert.Equal(1, reactionsInfo.Count);
+            Assert.Single(reactionsInfo);
 
             Assert.Equal(reactions.Last().Id, reactionsInfo[0].Id);
             Assert.Equal(reactions.Last().Content, reactionsInfo[0].Content);
@@ -173,8 +173,8 @@ public async Task ReturnsDistinctReactionsBasedOnStartPage()
             };
             var secondPage = await _github.Reaction.CommitComment.GetAll(_context.RepositoryOwner, _context.RepositoryName, result.Id, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage[0].Id, secondPage[0].Id);
             Assert.NotEqual(firstPage[0].Content, secondPage[0].Content);
         }
@@ -225,7 +225,7 @@ public async Task ReturnsCorrectCountOfReactionsWithoutStartWithRepositoryId()
             };
             var reactions = await _github.Reaction.CommitComment.GetAll(_context.Repository.Id, result.Id, options);
 
-            Assert.Equal(1, reactions.Count);
+            Assert.Single(reactions);
 
             Assert.Equal(reaction.Id, reactions[0].Id);
             Assert.Equal(reaction.Content, reactions[0].Content);
@@ -260,7 +260,7 @@ public async Task ReturnsCorrectCountOfReactionsWithStartWithRepositoryId()
             };
             var reactionsInfo = await _github.Reaction.CommitComment.GetAll(_context.Repository.Id, result.Id, options);
 
-            Assert.Equal(1, reactionsInfo.Count);
+            Assert.Single(reactionsInfo);
 
             Assert.Equal(reactions.Last().Id, reactionsInfo[0].Id);
             Assert.Equal(reactions.Last().Content, reactionsInfo[0].Content);
@@ -301,8 +301,8 @@ public async Task ReturnsDistinctReactionsBasedOnStartPageWithRepositoryId()
             };
             var secondPage = await _github.Reaction.CommitComment.GetAll(_context.Repository.Id, result.Id, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage[0].Id, secondPage[0].Id);
             Assert.NotEqual(firstPage[0].Content, secondPage[0].Content);
         }
diff --git a/Octokit.Tests.Integration/Clients/CommitStatusClientTests.cs b/Octokit.Tests.Integration/Clients/CommitStatusClientTests.cs
index 3cccfd7fec..9bb35eda43 100644
--- a/Octokit.Tests.Integration/Clients/CommitStatusClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/CommitStatusClientTests.cs
@@ -57,7 +57,7 @@ public async Task ReturnsCorrectCountOfStatusesWithoutStart()
             var statuses = await github.Repository.Status.GetAll("rails", "rails",
                                     "94b857899506612956bb542e28e292308accb908", options);
 
-            Assert.Equal(1, statuses.Count);
+            Assert.Single(statuses);
         }
 
         [IntegrationTest]
@@ -75,7 +75,7 @@ public async Task ReturnsCorrectCountOfStatusesWithStart()
             var statuses = await github.Repository.Status.GetAll("rails", "rails",
                                     "94b857899506612956bb542e28e292308accb908", options);
 
-            Assert.Equal(1, statuses.Count);
+            Assert.Single(statuses);
         }
 
         [IntegrationTest]
@@ -101,8 +101,8 @@ public async Task ReturnsDistinctStatusesBasedOnStartPage()
 
             var secondPage = await github.Repository.Status.GetAll("rails", "rails", "94b857899506612956bb542e28e292308accb908", skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage[0].Id, secondPage[0].Id);
         }
 
@@ -120,7 +120,7 @@ public async Task ReturnsCorrectCountOfStatusesWithRepositoryIdWithoutStart()
             var statuses = await github.Repository.Status.GetAll(8514,
                                     "94b857899506612956bb542e28e292308accb908", options);
 
-            Assert.Equal(1, statuses.Count);
+            Assert.Single(statuses);
         }
 
         [IntegrationTest]
@@ -138,7 +138,7 @@ public async Task ReturnsCorrectCountOfStatusesWithRepositoryIdWithStart()
             var statuses = await github.Repository.Status.GetAll(8514,
                                     "94b857899506612956bb542e28e292308accb908", options);
 
-            Assert.Equal(1, statuses.Count);
+            Assert.Single(statuses);
         }
 
         [IntegrationTest]
@@ -164,8 +164,8 @@ public async Task ReturnsDistinctStatusesBasedOnStartPageWithRepositoryId()
 
             var secondPage = await github.Repository.Status.GetAll(8514, "94b857899506612956bb542e28e292308accb908", skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage[0].Id, secondPage[0].Id);
         }
     }
@@ -247,7 +247,7 @@ public async Task CanRetrievePendingStatus()
 
             var statuses = await _github.Repository.Status.GetAll(_context.RepositoryOwner, _context.RepositoryName, commit.Sha);
 
-            Assert.Equal(1, statuses.Count);
+            Assert.Single(statuses);
             Assert.Equal(CommitState.Pending, statuses[0].State);
         }
 
@@ -289,7 +289,7 @@ public async Task CanProvideACommitStatusWithoutRequiringAContext()
 
             var statuses = await _github.Repository.Status.GetAll(_context.RepositoryOwner, _context.RepositoryName, commit.Sha);
 
-            Assert.Equal(1, statuses.Count);
+            Assert.Single(statuses);
             Assert.Equal("default", statuses[0].Context);
         }
 
diff --git a/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs b/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs
index 1fa4b89943..a95f0874f6 100644
--- a/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/DeploymentStatusClientTests.cs
@@ -168,7 +168,7 @@ public async Task ReturnsCorrectCountOfDeploymentStatusesWithStart()
 
         var deploymentStatuses = await _deploymentsClient.Status.GetAll(_context.RepositoryOwner, _context.RepositoryName, _deployment.Id, options);
 
-        Assert.Equal(1, deploymentStatuses.Count);
+        Assert.Single(deploymentStatuses);
     }
 
     [IntegrationTest]
@@ -190,7 +190,7 @@ public async Task ReturnsCorrectCountOfDeploymentStatusesWithStartWithRepository
 
         var deploymentStatuses = await _deploymentsClient.Status.GetAll(_context.Repository.Id, _deployment.Id, options);
 
-        Assert.Equal(1, deploymentStatuses.Count);
+        Assert.Single(deploymentStatuses);
     }
 
     [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseLdapClientTests.cs b/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseLdapClientTests.cs
index 9548a2b16e..f0e6850038 100644
--- a/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseLdapClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/Enterprise/EnterpriseLdapClientTests.cs
@@ -50,7 +50,7 @@ public async Task CanQueueSyncUserMapping()
         // Check response message indicates LDAP sync was queued
         Assert.NotNull(response);
         Assert.NotNull(response.Status);
-        Assert.True(response.Status == "queued");
+        Assert.Equal("queued", response.Status);
     }
 
     [GitHubEnterpriseTest]
@@ -79,7 +79,7 @@ public async Task CanQueueSyncTeamMapping()
         // Check response message indicates LDAP sync was queued
         Assert.NotNull(response);
         Assert.NotNull(response.Status);
-        Assert.True(response.Status == "queued");
+        Assert.Equal("queued", response.Status);
     }
 
     public void Dispose()
diff --git a/Octokit.Tests.Integration/Clients/Enterprise/EnterprisePreReceiveEnvironmentsClientTests.cs b/Octokit.Tests.Integration/Clients/Enterprise/EnterprisePreReceiveEnvironmentsClientTests.cs
index 92e2022197..dad9fefc2d 100644
--- a/Octokit.Tests.Integration/Clients/Enterprise/EnterprisePreReceiveEnvironmentsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/Enterprise/EnterprisePreReceiveEnvironmentsClientTests.cs
@@ -54,7 +54,7 @@ public async Task ReturnsCorrectCountOfPreReceiveEnvironmentsWithoutStart()
 
             var preReceiveEnvironments = await _preReceiveEnvironmentsClient.GetAll(options);
 
-            Assert.Equal(1, preReceiveEnvironments.Count);
+            Assert.Single(preReceiveEnvironments);
         }
 
         [GitHubEnterpriseTest]
@@ -69,7 +69,7 @@ public async Task ReturnsCorrectCountOfPreReceiveEnvironmentsWithStart()
 
             var preReceiveEnvironments = await _preReceiveEnvironmentsClient.GetAll(options);
 
-            Assert.Equal(1, preReceiveEnvironments.Count);
+            Assert.Single(preReceiveEnvironments);
         }
 
         [GitHubEnterpriseTest]
diff --git a/Octokit.Tests.Integration/Clients/Enterprise/EnterprisePreReceiveHooksClientTests.cs b/Octokit.Tests.Integration/Clients/Enterprise/EnterprisePreReceiveHooksClientTests.cs
index 4f4583779f..082e5a400a 100644
--- a/Octokit.Tests.Integration/Clients/Enterprise/EnterprisePreReceiveHooksClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/Enterprise/EnterprisePreReceiveHooksClientTests.cs
@@ -54,7 +54,7 @@ public async Task ReturnsCorrectCountOfPreReceiveHooksWithoutStart()
 
             var preReceiveHooks = await _preReceiveHooksClient.GetAll(options);
 
-            Assert.Equal(1, preReceiveHooks.Count);
+            Assert.Single(preReceiveHooks);
         }
 
         [GitHubEnterpriseTest]
@@ -69,7 +69,7 @@ public async Task ReturnsCorrectCountOfPreReceiveHooksWithStart()
 
             var preReceiveHooks = await _preReceiveHooksClient.GetAll(options);
 
-            Assert.Equal(1, preReceiveHooks.Count);
+            Assert.Single(preReceiveHooks);
         }
 
         [GitHubEnterpriseTest]
diff --git a/Octokit.Tests.Integration/Clients/EventsClientTests.cs b/Octokit.Tests.Integration/Clients/EventsClientTests.cs
index e0e8545665..0d959ceaef 100644
--- a/Octokit.Tests.Integration/Clients/EventsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/EventsClientTests.cs
@@ -332,7 +332,7 @@ public void PushEventPayloadDeserializesCorrectly()
                 var pushPayload = pushEvent.Payload as PushEventPayload;
                 Assert.NotNull(pushPayload);
                 Assert.NotNull(pushPayload.Commits);
-                Assert.Equal(1, pushPayload.Commits.Count);
+                Assert.Single(pushPayload.Commits);
                 Assert.Equal("3cdcba0ccbea0e6d13ae94249fbb294d71648321", pushPayload.Commits.FirstOrDefault().Sha);
                 Assert.Equal("3cdcba0ccbea0e6d13ae94249fbb294d71648321", pushPayload.Head);
                 Assert.Equal("refs/heads/release-candidate", pushPayload.Ref);
diff --git a/Octokit.Tests.Integration/Clients/GitHubClientTests.cs b/Octokit.Tests.Integration/Clients/GitHubClientTests.cs
index bf3c61900f..f9262a0744 100644
--- a/Octokit.Tests.Integration/Clients/GitHubClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/GitHubClientTests.cs
@@ -26,7 +26,7 @@ public async Task CanRetrieveLastApiInfoWithEtag()
 
                 var result = github.GetLastApiInfo();
 
-                Assert.True(result.Links.Count == 0);
+                Assert.Equal(0, result.Links.Count);
                 Assert.True(result.AcceptedOauthScopes.Count > -1);
                 Assert.True(result.OauthScopes.Count > -1);
                 Assert.False(string.IsNullOrEmpty(result.Etag));
@@ -67,8 +67,8 @@ public async Task CanRetrieveLastApiInfoAcceptedOauth()
 
             var result = github.GetLastApiInfo();
 
-            Assert.True(result.Links.Count == 0);
-            Assert.True(result.AcceptedOauthScopes.Count == 0);
+            Assert.Equal(0, result.Links.Count);
+            Assert.Equal(0, result.AcceptedOauthScopes.Count);
             Assert.True(result.OauthScopes.Count > 0);
             Assert.False(string.IsNullOrEmpty(result.Etag));
             Assert.True(result.RateLimit.Limit > 0);
diff --git a/Octokit.Tests.Integration/Clients/IssueCommentReactionsClientTests.cs b/Octokit.Tests.Integration/Clients/IssueCommentReactionsClientTests.cs
index 5042413012..435ef0f1b8 100644
--- a/Octokit.Tests.Integration/Clients/IssueCommentReactionsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/IssueCommentReactionsClientTests.cs
@@ -68,7 +68,7 @@ public async Task ReturnsCorrectCountOfReactionsWithoutStart()
 
             var reactions = await _github.Reaction.IssueComment.GetAll(_context.RepositoryOwner, _context.RepositoryName, issueComment.Id, options);
 
-            Assert.Equal(1, reactions.Count);
+            Assert.Single(reactions);
 
             Assert.Equal(reactions[0].Id, issueCommentReaction.Id);
             Assert.Equal(reactions[0].Content, issueCommentReaction.Content);
@@ -103,7 +103,7 @@ public async Task ReturnsCorrectCountOfReactionsWithStart()
 
             var reactionsInfo = await _github.Reaction.IssueComment.GetAll(_context.RepositoryOwner, _context.RepositoryName, issueComment.Id, options);
 
-            Assert.Equal(1, reactionsInfo.Count);
+            Assert.Single(reactionsInfo);
 
             Assert.Equal(reactionsInfo[0].Id, reactions.Last().Id);
             Assert.Equal(reactionsInfo[0].Content, reactions.Last().Content);
@@ -143,8 +143,8 @@ public async Task ReturnsDistinctReactionsBasedOnStartPage()
             };
             var secondPage = await _github.Reaction.IssueComment.GetAll(_context.RepositoryOwner, _context.RepositoryName, issueComment.Id, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage[0].Id, secondPage[0].Id);
             Assert.NotEqual(firstPage[0].Content, secondPage[0].Content);
         }
@@ -194,7 +194,7 @@ public async Task ReturnsCorrectCountOfReactionsWithoutStartWithRepositoryId()
 
             var reactions = await _github.Reaction.IssueComment.GetAll(_context.Repository.Id, issueComment.Id, options);
 
-            Assert.Equal(1, reactions.Count);
+            Assert.Single(reactions);
 
             Assert.Equal(reactions[0].Id, issueCommentReaction.Id);
             Assert.Equal(reactions[0].Content, issueCommentReaction.Content);
@@ -229,7 +229,7 @@ public async Task ReturnsCorrectCountOfReactionsWithStartWithRepositoryId()
 
             var reactionsInfo = await _github.Reaction.IssueComment.GetAll(_context.Repository.Id, issueComment.Id, options);
 
-            Assert.Equal(1, reactionsInfo.Count);
+            Assert.Single(reactionsInfo);
 
             Assert.Equal(reactionsInfo[0].Id, reactions.Last().Id);
             Assert.Equal(reactionsInfo[0].Content, reactions.Last().Content);
@@ -269,8 +269,8 @@ public async Task ReturnsDistinctReactionsBasedOnStartPageWithRepositoryId()
             };
             var secondPage = await _github.Reaction.IssueComment.GetAll(_context.Repository.Id, issueComment.Id, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage[0].Id, secondPage[0].Id);
             Assert.NotEqual(firstPage[0].Content, secondPage[0].Content);
         }
diff --git a/Octokit.Tests.Integration/Clients/IssueReactionsClientTests.cs b/Octokit.Tests.Integration/Clients/IssueReactionsClientTests.cs
index b38bee71a2..6f1575d146 100644
--- a/Octokit.Tests.Integration/Clients/IssueReactionsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/IssueReactionsClientTests.cs
@@ -61,7 +61,7 @@ public async Task ReturnsCorrectCountOfReactionsWithoutStart()
 
             var issueReactions = await _github.Reaction.Issue.GetAll(_context.RepositoryOwner, _context.RepositoryName, issue.Number, options);
 
-            Assert.Equal(1, issueReactions.Count);
+            Assert.Single(issueReactions);
 
             Assert.Equal(issueReaction.Id, issueReactions[0].Id);
             Assert.Equal(issueReaction.Content, issueReactions[0].Content);
@@ -92,7 +92,7 @@ public async Task ReturnsCorrectCountOfReactionsWithStart()
 
             var issueReactions = await _github.Reaction.Issue.GetAll(_context.RepositoryOwner, _context.RepositoryName, issue.Number, options);
 
-            Assert.Equal(1, issueReactions.Count);
+            Assert.Single(issueReactions);
 
             Assert.Equal(reactions.Last().Id, issueReactions[0].Id);
             Assert.Equal(reactions.Last().Content, issueReactions[0].Content);
@@ -130,8 +130,8 @@ public async Task ReturnsDistinctReactionsBasedOnStartPage()
             };
             var secondPage = await _github.Reaction.Issue.GetAll(_context.RepositoryOwner, _context.RepositoryName, issue.Number, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage[0].Id, secondPage[0].Id);
             Assert.NotEqual(firstPage[0].Content, secondPage[0].Content);
         }
@@ -172,7 +172,7 @@ public async Task ReturnsCorrectCountOfReactionsWithoutStartWithRepositoryId()
 
             var issueReactions = await _github.Reaction.Issue.GetAll(_context.Repository.Id, issue.Number, options);
 
-            Assert.Equal(1, issueReactions.Count);
+            Assert.Single(issueReactions);
 
             Assert.Equal(issueReaction.Id, issueReactions[0].Id);
             Assert.Equal(issueReaction.Content, issueReactions[0].Content);
@@ -203,7 +203,7 @@ public async Task ReturnsCorrectCountOfReactionsWithStartWithRepositoryId()
 
             var issueReactions = await _github.Reaction.Issue.GetAll(_context.Repository.Id, issue.Number, options);
 
-            Assert.Equal(1, issueReactions.Count);
+            Assert.Single(issueReactions);
 
             Assert.Equal(reactions.Last().Id, issueReactions[0].Id);
             Assert.Equal(reactions.Last().Content, issueReactions[0].Content);
@@ -241,8 +241,8 @@ public async Task ReturnsDistinctReactionsBasedOnStartPageWithRepositoryId()
             };
             var secondPage = await _github.Reaction.Issue.GetAll(_context.Repository.Id, issue.Number, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage[0].Id, secondPage[0].Id);
             Assert.NotEqual(firstPage[0].Content, secondPage[0].Content);
         }
diff --git a/Octokit.Tests.Integration/Clients/IssueTimelineClientTests.cs b/Octokit.Tests.Integration/Clients/IssueTimelineClientTests.cs
index fce0f1cbed..9b066a42ef 100644
--- a/Octokit.Tests.Integration/Clients/IssueTimelineClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/IssueTimelineClientTests.cs
@@ -29,7 +29,7 @@ public async Task CanRetrieveTimelineForIssue()
         {
             var timelineEventInfos = await _issueTimelineClient.GetAllForIssue("octokit", "octokit.net", 1503);
             Assert.NotEmpty(timelineEventInfos);
-            Assert.NotEqual(0, timelineEventInfos.Count);
+            Assert.NotEmpty(timelineEventInfos);
         }
 
         [IntegrationTest]
@@ -48,7 +48,7 @@ public async Task CanRetrieveTimelineForIssueWithApiOptions()
 
             timelineEventInfos = await _issueTimelineClient.GetAllForIssue("octokit", "octokit.net", 1503, pageOptions);
             Assert.NotEmpty(timelineEventInfos);
-            Assert.Equal(1, timelineEventInfos.Count);
+            Assert.Single(timelineEventInfos);
         }
 
         [IntegrationTest]
@@ -125,7 +125,7 @@ public async Task CanDeserializeRenameEvent()
             Assert.Equal("A test issue", renamed.Title);
 
             var timelineEventInfos = await _issueTimelineClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-            Assert.Equal(1, timelineEventInfos.Count);
+            Assert.Single(timelineEventInfos);
             Assert.Equal("a test issue", timelineEventInfos[0].Rename.From);
             Assert.Equal("A test issue", timelineEventInfos[0].Rename.To);
         }
@@ -140,7 +140,7 @@ public async Task CanDeserializeCrossReferenceEvent()
             var anotherNewIssue = await _issuesClient.Create(_context.Repository.Id, newIssue);
 
             var timelineEventInfos = await _issueTimelineClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
-            Assert.Equal(1, timelineEventInfos.Count);
+            Assert.Single(timelineEventInfos);
             Assert.Equal(anotherNewIssue.Id, timelineEventInfos[0].Source.Issue.Id);
         }
 
@@ -157,7 +157,7 @@ public async Task CanRetrieveTimelineForIssueByRepositoryId()
             Assert.NotNull(closed);
 
             timelineEventInfos = await _issueTimelineClient.GetAllForIssue(_context.Repository.Id, issue.Number);
-            Assert.Equal(1, timelineEventInfos.Count);
+            Assert.Single(timelineEventInfos);
             Assert.Equal(EventInfoState.Closed, timelineEventInfos[0].Event);
         }
 
@@ -172,7 +172,7 @@ public async Task CanDeserializeRenameEventByRepositoryId()
             Assert.Equal("A test issue", renamed.Title);
 
             var timelineEventInfos = await _issueTimelineClient.GetAllForIssue(_context.Repository.Id, issue.Number);
-            Assert.Equal(1, timelineEventInfos.Count);
+            Assert.Single(timelineEventInfos);
             Assert.Equal("a test issue", timelineEventInfos[0].Rename.From);
             Assert.Equal("A test issue", timelineEventInfos[0].Rename.To);
         }
@@ -187,7 +187,7 @@ public async Task CanDeserializeCrossReferenceEventByRepositoryId()
             var anotherNewIssue = await _issuesClient.Create(_context.Repository.Id, newIssue);
 
             var timelineEventInfos = await _issueTimelineClient.GetAllForIssue(_context.Repository.Id, issue.Number);
-            Assert.Equal(1, timelineEventInfos.Count);
+            Assert.Single(timelineEventInfos);
             Assert.Equal(anotherNewIssue.Id, timelineEventInfos[0].Source.Issue.Id);
         }
 
diff --git a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs
index 0edfcbdcfe..0bb37628bd 100644
--- a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs
@@ -197,7 +197,7 @@ public async Task CanCreateRetrieveAndCloseIssue()
 
             var retrieved = await _issuesClient.Get(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
             Assert.NotNull(retrieved);
-            Assert.True(retrieved.Assignees.Count == 1);
+            Assert.Equal(1, retrieved.Assignees.Count);
             Assert.True(retrieved.Assignees[0].Login == _context.RepositoryOwner);
             var all = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName);
             Assert.Contains(all, i => i.Number == retrieved.Number);
@@ -208,7 +208,7 @@ public async Task CanCreateRetrieveAndCloseIssue()
         {
             var closed = _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, new IssueUpdate { State = ItemState.Closed }).Result;
             Assert.NotNull(closed);
-            Assert.Equal(1, closed.Assignees.Count);
+            Assert.Single(closed.Assignees);
             Assert.Equal(_context.RepositoryOwner, closed.Assignees[0].Login);
         }
     }
@@ -226,7 +226,7 @@ public async Task CanCreateCloseAndReopenIssue()
 
         var retrieved = await _issuesClient.Get(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
         Assert.NotNull(retrieved);
-        Assert.True(retrieved.Assignees.Count == 1);
+        Assert.Equal(1, retrieved.Assignees.Count);
         Assert.True(retrieved.Assignees[0].Login == _context.RepositoryOwner);
 
         var update = retrieved.ToUpdate();
@@ -438,7 +438,7 @@ await _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, cl
         var issues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName,
             new RepositoryIssueRequest { State = ItemStateFilter.Closed });
 
-        Assert.Equal(1, issues.Count);
+        Assert.Single(issues);
         Assert.Equal("A closed issue", issues[0].Title);
     }
 
@@ -456,7 +456,7 @@ await _issuesClient.Update(_context.Repository.Id, closed.Number,
         var issues = await _issuesClient.GetAllForRepository(_context.Repository.Id,
             new RepositoryIssueRequest { State = ItemStateFilter.Closed });
 
-        Assert.Equal(1, issues.Count);
+        Assert.Single(issues);
         Assert.Equal("A closed issue", issues[0].Title);
     }
 
@@ -472,7 +472,7 @@ public async Task CanListMilestoneIssues()
         var issues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName,
             new RepositoryIssueRequest { Milestone = milestone.Number.ToString(CultureInfo.InvariantCulture) });
 
-        Assert.Equal(1, issues.Count);
+        Assert.Single(issues);
         Assert.Equal("A milestone issue", issues[0].Title);
     }
 
@@ -488,7 +488,7 @@ public async Task CanListMilestoneIssuesWithRepositoryId()
         var issues = await _issuesClient.GetAllForRepository(_context.Repository.Id,
             new RepositoryIssueRequest { Milestone = milestone.Number.ToString(CultureInfo.InvariantCulture) });
 
-        Assert.Equal(1, issues.Count);
+        Assert.Single(issues);
         Assert.Equal("A milestone issue", issues[0].Title);
     }
 
@@ -576,7 +576,7 @@ public async Task CanRetrieveAllIssuesWithApiOptionsWithStart()
 
         var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request, options);
 
-        Assert.Equal(1, retrieved.Count);
+        Assert.Single(retrieved);
         Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
@@ -604,7 +604,7 @@ public async Task CanRetrieveAllIssuesWithApiOptionsWithStartWithRepositoryId()
 
         var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request, options);
 
-        Assert.Equal(1, retrieved.Count);
+        Assert.Single(retrieved);
         Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
@@ -735,13 +735,13 @@ public async Task CanFilterByAssigned()
         var assignedIssues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName,
             new RepositoryIssueRequest { Assignee = _context.RepositoryOwner });
 
-        Assert.Equal(1, assignedIssues.Count);
+        Assert.Single(assignedIssues);
         Assert.Equal("An assigned issue", assignedIssues[0].Title);
 
         var unassignedIssues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName,
             new RepositoryIssueRequest { Assignee = "none" });
 
-        Assert.Equal(1, unassignedIssues.Count);
+        Assert.Single(unassignedIssues);
         Assert.Equal("An unassigned issue", unassignedIssues[0].Title);
     }
 
@@ -763,13 +763,13 @@ public async Task CanFilterByAssignedWithRepositoryId()
         var assignedIssues = await _issuesClient.GetAllForRepository(_context.Repository.Id,
             new RepositoryIssueRequest { Assignee = _context.RepositoryOwner });
 
-        Assert.Equal(1, assignedIssues.Count);
+        Assert.Single(assignedIssues);
         Assert.Equal("An assigned issue", assignedIssues[0].Title);
 
         var unassignedIssues = await _issuesClient.GetAllForRepository(_context.Repository.Id,
             new RepositoryIssueRequest { Assignee = "none" });
 
-        Assert.Equal(1, unassignedIssues.Count);
+        Assert.Single(unassignedIssues);
         Assert.Equal("An unassigned issue", unassignedIssues[0].Title);
     }
 
@@ -794,7 +794,7 @@ public async Task CanFilterByCreator()
         var issuesCreatedByExternalUser = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName,
             new RepositoryIssueRequest { Creator = "shiftkey" });
 
-        Assert.Equal(0, issuesCreatedByExternalUser.Count);
+        Assert.Empty(issuesCreatedByExternalUser);
     }
 
     [IntegrationTest]
@@ -818,7 +818,7 @@ public async Task CanFilterByCreatorWithRepositoryId()
         var issuesCreatedByExternalUser = await _issuesClient.GetAllForRepository(_context.Repository.Id,
             new RepositoryIssueRequest { Creator = "shiftkey" });
 
-        Assert.Equal(0, issuesCreatedByExternalUser.Count);
+        Assert.Empty(issuesCreatedByExternalUser);
     }
 
     [IntegrationTest]
@@ -837,12 +837,12 @@ public async Task CanFilterByMentioned()
         var mentionsWithShiftkey = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName,
             new RepositoryIssueRequest { Mentioned = "shiftkey" });
 
-        Assert.Equal(1, mentionsWithShiftkey.Count);
+        Assert.Single(mentionsWithShiftkey);
 
         var mentionsWithHaacked = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName,
             new RepositoryIssueRequest { Mentioned = "haacked" });
 
-        Assert.Equal(0, mentionsWithHaacked.Count);
+        Assert.Empty(mentionsWithHaacked);
     }
 
     [IntegrationTest]
@@ -861,12 +861,12 @@ public async Task CanFilterByMentionedWithRepositoryId()
         var mentionsWithShiftkey = await _issuesClient.GetAllForRepository(_context.Repository.Id,
             new RepositoryIssueRequest { Mentioned = "shiftkey" });
 
-        Assert.Equal(1, mentionsWithShiftkey.Count);
+        Assert.Single(mentionsWithShiftkey);
 
         var mentionsWithHaacked = await _issuesClient.GetAllForRepository(_context.Repository.Id,
             new RepositoryIssueRequest { Mentioned = "haacked" });
 
-        Assert.Equal(0, mentionsWithHaacked.Count);
+        Assert.Empty(mentionsWithHaacked);
     }
 
     [IntegrationTest]
@@ -948,7 +948,7 @@ public async Task DoesNotChangeLabelsByDefault()
 
         var updatedIssue = await _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, issueUpdate);
 
-        Assert.Equal(1, updatedIssue.Labels.Count);
+        Assert.Single(updatedIssue.Labels);
     }
 
     [IntegrationTest]
@@ -968,7 +968,7 @@ public async Task DoesNotChangeLabelsByDefaultWithRepositoryId()
 
         var updatedIssue = await _issuesClient.Update(_context.Repository.Id, issue.Number, issueUpdate);
 
-        Assert.Equal(1, updatedIssue.Labels.Count);
+        Assert.Single(updatedIssue.Labels);
     }
 
     [IntegrationTest]
@@ -1128,7 +1128,7 @@ public async Task DoesNotChangeAssigneesByDefault()
 
         var updatedIssue = await _issuesClient.Update(_context.RepositoryOwner, _context.RepositoryName, issue.Number, issueUpdate);
 
-        Assert.Equal(1, updatedIssue.Assignees.Count);
+        Assert.Single(updatedIssue.Assignees);
         Assert.Equal(_context.RepositoryOwner, updatedIssue.Assignees[0].Login);
     }
 
@@ -1147,7 +1147,7 @@ public async Task DoesNotChangeAssigneesByDefaultWithRepositoryId()
 
         var updatedIssue = await _issuesClient.Update(_context.Repository.Id, issue.Number, issueUpdate);
 
-        Assert.Equal(1, updatedIssue.Assignees.Count);
+        Assert.Single(updatedIssue.Assignees);
         Assert.Equal(_context.RepositoryOwner, updatedIssue.Assignees[0].Login);
     }
 
@@ -1236,7 +1236,7 @@ public async Task CanClearAssigneesForAnIssue()
         newIssue.Assignees.Add(_context.RepositoryOwner);
 
         var issue = await _issuesClient.Create(_context.RepositoryOwner, _context.RepositoryName, newIssue);
-        Assert.Equal(1, issue.Assignees.Count);
+        Assert.Single(issue.Assignees);
 
         // update the issue
         var issueUpdate = issue.ToUpdate();
@@ -1258,7 +1258,7 @@ public async Task CanClearAssigneesForAnIssueWithRepositoryId()
         newIssue.Assignees.Add(_context.RepositoryOwner);
 
         var issue = await _issuesClient.Create(_context.Repository.Id, newIssue);
-        Assert.Equal(1, issue.Assignees.Count);
+        Assert.Single(issue.Assignees);
 
         // update the issue
         var issueUpdate = issue.ToUpdate();
diff --git a/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs
index a223d65e60..11ccc194a9 100644
--- a/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/IssuesEventsClientTests.cs
@@ -37,7 +37,7 @@ public async Task CanListEventInfoForAnIssue()
         Assert.NotNull(closed);
         issueEventInfo = await _issuesEventsClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
-        Assert.Equal(1, issueEventInfo.Count);
+        Assert.Single(issueEventInfo);
         Assert.Equal(EventInfoState.Closed, issueEventInfo[0].Event);
     }
 
@@ -54,7 +54,7 @@ public async Task CanListEventInfoForAnIssueWithRepositoryId()
         Assert.NotNull(closed);
         issueEventInfo = await _issuesEventsClient.GetAllForIssue(_context.Repository.Id, issue.Number);
 
-        Assert.Equal(1, issueEventInfo.Count);
+        Assert.Single(issueEventInfo);
         Assert.Equal(EventInfoState.Closed, issueEventInfo[0].Event);
     }
 
@@ -116,7 +116,7 @@ public async Task ReturnsCorrectCountOfEventInfosWithStart()
 
         var eventInfos = await _issuesEventsClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number, options);
 
-        Assert.Equal(1, eventInfos.Count);
+        Assert.Single(eventInfos);
     }
 
     [IntegrationTest]
@@ -137,7 +137,7 @@ public async Task ReturnsCorrectCountOfEventInfosWithStartWithRepositoryId()
 
         var eventInfos = await _issuesEventsClient.GetAllForIssue(_context.Repository.Id, issue.Number, options);
 
-        Assert.Equal(1, eventInfos.Count);
+        Assert.Single(eventInfos);
     }
 
     [IntegrationTest]
@@ -312,7 +312,7 @@ public async Task ReturnsCorrectCountOfIssueEventsWithStart()
 
         var eventInfos = await _issuesEventsClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, options);
 
-        Assert.Equal(1, eventInfos.Count);
+        Assert.Single(eventInfos);
     }
 
     [IntegrationTest]
@@ -333,7 +333,7 @@ public async Task ReturnsCorrectCountOfIssueEventsWithStartWithRepositoryId()
 
         var eventInfos = await _issuesEventsClient.GetAllForRepository(_context.Repository.Id, options);
 
-        Assert.Equal(1, eventInfos.Count);
+        Assert.Single(eventInfos);
     }
 
     [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/IssuesLabelsClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesLabelsClientTests.cs
index e95b7c7f80..c51ea9fd79 100644
--- a/Octokit.Tests.Integration/Clients/IssuesLabelsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/IssuesLabelsClientTests.cs
@@ -44,7 +44,7 @@ public async Task CanListIssueLabelsForAnIssue()
 
         issueLabelsInfo = await _issuesLabelsClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
         Assert.Equal(newLabel.Color, issueLabelsInfo[0].Color);
         Assert.Equal(newLabel.Description, issueLabelsInfo[0].Description);
     }
@@ -68,7 +68,7 @@ public async Task CanListIssueLabelsForAnIssueWithRepositoryId()
 
         issueLabelsInfo = await _issuesLabelsClient.GetAllForIssue(_context.Repository.Id, issue.Number);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
         Assert.Equal(newLabel.Color, issueLabelsInfo[0].Color);
         Assert.Equal(newLabel.Description, issueLabelsInfo[0].Description);
     }
@@ -98,7 +98,7 @@ public async Task ReturnsCorrectCountOfIssueLabelsWithoutStartForAnIssue()
 
         issueLabelsInfo = await _issuesLabelsClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number, options);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
         Assert.Equal(newLabel.Color, issueLabelsInfo[0].Color);
     }
 
@@ -127,7 +127,7 @@ public async Task ReturnsCorrectCountOfIssueLabelsWithoutStartForAnIssueWithRepo
 
         issueLabelsInfo = await _issuesLabelsClient.GetAllForIssue(_context.Repository.Id, issue.Number, options);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
         Assert.Equal(newLabel.Color, issueLabelsInfo[0].Color);
     }
 
@@ -161,7 +161,7 @@ public async Task ReturnsCorrectCountOfIssueLabelsWithStartForAnIssue()
 
         issueLabelsInfo = await _issuesLabelsClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number, options);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
         Assert.Equal(labels.Last().Color, issueLabelsInfo.First().Color);
     }
 
@@ -195,7 +195,7 @@ public async Task ReturnsCorrectCountOfIssueLabelsWithStartForAnIssueWithReposit
 
         issueLabelsInfo = await _issuesLabelsClient.GetAllForIssue(_context.Repository.Id, issue.Number, options);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
         Assert.Equal(labels.Last().Color, issueLabelsInfo.First().Color);
     }
 
@@ -235,8 +235,8 @@ public async Task ReturnsDistinctIssueLabelsBasedOnStartPageForAnIssue()
 
         var secondPage = await _issuesLabelsClient.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number, skipStartOptions);
 
-        Assert.Equal(1, firstPage.Count);
-        Assert.Equal(1, secondPage.Count);
+        Assert.Single(firstPage);
+        Assert.Single(secondPage);
         Assert.NotEqual(firstPage.First().Color, secondPage.First().Color);
     }
 
@@ -276,8 +276,8 @@ public async Task ReturnsDistinctIssueLabelsBasedOnStartPageForAnIssueWithReposi
 
         var secondPage = await _issuesLabelsClient.GetAllForIssue(_context.Repository.Id, issue.Number, skipStartOptions);
 
-        Assert.Equal(1, firstPage.Count);
-        Assert.Equal(1, secondPage.Count);
+        Assert.Single(firstPage);
+        Assert.Single(secondPage);
         Assert.NotEqual(firstPage.First().Color, secondPage.First().Color);
     }
 
@@ -339,7 +339,7 @@ public async Task ReturnsCorrectCountOfIssueLabelsWithoutStartForARepository()
 
         var issueLabelsInfo = await _issuesLabelsClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, options);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
     }
 
     [IntegrationTest]
@@ -368,7 +368,7 @@ public async Task ReturnsCorrectCountOfIssueLabelsWithoutStartForARepositoryWith
 
         var issueLabelsInfo = await _issuesLabelsClient.GetAllForRepository(_context.Repository.Id, options);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
     }
 
     [IntegrationTest]
@@ -398,7 +398,7 @@ public async Task ReturnsCorrectCountOfIssueLabelsWithStartForARepository()
 
         var issueLabelsInfo = await _issuesLabelsClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, options);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
     }
 
     [IntegrationTest]
@@ -428,7 +428,7 @@ public async Task ReturnsCorrectCountOfIssueLabelsWithStartForARepositoryWithRep
 
         var issueLabelsInfo = await _issuesLabelsClient.GetAllForRepository(_context.Repository.Id, options);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
     }
 
     [IntegrationTest]
@@ -467,8 +467,8 @@ public async Task ReturnsDistinctIssueLabelsBasedOnStartPageForARepository()
 
         var secondPage = await _issuesLabelsClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, skipStartOptions);
 
-        Assert.Equal(1, firstPage.Count);
-        Assert.Equal(1, secondPage.Count);
+        Assert.Single(firstPage);
+        Assert.Single(secondPage);
         Assert.NotEqual(firstPage.First().Color, secondPage.First().Color);
     }
 
@@ -508,8 +508,8 @@ public async Task ReturnsDistinctIssueLabelsBasedOnStartPageForARepositoryWithRe
 
         var secondPage = await _issuesLabelsClient.GetAllForRepository(_context.Repository.Id, skipStartOptions);
 
-        Assert.Equal(1, firstPage.Count);
-        Assert.Equal(1, secondPage.Count);
+        Assert.Single(firstPage);
+        Assert.Single(secondPage);
         Assert.NotEqual(firstPage.First().Color, secondPage.First().Color);
     }
 
@@ -535,7 +535,7 @@ public async Task CanListLabelsForAnMilestone()
 
         issueLabelsInfo = await _issuesLabelsClient.GetAllForMilestone(_context.RepositoryOwner, _context.RepositoryName, milestone.Number);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
         Assert.Equal(label.Color, issueLabelsInfo[0].Color);
     }
 
@@ -561,7 +561,7 @@ public async Task CanListLabelsForAMilestoneWithRepositoryId()
 
         issueLabelsInfo = await _issuesLabelsClient.GetAllForMilestone(_context.Repository.Id, milestone.Number);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
         Assert.Equal(label.Color, issueLabelsInfo[0].Color);
     }
 
@@ -594,7 +594,7 @@ public async Task ReturnsCorrectCountOfIssueLabelsWithoutStartForAMilestone()
 
         var issueLabelsInfo = await _issuesLabelsClient.GetAllForMilestone(_context.RepositoryOwner, _context.RepositoryName, milestone.Number, options);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
     }
 
     [IntegrationTest]
@@ -626,7 +626,7 @@ public async Task ReturnsCorrectCountOfIssueLabelsWithoutStartForAMilestoneWithR
 
         var issueLabelsInfo = await _issuesLabelsClient.GetAllForMilestone(_context.Repository.Id, milestone.Number, options);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
     }
 
     [IntegrationTest]
@@ -659,7 +659,7 @@ public async Task ReturnsCorrectCountOfIssueLabelsWithStartForAMilestone()
 
         var issueLabelsInfo = await _issuesLabelsClient.GetAllForMilestone(_context.RepositoryOwner, _context.RepositoryName, milestone.Number, options);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
     }
 
     [IntegrationTest]
@@ -692,7 +692,7 @@ public async Task ReturnsCorrectCountOfIssueLabelsWithStartForAMilestoneWithRepo
 
         var issueLabelsInfo = await _issuesLabelsClient.GetAllForMilestone(_context.Repository.Id, milestone.Number, options);
 
-        Assert.Equal(1, issueLabelsInfo.Count);
+        Assert.Single(issueLabelsInfo);
     }
 
     [IntegrationTest]
@@ -734,8 +734,8 @@ public async Task ReturnsDistinctIssueLabelsBasedOnStartPageForAMilestone()
 
         var secondPage = await _issuesLabelsClient.GetAllForMilestone(_context.RepositoryOwner, _context.RepositoryName, milestone.Number, skipStartOptions);
 
-        Assert.Equal(1, firstPage.Count);
-        Assert.Equal(1, secondPage.Count);
+        Assert.Single(firstPage);
+        Assert.Single(secondPage);
         Assert.NotEqual(firstPage.First().Color, secondPage.First().Color);
     }
 
@@ -778,8 +778,8 @@ public async Task ReturnsDistinctIssueLabelsBasedOnStartPageForAMilestoneWithRep
 
         var secondPage = await _issuesLabelsClient.GetAllForMilestone(_context.Repository.Id, milestone.Number, skipStartOptions);
 
-        Assert.Equal(1, firstPage.Count);
-        Assert.Equal(1, secondPage.Count);
+        Assert.Single(firstPage);
+        Assert.Single(secondPage);
         Assert.NotEqual(firstPage.First().Color, secondPage.First().Color);
     }
 
diff --git a/Octokit.Tests.Integration/Clients/MigrationsClientTests.cs b/Octokit.Tests.Integration/Clients/MigrationsClientTests.cs
index 4e6298c919..c9434ab2a8 100644
--- a/Octokit.Tests.Integration/Clients/MigrationsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/MigrationsClientTests.cs
@@ -64,7 +64,7 @@ public async Task CanGetAllMigrations()
         var migrations = await _gitHub.Migration.Migrations.GetAll(_orgName);
 
         Assert.NotNull(migrations);
-        Assert.NotEqual(0, migrations.Count);
+        Assert.NotEmpty(migrations);
     }
 
     [IntegrationTest]
@@ -78,7 +78,7 @@ public async Task ReturnsCorrectCountOfMigrationsWithoutStart()
 
         var migrations = await _gitHub.Migration.Migrations.GetAll(_orgName, options);
 
-        Assert.Equal(1, migrations.Count);
+        Assert.Single(migrations);
     }
 
     [IntegrationTest]
@@ -93,7 +93,7 @@ public async Task ReturnsCorrectCountOfMigrationsWithStart()
 
         var migrations = await _gitHub.Migration.Migrations.GetAll(_orgName, options);
 
-        Assert.Equal(1, migrations.Count);
+        Assert.Single(migrations);
     }
 
     [IntegrationTest]
@@ -116,8 +116,8 @@ public async Task ReturnsDistinctMigrationsBasedOnStartPage()
         };
         var secondPage = await _gitHub.Migration.Migrations.GetAll(_orgName, skipStartOptions);
 
-        Assert.Equal(1, firstPage.Count);
-        Assert.Equal(1, secondPage.Count);
+        Assert.Single(firstPage);
+        Assert.Single(secondPage);
         Assert.NotEqual(firstPage[0].Id, secondPage[0].Id);
         Assert.NotEqual(firstPage[0].Repositories, secondPage[0].Repositories);
     }
diff --git a/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs b/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs
index 2e0e76fbd1..b7ca257085 100644
--- a/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/MilestonesClientTests.cs
@@ -199,7 +199,7 @@ public async Task CanListClosedMilestones()
         var milestones = await _milestonesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName,
             new MilestoneRequest { State = ItemStateFilter.Closed });
 
-        Assert.Equal(1, milestones.Count);
+        Assert.Single(milestones);
         Assert.Equal("milestone 3", milestones[0].Title);
     }
 
@@ -216,7 +216,7 @@ public async Task CanListClosedMilestonesWithRepositoryId()
         var milestones = await _milestonesClient.GetAllForRepository(_context.Repository.Id,
             new MilestoneRequest { State = ItemStateFilter.Closed });
 
-        Assert.Equal(1, milestones.Count);
+        Assert.Single(milestones);
         Assert.Equal("milestone 3", milestones[0].Title);
     }
 
@@ -281,7 +281,7 @@ public async Task ReturnsCorrectCountOfMilestonesWithStart()
 
         var milestones = await _milestonesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, options);
 
-        Assert.Equal(1, milestones.Count);
+        Assert.Single(milestones);
     }
 
     [IntegrationTest]
@@ -303,7 +303,7 @@ public async Task ReturnsCorrectCountOfMilestonesWithStartWithRepositoryId()
 
         var milestones = await _milestonesClient.GetAllForRepository(_context.Repository.Id, options);
 
-        Assert.Equal(1, milestones.Count);
+        Assert.Single(milestones);
     }
 
     [IntegrationTest]
@@ -433,7 +433,7 @@ public async Task ReturnsCorrectCountOfMilestonesWithStartParametrized()
 
         var milestones = await _milestonesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, new MilestoneRequest { State = ItemStateFilter.Closed }, options);
 
-        Assert.Equal(1, milestones.Count);
+        Assert.Single(milestones);
     }
 
     [IntegrationTest]
@@ -457,7 +457,7 @@ public async Task ReturnsCorrectCountOfMilestonesWithStartParametrizedWithReposi
 
         var milestones = await _milestonesClient.GetAllForRepository(_context.Repository.Id, new MilestoneRequest { State = ItemStateFilter.Closed }, options);
 
-        Assert.Equal(1, milestones.Count);
+        Assert.Single(milestones);
     }
 
     [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/OrganizationClientTests.cs b/Octokit.Tests.Integration/Clients/OrganizationClientTests.cs
index 8faabf581d..94485ce716 100644
--- a/Octokit.Tests.Integration/Clients/OrganizationClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/OrganizationClientTests.cs
@@ -151,7 +151,7 @@ public async Task ReturnsCorrectCountOfUserOrganizationsWithStart()
 
                 var organizations = await _organizationsClient.GetAllForCurrent(options);
 
-                Assert.Equal(1, organizations.Count);
+                Assert.Single(organizations);
             }
 
             [GitHubEnterpriseTest]
diff --git a/Octokit.Tests.Integration/Clients/OrganizationHooksClientTests.cs b/Octokit.Tests.Integration/Clients/OrganizationHooksClientTests.cs
index 26a6bd6cfe..8149f11585 100644
--- a/Octokit.Tests.Integration/Clients/OrganizationHooksClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/OrganizationHooksClientTests.cs
@@ -61,7 +61,7 @@ public async Task ReturnsCorrectCountOfHooksWithStart()
 
                 var hooks = await github.Organization.Hook.GetAll(_fixture.org, options);
 
-                Assert.Equal(1, hooks.Count);
+                Assert.Single(hooks);
             }
 
             [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/OrganizationMembersClientTests.cs b/Octokit.Tests.Integration/Clients/OrganizationMembersClientTests.cs
index 580d24fe09..776a0a5abd 100644
--- a/Octokit.Tests.Integration/Clients/OrganizationMembersClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/OrganizationMembersClientTests.cs
@@ -39,7 +39,7 @@ public async Task ReturnsCorrectCountOfMembersWithoutStart()
 
                 var members = await _gitHub.Organization.Member.GetAll(_organizationFixture, options);
 
-                Assert.Equal(1, members.Count);
+                Assert.Single(members);
             }
 
             [OrganizationTest]
@@ -54,7 +54,7 @@ public async Task ReturnsCorrectCountOfMembersWithStart()
 
                 var members = await _gitHub.Organization.Member.GetAll(_organizationFixture, options);
 
-                Assert.Equal(1, members.Count);
+                Assert.Single(members);
             }
 
             [OrganizationTest]
@@ -78,8 +78,8 @@ public async Task ReturnsDistinctMembersBasedOnStartPage()
 
                 var secondPage = await _gitHub.Organization.Member.GetAll(_organizationFixture, skipStartOptions);
 
-                Assert.Equal(1, firstPage.Count);
-                Assert.Equal(1, secondPage.Count);
+                Assert.Single(firstPage);
+                Assert.Single(secondPage);
                 Assert.NotEqual(firstPage.First().Id, secondPage.First().Id);
             }
 
@@ -328,7 +328,7 @@ public async Task ReturnsCorrectCountOfPendingInvitationsWithoutStart()
 
                     var pendingInvitations = await _gitHub.Organization.Member.GetAllPendingInvitations(Helper.Organization, options);
                     Assert.NotEmpty(pendingInvitations);
-                    Assert.Equal(1, pendingInvitations.Count);
+                    Assert.Single(pendingInvitations);
                 }
             }
 
@@ -349,7 +349,7 @@ public async Task ReturnsCorrectCountOfPendingInvitationsWithStart()
 
                     var firstPagePendingInvitations = await _gitHub.Organization.Member.GetAllPendingInvitations(Helper.Organization, firstPageOptions);
                     Assert.NotEmpty(firstPagePendingInvitations);
-                    Assert.Equal(1, firstPagePendingInvitations.Count);
+                    Assert.Single(firstPagePendingInvitations);
 
                     var secondPageOptions = new ApiOptions
                     {
@@ -360,7 +360,7 @@ public async Task ReturnsCorrectCountOfPendingInvitationsWithStart()
 
                     var secondPagePendingInvitations = await _gitHub.Organization.Member.GetAllPendingInvitations(Helper.Organization, secondPageOptions);
                     Assert.NotEmpty(secondPagePendingInvitations);
-                    Assert.Equal(1, secondPagePendingInvitations.Count);
+                    Assert.Single(secondPagePendingInvitations);
 
                     Assert.NotEqual(firstPagePendingInvitations[0].Login, secondPagePendingInvitations[0].Login);
                 }
@@ -412,7 +412,7 @@ public async Task ReturnsCorrectCountOfMembersWithoutStart()
 
                 var memberships = await _gitHub.Organization.Member.GetAllOrganizationMembershipsForCurrent(options);
 
-                Assert.Equal(1, memberships.Count);
+                Assert.Single(memberships);
             }
 
         }
diff --git a/Octokit.Tests.Integration/Clients/OrganizationOutsideCollaboratorsClientTests.cs b/Octokit.Tests.Integration/Clients/OrganizationOutsideCollaboratorsClientTests.cs
index ab4c548a7f..21b4e36ebc 100644
--- a/Octokit.Tests.Integration/Clients/OrganizationOutsideCollaboratorsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/OrganizationOutsideCollaboratorsClientTests.cs
@@ -44,7 +44,7 @@ public async Task ReturnsOutsideCollaborators()
                         .GetAll(Helper.Organization);
 
                     Assert.NotNull(outsideCollaborators);
-                    Assert.Equal(1, outsideCollaborators.Count);
+                    Assert.Single(outsideCollaborators);
                 }
             }
 
@@ -67,7 +67,7 @@ public async Task ReturnsCorrectCountOfOutsideCollaboratorsWithoutStart()
                         .GetAll(Helper.Organization, options);
 
                     Assert.NotNull(outsideCollaborators);
-                    Assert.Equal(1, outsideCollaborators.Count);
+                    Assert.Single(outsideCollaborators);
                 }
             }
 
@@ -92,7 +92,7 @@ public async Task ReturnsCorrectCountOfOutsideCollaboratorsWithStart()
                         .GetAll(Helper.Organization, options);
 
                     Assert.NotNull(outsideCollaborators);
-                    Assert.Equal(1, outsideCollaborators.Count);
+                    Assert.Single(outsideCollaborators);
                 }
             }
 
@@ -134,7 +134,7 @@ public async Task ReturnsCorrectCountOfOutsideCollaboratorsWithAllFilterAndApiOp
                         .GetAll(Helper.Organization, OrganizationMembersFilter.All, options);
 
                     Assert.NotNull(outsideCollaborators);
-                    Assert.Equal(1, outsideCollaborators.Count);
+                    Assert.Single(outsideCollaborators);
                 }
             }
 
@@ -169,8 +169,8 @@ public async Task ReturnsCorrectCountOfOutsideCollaboratorsWithAllFilterWithStar
                         .OutsideCollaborator
                         .GetAll(Helper.Organization, OrganizationMembersFilter.All, secondPageOptions);
 
-                    Assert.Equal(1, firstPageOfOutsideCollaborators.Count);
-                    Assert.Equal(1, secondPageOfOutsideCollaborators.Count);
+                    Assert.Single(firstPageOfOutsideCollaborators);
+                    Assert.Single(secondPageOfOutsideCollaborators);
                     Assert.NotEqual(firstPageOfOutsideCollaborators[0].Login, secondPageOfOutsideCollaborators[0].Login);
                 }
             }
@@ -189,7 +189,7 @@ public async Task ReturnsCorrectCountOfOutsideCollaboratorsWithTwoFactorFilter()
                         .GetAll(Helper.Organization, OrganizationMembersFilter.TwoFactorAuthenticationDisabled);
 
                     Assert.NotNull(outsideCollaborators);
-                    Assert.Equal(1, outsideCollaborators.Count);
+                    Assert.Single(outsideCollaborators);
                     Assert.Equal(_fixtureCollaborator, outsideCollaborators[0].Login);
                 }
             }
@@ -214,7 +214,7 @@ public async Task ReturnsCorrectCountOfOutsideCollaboratorsWithTwoFactorFilterAn
                         .GetAll(Helper.Organization, OrganizationMembersFilter.TwoFactorAuthenticationDisabled, options);
 
                     Assert.NotNull(outsideCollaborators);
-                    Assert.Equal(1, outsideCollaborators.Count);
+                    Assert.Single(outsideCollaborators);
                     Assert.Equal(_fixtureCollaborator, outsideCollaborators[0].Login);
                 }
             }
@@ -283,7 +283,7 @@ public async Task CanConvertOrgMemberToOutsideCollaborator()
 
                 var outsideCollaborators = await _gitHub.Organization.OutsideCollaborator.GetAll(Helper.Organization);
 
-                Assert.Equal(1, outsideCollaborators.Count);
+                Assert.Single(outsideCollaborators);
                 Assert.Equal(_fixtureCollaborator, outsideCollaborators[0].Login);
             }
 
diff --git a/Octokit.Tests.Integration/Clients/OrganizationSecretsClientTests.cs b/Octokit.Tests.Integration/Clients/OrganizationSecretsClientTests.cs
index ab93991787..4cf7d6a863 100644
--- a/Octokit.Tests.Integration/Clients/OrganizationSecretsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/OrganizationSecretsClientTests.cs
@@ -23,7 +23,7 @@ public async Task GetPublicKey()
 
                 var key = await github.Organization.Actions.Secrets.GetPublicKey(Helper.Organization);
 
-                Assert.True(!string.IsNullOrWhiteSpace(key.KeyId));
+                Assert.False(string.IsNullOrWhiteSpace(key.KeyId));
             }
         }
 
@@ -53,7 +53,7 @@ public async Task GetSecret()
                 var secret = await github.Organization.Actions.Secrets.Get(Helper.Organization, "TEST");
 
                 Assert.NotNull(secret);
-                Assert.True(secret.Name == "TEST");
+                Assert.Equal("TEST", secret.Name);
             }
         }
 
diff --git a/Octokit.Tests.Integration/Clients/ProjectCardsClientTests.cs b/Octokit.Tests.Integration/Clients/ProjectCardsClientTests.cs
index e9d5b2384a..f6d648ede8 100644
--- a/Octokit.Tests.Integration/Clients/ProjectCardsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/ProjectCardsClientTests.cs
@@ -47,7 +47,7 @@ public async Task GetsAllArchivedCards()
 
             var result = await _github.Repository.Project.Card.GetAll(column.Id, request);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.Contains(result, x => x.Id == card2.Id);
         }
 
@@ -63,7 +63,7 @@ public async Task GetsAllNotArchivedCards()
 
             var result = await _github.Repository.Project.Card.GetAll(column.Id, request);
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.Contains(result, x => x.Id == card1.Id);
         }
 
@@ -101,7 +101,7 @@ public async Task ReturnsCorrectCountOfCardWithoutStart()
             var cards = await _github.Repository.Project.Card.GetAll(column.Id, options);
 
             // NOTE: cards are returned in reverse order
-            Assert.Equal(1, cards.Count);
+            Assert.Single(cards);
             Assert.Equal(card2.Id, cards[0].Id);
         }
 
@@ -123,7 +123,7 @@ public async Task ReturnsCorrectCountOfCardsWithStart()
             var cards = await _github.Repository.Project.Card.GetAll(column.Id, options);
 
             // NOTE: cards are returned in reverse order
-            Assert.Equal(1, cards.Count);
+            Assert.Single(cards);
             Assert.Equal(card1.Id, cards[0].Id);
         }
 
diff --git a/Octokit.Tests.Integration/Clients/ProjectColumnsClientTests.cs b/Octokit.Tests.Integration/Clients/ProjectColumnsClientTests.cs
index c7843d797f..92eb546b55 100644
--- a/Octokit.Tests.Integration/Clients/ProjectColumnsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/ProjectColumnsClientTests.cs
@@ -51,7 +51,7 @@ public async Task ReturnsCorrectCountOfColumnsWithoutStart()
 
             var columns = await _github.Repository.Project.Column.GetAll(project.Id, options);
 
-            Assert.Equal(1, columns.Count);
+            Assert.Single(columns);
             Assert.Equal(column1.Id, columns[0].Id);
         }
 
@@ -71,7 +71,7 @@ public async Task ReturnsCorrectCountOfColumnsWithStart()
 
             var columns = await _github.Repository.Project.Column.GetAll(project.Id, options);
 
-            Assert.Equal(1, columns.Count);
+            Assert.Single(columns);
             Assert.Equal(column2.Id, columns[0].Id);
         }
 
diff --git a/Octokit.Tests.Integration/Clients/ProjectsClientTests.cs b/Octokit.Tests.Integration/Clients/ProjectsClientTests.cs
index 4d82149e3c..e23f14c046 100644
--- a/Octokit.Tests.Integration/Clients/ProjectsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/ProjectsClientTests.cs
@@ -59,7 +59,7 @@ public async Task GetsAllFilteredProjectsForRepository()
 
             var projects = await _github.Repository.Project.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, new ProjectRequest(ItemStateFilter.Closed));
 
-            Assert.Equal(1, projects.Count);
+            Assert.Single(projects);
             Assert.True(projects.FirstOrDefault(x => x.Name == project2.Name).Id == project2.Id);
         }
 
@@ -74,7 +74,7 @@ public async Task GetsAllFilteredProjectsForRepositoryWithRepositoryId()
 
             var projects = await _github.Repository.Project.GetAllForRepository(_context.RepositoryId, new ProjectRequest(ItemStateFilter.Closed));
 
-            Assert.Equal(1, projects.Count);
+            Assert.Single(projects);
             Assert.True(projects.FirstOrDefault(x => x.Name == project2.Name).Id == project2.Id);
         }
 
@@ -92,7 +92,7 @@ public async Task ReturnsCorrectCountOfProjectsForRepositoryWithoutStart()
 
             var projects = await _github.Repository.Project.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, options);
 
-            Assert.Equal(1, projects.Count);
+            Assert.Single(projects);
             Assert.Equal(project1.Id, projects[0].Id);
         }
 
@@ -110,7 +110,7 @@ public async Task ReturnsCorrectCountOfProjectsForRepositoryWithRepositoryIdWith
 
             var projects = await _github.Repository.Project.GetAllForRepository(_context.RepositoryId, options);
 
-            Assert.Equal(1, projects.Count);
+            Assert.Single(projects);
             Assert.Equal(project1.Id, projects[0].Id);
         }
 
@@ -129,7 +129,7 @@ public async Task ReturnsCorrectCountOfProjectsForRepositoryWithStart()
 
             var projects = await _github.Repository.Project.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, options);
 
-            Assert.Equal(1, projects.Count);
+            Assert.Single(projects);
             Assert.Equal(project2.Id, projects[0].Id);
         }
 
@@ -148,7 +148,7 @@ public async Task ReturnsCorrectCountOfProjectsForRepositoryWithRepositoryIdWith
 
             var projects = await _github.Repository.Project.GetAllForRepository(_context.RepositoryId, options);
 
-            Assert.Equal(1, projects.Count);
+            Assert.Single(projects);
             Assert.Equal(project2.Id, projects[0].Id);
         }
 
diff --git a/Octokit.Tests.Integration/Clients/PullRequestReviewCommentReactionsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestReviewCommentReactionsClientTests.cs
index a6a05c8871..58036d284f 100644
--- a/Octokit.Tests.Integration/Clients/PullRequestReviewCommentReactionsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/PullRequestReviewCommentReactionsClientTests.cs
@@ -75,7 +75,7 @@ public async Task ReturnsCorrectCountOfReactionsWithoutStart()
 
         var reactions = await _github.Reaction.PullRequestReviewComment.GetAll(_context.RepositoryOwner, _context.RepositoryName, commentFromGitHub.Id, options);
 
-        Assert.Equal(1, reactions.Count);
+        Assert.Single(reactions);
         Assert.Equal(reaction.Id, reactions[0].Id);
         Assert.Equal(reaction.Content, reactions[0].Content);
     }
@@ -111,7 +111,7 @@ public async Task ReturnsCorrectCountOfReactionsWithStart()
 
         var reactionsInfo = await _github.Reaction.PullRequestReviewComment.GetAll(_context.RepositoryOwner, _context.RepositoryName, commentFromGitHub.Id, options);
 
-        Assert.Equal(1, reactionsInfo.Count);
+        Assert.Single(reactionsInfo);
         Assert.Equal(reactions.Last().Id, reactionsInfo[0].Id);
         Assert.Equal(reactions.Last().Content, reactionsInfo[0].Content);
     }
@@ -152,8 +152,8 @@ public async Task ReturnsDistinctReactionsBasedOnStartPage()
         };
         var secondPage = await _github.Reaction.PullRequestReviewComment.GetAll(_context.RepositoryOwner, _context.RepositoryName, commentFromGitHub.Id, skipStartOptions);
 
-        Assert.Equal(1, firstPage.Count);
-        Assert.Equal(1, secondPage.Count);
+        Assert.Single(firstPage);
+        Assert.Single(secondPage);
         Assert.Equal(firstPage[0].Id, secondPage[0].Id);
         Assert.Equal(firstPage[0].Content, secondPage[0].Content);
     }
@@ -205,7 +205,7 @@ public async Task ReturnsCorrectCountOfReactionsWithoutStartWithRepositoryId()
 
         var reactions = await _github.Reaction.PullRequestReviewComment.GetAll(_context.Repository.Id, commentFromGitHub.Id, options);
 
-        Assert.Equal(1, reactions.Count);
+        Assert.Single(reactions);
         Assert.Equal(reaction.Id, reactions[0].Id);
         Assert.Equal(reaction.Content, reactions[0].Content);
     }
@@ -241,7 +241,7 @@ public async Task ReturnsCorrectCountOfReactionsWithStartWithRepositoryId()
 
         var reactionsInfo = await _github.Reaction.PullRequestReviewComment.GetAll(_context.Repository.Id, commentFromGitHub.Id, options);
 
-        Assert.Equal(1, reactionsInfo.Count);
+        Assert.Single(reactionsInfo);
         Assert.Equal(reactions.Last().Id, reactionsInfo[0].Id);
         Assert.Equal(reactions.Last().Content, reactionsInfo[0].Content);
     }
@@ -282,8 +282,8 @@ public async Task ReturnsDistinctReactionsBasedOnStartPageWithRepositoryId()
         };
         var secondPage = await _github.Reaction.PullRequestReviewComment.GetAll(_context.Repository.Id, commentFromGitHub.Id, skipStartOptions);
 
-        Assert.Equal(1, firstPage.Count);
-        Assert.Equal(1, secondPage.Count);
+        Assert.Single(firstPage);
+        Assert.Single(secondPage);
         Assert.Equal(firstPage[0].Id, secondPage[0].Id);
         Assert.Equal(firstPage[0].Content, secondPage[0].Content);
     }
diff --git a/Octokit.Tests.Integration/Clients/PullRequestReviewCommentsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestReviewCommentsClientTests.cs
index 82e2f9bb5e..2b6f55da95 100644
--- a/Octokit.Tests.Integration/Clients/PullRequestReviewCommentsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/PullRequestReviewCommentsClientTests.cs
@@ -293,7 +293,7 @@ public async Task ReturnsCorrectCountOfPullRequestReviewCommentWithStart()
 
         var pullRequestComments = await _client.GetAll(Helper.UserName, _context.RepositoryName, pullRequest.Number, options);
 
-        Assert.Equal(1, pullRequestComments.Count);
+        Assert.Single(pullRequestComments);
     }
 
     [IntegrationTest]
@@ -315,7 +315,7 @@ public async Task ReturnsCorrectCountOfPullRequestReviewCommentWithStartWithRepo
 
         var pullRequestComments = await _client.GetAll(_context.Repository.Id, pullRequest.Number, options);
 
-        Assert.Equal(1, pullRequestComments.Count);
+        Assert.Single(pullRequestComments);
     }
 
     [IntegrationTest]
@@ -469,7 +469,7 @@ public async Task ReturnsCorrectCountOfPullRequestReviewCommentWithStartForRepos
 
         var pullRequestComments = await _client.GetAllForRepository(Helper.UserName, _context.RepositoryName, options);
 
-        Assert.Equal(1, pullRequestComments.Count);
+        Assert.Single(pullRequestComments);
     }
 
     [IntegrationTest]
@@ -491,7 +491,7 @@ public async Task ReturnsCorrectCountOfPullRequestReviewCommentWithStartForRepos
 
         var pullRequestComments = await _client.GetAllForRepository(_context.Repository.Id, options);
 
-        Assert.Equal(1, pullRequestComments.Count);
+        Assert.Single(pullRequestComments);
     }
 
     [IntegrationTest]
@@ -689,7 +689,7 @@ public async Task ReturnsCorrectCountOfPullRequestReviewCommentWithStartForRepos
 
         var pullRequestComments = await _client.GetAllForRepository(Helper.UserName, _context.RepositoryName, pullRequestReviewCommentRequest, options);
 
-        Assert.Equal(1, pullRequestComments.Count);
+        Assert.Single(pullRequestComments);
     }
 
     [IntegrationTest]
@@ -713,7 +713,7 @@ public async Task ReturnsCorrectCountOfPullRequestReviewCommentWithStartForRepos
 
         var pullRequestComments = await _client.GetAllForRepository(_context.Repository.Id, pullRequestReviewCommentRequest, options);
 
-        Assert.Equal(1, pullRequestComments.Count);
+        Assert.Single(pullRequestComments);
     }
 
     [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/PullRequestReviewsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestReviewsClientTests.cs
index 5e57ca592d..e706d12566 100644
--- a/Octokit.Tests.Integration/Clients/PullRequestReviewsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/PullRequestReviewsClientTests.cs
@@ -42,7 +42,7 @@ public async Task ReturnsCorrectCountOfReviewsWithoutStart()
 
             var reviews = await _github.PullRequest.Review.GetAll("octokit", "octokit.net", 1648, options);
 
-            Assert.Equal(1, reviews.Count);
+            Assert.Single(reviews);
         }
 
         [IntegrationTest]
@@ -57,7 +57,7 @@ public async Task ReturnsCorrectCountOfReviewsWithStart()
 
             var reviews = await _github.PullRequest.Review.GetAll("octokit", "octokit.net", 1648, options);
 
-            Assert.Equal(1, reviews.Count);
+            Assert.Single(reviews);
         }
 
         [IntegrationTest]
@@ -81,8 +81,8 @@ public async Task ReturnsDistinctReviewsBasedOnStartPage()
 
             var secondPage = await _github.PullRequest.Review.GetAll("octokit", "octokit.net", 1648, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().Id, secondPage.First().Id);
         }
     }
@@ -502,7 +502,7 @@ public async Task ReturnsCorrectCountOfCommentsWithoutStart()
 
             var comments = await _github.PullRequest.Review.GetAllComments("octokit", "octokit.net", 1648, 54646850, options);
 
-            Assert.Equal(1, comments.Count);
+            Assert.Single(comments);
         }
 
         [IntegrationTest]
@@ -517,7 +517,7 @@ public async Task ReturnsCorrectCountOfCommentsWithStart()
 
             var comments = await _github.PullRequest.Review.GetAllComments("octokit", "octokit.net", 1648, 54646850, options);
 
-            Assert.Equal(1, comments.Count);
+            Assert.Single(comments);
         }
 
         [IntegrationTest]
@@ -541,8 +541,8 @@ public async Task ReturnsDistinctCommentsBasedOnStartPage()
 
             var secondPage = await _github.PullRequest.Review.GetAllComments("octokit", "octokit.net", 1648, 54646850, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().Id, secondPage.First().Id);
         }
     }
diff --git a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
index d8c6cc410e..28511eaf03 100644
--- a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
@@ -104,7 +104,7 @@ public async Task CanGetForRepository()
 
         var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
         Assert.True(pullRequests[0].Id > 0);
     }
@@ -119,7 +119,7 @@ public async Task CanGetDraftForRepository()
 
         var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
         Assert.Equal(result.Draft, pullRequests[0].Draft);
         Assert.True(pullRequests[0].Id > 0);
@@ -135,7 +135,7 @@ public async Task CanGetForRepositoryWithRepositoryId()
 
         var pullRequests = await _fixture.GetAllForRepository(_context.Repository.Id);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
     }
 
@@ -149,7 +149,7 @@ public async Task CanGetDraftForRepositoryWithRepositoryId()
 
         var pullRequests = await _fixture.GetAllForRepository(_context.Repository.Id);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
         Assert.Equal(result.Draft, pullRequests[0].Draft);
         Assert.True(pullRequests[0].Id > 0);
@@ -171,10 +171,10 @@ public async Task CanGetWithAssigneesForRepository()
         // Retrieve the Pull Requests
         var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
         Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login);
-        Assert.Equal(1, pullRequests[0].Assignees.Count);
+        Assert.Single(pullRequests[0].Assignees);
         Assert.Contains(pullRequests[0].Assignees, x => x.Login == Helper.UserName);
     }
 
@@ -194,10 +194,10 @@ public async Task CanGetWithAssigneesForRepositoryWithRepositoryId()
         // Retrieve the Pull Requests
         var pullRequests = await _fixture.GetAllForRepository(_context.Repository.Id);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
         Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login);
-        Assert.Equal(1, pullRequests[0].Assignees.Count);
+        Assert.Single(pullRequests[0].Assignees);
         Assert.Contains(pullRequests[0].Assignees, x => x.Login == Helper.UserName);
     }
 
@@ -217,10 +217,10 @@ public async Task CanGetWithLabelsForRepository()
         // Retrieve the Pull Requests
         var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
         Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login);
-        Assert.Equal(1, pullRequests[0].Labels.Count);
+        Assert.Single(pullRequests[0].Labels);
         Assert.Contains(pullRequests[0].Labels, x => x.Name == labelName);
     }
 
@@ -240,10 +240,10 @@ public async Task CanGetWithLabelsForRepositoryWithRepositoryId()
         // Retrieve the Pull Requests
         var pullRequests = await _fixture.GetAllForRepository(_context.Repository.Id);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
         Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login);
-        Assert.Equal(1, pullRequests[0].Labels.Count);
+        Assert.Single(pullRequests[0].Labels);
         Assert.Contains(pullRequests[0].Labels, x => x.Name == labelName);
     }
 
@@ -263,7 +263,7 @@ public async Task ReturnsCorrectCountOfPullRequestsWithoutStart()
 
         var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName, options);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
     }
 
@@ -283,7 +283,7 @@ public async Task ReturnsCorrectCountOfPullRequestsWithoutStartWithRepositoryId(
 
         var pullRequests = await _fixture.GetAllForRepository(_context.Repository.Id, options);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
     }
 
@@ -306,7 +306,7 @@ public async Task ReturnsCorrectCountOfPullRequestsWithStart()
 
         var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName, options);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
     }
 
@@ -329,7 +329,7 @@ public async Task ReturnsCorrectCountOfPullRequestsWithStartWithRepositoryId()
 
         var pullRequests = await _fixture.GetAllForRepository(_context.Repository.Id, options);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
     }
 
@@ -404,7 +404,7 @@ public async Task CanGetOpenPullRequest()
         var openPullRequests = new PullRequestRequest { State = ItemStateFilter.Open };
         var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName, openPullRequests);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
     }
 
@@ -419,7 +419,7 @@ public async Task CanGetOpenPullRequestWithRepositoryId()
         var openPullRequests = new PullRequestRequest { State = ItemStateFilter.Open };
         var pullRequests = await _fixture.GetAllForRepository(_context.Repository.Id, openPullRequests);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
     }
 
@@ -440,7 +440,7 @@ public async Task ReturnsCorrectCountOfPullRequestsWithoutStartParameterized()
         var openPullRequests = new PullRequestRequest { State = ItemStateFilter.Open };
         var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName, openPullRequests, options);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
     }
 
@@ -461,7 +461,7 @@ public async Task ReturnsCorrectCountOfPullRequestsWithoutStartParameterizedWith
         var openPullRequests = new PullRequestRequest { State = ItemStateFilter.Open };
         var pullRequests = await _fixture.GetAllForRepository(_context.Repository.Id, openPullRequests, options);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
     }
 
@@ -485,7 +485,7 @@ public async Task ReturnsCorrectCountOfPullRequestsWithStartParameterized()
         var openPullRequests = new PullRequestRequest { State = ItemStateFilter.Open };
         var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName, openPullRequests, options);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
     }
 
@@ -509,7 +509,7 @@ public async Task ReturnsCorrectCountOfPullRequestsWithStartParameterizedWithRep
         var openPullRequests = new PullRequestRequest { State = ItemStateFilter.Open };
         var pullRequests = await _fixture.GetAllForRepository(_context.Repository.Id, openPullRequests, options);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
         Assert.Equal(result.Title, pullRequests[0].Title);
     }
 
@@ -686,7 +686,7 @@ public async Task CanFindClosedPullRequest()
         var closedPullRequests = new PullRequestRequest { State = ItemStateFilter.Closed };
         var pullRequests = await _fixture.GetAllForRepository(Helper.UserName, _context.RepositoryName, closedPullRequests);
 
-        Assert.Equal(1, pullRequests.Count);
+        Assert.Single(pullRequests);
     }
 
     [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/ReleasesClientTests.cs b/Octokit.Tests.Integration/Clients/ReleasesClientTests.cs
index 9e5efcf461..c8f68e650e 100644
--- a/Octokit.Tests.Integration/Clients/ReleasesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/ReleasesClientTests.cs
@@ -115,7 +115,7 @@ public async Task ReturnsAssets()
             var release = await _releaseClient.Get("git-tfs", "git-tfs", 2276624);
 
             Assert.NotNull(release);
-            Assert.Equal(1, release.Assets.Count);
+            Assert.Single(release.Assets);
             Assert.Equal("GitTfs-0.24.1.zip", release.Assets.First().Name);
             Assert.Equal("https://api.github.com/repos/git-tfs/git-tfs/tarball/v0.24.1", release.TarballUrl);
             Assert.Equal("https://api.github.com/repos/git-tfs/git-tfs/zipball/v0.24.1", release.ZipballUrl);
@@ -127,7 +127,7 @@ public async Task ReturnsAssetsWithRepositoryId()
             var release = await _releaseClient.Get(252774, 2276624);
 
             Assert.NotNull(release);
-            Assert.Equal(1, release.Assets.Count);
+            Assert.Single(release.Assets);
             Assert.Equal("GitTfs-0.24.1.zip", release.Assets.First().Name);
             Assert.Equal("https://api.github.com/repos/git-tfs/git-tfs/tarball/v0.24.1", release.TarballUrl);
             Assert.Equal("https://api.github.com/repos/git-tfs/git-tfs/zipball/v0.24.1", release.ZipballUrl);
@@ -160,7 +160,7 @@ public async Task ReturnsReleasesWithNullPublishDate()
 
             var releases = await _releaseClient.GetAll(_context.RepositoryOwner, _context.RepositoryName);
 
-            Assert.True(releases.Count == 1);
+            Assert.Equal(1, releases.Count);
             Assert.False(releases.First().PublishedAt.HasValue);
         }
 
@@ -173,7 +173,7 @@ public async Task ReturnsReleasesWithNullPublishDateWithRepositoryDate()
 
             var releases = await _releaseClient.GetAll(_context.Repository.Id);
 
-            Assert.True(releases.Count == 1);
+            Assert.Equal(1, releases.Count);
             Assert.False(releases.First().PublishedAt.HasValue);
         }
 
@@ -521,7 +521,7 @@ public async Task CanUploadAndRetrieveAnAsset()
 
             var assets = await _releaseClient.GetAllAssets(_context.RepositoryOwner, _context.RepositoryName, release.Id);
 
-            Assert.Equal(1, assets.Count);
+            Assert.Single(assets);
             var asset = assets[0];
             Assert.Equal(result.Id, asset.Id);
             Assert.NotNull(asset.Url);
@@ -544,7 +544,7 @@ public async Task CanUploadAndRetrieveAnAssetWithRepositoryId()
 
             var assets = await _releaseClient.GetAllAssets(_context.Repository.Id, release.Id);
 
-            Assert.Equal(1, assets.Count);
+            Assert.Single(assets);
             var asset = assets[0];
             Assert.Equal(result.Id, asset.Id);
             Assert.NotNull(asset.Url);
@@ -716,7 +716,7 @@ public async Task ReturnsCorrectCountOfReleasesWithStart()
 
             var assets = await _releaseClient.GetAllAssets(owner, name, releaseId, options);
 
-            Assert.Equal(1, assets.Count);
+            Assert.Single(assets);
         }
 
         [IntegrationTest]
@@ -731,7 +731,7 @@ public async Task ReturnsCorrectCountOfReleasesWithStartWithRepositoryId()
 
             var assets = await _releaseClient.GetAllAssets(repositoryId, releaseId, options);
 
-            Assert.Equal(1, assets.Count);
+            Assert.Single(assets);
         }
 
         [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/RepositoryBranchesClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryBranchesClientTests.cs
index 592ce1253d..5a88eab629 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryBranchesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryBranchesClientTests.cs
@@ -347,14 +347,14 @@ public async Task GetsBranchProtectionForOrgRepo()
                     Assert.True(protection.RequiredStatusChecks.Strict);
                     Assert.Equal(2, protection.RequiredStatusChecks.Contexts.Count);
 
-                    Assert.Equal(1, protection.RequiredPullRequestReviews.DismissalRestrictions.Teams.Count);
-                    Assert.Equal(0, protection.RequiredPullRequestReviews.DismissalRestrictions.Users.Count);
+                    Assert.Single(protection.RequiredPullRequestReviews.DismissalRestrictions.Teams);
+                    Assert.Empty(protection.RequiredPullRequestReviews.DismissalRestrictions.Users);
                     Assert.True(protection.RequiredPullRequestReviews.DismissStaleReviews);
                     Assert.True(protection.RequiredPullRequestReviews.RequireCodeOwnerReviews);
                     Assert.True(protection.RequiredPullRequestReviews.RequireLastPushApproval);
 
-                    Assert.Equal(1, protection.Restrictions.Teams.Count);
-                    Assert.Equal(0, protection.Restrictions.Users.Count);
+                    Assert.Single(protection.Restrictions.Teams);
+                    Assert.Empty(protection.Restrictions.Users);
 
                     Assert.True(protection.EnforceAdmins.Enabled);
                 }
@@ -372,14 +372,14 @@ public async Task GetsBranchProtectionForOrgRepoWithRepositoryId()
                     Assert.True(protection.RequiredStatusChecks.Strict);
                     Assert.Equal(2, protection.RequiredStatusChecks.Contexts.Count);
 
-                    Assert.Equal(1, protection.RequiredPullRequestReviews.DismissalRestrictions.Teams.Count);
-                    Assert.Equal(0, protection.RequiredPullRequestReviews.DismissalRestrictions.Users.Count);
+                    Assert.Single(protection.RequiredPullRequestReviews.DismissalRestrictions.Teams);
+                    Assert.Empty(protection.RequiredPullRequestReviews.DismissalRestrictions.Users);
                     Assert.True(protection.RequiredPullRequestReviews.DismissStaleReviews);
                     Assert.True(protection.RequiredPullRequestReviews.RequireCodeOwnerReviews);
                     Assert.True(protection.RequiredPullRequestReviews.RequireLastPushApproval);
 
-                    Assert.Equal(1, protection.Restrictions.Teams.Count);
-                    Assert.Equal(0, protection.Restrictions.Users.Count);
+                    Assert.Single(protection.Restrictions.Teams);
+                    Assert.Empty(protection.Restrictions.Users);
 
                     Assert.True(protection.EnforceAdmins.Enabled);
                 }
@@ -403,7 +403,7 @@ public async Task UpdatesBranchProtection()
                     var protection = await _github.Repository.Branch.UpdateBranchProtection(repoContext.RepositoryOwner, repoContext.RepositoryName, repoContext.RepositoryDefaultBranch, update);
 
                     Assert.False(protection.RequiredStatusChecks.Strict);
-                    Assert.Equal(1, protection.RequiredStatusChecks.Contexts.Count);
+                    Assert.Single(protection.RequiredStatusChecks.Contexts);
 
                     Assert.Null(protection.RequiredPullRequestReviews.DismissalRestrictions);
                     Assert.False(protection.RequiredPullRequestReviews.DismissStaleReviews);
@@ -432,7 +432,7 @@ public async Task UpdatesBranchProtectionWithRepositoryId()
                     var protection = await _github.Repository.Branch.UpdateBranchProtection(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch, update);
 
                     Assert.False(protection.RequiredStatusChecks.Strict);
-                    Assert.Equal(1, protection.RequiredStatusChecks.Contexts.Count);
+                    Assert.Single(protection.RequiredStatusChecks.Contexts);
 
                     Assert.Null(protection.RequiredPullRequestReviews.DismissalRestrictions);
                     Assert.False(protection.RequiredPullRequestReviews.DismissStaleReviews);
@@ -462,7 +462,7 @@ public async Task UpdatesBranchProtectionForOrgRepo()
                     var protection = await _github.Repository.Branch.UpdateBranchProtection(repoContext.RepositoryOwner, repoContext.RepositoryName, repoContext.RepositoryDefaultBranch, update);
 
                     Assert.False(protection.RequiredStatusChecks.Strict);
-                    Assert.Equal(1, protection.RequiredStatusChecks.Contexts.Count);
+                    Assert.Single(protection.RequiredStatusChecks.Contexts);
 
                     Assert.Null(protection.RequiredPullRequestReviews.DismissalRestrictions);
                     Assert.False(protection.RequiredPullRequestReviews.DismissStaleReviews);
@@ -492,7 +492,7 @@ public async Task UpdatesBranchProtectionForOrgRepoWithRepositoryId()
                     var protection = await _github.Repository.Branch.UpdateBranchProtection(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch, update);
 
                     Assert.False(protection.RequiredStatusChecks.Strict);
-                    Assert.Equal(1, protection.RequiredStatusChecks.Contexts.Count);
+                    Assert.Single(protection.RequiredStatusChecks.Contexts);
 
                     Assert.Null(protection.RequiredPullRequestReviews.DismissalRestrictions);
                     Assert.False(protection.RequiredPullRequestReviews.DismissStaleReviews);
@@ -612,7 +612,7 @@ public async Task UpdateRequiredStatusChecks()
                     Assert.NotNull(requiredStatusChecks.Contexts);
                     Assert.Contains("new", requiredStatusChecks.Contexts);
                     Assert.True(requiredStatusChecks.Strict);
-                    Assert.Equal(1, requiredStatusChecks.Contexts.Count);
+                    Assert.Single(requiredStatusChecks.Contexts);
                 }
             }
 
@@ -630,7 +630,7 @@ public async Task UpdatesRequiredStatusChecksWithRepositoryId()
                     Assert.NotNull(requiredStatusChecks.Contexts);
                     Assert.Contains("new", requiredStatusChecks.Contexts);
                     Assert.True(requiredStatusChecks.Strict);
-                    Assert.Equal(1, requiredStatusChecks.Contexts.Count);
+                    Assert.Single(requiredStatusChecks.Contexts);
                 }
             }
         }
@@ -707,7 +707,7 @@ public async Task UpdateRequiredStatusChecksContexts()
                     var update = new List<string>() { "build2" };
                     var requiredStatusChecksContexts = await _github.Repository.Branch.UpdateRequiredStatusChecksContexts(repoContext.RepositoryOwner, repoContext.RepositoryName, repoContext.RepositoryDefaultBranch, update);
 
-                    Assert.Equal(1, requiredStatusChecksContexts.Count);
+                    Assert.Single(requiredStatusChecksContexts);
                 }
             }
 
@@ -721,7 +721,7 @@ public async Task UpdatesRequiredStatusChecksContextsWithRepositoryId()
                     var update = new List<string>() { "build2" };
                     var requiredStatusChecksContexts = await _github.Repository.Branch.UpdateRequiredStatusChecksContexts(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch, update);
 
-                    Assert.Equal(1, requiredStatusChecksContexts.Count);
+                    Assert.Single(requiredStatusChecksContexts);
                 }
             }
         }
@@ -835,8 +835,8 @@ public async Task GetsReviewEnforcementForOrgRepo()
 
                     var requiredReviews = await _github.Repository.Branch.GetReviewEnforcement(repoContext.RepositoryOwner, repoContext.RepositoryName, repoContext.RepositoryDefaultBranch);
 
-                    Assert.Equal(1, requiredReviews.DismissalRestrictions.Teams.Count);
-                    Assert.Equal(0, requiredReviews.DismissalRestrictions.Users.Count);
+                    Assert.Single(requiredReviews.DismissalRestrictions.Teams);
+                    Assert.Empty(requiredReviews.DismissalRestrictions.Users);
                     Assert.True(requiredReviews.DismissStaleReviews);
                     Assert.True(requiredReviews.RequireCodeOwnerReviews);
                     Assert.True(requiredReviews.RequireLastPushApproval);
@@ -852,8 +852,8 @@ public async Task GetsReviewEnforcementForOrgRepoWithRepositoryId()
 
                     var requiredReviews = await _github.Repository.Branch.GetReviewEnforcement(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch);
 
-                    Assert.Equal(1, requiredReviews.DismissalRestrictions.Teams.Count);
-                    Assert.Equal(0, requiredReviews.DismissalRestrictions.Users.Count);
+                    Assert.Single(requiredReviews.DismissalRestrictions.Teams);
+                    Assert.Empty(requiredReviews.DismissalRestrictions.Users);
                     Assert.True(requiredReviews.DismissStaleReviews);
                     Assert.True(requiredReviews.RequireCodeOwnerReviews);
                     Assert.True(requiredReviews.RequireLastPushApproval);
@@ -1165,8 +1165,8 @@ public async Task GetsProtectedBranchRestrictionsForOrgRepo()
 
                     var restrictions = await _github.Repository.Branch.GetProtectedBranchRestrictions(repoContext.RepositoryOwner, repoContext.RepositoryName, repoContext.RepositoryDefaultBranch);
 
-                    Assert.Equal(1, restrictions.Teams.Count);
-                    Assert.Equal(0, restrictions.Users.Count);
+                    Assert.Single(restrictions.Teams);
+                    Assert.Empty(restrictions.Users);
                 }
             }
 
@@ -1179,8 +1179,8 @@ public async Task GetsProtectedBranchRestrictionsForOrgRepoWithRepositoryId()
 
                     var restrictions = await _github.Repository.Branch.GetProtectedBranchRestrictions(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch);
 
-                    Assert.Equal(1, restrictions.Teams.Count);
-                    Assert.Equal(0, restrictions.Users.Count);
+                    Assert.Single(restrictions.Teams);
+                    Assert.Empty(restrictions.Users);
                 }
             }
         }
@@ -1226,7 +1226,7 @@ public async Task GetsProtectedBranchTeamRestrictionsForOrgRepo()
                     var restrictions = await _github.Repository.Branch.GetAllProtectedBranchTeamRestrictions(repoContext.RepositoryOwner, repoContext.RepositoryName, repoContext.RepositoryDefaultBranch);
 
                     Assert.NotNull(restrictions);
-                    Assert.Equal(1, restrictions.Count);
+                    Assert.Single(restrictions);
                 }
             }
 
@@ -1240,7 +1240,7 @@ public async Task GetsProtectedBranchTeamRestrictionsForOrgRepoWithRepositoryId(
                     var restrictions = await _github.Repository.Branch.GetAllProtectedBranchTeamRestrictions(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch);
 
                     Assert.NotNull(restrictions);
-                    Assert.Equal(1, restrictions.Count);
+                    Assert.Single(restrictions);
                 }
             }
         }
@@ -1291,7 +1291,7 @@ await _github.Organization.Team.AddRepository(
                     var restrictions = await _github.Repository.Branch.UpdateProtectedBranchTeamRestrictions(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch, newTeam);
 
                     Assert.NotNull(restrictions);
-                    Assert.Equal(1, restrictions.Count);
+                    Assert.Single(restrictions);
                 }
             }
         }
@@ -1360,7 +1360,7 @@ public async Task DeletesRProtectedBranchTeamRestrictionsForOrgRepo()
                     var deleted = await _github.Repository.Branch.DeleteProtectedBranchTeamRestrictions(repoContext.RepositoryOwner, repoContext.RepositoryName, repoContext.RepositoryDefaultBranch, teamToRemove);
 
                     Assert.NotNull(deleted);
-                    Assert.Equal(0, deleted.Count);
+                    Assert.Empty(deleted);
                 }
             }
 
@@ -1375,7 +1375,7 @@ public async Task DeletesProtectedBranchTeamRestrictionsForOrgRepoWithRepository
                     var deleted = await _github.Repository.Branch.DeleteProtectedBranchTeamRestrictions(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch, teamToRemove);
 
                     Assert.NotNull(deleted);
-                    Assert.Equal(0, deleted.Count);
+                    Assert.Empty(deleted);
                 }
             }
         }
@@ -1392,7 +1392,7 @@ public async Task GetsProtectedBranchUserRestrictionsForOrgRepo()
                     var restrictions = await _github.Repository.Branch.GetAllProtectedBranchUserRestrictions(repoContext.RepositoryOwner, repoContext.RepositoryName, repoContext.RepositoryDefaultBranch);
 
                     Assert.NotNull(restrictions);
-                    Assert.Equal(0, restrictions.Count);
+                    Assert.Empty(restrictions);
                 }
             }
 
@@ -1406,7 +1406,7 @@ public async Task GetsProtectedBranchUserRestrictionsForOrgRepoWithRepositoryId(
                     var restrictions = await _github.Repository.Branch.GetAllProtectedBranchUserRestrictions(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch);
 
                     Assert.NotNull(restrictions);
-                    Assert.Equal(0, restrictions.Count);
+                    Assert.Empty(restrictions);
                 }
             }
         }
@@ -1425,7 +1425,7 @@ public async Task UpdatesProtectedBranchUserRestrictionsForOrgRepo()
                     var restrictions = await _github.Repository.Branch.UpdateProtectedBranchUserRestrictions(repoContext.RepositoryOwner, repoContext.RepositoryName, repoContext.RepositoryDefaultBranch, newUser);
 
                     Assert.NotNull(restrictions);
-                    Assert.Equal(1, restrictions.Count);
+                    Assert.Single(restrictions);
                 }
             }
 
@@ -1441,7 +1441,7 @@ public async Task UpdatesProtectedBranchUserRestrictionsForOrgRepoWithRepository
                     var restrictions = await _github.Repository.Branch.UpdateProtectedBranchUserRestrictions(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch, newUser);
 
                     Assert.NotNull(restrictions);
-                    Assert.Equal(1, restrictions.Count);
+                    Assert.Single(restrictions);
                 }
             }
         }
@@ -1460,7 +1460,7 @@ public async Task AddsProtectedBranchUserRestrictionsForOrgRepo()
                     var restrictions = await _github.Repository.Branch.AddProtectedBranchUserRestrictions(repoContext.RepositoryOwner, repoContext.RepositoryName, repoContext.RepositoryDefaultBranch, newUser);
 
                     Assert.NotNull(restrictions);
-                    Assert.Equal(1, restrictions.Count);
+                    Assert.Single(restrictions);
                 }
             }
 
@@ -1476,7 +1476,7 @@ public async Task AddsProtectedBranchUserRestrictionsForOrgRepoWithRepositoryId(
                     var restrictions = await _github.Repository.Branch.AddProtectedBranchUserRestrictions(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch, newUser);
 
                     Assert.NotNull(restrictions);
-                    Assert.Equal(1, restrictions.Count);
+                    Assert.Single(restrictions);
                 }
             }
         }
@@ -1494,12 +1494,12 @@ public async Task DeletesProtectedBranchUserRestrictionsForOrgRepo()
                     var restrictions = await _github.Repository.Branch.AddProtectedBranchUserRestrictions(repoContext.RepositoryOwner, repoContext.RepositoryName, repoContext.RepositoryDefaultBranch, user);
 
                     Assert.NotNull(restrictions);
-                    Assert.Equal(1, restrictions.Count);
+                    Assert.Single(restrictions);
 
                     var deleted = await _github.Repository.Branch.DeleteProtectedBranchUserRestrictions(repoContext.RepositoryOwner, repoContext.RepositoryName, repoContext.RepositoryDefaultBranch, user);
 
                     Assert.NotNull(deleted);
-                    Assert.Equal(0, deleted.Count);
+                    Assert.Empty(deleted);
                 }
             }
 
@@ -1514,12 +1514,12 @@ public async Task DeletesProtectedBranchUserRestrictionsForOrgRepoWithRepository
                     var restrictions = await _github.Repository.Branch.AddProtectedBranchUserRestrictions(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch, user);
 
                     Assert.NotNull(restrictions);
-                    Assert.Equal(1, restrictions.Count);
+                    Assert.Single(restrictions);
 
                     var deleted = await _github.Repository.Branch.DeleteProtectedBranchUserRestrictions(repoContext.RepositoryId, repoContext.RepositoryDefaultBranch, user);
 
                     Assert.NotNull(deleted);
-                    Assert.Equal(0, deleted.Count);
+                    Assert.Empty(deleted);
                 }
             }
         }
diff --git a/Octokit.Tests.Integration/Clients/RepositoryCollaboratorClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryCollaboratorClientTests.cs
index 6ac5ce5959..0ec87c415e 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryCollaboratorClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryCollaboratorClientTests.cs
@@ -22,7 +22,7 @@ public async Task ReturnsAllCollaborators()
                 var collaborators = await fixture.GetAll(context.RepositoryOwner, context.RepositoryName);
 
                 Assert.NotNull(collaborators);
-                Assert.Equal(1, collaborators.Count);
+                Assert.Single(collaborators);
             }
         }
 
@@ -41,7 +41,7 @@ public async Task ReturnsCollaboratorsWithPermissionFilter()
                                                          new RepositoryCollaboratorListRequest() { Permission = CollaboratorPermission.Admin });
 
                 Assert.NotNull(collaborators);
-                Assert.Equal(1, collaborators.Count);
+                Assert.Single(collaborators);
             }
         }
 
@@ -58,7 +58,7 @@ public async Task ReturnsAllCollaboratorsWithRepositoryId()
                 var collaborators = await fixture.GetAll(context.Repository.Id);
 
                 Assert.NotNull(collaborators);
-                Assert.Equal(1, collaborators.Count);
+                Assert.Single(collaborators);
             }
         }
 
@@ -81,7 +81,7 @@ public async Task ReturnsCorrectCountOfCollaboratorsWithoutStart()
                 var collaborators = await fixture.GetAll(context.RepositoryOwner, context.RepositoryName, options);
 
                 Assert.NotNull(collaborators);
-                Assert.Equal(1, collaborators.Count);
+                Assert.Single(collaborators);
             }
         }
 
@@ -104,7 +104,7 @@ public async Task ReturnsCorrectCountOfCollaboratorsWithoutStartAndRepositoryId(
                 var collaborators = await fixture.GetAll(context.Repository.Id, options);
 
                 Assert.NotNull(collaborators);
-                Assert.Equal(1, collaborators.Count);
+                Assert.Single(collaborators);
             }
         }
 
@@ -128,7 +128,7 @@ public async Task ReturnsCorrectCountOfCollaboratorsWithStart()
                 var collaborators = await fixture.GetAll(context.RepositoryOwner, context.RepositoryName, options);
 
                 Assert.NotNull(collaborators);
-                Assert.Equal(0, collaborators.Count);
+                Assert.Empty(collaborators);
             }
         }
 
@@ -152,7 +152,7 @@ public async Task ReturnsCorrectCountOfCollaboratorsWithStartAndRepositoryId()
                 var collaborators = await fixture.GetAll(context.Repository.Id, options);
 
                 Assert.NotNull(collaborators);
-                Assert.Equal(0, collaborators.Count);
+                Assert.Empty(collaborators);
             }
         }
 
@@ -183,8 +183,8 @@ public async Task ReturnsDistinctResultsBasedOnStartPage()
 
                 var secondPage = await fixture.GetAll(context.RepositoryOwner, context.RepositoryName, skipStartOptions);
 
-                Assert.Equal(1, firstPage.Count);
-                Assert.Equal(0, secondPage.Count);
+                Assert.Single(firstPage);
+                Assert.Empty(secondPage);
             }
         }
 
@@ -215,8 +215,8 @@ public async Task ReturnsDistinctResultsBasedOnStartPageWithRepositoryId()
 
                 var secondPage = await fixture.GetAll(context.Repository.Id, skipStartOptions);
 
-                Assert.Equal(1, firstPage.Count);
-                Assert.Equal(0, secondPage.Count);
+                Assert.Single(firstPage);
+                Assert.Empty(secondPage);
             }
         }
     }
diff --git a/Octokit.Tests.Integration/Clients/RepositoryCommitsClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryCommitsClientTests.cs
index 80eb90ae1f..d1ff8dd8e2 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryCommitsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryCommitsClientTests.cs
@@ -317,7 +317,7 @@ public async Task CanCompareTheSameCommitWithApiOptions()
             const string head = "7349ecd6685c370ba84eb13f4c39f75f33";
 
             var compareResult = await _fixture.Compare(octokitNetRepositoryId, head, head, new ApiOptions { PageSize = 100 });
-            Assert.Equal(0, compareResult.Commits.Count);
+            Assert.Empty(compareResult.Commits);
         }
     }
 
@@ -344,7 +344,7 @@ public async Task CanCompareReferences()
             var result = await _fixture.Compare(Helper.UserName, _context.RepositoryName, "main", "my-branch");
 
             Assert.Equal(1, result.TotalCommits);
-            Assert.Equal(1, result.Commits.Count);
+            Assert.Single(result.Commits);
             Assert.Equal(1, result.AheadBy);
             Assert.Equal(0, result.BehindBy);
         }
@@ -357,7 +357,7 @@ public async Task CanCompareReferencesWithRepositoryId()
             var result = await _fixture.Compare(_context.Repository.Id, "main", "my-branch");
 
             Assert.Equal(1, result.TotalCommits);
-            Assert.Equal(1, result.Commits.Count);
+            Assert.Single(result.Commits);
             Assert.Equal(1, result.AheadBy);
             Assert.Equal(0, result.BehindBy);
         }
@@ -370,7 +370,7 @@ public async Task CanCompareReferencesOtherWayRound()
             var result = await _fixture.Compare(Helper.UserName, _context.RepositoryName, "my-branch", "main");
 
             Assert.Equal(0, result.TotalCommits);
-            Assert.Equal(0, result.Commits.Count);
+            Assert.Empty(result.Commits);
             Assert.Equal(0, result.AheadBy);
             Assert.Equal(1, result.BehindBy);
         }
@@ -383,7 +383,7 @@ public async Task CanCompareReferencesOtherWayRoundWithRepositoryId()
             var result = await _fixture.Compare(_context.Repository.Id, "my-branch", "main");
 
             Assert.Equal(0, result.TotalCommits);
-            Assert.Equal(0, result.Commits.Count);
+            Assert.Empty(result.Commits);
             Assert.Equal(0, result.AheadBy);
             Assert.Equal(1, result.BehindBy);
         }
@@ -424,7 +424,7 @@ public async Task CanCompareUsingSha()
 
             var result = await _fixture.Compare(Helper.UserName, _context.RepositoryName, main.Object.Sha, branch.Object.Sha);
 
-            Assert.Equal(1, result.Commits.Count);
+            Assert.Single(result.Commits);
             Assert.Equal(1, result.AheadBy);
             Assert.Equal(0, result.BehindBy);
         }
@@ -439,7 +439,7 @@ public async Task CanCompareUsingShaWithRepositoryId()
 
             var result = await _fixture.Compare(_context.Repository.Id, main.Object.Sha, branch.Object.Sha);
 
-            Assert.Equal(1, result.Commits.Count);
+            Assert.Single(result.Commits);
             Assert.Equal(1, result.AheadBy);
             Assert.Equal(0, result.BehindBy);
         }
diff --git a/Octokit.Tests.Integration/Clients/RepositoryContentsClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryContentsClientTests.cs
index 0501c092c7..5e429c78d1 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryContentsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryContentsClientTests.cs
@@ -71,7 +71,7 @@ public async Task GetsFileContent()
                     .Content
                     .GetAllContents("octokit", "octokit.net", "Octokit.Reactive/ObservableGitHubClient.cs");
 
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
                 Assert.Equal(ContentType.File, contents.First().Type);
                 Assert.Equal("https://github.com/octokit/octokit.net/blob/main/Octokit.Reactive/ObservableGitHubClient.cs", contents.First().HtmlUrl);
             }
@@ -86,7 +86,7 @@ public async Task GetsFileContentWithRepositoryId()
                     .Content
                     .GetAllContents(7528679, "Octokit.Reactive/ObservableGitHubClient.cs");
 
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
                 Assert.Equal(ContentType.File, contents.First().Type);
                 Assert.Equal("https://github.com/octokit/octokit.net/blob/main/Octokit.Reactive/ObservableGitHubClient.cs", contents.First().HtmlUrl);
             }
@@ -188,7 +188,7 @@ public async Task GetsFileContent()
                     .Content
                     .GetAllContentsByRef("octokit", "octokit.net", "Octokit.Reactive/ObservableGitHubClient.cs", "main");
 
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
                 Assert.Equal(ContentType.File, contents.First().Type);
                 Assert.Equal("https://github.com/octokit/octokit.net/blob/main/Octokit.Reactive/ObservableGitHubClient.cs", contents.First().HtmlUrl);
             }
@@ -203,7 +203,7 @@ public async Task GetsFileContentWithRepositoryId()
                     .Content
                     .GetAllContentsByRef(7528679, "Octokit.Reactive/ObservableGitHubClient.cs", "main");
 
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
                 Assert.Equal(ContentType.File, contents.First().Type);
                 Assert.Equal("https://github.com/octokit/octokit.net/blob/main/Octokit.Reactive/ObservableGitHubClient.cs", contents.First().HtmlUrl);
             }
diff --git a/Octokit.Tests.Integration/Clients/RepositoryDeployKeysClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryDeployKeysClientTests.cs
index 36ed67a14b..8ba2b766e1 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryDeployKeysClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryDeployKeysClientTests.cs
@@ -56,7 +56,7 @@ public async Task CanCreateADeployKeyWithRepositoryId()
     public async Task CanRetrieveAllDeployKeys()
     {
         var deployKeys = await _fixture.GetAll(_context.RepositoryOwner, _context.RepositoryName);
-        Assert.Equal(0, deployKeys.Count);
+        Assert.Empty(deployKeys);
 
         var deployKey = new NewDeployKey
         {
@@ -67,7 +67,7 @@ public async Task CanRetrieveAllDeployKeys()
         await _fixture.Create(_context.RepositoryOwner, _context.RepositoryName, deployKey);
 
         deployKeys = await _fixture.GetAll(_context.RepositoryOwner, _context.RepositoryName);
-        Assert.Equal(1, deployKeys.Count);
+        Assert.Single(deployKeys);
         Assert.Equal(_key, deployKeys[0].Key);
         Assert.Equal(_keyTitle, deployKeys[0].Title);
     }
@@ -76,7 +76,7 @@ public async Task CanRetrieveAllDeployKeys()
     public async Task CanRetrieveAllDeployKeysWithRepositoryId()
     {
         var deployKeys = await _fixture.GetAll(_context.RepositoryOwner, _context.RepositoryName);
-        Assert.Equal(0, deployKeys.Count);
+        Assert.Empty(deployKeys);
 
         var deployKey = new NewDeployKey
         {
@@ -87,7 +87,7 @@ public async Task CanRetrieveAllDeployKeysWithRepositoryId()
         await _fixture.Create(_context.Repository.Id, deployKey);
 
         deployKeys = await _fixture.GetAll(_context.Repository.Id);
-        Assert.Equal(1, deployKeys.Count);
+        Assert.Single(deployKeys);
         Assert.Equal(_key, deployKeys[0].Key);
         Assert.Equal(_keyTitle, deployKeys[0].Title);
     }
@@ -96,7 +96,7 @@ public async Task CanRetrieveAllDeployKeysWithRepositoryId()
     public async Task ReturnsCorrectCountOfDeployKeysWithoutStart()
     {
         var deployKeys = await _fixture.GetAll(_context.RepositoryOwner, _context.RepositoryName);
-        Assert.Equal(0, deployKeys.Count);
+        Assert.Empty(deployKeys);
 
         var list = new List<NewDeployKey>();
         var deployKeysCount = 5;
@@ -130,7 +130,7 @@ public async Task ReturnsCorrectCountOfDeployKeysWithoutStart()
     public async Task ReturnsCorrectCountOfDeployKeysWithStart()
     {
         var deployKeys = await _fixture.GetAll(_context.RepositoryOwner, _context.RepositoryName);
-        Assert.Equal(0, deployKeys.Count);
+        Assert.Empty(deployKeys);
 
         var list = new List<NewDeployKey>();
         var deployKeysCount = 5;
@@ -158,7 +158,7 @@ public async Task ReturnsCorrectCountOfDeployKeysWithStart()
 
         deployKeys = await _fixture.GetAll(_context.RepositoryOwner, _context.RepositoryName, options);
 
-        Assert.Equal(1, deployKeys.Count);
+        Assert.Single(deployKeys);
     }
 
     [IntegrationTest(Skip = "See https://github.com/octokit/octokit.net/issues/1003 for investigating this failing test")]
@@ -287,13 +287,13 @@ public async Task CanRemoveADeployKey()
         await _fixture.Create(_context.RepositoryOwner, _context.RepositoryName, newDeployKey);
 
         var deployKeys = await _fixture.GetAll(_context.RepositoryOwner, _context.RepositoryName);
-        Assert.Equal(1, deployKeys.Count);
+        Assert.Single(deployKeys);
         Assert.Equal(_key, deployKeys[0].Key);
         Assert.Equal(_keyTitle, deployKeys[0].Title);
 
         await _fixture.Delete(_context.RepositoryOwner, _context.RepositoryName, deployKeys[0].Id);
         deployKeys = await _fixture.GetAll(_context.RepositoryOwner, _context.RepositoryName);
-        Assert.Equal(0, deployKeys.Count);
+        Assert.Empty(deployKeys);
     }
 
     [IntegrationTest(Skip = "see https://github.com/octokit/octokit.net/issues/533 for the resolution to this failing test")]
@@ -308,13 +308,13 @@ public async Task CanRemoveADeployKeyWithRepositoryId()
         await _fixture.Create(_context.Repository.Id, newDeployKey);
 
         var deployKeys = await _fixture.GetAll(_context.Repository.Id);
-        Assert.Equal(1, deployKeys.Count);
+        Assert.Single(deployKeys);
         Assert.Equal(_key, deployKeys[0].Key);
         Assert.Equal(_keyTitle, deployKeys[0].Title);
 
         await _fixture.Delete(_context.Repository.Id, deployKeys[0].Id);
         deployKeys = await _fixture.GetAll(_context.Repository.Id);
-        Assert.Equal(0, deployKeys.Count);
+        Assert.Empty(deployKeys);
     }
 
     public void Dispose()
diff --git a/Octokit.Tests.Integration/Clients/RepositoryForksClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryForksClientTests.cs
index 836b1c55f4..b5d241cc35 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryForksClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryForksClientTests.cs
@@ -45,7 +45,7 @@ public async Task ReturnsCorrectCountOfForksWithoutStart()
 
                 var forks = await github.Repository.Forks.GetAll("octokit", "octokit.net", options);
 
-                Assert.Equal(1, forks.Count);
+                Assert.Single(forks);
             }
 
             [IntegrationTest]
@@ -61,7 +61,7 @@ public async Task ReturnsCorrectCountOfForksWithoutStartWithRepositoryId()
 
                 var forks = await github.Repository.Forks.GetAll(7528679, options);
 
-                Assert.Equal(1, forks.Count);
+                Assert.Single(forks);
             }
 
             [IntegrationTest]
@@ -78,7 +78,7 @@ public async Task ReturnsCorrectCountOfForksWithStart()
 
                 var forks = await github.Repository.Forks.GetAll("octokit", "octokit.net", options);
 
-                Assert.Equal(1, forks.Count);
+                Assert.Single(forks);
             }
 
             [IntegrationTest]
@@ -95,7 +95,7 @@ public async Task ReturnsCorrectCountOfForksWithStartWithRepositoryId()
 
                 var forks = await github.Repository.Forks.GetAll(7528679, options);
 
-                Assert.Equal(1, forks.Count);
+                Assert.Single(forks);
             }
 
             [IntegrationTest]
@@ -173,7 +173,7 @@ public async Task ReturnsCorrectCountOfForksWithoutStartParameterized()
 
                 var forks = await github.Repository.Forks.GetAll("octokit", "octokit.net", repositoryForksListRequest, options);
 
-                Assert.Equal(1, forks.Count);
+                Assert.Single(forks);
             }
 
             [IntegrationTest]
@@ -191,7 +191,7 @@ public async Task ReturnsCorrectCountOfForksWithoutStartParameterizedWithReposit
 
                 var forks = await github.Repository.Forks.GetAll(7528679, repositoryForksListRequest, options);
 
-                Assert.Equal(1, forks.Count);
+                Assert.Single(forks);
             }
 
             [IntegrationTest]
@@ -210,7 +210,7 @@ public async Task ReturnsCorrectCountOfForksWithStartParameterized()
 
                 var forks = await github.Repository.Forks.GetAll("octokit", "octokit.net", repositoryForksListRequest, options);
 
-                Assert.Equal(1, forks.Count);
+                Assert.Single(forks);
             }
 
             [IntegrationTest]
@@ -229,7 +229,7 @@ public async Task ReturnsCorrectCountOfForksWithStartParameterizedWithRepository
 
                 var forks = await github.Repository.Forks.GetAll(7528679, repositoryForksListRequest, options);
 
-                Assert.Equal(1, forks.Count);
+                Assert.Single(forks);
             }
 
             [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/RepositoryHooksClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryHooksClientTests.cs
index 838d959a92..af843f5698 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryHooksClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryHooksClientTests.cs
@@ -90,7 +90,7 @@ public async Task ReturnsCorrectCountOfHooksWithStart()
 
                 var hooks = await github.Repository.Hooks.GetAll(_fixture.RepositoryOwner, _fixture.RepositoryName, options);
 
-                Assert.Equal(1, hooks.Count);
+                Assert.Single(hooks);
             }
 
             [IntegrationTest]
@@ -107,7 +107,7 @@ public async Task ReturnsCorrectCountOfHooksWithStartWithRepositoryId()
 
                 var hooks = await github.Repository.Hooks.GetAll(_fixture.RepositoryId, options);
 
-                Assert.Equal(1, hooks.Count);
+                Assert.Single(hooks);
             }
 
             [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/RepositoryInvitationsClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryInvitationsClientTests.cs
index a3590942eb..0467a1bb6e 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryInvitationsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryInvitationsClientTests.cs
@@ -30,7 +30,7 @@ public async Task CanGetAllInvitations()
 
                 var invitations = await github.Repository.Invitation.GetAllForRepository(context.Repository.Id);
 
-                Assert.Equal(1, invitations.Count);
+                Assert.Single(invitations);
                 Assert.Equal(invitations[0].CreatedAt, response.CreatedAt);
                 Assert.Equal(invitations[0].Id, response.Id);
                 Assert.Equal(invitations[0].Invitee.Login, response.Invitee.Login);
@@ -72,7 +72,7 @@ public async Task ReturnsCorrectCountOfInvitationsWithStart()
 
                 var invitations = await github.Repository.Invitation.GetAllForRepository(context.Repository.Id, options);
 
-                Assert.Equal(1, invitations.Count);
+                Assert.Single(invitations);
             }
         }
 
@@ -102,7 +102,7 @@ public async Task ReturnsCorrectCountOfInvitationsWithoutStart()
 
                 var invitations = await github.Repository.Invitation.GetAllForRepository(context.Repository.Id, options);
 
-                Assert.Equal(1, invitations.Count);
+                Assert.Single(invitations);
             }
         }
 
@@ -215,7 +215,7 @@ public async Task ReturnsCorrectCountOfInvitationsWithStart()
 
 
                 var invitations = await github.Repository.Invitation.GetAllForCurrent(startOptions);
-                Assert.Equal(1, invitations.Count);
+                Assert.Single(invitations);
             }
             finally
             {
@@ -262,7 +262,7 @@ public async Task ReturnsCorrectCountOfInvitationsWithoutStart()
 
 
                 var invitations = await github.Repository.Invitation.GetAllForCurrent(startOptions);
-                Assert.Equal(1, invitations.Count);
+                Assert.Single(invitations);
             }
             finally
             {
diff --git a/Octokit.Tests.Integration/Clients/RespositorySecretsClientTests.cs b/Octokit.Tests.Integration/Clients/RespositorySecretsClientTests.cs
index e56c2d6cc2..166117d267 100644
--- a/Octokit.Tests.Integration/Clients/RespositorySecretsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RespositorySecretsClientTests.cs
@@ -34,7 +34,7 @@ public async Task GetPublicKey()
 
                 var key = await github.Repository.Actions.Secrets.GetPublicKey(OWNER, REPO);
 
-                Assert.True(!string.IsNullOrWhiteSpace(key.KeyId));
+                Assert.False(string.IsNullOrWhiteSpace(key.KeyId));
             }
         }
 
@@ -64,7 +64,7 @@ public async Task GetSecret()
                 var secret = await github.Repository.Actions.Secrets.Get(OWNER, REPO, "TEST");
 
                 Assert.NotNull(secret);
-                Assert.True(secret.Name == "TEST");
+                Assert.Equal("TEST", secret.Name);
             }
         }
 
diff --git a/Octokit.Tests.Integration/Clients/StarredClientTests.cs b/Octokit.Tests.Integration/Clients/StarredClientTests.cs
index 86175afe87..ef170ac406 100644
--- a/Octokit.Tests.Integration/Clients/StarredClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/StarredClientTests.cs
@@ -47,7 +47,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithoutStartForCurrent()
             };
 
             var repositories = await _fixture.GetAllForCurrent(options);
-            Assert.Equal(1, repositories.Count);
+            Assert.Single(repositories);
         }
 
         [IntegrationTest]
@@ -61,7 +61,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithStartForCurrent()
             };
 
             var repositories = await _fixture.GetAllForCurrent(options);
-            Assert.Equal(1, repositories.Count);
+            Assert.Single(repositories);
         }
 
         [IntegrationTest]
@@ -85,8 +85,8 @@ public async Task ReturnsDistinctRepositoriesBasedOnStartPageForCurrent()
 
             var secondPage = await _fixture.GetAllForCurrent(skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().Id, secondPage.First().Id);
         }
 
@@ -111,7 +111,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithoutStartForCurrentParamet
             };
 
             var repositories = await _fixture.GetAllForCurrent(starredRequest, options);
-            Assert.Equal(1, repositories.Count);
+            Assert.Single(repositories);
         }
 
         [IntegrationTest]
@@ -127,7 +127,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithStartForCurrentParameteri
             };
 
             var repositories = await _fixture.GetAllForCurrent(starredRequest, options);
-            Assert.Equal(1, repositories.Count);
+            Assert.Single(repositories);
         }
 
         [IntegrationTest]
@@ -154,8 +154,8 @@ public async Task ReturnsDistinctRepositoriesBasedOnStartPageForCurrentParameter
 
             var secondPage = await _fixture.GetAllForCurrent(starredRequestSecondPage, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().Id, secondPage.First().Id);
         }
 
@@ -181,7 +181,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithoutStartForCurrentWithTim
             };
 
             var repositories = await _fixture.GetAllForCurrentWithTimestamps(options);
-            Assert.Equal(1, repositories.Count);
+            Assert.Single(repositories);
         }
 
         [IntegrationTest]
@@ -195,7 +195,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithStartForCurrentWithTimest
             };
 
             var repositories = await _fixture.GetAllForCurrentWithTimestamps(options);
-            Assert.Equal(1, repositories.Count);
+            Assert.Single(repositories);
         }
 
         [IntegrationTest]
@@ -219,8 +219,8 @@ public async Task ReturnsDistinctRepositoriesBasedOnStartPageForCurrentWithTimes
 
             var secondPage = await _fixture.GetAllForCurrentWithTimestamps(skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().Repo.Id, secondPage.First().Repo.Id);
         }
 
@@ -255,7 +255,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithoutStartForCurrentWithTim
             };
 
             var stars = await _fixture.GetAllForCurrentWithTimestamps(starredRequest, options);
-            Assert.Equal(1, stars.Count);
+            Assert.Single(stars);
 
             for (int i = 1; i < stars.Count; i++)
             {
@@ -276,7 +276,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithStartForCurrentWithTimest
             };
 
             var stars = await _fixture.GetAllForCurrentWithTimestamps(starredRequest, options);
-            Assert.Equal(1, stars.Count);
+            Assert.Single(stars);
 
             for (int i = 1; i < stars.Count; i++)
             {
@@ -307,8 +307,8 @@ public async Task ReturnsDistinctRepositoriesBasedOnStartPageForCurrentWithTimes
 
             var secondPage = await _fixture.GetAllForCurrentWithTimestamps(starredRequest, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().Repo.Id, secondPage.First().Repo.Id);
 
             for (int i = 1; i < firstPage.Count; i++)
@@ -337,7 +337,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithoutStartForUser()
             };
 
             var repositories = await _fixture.GetAllForUser(Helper.UserName, options);
-            Assert.Equal(1, repositories.Count);
+            Assert.Single(repositories);
         }
 
         [IntegrationTest]
@@ -351,7 +351,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithStartForUser()
             };
 
             var repositories = await _fixture.GetAllForUser(Helper.UserName, options);
-            Assert.Equal(1, repositories.Count);
+            Assert.Single(repositories);
         }
 
         [IntegrationTest]
@@ -375,8 +375,8 @@ public async Task ReturnsDistinctRepositoriesBasedOnStartPageForUser()
 
             var secondPage = await _fixture.GetAllForUser(Helper.UserName, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().Id, secondPage.First().Id);
         }
 
@@ -404,7 +404,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithoutStartForUserParameteri
             };
 
             var repositories = await _fixture.GetAllForUser(Helper.UserName, starredRequest, options);
-            Assert.Equal(1, repositories.Count);
+            Assert.Single(repositories);
         }
 
         [IntegrationTest]
@@ -420,7 +420,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithStartForUserParameterized
             };
 
             var repositories = await _fixture.GetAllForUser(Helper.UserName, starredRequest, options);
-            Assert.Equal(1, repositories.Count);
+            Assert.Single(repositories);
         }
 
         [IntegrationTest]
@@ -447,8 +447,8 @@ public async Task ReturnsDistinctRepositoriesBasedOnStartPageForUserParameterize
 
             var secondPage = await _fixture.GetAllForUser(Helper.UserName, starredRequestSecondPage, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().Id, secondPage.First().Id);
         }
 
@@ -474,7 +474,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithoutStartForUserWithTimest
             };
 
             var stars = await _fixture.GetAllForUserWithTimestamps(Helper.UserName, options);
-            Assert.Equal(1, stars.Count);
+            Assert.Single(stars);
         }
 
         [IntegrationTest]
@@ -488,7 +488,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithStartForUserWithTimestamp
             };
 
             var stars = await _fixture.GetAllForUserWithTimestamps(Helper.UserName, options);
-            Assert.Equal(1, stars.Count);
+            Assert.Single(stars);
         }
 
         [IntegrationTest]
@@ -512,8 +512,8 @@ public async Task ReturnsDistinctRepositoriesBasedOnStartPageForUserWithTimestam
 
             var secondPage = await _fixture.GetAllForUserWithTimestamps(Helper.UserName, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().Repo.Id, secondPage.First().Repo.Id);
         }
 
@@ -548,7 +548,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithoutStartForUserWithTimest
             };
 
             var stars = await _fixture.GetAllForUserWithTimestamps(Helper.UserName, starredRequest, options);
-            Assert.Equal(1, stars.Count);
+            Assert.Single(stars);
 
             for (int i = 1; i < stars.Count; i++)
             {
@@ -569,7 +569,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithStartForUserWithTimestamp
             };
 
             var stars = await _fixture.GetAllForUserWithTimestamps(Helper.UserName, starredRequest, options);
-            Assert.Equal(1, stars.Count);
+            Assert.Single(stars);
 
             for (int i = 1; i < stars.Count; i++)
             {
@@ -600,8 +600,8 @@ public async Task ReturnsDistinctRepositoriesBasedOnStartPageForUserWithTimestam
 
             var secondPage = await _fixture.GetAllForUserWithTimestamps(Helper.UserName, starredRequest, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().Repo.Id, secondPage.First().Repo.Id);
 
             for (int i = 0; i < firstPage.Count; i++)
@@ -640,7 +640,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithoutStartAllStargazers()
             };
 
             var users = await _fixture.GetAllStargazers("octokit", "octokit.net", options);
-            Assert.Equal(1, users.Count);
+            Assert.Single(users);
         }
 
         [IntegrationTest]
@@ -653,7 +653,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithoutStartAllStargazersWith
             };
 
             var users = await _fixture.GetAllStargazers(7528679, options);
-            Assert.Equal(1, users.Count);
+            Assert.Single(users);
         }
 
         [IntegrationTest]
@@ -667,7 +667,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithStartAllStargazers()
             };
 
             var users = await _fixture.GetAllStargazers("octokit", "octokit.net", options);
-            Assert.Equal(1, users.Count);
+            Assert.Single(users);
         }
 
         [IntegrationTest]
@@ -681,7 +681,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithStartAllStargazersWithRep
             };
 
             var users = await _fixture.GetAllStargazers(7528679, options);
-            Assert.Equal(1, users.Count);
+            Assert.Single(users);
         }
 
         [IntegrationTest]
@@ -705,8 +705,8 @@ public async Task ReturnsDistinctRepositoriesBasedOnStartPageAllStargazers()
 
             var secondPage = await _fixture.GetAllStargazers("octokit", "octokit.net", skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().Id, secondPage.First().Id);
         }
 
@@ -731,8 +731,8 @@ public async Task ReturnsDistinctRepositoriesBasedOnStartPageAllStargazersWithRe
 
             var secondPage = await _fixture.GetAllStargazers(7528679, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().Id, secondPage.First().Id);
         }
 
@@ -773,7 +773,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithoutStartAllStargazersWith
             };
 
             var userStars = await _fixture.GetAllStargazersWithTimestamps("octokit", "octokit.net", options);
-            Assert.Equal(1, userStars.Count);
+            Assert.Single(userStars);
         }
 
         [IntegrationTest]
@@ -786,7 +786,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithoutStartAllStargazersWith
             };
 
             var userStars = await _fixture.GetAllStargazersWithTimestamps(7528679, options);
-            Assert.Equal(1, userStars.Count);
+            Assert.Single(userStars);
         }
 
         [IntegrationTest]
@@ -800,7 +800,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithStartAllStargazersWithTim
             };
 
             var userStars = await _fixture.GetAllStargazersWithTimestamps("octokit", "octokit.net", options);
-            Assert.Equal(1, userStars.Count);
+            Assert.Single(userStars);
         }
 
         [IntegrationTest]
@@ -814,7 +814,7 @@ public async Task ReturnsCorrectCountOfRepositoriesWithStartAllStargazersWithTim
             };
 
             var userStars = await _fixture.GetAllStargazersWithTimestamps(7528679, options);
-            Assert.Equal(1, userStars.Count);
+            Assert.Single(userStars);
         }
 
         [IntegrationTest]
@@ -838,8 +838,8 @@ public async Task ReturnsDistinctRepositoriesBasedOnStartPageAllStargazersWithTi
 
             var secondPage = await _fixture.GetAllStargazersWithTimestamps("octokit", "octokit.net", skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().StarredAt, secondPage.First().StarredAt);
         }
 
@@ -864,8 +864,8 @@ public async Task ReturnsDistinctRepositoriesBasedOnStartPageAllStargazersWithTi
 
             var secondPage = await _fixture.GetAllStargazersWithTimestamps(7528679, skipStartOptions);
 
-            Assert.Equal(1, firstPage.Count);
-            Assert.Equal(1, secondPage.Count);
+            Assert.Single(firstPage);
+            Assert.Single(secondPage);
             Assert.NotEqual(firstPage.First().StarredAt, secondPage.First().StarredAt);
         }
 
diff --git a/Octokit.Tests.Integration/Clients/StatisticsClientTests.cs b/Octokit.Tests.Integration/Clients/StatisticsClientTests.cs
index 9809e7ce8e..7dc88e88f6 100644
--- a/Octokit.Tests.Integration/Clients/StatisticsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/StatisticsClientTests.cs
@@ -26,13 +26,13 @@ public async Task CanCreateAndRetrieveContributors()
                 var contributors = await _client.Repository.Statistics.GetContributors(repository.Owner, repository.Name);
 
                 Assert.NotNull(contributors);
-                Assert.Equal(1, contributors.Count);
+                Assert.Single(contributors);
 
                 var soleContributor = contributors.First();
                 Assert.NotNull(soleContributor.Author);
                 Assert.True(soleContributor.Author.Login == repository.Owner);
 
-                Assert.Equal(1, soleContributor.Weeks.Count);
+                Assert.Single(soleContributor.Weeks);
                 Assert.Equal(1, soleContributor.Total);
             }
         }
@@ -47,13 +47,13 @@ public async Task CanCreateAndRetrieveContributorsWithRepositoryId()
                 var contributors = await _client.Repository.Statistics.GetContributors(context.Repository.Id);
 
                 Assert.NotNull(contributors);
-                Assert.Equal(1, contributors.Count);
+                Assert.Single(contributors);
 
                 var soleContributor = contributors.First();
                 Assert.NotNull(soleContributor.Author);
                 Assert.True(soleContributor.Author.Login == repository.Owner);
 
-                Assert.Equal(1, soleContributor.Weeks.Count);
+                Assert.Single(soleContributor.Weeks);
                 Assert.Equal(1, soleContributor.Total);
             }
         }
diff --git a/Octokit.Tests.Integration/Clients/TeamsClientTests.cs b/Octokit.Tests.Integration/Clients/TeamsClientTests.cs
index da59b46841..b58b25ac49 100644
--- a/Octokit.Tests.Integration/Clients/TeamsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/TeamsClientTests.cs
@@ -94,7 +94,7 @@ public async Task ReturnsCorrectCountOfChildTeamsWithoutStart()
 
                 var teams = await _github.Organization.Team.GetAllChildTeams(parentTeamContext.TeamId, options);
 
-                Assert.Equal(1, teams.Count);
+                Assert.Single(teams);
                 Assert.Equal(team1.Id, teams[0].Id);
             }
         }
@@ -116,7 +116,7 @@ public async Task ReturnsCorrectCountOfChildTeamsWithStart()
 
                 var teams = await _github.Organization.Team.GetAllChildTeams(parentTeamContext.TeamId, options);
 
-                Assert.Equal(1, teams.Count);
+                Assert.Single(teams);
                 Assert.Equal(team2.Id, teams[0].Id);
             }
         }
@@ -333,7 +333,7 @@ public async Task CanAddRepository()
                 var addedRepo = await _github.Organization.Team.GetAllRepositories(team.Id);
 
                 //Check if permission was correctly applied
-                Assert.True(addedRepo.First(x => x.Id == repo.Id).Permissions.Admin == true);
+                Assert.True(addedRepo.First(x => x.Id == repo.Id).Permissions.Admin);
             }
         }
     }
@@ -390,7 +390,7 @@ public async Task ReturnsCorrectCountOfPendingInvitationsWithoutStart()
 
                 var pendingInvitations = await _gitHub.Organization.Team.GetAllPendingInvitations(teamContext.TeamId, options);
                 Assert.NotEmpty(pendingInvitations);
-                Assert.Equal(1, pendingInvitations.Count);
+                Assert.Single(pendingInvitations);
             }
         }
 
@@ -411,7 +411,7 @@ public async Task ReturnsCorrectCountOfPendingInvitationsWithStart()
 
                 var firstPagePendingInvitations = await _gitHub.Organization.Team.GetAllPendingInvitations(teamContext.TeamId, firstPageOptions);
                 Assert.NotEmpty(firstPagePendingInvitations);
-                Assert.Equal(1, firstPagePendingInvitations.Count);
+                Assert.Single(firstPagePendingInvitations);
 
                 var secondPageOptions = new ApiOptions
                 {
@@ -422,7 +422,7 @@ public async Task ReturnsCorrectCountOfPendingInvitationsWithStart()
 
                 var secondPagePendingInvitations = await _gitHub.Organization.Team.GetAllPendingInvitations(teamContext.TeamId, secondPageOptions);
                 Assert.NotEmpty(secondPagePendingInvitations);
-                Assert.Equal(1, secondPagePendingInvitations.Count);
+                Assert.Single(secondPagePendingInvitations);
 
                 Assert.NotEqual(firstPagePendingInvitations[0].Login, secondPagePendingInvitations[0].Login);
             }
@@ -604,7 +604,7 @@ public async Task AddsTeamRepositoryPermissions()
             {
                 var teamRepositories = await github.Organization.Team.GetAllRepositories(teamContext.TeamId);
                 
-                Assert.Equal(0, teamRepositories.Count);
+                Assert.Empty(teamRepositories);
 
                 await github.Organization.Team.AddOrUpdateTeamRepositoryPermissions(
                     Helper.Organization,
@@ -678,7 +678,7 @@ await github.Organization.Team.RemoveRepositoryFromATeam(
 
                 var addedRepo = await github.Organization.Team.GetAllRepositories(teamContext.TeamId);
 
-                Assert.Equal(0, addedRepo.Count);
+                Assert.Empty(addedRepo);
             }
         }
     }
diff --git a/Octokit.Tests.Integration/Clients/TreeClientTests.cs b/Octokit.Tests.Integration/Clients/TreeClientTests.cs
index a069bb445c..ac54e69b0b 100644
--- a/Octokit.Tests.Integration/Clients/TreeClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/TreeClientTests.cs
@@ -113,7 +113,7 @@ public async Task CanGetACreatedTree()
         var result = await _fixture.Get(_context.RepositoryOwner, _context.RepositoryName, tree.Sha);
 
         Assert.NotNull(result);
-        Assert.Equal(1, result.Tree.Count);
+        Assert.Single(result.Tree);
     }
 
     [IntegrationTest]
@@ -141,7 +141,7 @@ public async Task CanGetACreatedTreeWithRepositoryId()
         var result = await _fixture.Get(_context.Repository.Id, tree.Sha);
 
         Assert.NotNull(result);
-        Assert.Equal(1, result.Tree.Count);
+        Assert.Single(result.Tree);
     }
 
     public void Dispose()
diff --git a/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterpriseLdapClientTests.cs b/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterpriseLdapClientTests.cs
index f09b45ee31..f9a4477c26 100644
--- a/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterpriseLdapClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterpriseLdapClientTests.cs
@@ -54,7 +54,7 @@ public async Task CanQueueSyncUserMapping()
             // Check response message indicates LDAP sync was queued
             Assert.NotNull(response);
             Assert.NotNull(response.Status);
-            Assert.True(response.Status == "queued");
+            Assert.Equal("queued", response.Status);
         }
 
         [GitHubEnterpriseTest]
@@ -85,7 +85,7 @@ public async Task CanQueueSyncTeamMapping()
             // Check response message indicates LDAP sync was queued
             Assert.NotNull(response);
             Assert.NotNull(response.Status);
-            Assert.True(response.Status == "queued");
+            Assert.Equal("queued", response.Status);
         }
 
         public void Dispose()
diff --git a/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterprisePreReceiveEnvironmentsClientTests.cs b/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterprisePreReceiveEnvironmentsClientTests.cs
index cb08ac8a95..138b512978 100644
--- a/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterprisePreReceiveEnvironmentsClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterprisePreReceiveEnvironmentsClientTests.cs
@@ -56,7 +56,7 @@ public async Task ReturnsCorrectCountOfPreReceiveEnvironmentsWithoutStart()
 
             var preReceiveEnvironments = await _preReceiveEnvironmentsClient.GetAll(options).ToList();
 
-            Assert.Equal(1, preReceiveEnvironments.Count);
+            Assert.Single(preReceiveEnvironments);
         }
 
         [GitHubEnterpriseTest]
@@ -71,7 +71,7 @@ public async Task ReturnsCorrectCountOfPreReceiveEnvironmentsWithStart()
 
             var preReceiveEnvironments = await _preReceiveEnvironmentsClient.GetAll(options).ToList();
 
-            Assert.Equal(1, preReceiveEnvironments.Count);
+            Assert.Single(preReceiveEnvironments);
         }
 
         [GitHubEnterpriseTest]
diff --git a/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterprisePreReceiveHooksClientTests.cs b/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterprisePreReceiveHooksClientTests.cs
index 2ec9b074a8..75f43bab4b 100644
--- a/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterprisePreReceiveHooksClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/Enterprise/ObservableEnterprisePreReceiveHooksClientTests.cs
@@ -56,7 +56,7 @@ public async Task ReturnsCorrectCountOfPreReceiveHooksWithoutStart()
 
             var preReceiveHooks = await _preReceiveHooksClient.GetAll(options).ToList();
 
-            Assert.Equal(1, preReceiveHooks.Count);
+            Assert.Single(preReceiveHooks);
         }
 
         [GitHubEnterpriseTest]
@@ -71,7 +71,7 @@ public async Task ReturnsCorrectCountOfPreReceiveHooksWithStart()
 
             var preReceiveHooks = await _preReceiveHooksClient.GetAll(options).ToList();
 
-            Assert.Equal(1, preReceiveHooks.Count);
+            Assert.Single(preReceiveHooks);
         }
 
         [GitHubEnterpriseTest]
diff --git a/Octokit.Tests.Integration/Reactive/ObservableCheckRunsClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableCheckRunsClientTests.cs
index 25f2f150aa..e5450ef00f 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableCheckRunsClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableCheckRunsClientTests.cs
@@ -422,7 +422,7 @@ public async Task GetsAllAnnotations()
                     var annotations = await _githubAppInstallation.Check.Run.GetAllAnnotations(repoContext.RepositoryOwner, repoContext.RepositoryName, created.Id).ToList();
 
                     // Check result
-                    Assert.Equal(1, annotations.Count);
+                    Assert.Single(annotations);
                     Assert.Equal("this is a warning", annotations.First().Message);
                     Assert.Equal(CheckAnnotationLevel.Warning, annotations.First().AnnotationLevel);
                 }
@@ -455,7 +455,7 @@ public async Task GetsAllAnnotationsWithRepositoryId()
                     var annotations = await _githubAppInstallation.Check.Run.GetAllAnnotations(repoContext.RepositoryId, created.Id).ToList();
 
                     // Check result
-                    Assert.Equal(1, annotations.Count);
+                    Assert.Single(annotations);
                     Assert.Equal("this is a warning", annotations.First().Message);
                     Assert.Equal(CheckAnnotationLevel.Warning, annotations.First().AnnotationLevel);
                 }
diff --git a/Octokit.Tests.Integration/Reactive/ObservableFollowersClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableFollowersClientTests.cs
index 150fbcca24..42fad84e18 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableFollowersClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableFollowersClientTests.cs
@@ -38,7 +38,7 @@ public async Task ReturnsCorrectCountOfFollowersWithoutStart()
 
                 var followers = await _followersClient.GetAllForCurrent(options).ToList();
 
-                Assert.Equal(1, followers.Count);
+                Assert.Single(followers);
             }
 
             [IntegrationTest]
@@ -53,7 +53,7 @@ public async Task ReturnsCorrectCountOfFollowersWithStart()
 
                 var followers = await _followersClient.GetAllForCurrent(options).ToList();
 
-                Assert.Equal(1, followers.Count);
+                Assert.Single(followers);
             }
 
             [IntegrationTest]
@@ -188,7 +188,7 @@ public async Task ReturnsCorrectCountOfFollowingWithoutStart()
 
                 var following = await _followersClient.GetAllFollowingForCurrent(options).ToList();
 
-                Assert.Equal(1, following.Count);
+                Assert.Single(following);
             }
 
             [IntegrationTest]
@@ -203,7 +203,7 @@ public async Task ReturnsCorrectCountOfFollowingWithStart()
 
                 var following = await _followersClient.GetAllFollowingForCurrent(options).ToList();
 
-                Assert.Equal(1, following.Count);
+                Assert.Single(following);
             }
 
             [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Reactive/ObservableIssueTimelineClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableIssueTimelineClientTests.cs
index ffad9fa58c..c304f2a483 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableIssueTimelineClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableIssueTimelineClientTests.cs
@@ -27,7 +27,7 @@ public async Task CanRetrieveTimelineForIssue()
             var observableTimeline = _client.Issue.Timeline.GetAllForIssue("octokit", "octokit.net", 1503);
             var timelineEventInfos = await observableTimeline.ToList();
             Assert.NotEmpty(timelineEventInfos);
-            Assert.NotEqual(0, timelineEventInfos.Count);
+            Assert.NotEmpty(timelineEventInfos);
         }
 
         [IntegrationTest]
@@ -47,7 +47,7 @@ public async Task CanRetrieveTimelineForIssueWithApiOptions()
             observableTimeline = _client.Issue.Timeline.GetAllForIssue("octokit", "octokit.net", 1503, pageOptions);
             timelineEventInfos = await observableTimeline.ToList();
             Assert.NotEmpty(timelineEventInfos);
-            Assert.Equal(1, timelineEventInfos.Count);
+            Assert.Single(timelineEventInfos);
         }
 
         [IntegrationTest]
@@ -64,7 +64,7 @@ public async Task CanDeserializeRenameEvent()
 
             var observableTimeline = _client.Issue.Timeline.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
             var timelineEventInfos = await observableTimeline.ToList();
-            Assert.Equal(1, timelineEventInfos.Count);
+            Assert.Single(timelineEventInfos);
             Assert.Equal("a test issue", timelineEventInfos[0].Rename.From);
             Assert.Equal("A test issue", timelineEventInfos[0].Rename.To);
         }
@@ -82,7 +82,7 @@ public async Task CanDeserializeCrossReferenceEvent()
 
             var observableTimeline = _client.Issue.Timeline.GetAllForIssue(_context.RepositoryOwner, _context.RepositoryName, issue.Number);
             var timelineEventInfos = await observableTimeline.ToList();
-            Assert.Equal(1, timelineEventInfos.Count);
+            Assert.Single(timelineEventInfos);
             Assert.Equal(anotherNewIssue.Id, timelineEventInfos[0].Source.Issue.Id);
         }
 
@@ -103,7 +103,7 @@ public async Task CanRetrieveTimelineForIssueByRepositoryId()
 
             observableTimeline = _client.Issue.Timeline.GetAllForIssue(_context.Repository.Id, issue.Number);
             timelineEventInfos = await observableTimeline.ToList();
-            Assert.Equal(1, timelineEventInfos.Count);
+            Assert.Single(timelineEventInfos);
             Assert.Equal(EventInfoState.Closed, timelineEventInfos[0].Event);
         }
 
@@ -121,7 +121,7 @@ public async Task CanDeserializeRenameEventByRepositoryId()
 
             var observableTimeline = _client.Issue.Timeline.GetAllForIssue(_context.Repository.Id, issue.Number);
             var timelineEventInfos = await observableTimeline.ToList();
-            Assert.Equal(1, timelineEventInfos.Count);
+            Assert.Single(timelineEventInfos);
             Assert.Equal("a test issue", timelineEventInfos[0].Rename.From);
             Assert.Equal("A test issue", timelineEventInfos[0].Rename.To);
         }
@@ -139,7 +139,7 @@ public async Task CanDeserializeCrossReferenceEventByRepositoryId()
 
             var observableTimeline = _client.Issue.Timeline.GetAllForIssue(_context.Repository.Id, issue.Number);
             var timelineEventInfos = await observableTimeline.ToList();
-            Assert.Equal(1, timelineEventInfos.Count);
+            Assert.Single(timelineEventInfos);
             Assert.Equal(anotherNewIssue.Id, timelineEventInfos[0].Source.Issue.Id);
         }
     }
diff --git a/Octokit.Tests.Integration/Reactive/ObservableOrganizationMembersClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableOrganizationMembersClientTests.cs
index aed9bcf5b7..d6d8a1e183 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableOrganizationMembersClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableOrganizationMembersClientTests.cs
@@ -223,7 +223,7 @@ public async Task ReturnsCorrectCountOfPendingInvitationsWithoutStart()
 
                     var pendingInvitations = await _client.GetAllPendingInvitations(Helper.Organization, options).ToList();
                     Assert.NotEmpty(pendingInvitations);
-                    Assert.Equal(1, pendingInvitations.Count);
+                    Assert.Single(pendingInvitations);
                 }
             }
 
@@ -244,7 +244,7 @@ public async Task ReturnsCorrectCountOfPendingInvitationsWithStart()
 
                     var firstPagePendingInvitations = await _client.GetAllPendingInvitations(Helper.Organization, firstPageOptions).ToList();
                     Assert.NotEmpty(firstPagePendingInvitations);
-                    Assert.Equal(1, firstPagePendingInvitations.Count);
+                    Assert.Single(firstPagePendingInvitations);
 
 
                     var secondPageOptions = new ApiOptions
@@ -256,7 +256,7 @@ public async Task ReturnsCorrectCountOfPendingInvitationsWithStart()
 
                     var secondPagePendingInvitations = await _client.GetAllPendingInvitations(Helper.Organization, secondPageOptions).ToList();
                     Assert.NotEmpty(secondPagePendingInvitations);
-                    Assert.Equal(1, secondPagePendingInvitations.Count);
+                    Assert.Single(secondPagePendingInvitations);
 
                     Assert.NotEqual(firstPagePendingInvitations[0].Login, secondPagePendingInvitations[0].Login);
                 }
diff --git a/Octokit.Tests.Integration/Reactive/ObservableOrganizationOutsideCollaboratorsClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableOrganizationOutsideCollaboratorsClientTests.cs
index d3aca7128c..ec8327195c 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableOrganizationOutsideCollaboratorsClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableOrganizationOutsideCollaboratorsClientTests.cs
@@ -42,7 +42,7 @@ public async Task ReturnsOutsideCollaborators()
                         .GetAll(Helper.Organization).ToList();
 
                     Assert.NotNull(outsideCollaborators);
-                    Assert.Equal(1, outsideCollaborators.Count);
+                    Assert.Single(outsideCollaborators);
                 }
             }
 
@@ -64,7 +64,7 @@ public async Task ReturnsCorrectCountOfOutsideCollaboratorsWithoutStart()
                         .GetAll(Helper.Organization, options).ToList();
 
                     Assert.NotNull(outsideCollaborators);
-                    Assert.Equal(1, outsideCollaborators.Count);
+                    Assert.Single(outsideCollaborators);
                 }
             }
 
@@ -88,7 +88,7 @@ public async Task ReturnsCorrectCountOfOutsideCollaboratorsWithStart()
                         .GetAll(Helper.Organization, options).ToList();
 
                     Assert.NotNull(outsideCollaborators);
-                    Assert.Equal(1, outsideCollaborators.Count);
+                    Assert.Single(outsideCollaborators);
                 }
             }
 
@@ -128,7 +128,7 @@ public async Task ReturnsCorrectCountOfOutsideCollaboratorsWithAllFilterAndApiOp
                         .GetAll(Helper.Organization, OrganizationMembersFilter.All, options).ToList();
 
                     Assert.NotNull(outsideCollaborators);
-                    Assert.Equal(1, outsideCollaborators.Count);
+                    Assert.Single(outsideCollaborators);
                 }
             }
 
@@ -161,8 +161,8 @@ public async Task ReturnsCorrectCountOfOutsideCollaboratorsWithAllFilterWithStar
                     var secondPageOfOutsideCollaborators = await _client
                         .GetAll(Helper.Organization, OrganizationMembersFilter.All, secondPageOptions).ToList();
 
-                    Assert.Equal(1, firstPageOfOutsideCollaborators.Count);
-                    Assert.Equal(1, secondPageOfOutsideCollaborators.Count);
+                    Assert.Single(firstPageOfOutsideCollaborators);
+                    Assert.Single(secondPageOfOutsideCollaborators);
                     Assert.NotEqual(firstPageOfOutsideCollaborators[0].Login, secondPageOfOutsideCollaborators[0].Login);
                 }
             }
@@ -180,7 +180,7 @@ public async Task ReturnsCorrectCountOfOutsideCollaboratorsWithTwoFactorFilter()
                         .GetAll(Helper.Organization, OrganizationMembersFilter.TwoFactorAuthenticationDisabled).ToList();
 
                     Assert.NotNull(outsideCollaborators);
-                    Assert.Equal(1, outsideCollaborators.Count);
+                    Assert.Single(outsideCollaborators);
                     Assert.Equal("octokitnet-test1", outsideCollaborators[0].Login);
                 }
             }
@@ -204,7 +204,7 @@ public async Task ReturnsCorrectCountOfOutsideCollaboratorsWithTwoFactorFilterAn
                         .GetAll(Helper.Organization, OrganizationMembersFilter.TwoFactorAuthenticationDisabled, options).ToList();
 
                     Assert.NotNull(outsideCollaborators);
-                    Assert.Equal(1, outsideCollaborators.Count);
+                    Assert.Single(outsideCollaborators);
                     Assert.Equal("octokitnet-test1", outsideCollaborators[0].Login);
                 }
             }
@@ -262,7 +262,7 @@ public async Task CanConvertOrgMemberToOutsideCollaborator()
                 var outsideCollaborators = await _client
                     .GetAll(Helper.Organization).ToList();
 
-                Assert.Equal(1, outsideCollaborators.Count);
+                Assert.Single(outsideCollaborators);
                 Assert.Equal(_fixtureCollaborator, outsideCollaborators[0].Login);
             }
         }
diff --git a/Octokit.Tests.Integration/Reactive/ObservableOrganizationSecretsClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableOrganizationSecretsClientTests.cs
index 9cdf668ba8..5d04359180 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableOrganizationSecretsClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableOrganizationSecretsClientTests.cs
@@ -27,7 +27,7 @@ public async Task GetPublicKey()
                 var keyObservable = clients.GetPublicKey(Helper.Organization);
                 var key = await keyObservable;
 
-                Assert.True(!string.IsNullOrWhiteSpace(key.KeyId));
+                Assert.False(string.IsNullOrWhiteSpace(key.KeyId));
             }
         }
 
@@ -61,7 +61,7 @@ public async Task GetSecret()
                 var secret = await secretObservable;
 
                 Assert.NotNull(secret);
-                Assert.True(secret.Name == "TEST");
+                Assert.Equal("TEST", secret.Name);
             }
         }
 
diff --git a/Octokit.Tests.Integration/Reactive/ObservableProjectCardsClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableProjectCardsClientTests.cs
index 05369d95e0..f97db48a3e 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableProjectCardsClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableProjectCardsClientTests.cs
@@ -50,7 +50,7 @@ public async Task GetsAllArchivedCards()
 
             var result = await _github.Repository.Project.Card.GetAll(column.Id, request).ToList();
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.Contains(result, x => x.Id == card2.Id);
         }
 
@@ -66,7 +66,7 @@ public async Task GetsAllNotArchivedCards()
 
             var result = await _github.Repository.Project.Card.GetAll(column.Id, request).ToList();
 
-            Assert.Equal(1, result.Count);
+            Assert.Single(result);
             Assert.Contains(result, x => x.Id == card1.Id);
         }
 
@@ -104,7 +104,7 @@ public async Task ReturnsCorrectCountOfCardWithoutStart()
             var cards = await _github.Repository.Project.Card.GetAll(column.Id, options).ToList();
 
             // NOTE: cards are returned in reverse order
-            Assert.Equal(1, cards.Count);
+            Assert.Single(cards);
             Assert.Equal(card2.Id, cards[0].Id);
         }
 
@@ -126,7 +126,7 @@ public async Task ReturnsCorrectCountOfCardsWithStart()
             var cards = await _github.Repository.Project.Card.GetAll(column.Id, options).ToList();
 
             // NOTE: cards are returned in reverse order
-            Assert.Equal(1, cards.Count);
+            Assert.Single(cards);
             Assert.Equal(card1.Id, cards[0].Id);
         }
 
diff --git a/Octokit.Tests.Integration/Reactive/ObservableProjectColumnsClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableProjectColumnsClientTests.cs
index 5bf5214940..16be0da6b8 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableProjectColumnsClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableProjectColumnsClientTests.cs
@@ -53,7 +53,7 @@ public async Task ReturnsCorrectCountOfColumnsWithoutStart()
 
             var columns = await _github.Repository.Project.Column.GetAll(project.Id, options).ToList();
 
-            Assert.Equal(1, columns.Count);
+            Assert.Single(columns);
             Assert.Equal(column1.Id, columns[0].Id);
         }
 
@@ -73,7 +73,7 @@ public async Task ReturnsCorrectCountOfColumnsWithStart()
 
             var columns = await _github.Repository.Project.Column.GetAll(project.Id, options).ToList();
 
-            Assert.Equal(1, columns.Count);
+            Assert.Single(columns);
             Assert.Equal(column2.Id, columns[0].Id);
         }
 
diff --git a/Octokit.Tests.Integration/Reactive/ObservableProjectsClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableProjectsClientTests.cs
index bdb39975d3..0f06ab94f1 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableProjectsClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableProjectsClientTests.cs
@@ -61,7 +61,7 @@ public async Task GetsAllFilteredProjectsForRepository()
 
             var projects = await _github.Repository.Project.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, new ProjectRequest(ItemStateFilter.Closed)).ToList();
 
-            Assert.Equal(1, projects.Count);
+            Assert.Single(projects);
             Assert.True(projects.FirstOrDefault(x => x.Name == project2.Name).Id == project2.Id);
         }
 
@@ -76,7 +76,7 @@ public async Task GetsAllFilteredProjectsForRepositoryWithRepositoryId()
 
             var projects = await _github.Repository.Project.GetAllForRepository(_context.RepositoryId, new ProjectRequest(ItemStateFilter.Closed)).ToList();
 
-            Assert.Equal(1, projects.Count);
+            Assert.Single(projects);
             Assert.True(projects.FirstOrDefault(x => x.Name == project2.Name).Id == project2.Id);
         }
 
@@ -94,7 +94,7 @@ public async Task ReturnsCorrectCountOfProjectsForRepositoryWithoutStart()
 
             var projects = await _github.Repository.Project.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, options).ToList();
 
-            Assert.Equal(1, projects.Count);
+            Assert.Single(projects);
             Assert.Equal(project1.Id, projects[0].Id);
         }
 
@@ -112,7 +112,7 @@ public async Task ReturnsCorrectCountOfProjectsForRepositoryWithRepositoryIdWith
 
             var projects = await _github.Repository.Project.GetAllForRepository(_context.RepositoryId, options).ToList();
 
-            Assert.Equal(1, projects.Count);
+            Assert.Single(projects);
             Assert.Equal(project1.Id, projects[0].Id);
         }
 
@@ -131,7 +131,7 @@ public async Task ReturnsCorrectCountOfProjectsForRepositoryWithStart()
 
             var projects = await _github.Repository.Project.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, options).ToList();
 
-            Assert.Equal(1, projects.Count);
+            Assert.Single(projects);
             Assert.Equal(project2.Id, projects[0].Id);
         }
 
@@ -150,7 +150,7 @@ public async Task ReturnsCorrectCountOfProjectsForRepositoryWithRepositoryIdWith
 
             var projects = await _github.Repository.Project.GetAllForRepository(_context.RepositoryId, options).ToList();
 
-            Assert.Equal(1, projects.Count);
+            Assert.Single(projects);
             Assert.Equal(project2.Id, projects[0].Id);
         }
 
diff --git a/Octokit.Tests.Integration/Reactive/ObservableRepositoryBranchesClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableRepositoryBranchesClientTests.cs
index 4ed3b969e9..5ce91644c9 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableRepositoryBranchesClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableRepositoryBranchesClientTests.cs
@@ -76,14 +76,14 @@ public async Task GetsBranchProtectionForOrgRepo()
                     Assert.True(protection.RequiredStatusChecks.Strict);
                     Assert.Equal(2, protection.RequiredStatusChecks.Contexts.Count);
 
-                    Assert.Equal(1, protection.RequiredPullRequestReviews.DismissalRestrictions.Teams.Count);
-                    Assert.Equal(0, protection.RequiredPullRequestReviews.DismissalRestrictions.Users.Count);
+                    Assert.Single(protection.RequiredPullRequestReviews.DismissalRestrictions.Teams);
+                    Assert.Empty(protection.RequiredPullRequestReviews.DismissalRestrictions.Users);
                     Assert.True(protection.RequiredPullRequestReviews.DismissStaleReviews);
                     Assert.True(protection.RequiredPullRequestReviews.RequireCodeOwnerReviews);
                     Assert.Equal(3, protection.RequiredPullRequestReviews.RequiredApprovingReviewCount);
 
-                    Assert.Equal(1, protection.Restrictions.Teams.Count);
-                    Assert.Equal(0, protection.Restrictions.Users.Count);
+                    Assert.Single(protection.Restrictions.Teams);
+                    Assert.Empty(protection.Restrictions.Users);
 
                     Assert.True(protection.EnforceAdmins.Enabled);
                 }
@@ -100,14 +100,14 @@ public async Task GetsBranchProtectionForOrgRepoWithRepositoryId()
                     Assert.True(protection.RequiredStatusChecks.Strict);
                     Assert.Equal(2, protection.RequiredStatusChecks.Contexts.Count);
 
-                    Assert.Equal(1, protection.RequiredPullRequestReviews.DismissalRestrictions.Teams.Count);
-                    Assert.Equal(0, protection.RequiredPullRequestReviews.DismissalRestrictions.Users.Count);
+                    Assert.Single(protection.RequiredPullRequestReviews.DismissalRestrictions.Teams);
+                    Assert.Empty(protection.RequiredPullRequestReviews.DismissalRestrictions.Users);
                     Assert.True(protection.RequiredPullRequestReviews.DismissStaleReviews);
                     Assert.True(protection.RequiredPullRequestReviews.RequireCodeOwnerReviews);
                     Assert.Equal(3, protection.RequiredPullRequestReviews.RequiredApprovingReviewCount);
 
-                    Assert.Equal(1, protection.Restrictions.Teams.Count);
-                    Assert.Equal(0, protection.Restrictions.Users.Count);
+                    Assert.Single(protection.Restrictions.Teams);
+                    Assert.Empty(protection.Restrictions.Users);
 
                     Assert.True(protection.EnforceAdmins.Enabled);
                 }
@@ -140,7 +140,7 @@ public async Task UpdatesBranchProtection()
                     var protection = await _client.UpdateBranchProtection(repoOwner, repoName, "main", update);
 
                     Assert.False(protection.RequiredStatusChecks.Strict);
-                    Assert.Equal(1, protection.RequiredStatusChecks.Contexts.Count);
+                    Assert.Single(protection.RequiredStatusChecks.Contexts);
 
                     Assert.Null(protection.RequiredPullRequestReviews.DismissalRestrictions);
                     Assert.False(protection.RequiredPullRequestReviews.DismissStaleReviews);
@@ -167,7 +167,7 @@ public async Task UpdatesBranchProtectionWithRepositoryId()
                     var protection = await _client.UpdateBranchProtection(repoId, "main", update);
 
                     Assert.False(protection.RequiredStatusChecks.Strict);
-                    Assert.Equal(1, protection.RequiredStatusChecks.Contexts.Count);
+                    Assert.Single(protection.RequiredStatusChecks.Contexts);
 
                     Assert.Null(protection.RequiredPullRequestReviews.DismissalRestrictions);
                     Assert.False(protection.RequiredPullRequestReviews.DismissStaleReviews);
@@ -202,7 +202,7 @@ public async Task UpdatesBranchProtectionForOrgRepo()
                     var protection = await _client.UpdateBranchProtection(repoOwner, repoName, "main", update);
 
                     Assert.False(protection.RequiredStatusChecks.Strict);
-                    Assert.Equal(1, protection.RequiredStatusChecks.Contexts.Count);
+                    Assert.Single(protection.RequiredStatusChecks.Contexts);
 
                     Assert.Null(protection.RequiredPullRequestReviews.DismissalRestrictions);
                     Assert.False(protection.RequiredPullRequestReviews.DismissStaleReviews);
@@ -243,7 +243,7 @@ public async Task UpdatesBranchProtectionForOrgRepoWithRepositoryId()
                     var protection = await _client.UpdateBranchProtection(repoId, "main", update);
 
                     Assert.False(protection.RequiredStatusChecks.Strict);
-                    Assert.Equal(1, protection.RequiredStatusChecks.Contexts.Count);
+                    Assert.Single(protection.RequiredStatusChecks.Contexts);
 
                     Assert.Null(protection.RequiredPullRequestReviews.DismissalRestrictions);
                     Assert.False(protection.RequiredPullRequestReviews.DismissStaleReviews);
@@ -375,8 +375,8 @@ public async Task GetsReviewEnforcementForOrgRepo()
                     var repoName = context.RepositoryContext.RepositoryName;
                     var requiredReviews = await _client.GetReviewEnforcement(repoOwner, repoName, "main");
 
-                    Assert.Equal(1, requiredReviews.DismissalRestrictions.Teams.Count);
-                    Assert.Equal(0, requiredReviews.DismissalRestrictions.Users.Count);
+                    Assert.Single(requiredReviews.DismissalRestrictions.Teams);
+                    Assert.Empty(requiredReviews.DismissalRestrictions.Users);
                     Assert.True(requiredReviews.DismissStaleReviews);
                     Assert.True(requiredReviews.RequireCodeOwnerReviews);
                 }
@@ -390,8 +390,8 @@ public async Task GetsReviewEnforcementForOrgRepoWithRepositoryId()
                     var repoId = context.RepositoryContext.RepositoryId;
                     var requiredReviews = await _client.GetReviewEnforcement(repoId, "main");
 
-                    Assert.Equal(1, requiredReviews.DismissalRestrictions.Teams.Count);
-                    Assert.Equal(0, requiredReviews.DismissalRestrictions.Users.Count);
+                    Assert.Single(requiredReviews.DismissalRestrictions.Teams);
+                    Assert.Empty(requiredReviews.DismissalRestrictions.Users);
                     Assert.True(requiredReviews.DismissStaleReviews);
                     Assert.True(requiredReviews.RequireCodeOwnerReviews);
                 }
diff --git a/Octokit.Tests.Integration/Reactive/ObservableRepositoryCollaboratorClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableRepositoryCollaboratorClientTests.cs
index 2fad13688c..6b8170acca 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableRepositoryCollaboratorClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableRepositoryCollaboratorClientTests.cs
@@ -24,7 +24,7 @@ public async Task ReturnsAllCollaborators()
                 var collaborators = await fixture.GetAll(context.RepositoryOwner, context.RepositoryName).ToList();
 
                 Assert.NotNull(collaborators);
-                Assert.Equal(1, collaborators.Count);
+                Assert.Single(collaborators);
             }
         }
 
@@ -47,7 +47,7 @@ public async Task ReturnsCorrectCountOfCollaboratorsWithoutStart()
                 var collaborators = await fixture.GetAll(context.RepositoryOwner, context.RepositoryName, options).ToList();
 
                 Assert.NotNull(collaborators);
-                Assert.Equal(1, collaborators.Count);
+                Assert.Single(collaborators);
             }
         }
 
@@ -71,7 +71,7 @@ public async Task ReturnsCorrectCountOfCollaboratorsWithStart()
                 var collaborators = await fixture.GetAll(context.RepositoryOwner, context.RepositoryName, options).ToList();
 
                 Assert.NotNull(collaborators);
-                Assert.Equal(0, collaborators.Count);
+                Assert.Empty(collaborators);
             }
         }
 
@@ -102,8 +102,8 @@ public async Task ReturnsDistinctResultsBasedOnStartPage()
 
                 var secondPage = await fixture.GetAll(context.RepositoryOwner, context.RepositoryName, skipStartOptions).ToList();
 
-                Assert.Equal(1, firstPage.Count);
-                Assert.Equal(0, secondPage.Count);
+                Assert.Single(firstPage);
+                Assert.Empty(secondPage);
             }
         }
     }
diff --git a/Octokit.Tests.Integration/Reactive/ObservableRepositoryDeployKeysClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableRepositoryDeployKeysClientTests.cs
index cb0364ce58..efa1b98dca 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableRepositoryDeployKeysClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableRepositoryDeployKeysClientTests.cs
@@ -56,7 +56,7 @@ public async Task CanRetrieveAllDeployKeys()
         await _client.Create(_owner, _repository.Name, deployKey);
 
         deployKeys = await _client.GetAll(_owner, _repository.Name).ToList();
-        Assert.Equal(1, deployKeys.Count);
+        Assert.Single(deployKeys);
         Assert.Equal(_key, deployKeys[0].Key);
         Assert.Equal(_keyTitle, deployKeys[0].Title);
     }
@@ -90,7 +90,7 @@ public async Task CanRemoveADeployKey()
         await _client.Create(_owner, _repository.Name, newDeployKey);
 
         var deployKeys = await _client.GetAll(_owner, _repository.Name).ToList();
-        Assert.Equal(1, deployKeys.Count);
+        Assert.Single(deployKeys);
         Assert.Equal(_key, deployKeys[0].Key);
         Assert.Equal(_keyTitle, deployKeys[0].Title);
 
diff --git a/Octokit.Tests.Integration/Reactive/ObservableRepositoryHooksClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableRepositoryHooksClientTests.cs
index e863226e22..28b9975897 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableRepositoryHooksClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableRepositoryHooksClientTests.cs
@@ -67,7 +67,7 @@ public async Task ReturnsCorrectCountOfHooksWithStart()
 
                 var hooks = await client.GetAll(_fixture.RepositoryOwner, _fixture.RepositoryName, options).ToList();
 
-                Assert.Equal(1, hooks.Count);
+                Assert.Single(hooks);
             }
 
             [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Reactive/ObservableRepositorySecretsClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableRepositorySecretsClientTests.cs
index bb29cd6175..971902a026 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableRepositorySecretsClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableRepositorySecretsClientTests.cs
@@ -31,7 +31,7 @@ public async Task GetPublicKey()
                 var keyObservable = client.GetPublicKey(OWNER, REPO);
                 var key = await keyObservable;
 
-                Assert.True(!string.IsNullOrWhiteSpace(key.KeyId));
+                Assert.False(string.IsNullOrWhiteSpace(key.KeyId));
             }
         }
 
diff --git a/Octokit.Tests.Integration/Reactive/ObservableTeamsClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableTeamsClientTests.cs
index a818b20c04..7aac8c5525 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableTeamsClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableTeamsClientTests.cs
@@ -51,7 +51,7 @@ public async Task ReturnsCorrectCountOfChildTeamsWithoutStart()
 
                 var teams = await _github.Organization.Team.GetAllChildTeams(parentTeamContext.TeamId, options).ToList();
 
-                Assert.Equal(1, teams.Count);
+                Assert.Single(teams);
                 Assert.Equal(team1.Id, teams[0].Id);
             }
         }
@@ -73,7 +73,7 @@ public async Task ReturnsCorrectCountOfChildTeamsWithStart()
 
                 var teams = await _github.Organization.Team.GetAllChildTeams(parentTeamContext.TeamId, options).ToList();
 
-                Assert.Equal(1, teams.Count);
+                Assert.Single(teams);
                 Assert.Equal(team2.Id, teams[0].Id);
             }
         }
@@ -323,7 +323,7 @@ public async Task ReturnsCorrectCountOfPendingInvitationsWithoutStart()
                 var observable = _client.GetAllPendingInvitations(teamContext.TeamId, options);
                 var pendingInvitations = await observable.ToList();
                 Assert.NotEmpty(pendingInvitations);
-                Assert.Equal(1, pendingInvitations.Count);
+                Assert.Single(pendingInvitations);
             }
         }
 
@@ -344,7 +344,7 @@ public async Task ReturnsCorrectCountOfPendingInvitationsWithStart()
                 var firstObservable = _client.GetAllPendingInvitations(teamContext.TeamId, firstPageOptions);
                 var firstPagePendingInvitations = await firstObservable.ToList();
                 Assert.NotEmpty(firstPagePendingInvitations);
-                Assert.Equal(1, firstPagePendingInvitations.Count);
+                Assert.Single(firstPagePendingInvitations);
 
                 var secondPageOptions = new ApiOptions
                 {
@@ -355,7 +355,7 @@ public async Task ReturnsCorrectCountOfPendingInvitationsWithStart()
                 var secondObservable = _client.GetAllPendingInvitations(teamContext.TeamId, secondPageOptions);
                 var secondPagePendingInvitations = await secondObservable.ToList();
                 Assert.NotEmpty(secondPagePendingInvitations);
-                Assert.Equal(1, secondPagePendingInvitations.Count);
+                Assert.Single(secondPagePendingInvitations);
 
                 Assert.NotEqual(firstPagePendingInvitations[0].Login, secondPagePendingInvitations[0].Login);
             }
@@ -618,7 +618,7 @@ await github.Organization.Team.RemoveRepositoryFromATeam(
 
                 var addedRepo = await github.Organization.Team.GetAllRepositories(teamContext.TeamId).ToList();
 
-                Assert.Equal(0, addedRepo.Count);
+                Assert.Empty(addedRepo);
             }
         }
     }
diff --git a/Octokit.Tests/Clients/EventsClientTests.cs b/Octokit.Tests/Clients/EventsClientTests.cs
index ad5dd6cc28..bffc6a8243 100644
--- a/Octokit.Tests/Clients/EventsClientTests.cs
+++ b/Octokit.Tests/Clients/EventsClientTests.cs
@@ -594,7 +594,7 @@ public async Task DeserializesPayloadToCorrectType()
                 var client = GetTestingEventsClient(jsonObj);
 
                 var activities = await client.GetAll();
-                Assert.Equal(1, activities.Count);
+                Assert.Single(activities);
                 var activity = activities.FirstOrDefault();
                 Assert.Equal(kvp.Value, activity.Payload.GetType());
                 Assert.NotNull(activity.Payload.Repository);
@@ -623,7 +623,7 @@ public async Task DeserializesCommitCommentEventCorrectly()
 
             var client = GetTestingEventsClient(jsonObj);
             var activities = await client.GetAll();
-            Assert.Equal(1, activities.Count);
+            Assert.Single(activities);
 
             var payload = activities.FirstOrDefault().Payload as CommitCommentPayload;
             Assert.Equal(1337, payload.Comment.Id);
@@ -646,7 +646,7 @@ public async Task DeserializesCreateEventCorrectly()
 
             var client = GetTestingEventsClient(jsonObj);
             var activities = await client.GetAll();
-            Assert.Equal(1, activities.Count);
+            Assert.Single(activities);
 
             var payload = activities.FirstOrDefault().Payload as CreateEventPayload;
             Assert.Equal(GitHubConstants.DefaultBranchName, payload.Ref);
@@ -670,7 +670,7 @@ public async Task DeserializesDeleteEventCorrectly()
 
             var client = GetTestingEventsClient(jsonObj);
             var activities = await client.GetAll();
-            Assert.Equal(1, activities.Count);
+            Assert.Single(activities);
 
             var payload = activities.FirstOrDefault().Payload as DeleteEventPayload;
             Assert.Equal(GitHubConstants.DefaultBranchName, payload.Ref);
@@ -696,7 +696,7 @@ public async Task DeserializesForkEventCorrectly()
 
             var client = GetTestingEventsClient(jsonObj);
             var activities = await client.GetAll();
-            Assert.Equal(1, activities.Count);
+            Assert.Single(activities);
 
             var payload = activities.FirstOrDefault().Payload as ForkEventPayload;
             Assert.Equal(1337, payload.Forkee.Id);
@@ -726,7 +726,7 @@ public async Task DeserializesIssueCommentEventCorrectly()
 
             var client = GetTestingEventsClient(jsonObj);
             var activities = await client.GetAll();
-            Assert.Equal(1, activities.Count);
+            Assert.Single(activities);
 
             var payload = activities.FirstOrDefault().Payload as IssueCommentPayload;
             Assert.Equal("created", payload.Action);
@@ -762,7 +762,7 @@ public async Task DeserializesIssueEventCorrectly()
 
             var client = GetTestingEventsClient(jsonObj);
             var activities = await client.GetAll();
-            Assert.Equal(1, activities.Count);
+            Assert.Single(activities);
 
             var payload = activities.FirstOrDefault().Payload as IssueEventPayload;
             Assert.Equal("created", payload.Action);
@@ -792,7 +792,7 @@ public async Task DeserializesPullRequestEventCorrectly()
 
             var client = GetTestingEventsClient(jsonObj);
             var activities = await client.GetAll();
-            Assert.Equal(1, activities.Count);
+            Assert.Single(activities);
 
             var payload = activities.FirstOrDefault().Payload as PullRequestEventPayload;
             Assert.Equal("assigned", payload.Action);
@@ -826,7 +826,7 @@ public async Task DeserializesPullRequestReviewEventCorrectly()
 
             var client = GetTestingEventsClient(jsonObj);
             var activities = await client.GetAll();
-            Assert.Equal(1, activities.Count);
+            Assert.Single(activities);
 
             var payload = activities.FirstOrDefault().Payload as PullRequestReviewEventPayload;
             Assert.Equal("submitted", payload.Action);
@@ -861,7 +861,7 @@ public async Task DeserializesPullRequestCommentEventCorrectly()
 
             var client = GetTestingEventsClient(jsonObj);
             var activities = await client.GetAll();
-            Assert.Equal(1, activities.Count);
+            Assert.Single(activities);
 
             var payload = activities.FirstOrDefault().Payload as PullRequestCommentPayload;
             Assert.Equal("assigned", payload.Action);
@@ -897,14 +897,14 @@ public async Task DeserializesPushEventCorrectly()
 
             var client = GetTestingEventsClient(jsonObj);
             var activities = await client.GetAll();
-            Assert.Equal(1, activities.Count);
+            Assert.Single(activities);
 
             var payload = activities.FirstOrDefault().Payload as PushEventPayload;
             Assert.Equal("head", payload.Head);
             Assert.Equal("ref", payload.Ref);
             Assert.Equal(1337, payload.Size);
             Assert.NotNull(payload.Commits);
-            Assert.Equal(1, payload.Commits.Count);
+            Assert.Single(payload.Commits);
             Assert.Equal("message", payload.Commits.FirstOrDefault().Message);
             Assert.Equal("before", payload.Before);
             Assert.Equal(1337, payload.DistinctSize);
@@ -977,7 +977,7 @@ public async Task DeserializesStatusEventCorrectly()
 
             var client = GetTestingEventsClient(jsonObj);
             var activities = await client.GetAll();
-            Assert.Equal(1, activities.Count);
+            Assert.Single(activities);
 
             var payload = activities.FirstOrDefault().Payload as StatusEventPayload;
             Assert.Equal(214015194, payload.Id);
@@ -987,7 +987,7 @@ public async Task DeserializesStatusEventCorrectly()
             Assert.Equal("default", payload.Context);
             Assert.Equal("some human readable text", payload.Description);
             Assert.Equal(CommitState.Success, payload.State.Value);
-            Assert.Equal(1, payload.Branches.Count);
+            Assert.Single(payload.Branches);
             Assert.Equal(new DateTimeOffset(2015, 05, 05, 23, 40, 39, TimeSpan.Zero), payload.CreatedAt);
         }
 
@@ -1007,7 +1007,7 @@ public async Task DeserializesStarredEventCorrectly()
 
             var client = GetTestingEventsClient(jsonObj);
             var activities = await client.GetAll();
-            Assert.Equal(1, activities.Count);
+            Assert.Single(activities);
 
             var payload = activities.FirstOrDefault().Payload as StarredEventPayload;
             Assert.Equal("started", payload.Action);
diff --git a/Octokit.Tests/Clients/RepositoryContentsClientTests.cs b/Octokit.Tests/Clients/RepositoryContentsClientTests.cs
index c07e33e162..ea5cf2420f 100644
--- a/Octokit.Tests/Clients/RepositoryContentsClientTests.cs
+++ b/Octokit.Tests/Clients/RepositoryContentsClientTests.cs
@@ -147,7 +147,7 @@ public async Task ReturnsContents()
                 var contents = await contentsClient.GetAllContents("fake", "repo", "readme.md");
 
                 connection.Received().GetAll<RepositoryContent>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/contents/readme.md"));
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -162,7 +162,7 @@ public async Task ReturnsContentsWithRepositoryId()
                 var contents = await contentsClient.GetAllContents(1, "readme.md");
 
                 connection.Received().GetAll<RepositoryContent>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/contents/readme.md"));
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -177,7 +177,7 @@ public async Task ReturnsAllContents()
                 var contents = await contentsClient.GetAllContents("fake", "repo");
 
                 connection.Received().GetAll<RepositoryContent>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/contents/"));
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -192,7 +192,7 @@ public async Task ReturnsAllContentsWithRepositoryId()
                 var contents = await contentsClient.GetAllContents(1);
 
                 connection.Received().GetAll<RepositoryContent>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/contents/"));
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -266,7 +266,7 @@ public async Task ReturnsContentsByRef()
                 var contents = await contentsClient.GetAllContentsByRef("fake", "repo", "readme.md", GitHubConstants.DefaultBranchName);
 
                 connection.Received().GetAll<RepositoryContent>(Arg.Is<Uri>(u => u.ToString() == $"repos/fake/repo/contents/readme.md?ref={GitHubConstants.DefaultBranchName}"));
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -281,7 +281,7 @@ public async Task ReturnsContentsByRefWithRepositoryId()
                 var contents = await contentsClient.GetAllContentsByRef(1, "readme.md", GitHubConstants.DefaultBranchName);
 
                 connection.Received().GetAll<RepositoryContent>(Arg.Is<Uri>(u => u.ToString() == $"repositories/1/contents/readme.md?ref={GitHubConstants.DefaultBranchName}"));
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -296,7 +296,7 @@ public async Task ReturnsAllContentsByRef()
                 var contents = await contentsClient.GetAllContentsByRef("fake", "repo", GitHubConstants.DefaultBranchName);
 
                 connection.Received().GetAll<RepositoryContent>(Arg.Is<Uri>(u => u.ToString() == $"repos/fake/repo/contents/?ref={GitHubConstants.DefaultBranchName}"));
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -311,7 +311,7 @@ public async Task ReturnsAllContentsByRefWithRepositoryId()
                 var contents = await contentsClient.GetAllContentsByRef(1, GitHubConstants.DefaultBranchName);
 
                 connection.Received().GetAll<RepositoryContent>(Arg.Is<Uri>(u => u.ToString() == $"repositories/1/contents/?ref={GitHubConstants.DefaultBranchName}"));
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
diff --git a/Octokit.Tests/Clients/StatisticsClientTests.cs b/Octokit.Tests/Clients/StatisticsClientTests.cs
index df9549f864..8c18afaae1 100644
--- a/Octokit.Tests/Clients/StatisticsClientTests.cs
+++ b/Octokit.Tests/Clients/StatisticsClientTests.cs
@@ -35,7 +35,7 @@ public async Task RequestsCorrectUrl()
 
                 var result = await client.GetContributors("owner", "name");
 
-                Assert.Equal(1, result.Count);
+                Assert.Single(result);
             }
 
             [Fact]
@@ -52,7 +52,7 @@ public async Task RequestsCorrectUrlWithRepositoryId()
 
                 var result = await client.GetContributors(1);
 
-                Assert.Equal(1, result.Count);
+                Assert.Single(result);
             }
 
             [Fact]
@@ -71,7 +71,7 @@ public async Task RequestsCorrectUrlWithCancellactionToken()
 
                 var result = await client.GetContributors("owner", "name", cancellationToken);
 
-                Assert.Equal(1, result.Count);
+                Assert.Single(result);
             }
 
             [Fact]
@@ -90,7 +90,7 @@ public async Task RequestsCorrectUrlWithRepositoryIdWithCancellactionToken()
 
                 var result = await client.GetContributors(1, cancellationToken);
 
-                Assert.Equal(1, result.Count);
+                Assert.Single(result);
             }
 
             [Fact]
@@ -424,7 +424,7 @@ public async Task RequestsCorrectUrl()
 
                 var result = await statisticsClient.GetPunchCard("owner", "name");
 
-                Assert.Equal(1, result.PunchPoints.Count);
+                Assert.Single(result.PunchPoints);
                 Assert.Equal(DayOfWeek.Tuesday, result.PunchPoints[0].DayOfWeek);
                 Assert.Equal(8, result.PunchPoints[0].HourOfTheDay);
                 Assert.Equal(42, result.PunchPoints[0].CommitCount);
@@ -443,7 +443,7 @@ public async Task RequestsCorrectUrlWithRepositoryId()
 
                 var result = await statisticsClient.GetPunchCard(1);
 
-                Assert.Equal(1, result.PunchPoints.Count);
+                Assert.Single(result.PunchPoints);
                 Assert.Equal(DayOfWeek.Tuesday, result.PunchPoints[0].DayOfWeek);
                 Assert.Equal(8, result.PunchPoints[0].HourOfTheDay);
                 Assert.Equal(42, result.PunchPoints[0].CommitCount);
@@ -464,7 +464,7 @@ public async Task RequestsCorrectUrlWithCancellationToken()
 
                 var result = await client.GetPunchCard("owner", "name", cancellationToken);
 
-                Assert.Equal(1, result.PunchPoints.Count);
+                Assert.Single(result.PunchPoints);
                 Assert.Equal(DayOfWeek.Tuesday, result.PunchPoints[0].DayOfWeek);
                 Assert.Equal(8, result.PunchPoints[0].HourOfTheDay);
                 Assert.Equal(42, result.PunchPoints[0].CommitCount);
@@ -485,7 +485,7 @@ public async Task RequestsCorrectUrlWithRepositoryIdWithCancellationToken()
 
                 var result = await client.GetPunchCard(1, cancellationToken);
 
-                Assert.Equal(1, result.PunchPoints.Count);
+                Assert.Single(result.PunchPoints);
                 Assert.Equal(DayOfWeek.Tuesday, result.PunchPoints[0].DayOfWeek);
                 Assert.Equal(8, result.PunchPoints[0].HourOfTheDay);
                 Assert.Equal(42, result.PunchPoints[0].CommitCount);
diff --git a/Octokit.Tests/Exceptions/ApiErrorTests.cs b/Octokit.Tests/Exceptions/ApiErrorTests.cs
index 4b550a7ca8..b7a4d19c31 100644
--- a/Octokit.Tests/Exceptions/ApiErrorTests.cs
+++ b/Octokit.Tests/Exceptions/ApiErrorTests.cs
@@ -28,7 +28,7 @@ public void CanBeDeserialized()
             var apiError = serializer.Deserialize<ApiError>(json);
 
             Assert.Equal("Validation Failed", apiError.Message);
-            Assert.Equal(1, apiError.Errors.Count);
+            Assert.Single(apiError.Errors);
             Assert.Equal("Issue", apiError.Errors[0].Resource);
             Assert.Equal("title", apiError.Errors[0].Field);
             Assert.Equal("missing_field", apiError.Errors[0].Code);
diff --git a/Octokit.Tests/Http/ApiConnectionTests.cs b/Octokit.Tests/Http/ApiConnectionTests.cs
index 22c43c082b..13c64e05a7 100644
--- a/Octokit.Tests/Http/ApiConnectionTests.cs
+++ b/Octokit.Tests/Http/ApiConnectionTests.cs
@@ -98,7 +98,7 @@ public async Task MakesGetRequestForAllItems()
 
                 var data = await apiConnection.GetAll<object>(getAllUri);
 
-                Assert.Equal(0, data.Count);
+                Assert.Empty(data);
                 connection.Received().Get<List<object>>(getAllUri, Args.EmptyDictionary, null, CancellationToken.None, null);
             }
 
diff --git a/Octokit.Tests/Http/ApiInfoParserTests.cs b/Octokit.Tests/Http/ApiInfoParserTests.cs
index 45cb1301c9..3768330718 100644
--- a/Octokit.Tests/Http/ApiInfoParserTests.cs
+++ b/Octokit.Tests/Http/ApiInfoParserTests.cs
@@ -69,7 +69,7 @@ public void BadHeadersAreIgnored()
                 var apiInfo = ApiInfoParser.ParseResponseHeaders(headers);
 
                 Assert.NotNull(apiInfo);
-                Assert.Equal(0, apiInfo.Links.Count);
+                Assert.Empty(apiInfo.Links);
             }
 
             [Fact]
diff --git a/Octokit.Tests/Http/ApiInfoTests.cs b/Octokit.Tests/Http/ApiInfoTests.cs
index 21fedeba91..929f63fae2 100644
--- a/Octokit.Tests/Http/ApiInfoTests.cs
+++ b/Octokit.Tests/Http/ApiInfoTests.cs
@@ -127,8 +127,8 @@ public void CanCloneWithNullETag()
 
                 Assert.NotNull(clone);
                 Assert.Equal(4, clone.Links.Count);
-                Assert.Equal(1, clone.OauthScopes.Count);
-                Assert.Equal(0, clone.AcceptedOauthScopes.Count);
+                Assert.Single(clone.OauthScopes);
+                Assert.Empty(clone.AcceptedOauthScopes);
                 Assert.Null(clone.Etag);
                 Assert.Equal(100, clone.RateLimit.Limit);
                 Assert.Equal(75, clone.RateLimit.Remaining);
@@ -171,8 +171,8 @@ public void CanCloneWithNullRateLimit()
 
                 Assert.NotNull(clone);
                 Assert.Equal(4, clone.Links.Count);
-                Assert.Equal(1, clone.OauthScopes.Count);
-                Assert.Equal(0, clone.AcceptedOauthScopes.Count);
+                Assert.Single(clone.OauthScopes);
+                Assert.Empty(clone.AcceptedOauthScopes);
                 Assert.Equal("123abc", clone.Etag);
                 Assert.Null(clone.RateLimit);
             }
diff --git a/Octokit.Tests/Http/ConnectionTests.cs b/Octokit.Tests/Http/ConnectionTests.cs
index 1f6b9b362d..b314735c78 100644
--- a/Octokit.Tests/Http/ConnectionTests.cs
+++ b/Octokit.Tests/Http/ConnectionTests.cs
@@ -964,7 +964,7 @@ public async Task ReturnsObjectIfNotNew()
                 // No point checking all of the values as they are tested elsewhere
                 // Just provde that the ApiInfo is populated
                 Assert.Equal(4, result.Links.Count);
-                Assert.Equal(1, result.OauthScopes.Count);
+                Assert.Single(result.OauthScopes);
                 Assert.Equal(4, result.AcceptedOauthScopes.Count);
                 Assert.Equal("5634b0b187fd2e91e3126a75006cc4fa", result.Etag);
                 Assert.Equal(100, result.RateLimit.Limit);
diff --git a/Octokit.Tests/Models/DeploymentStatusTests.cs b/Octokit.Tests/Models/DeploymentStatusTests.cs
index dd402b8f7b..561d81a95d 100644
--- a/Octokit.Tests/Models/DeploymentStatusTests.cs
+++ b/Octokit.Tests/Models/DeploymentStatusTests.cs
@@ -44,7 +44,7 @@ public void CanDeserialize()
             Assert.Equal(1, actual.Id);
             Assert.Equal("https://api.github.com/repos/octocat/example/deployments/1/statuses/42", actual.Url);
             Assert.Equal(DeploymentState.Success, actual.State);
-            Assert.Equal(1, actual.Payload.Count);
+            Assert.Single(actual.Payload);
             Assert.Equal("production", actual.Payload["environment"]);
             Assert.Equal("https://gist.github.com/628b2736d379f", actual.TargetUrl);
             Assert.Equal(DateTimeOffset.Parse("2012-07-20T01:19:13Z"), actual.CreatedAt);
diff --git a/Octokit.Tests/Models/InstallationTests.cs b/Octokit.Tests/Models/InstallationTests.cs
index 5a5e71ba34..c28a40c56e 100644
--- a/Octokit.Tests/Models/InstallationTests.cs
+++ b/Octokit.Tests/Models/InstallationTests.cs
@@ -69,10 +69,9 @@ public void CanBeDeserialized()
 
       Assert.NotNull(installations);
       Assert.NotEmpty(installations);
-      Assert.Equal(1, installations.Count);
+            Assert.Single(installations);
       Assert.Null(installations.First().SuspendedAt);
       Assert.Null(installations.First().SuspendedBy);
-
     }
 
     [Fact]
@@ -156,7 +155,7 @@ public void CanBeDeserializedWithSuspendedAtValues()
 
       Assert.NotNull(installations);
       Assert.NotEmpty(installations);
-      Assert.Equal(1, installations.Count);
+            Assert.Single(installations);
       Assert.NotNull(installations.First().SuspendedAt);
       Assert.NotNull(installations.First().SuspendedBy);
 
diff --git a/Octokit.Tests/Models/MigrationTests.cs b/Octokit.Tests/Models/MigrationTests.cs
index 0f54c916ce..566c8894f6 100644
--- a/Octokit.Tests/Models/MigrationTests.cs
+++ b/Octokit.Tests/Models/MigrationTests.cs
@@ -119,7 +119,7 @@ public void CanBeDeserialized()
 
             Assert.Equal(79, _migration.Id);
             Assert.Equal("0b989ba4-242f-11e5-81e1-c7b6966d2516", _migration.Guid);
-            Assert.Equal(1, _migration.Repositories.Count);
+            Assert.Single(_migration.Repositories);
             Assert.Equal(1296269, _migration.Repositories[0].Id);
             Assert.Equal(Migration.MigrationState.Pending, _migration.State);
         }
@@ -151,7 +151,7 @@ public void CanBeDeserialized()
             var _migrationReuqest = serializer.Deserialize<StartMigrationRequest>(migrationRequestJson);
 
             Assert.Equal("octocat/Hello-World", _migrationReuqest.Repositories[0]);
-            Assert.Equal(1, _migrationReuqest.Repositories.Count);
+            Assert.Single(_migrationReuqest.Repositories);
             Assert.True(_migrationReuqest.LockRepositories);
         }
     }
diff --git a/Octokit.Tests/Models/PullRequestCommitTests.cs b/Octokit.Tests/Models/PullRequestCommitTests.cs
index 0fa4a9ec9a..ae6429be6c 100644
--- a/Octokit.Tests/Models/PullRequestCommitTests.cs
+++ b/Octokit.Tests/Models/PullRequestCommitTests.cs
@@ -4,7 +4,8 @@
 using Octokit.Internal;
 using Xunit;
 
-public class PullRequestCommitTests {
+public class PullRequestCommitTests
+{
     // the following JSON is taken from the documentation available at https://developer.github.com/v3/pulls/#list-commits-on-a-pull-request
 
     const string jsonPayload = @"
@@ -91,7 +92,8 @@ public class PullRequestCommitTests {
 ";
 
     [Fact]
-    public void AuthorAndCommitterDeserializedCorrectly() {
+    public void AuthorAndCommitterDeserializedCorrectly()
+    {
         var serializer = new SimpleJsonSerializer();
         var commits = serializer.Deserialize<List<PullRequestCommit>>(jsonPayload);
 
diff --git a/Octokit.Tests/Models/RequestParametersTests.cs b/Octokit.Tests/Models/RequestParametersTests.cs
index e62be6432a..fe1b85f75b 100644
--- a/Octokit.Tests/Models/RequestParametersTests.cs
+++ b/Octokit.Tests/Models/RequestParametersTests.cs
@@ -29,7 +29,7 @@ public void OmitsNullValues()
 
                 var result = model.ToParametersDictionary();
 
-                Assert.Equal(1, result.Count);
+                Assert.Single(result);
                 Assert.DoesNotContain("foo", result.Keys);
                 Assert.Equal("123", result["bar"]);
             }
@@ -41,7 +41,7 @@ public void HandlesEnums()
 
                 var result = model.ToParametersDictionary();
 
-                Assert.Equal(1, result.Count);
+                Assert.Single(result);
                 Assert.Equal("yuck", result["nom"]);
             }
 
@@ -52,7 +52,7 @@ public void TreatsFirstEnumMemberAsDefault()
 
                 var result = model.ToParametersDictionary();
 
-                Assert.Equal(1, result.Count);
+                Assert.Single(result);
                 Assert.Equal("bland", result["nom"]);
             }
 
@@ -63,7 +63,7 @@ public void HandlesEnumsWithSpecifiedValue()
 
                 var result = model.ToParametersDictionary();
 
-                Assert.Equal(1, result.Count);
+                Assert.Single(result);
                 Assert.Equal("noms", result["nom"]);
             }
 
@@ -78,7 +78,7 @@ public void ConvertsDatetTimeOffsetToIso8601Format()
 
                 var result = model.ToParametersDictionary();
 
-                Assert.Equal(1, result.Count);
+                Assert.Single(result);
                 Assert.Equal("2013-01-23T16:30:00Z", result["when"]);
             }
 
@@ -89,7 +89,7 @@ public void OmitsNullDatetTimeOffsetToIso8601Format()
 
                 var result = model.ToParametersDictionary();
 
-                Assert.Equal(0, result.Count);
+                Assert.Empty(result);
             }
 
             [Fact]
@@ -99,7 +99,7 @@ public void JoinsStringCollectionIntoCommaSeparatedString()
 
                 var result = model.ToParametersDictionary();
 
-                Assert.Equal(1, result.Count);
+                Assert.Single(result);
                 Assert.Equal("one,two", result["strings"]);
             }
 
@@ -110,7 +110,7 @@ public void DoesNotIncludeEmptyList()
 
                 var result = model.ToParametersDictionary();
 
-                Assert.Equal(0, result.Count);
+                Assert.Empty(result);
             }
 
             [Fact]
@@ -120,7 +120,7 @@ public void UsesParameterAttributeForKey()
 
                 var result = model.ToParametersDictionary();
 
-                Assert.Equal(1, result.Count);
+                Assert.Single(result);
                 Assert.Equal("verbose", result["prop"]);
             }
 
diff --git a/Octokit.Tests/Models/SearchIssuesRequestExclusionsTests.cs b/Octokit.Tests/Models/SearchIssuesRequestExclusionsTests.cs
index fdbaab560f..b45cc6d46c 100644
--- a/Octokit.Tests/Models/SearchIssuesRequestExclusionsTests.cs
+++ b/Octokit.Tests/Models/SearchIssuesRequestExclusionsTests.cs
@@ -34,7 +34,7 @@ public void HandlesStringAttributesCorrectly()
                 property.Value(request, "blah");
 
                 // Ensure the specified parameter now exists
-                Assert.True(request.MergedQualifiers().Count(x => x.Contains(property.Key)) == 1);
+                Assert.Equal(1, request.MergedQualifiers().Count(x => x.Contains(property.Key)));
             }
         }
 
diff --git a/Octokit.Tests/Models/SearchIssuesRequestTests.cs b/Octokit.Tests/Models/SearchIssuesRequestTests.cs
index 1b6219fcd2..d97d3012f0 100644
--- a/Octokit.Tests/Models/SearchIssuesRequestTests.cs
+++ b/Octokit.Tests/Models/SearchIssuesRequestTests.cs
@@ -58,7 +58,7 @@ public void HandlesStringAttributesCorrectly()
                 property.Value(request, "blah");
 
                 // Ensure the specified parameter now exists
-                Assert.True(request.MergedQualifiers().Count(x => x.Contains(property.Key)) == 1);
+                Assert.Equal(1, request.MergedQualifiers().Count(x => x.Contains(property.Key)));
             }
         }
 
@@ -84,7 +84,7 @@ public void HandlesDateRangeAttributesCorrectly()
                 property.Value(request, DateRange.GreaterThan(new DateTimeOffset(DateTime.Today.AddDays(-7))));
 
                 // Ensure the specified parameter now exists
-                Assert.True(request.MergedQualifiers().Count(x => x.Contains(property.Key)) == 1);
+                Assert.Equal(1, request.MergedQualifiers().Count(x => x.Contains(property.Key)));
             }
         }
 
diff --git a/Octokit.Tests/Models/WorkflowJobsResponseTests.cs b/Octokit.Tests/Models/WorkflowJobsResponseTests.cs
index 1883d5535a..121b842e07 100644
--- a/Octokit.Tests/Models/WorkflowJobsResponseTests.cs
+++ b/Octokit.Tests/Models/WorkflowJobsResponseTests.cs
@@ -128,7 +128,7 @@ public void CanBeDeserialized()
             Assert.Equal(1, payload.TotalCount);
             Assert.NotNull(payload.Jobs);
             Assert.NotEmpty(payload.Jobs);
-            Assert.Equal(1, payload.Jobs.Count);
+            Assert.Single(payload.Jobs);
         }
     }
 }
diff --git a/Octokit.Tests/Models/WorkflowRunUsageTests.cs b/Octokit.Tests/Models/WorkflowRunUsageTests.cs
index df434f4efb..005490297a 100644
--- a/Octokit.Tests/Models/WorkflowRunUsageTests.cs
+++ b/Octokit.Tests/Models/WorkflowRunUsageTests.cs
@@ -73,7 +73,7 @@ public void CanBeDeserialized()
             Assert.Equal(180000, payload.Billable.Ubuntu.TotalMs);
             Assert.Equal(1, payload.Billable.Ubuntu.Jobs);
             Assert.NotNull(payload.Billable.Ubuntu.JobRuns);
-            Assert.Equal(1, payload.Billable.Ubuntu.JobRuns.Count);
+            Assert.Single(payload.Billable.Ubuntu.JobRuns);
             Assert.Equal(240000, payload.Billable.MacOS.TotalMs);
             Assert.Equal(4, payload.Billable.MacOS.Jobs);
             Assert.NotNull(payload.Billable.MacOS.JobRuns);
diff --git a/Octokit.Tests/Reactive/ObservableIssueTimelineClientTests.cs b/Octokit.Tests/Reactive/ObservableIssueTimelineClientTests.cs
index 6e5ef0902c..cf139d57be 100644
--- a/Octokit.Tests/Reactive/ObservableIssueTimelineClientTests.cs
+++ b/Octokit.Tests/Reactive/ObservableIssueTimelineClientTests.cs
@@ -46,7 +46,7 @@ public async Task RequestsCorrectUrl()
                 connection.Received().Get<List<TimelineEventInfo>>(
                     Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/42/timeline"),
                     Arg.Any<Dictionary<string, string>>());
-                Assert.Equal(1, timelineEvents.Count);
+                Assert.Single(timelineEvents);
             }
 
             [Fact]
@@ -67,7 +67,7 @@ public async Task RequestsCorrectUrlWithApiOptions()
                 connection.Received().Get<List<TimelineEventInfo>>(
                     Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/42/timeline"),
                     Arg.Is<Dictionary<string, string>>(d => d.Count == 1 && d["per_page"] == "30"));
-                Assert.Equal(1, timelineEvents.Count);
+                Assert.Single(timelineEvents);
             }
 
             [Fact]
@@ -87,7 +87,7 @@ public async Task RequestCorrectUrlWithRepositoryId()
                 connection.Received().Get<List<TimelineEventInfo>>(
                     Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/42/timeline"),
                     Arg.Any<Dictionary<string, string>>());
-                Assert.Equal(1, timelineEvents.Count);
+                Assert.Single(timelineEvents);
             }
 
             [Fact]
@@ -107,7 +107,7 @@ public async Task RequestCorrectUrlWithRepositoryIdAndApiOptions()
                 connection.Received().Get<List<TimelineEventInfo>>(
                     Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/42/timeline"),
                     Arg.Is<Dictionary<string, string>>(d => d.Count == 1 && d["per_page"] == "30"));
-                Assert.Equal(1, timelineEvents.Count);
+                Assert.Single(timelineEvents);
             }
 
             [Fact]
diff --git a/Octokit.Tests/Reactive/ObservableIssuesEventsClientTests.cs b/Octokit.Tests/Reactive/ObservableIssuesEventsClientTests.cs
index d03d98dfca..07e51f2935 100644
--- a/Octokit.Tests/Reactive/ObservableIssuesEventsClientTests.cs
+++ b/Octokit.Tests/Reactive/ObservableIssuesEventsClientTests.cs
@@ -42,7 +42,7 @@ public async Task RequestsCorrectUrl()
                 var eventInfos = await client.GetAllForIssue("fake", "repo", 42).ToList();
 
                 connection.Received().Get<List<IssueEvent>>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/42/events"), Args.EmptyDictionary);
-                Assert.Equal(1, eventInfos.Count);
+                Assert.Single(eventInfos);
             }
 
             [Fact]
@@ -61,7 +61,7 @@ public async Task RequestsCorrectUrlWithRepositoryId()
                 var eventInfos = await client.GetAllForIssue(1, 42).ToList();
 
                 connection.Received().Get<List<IssueEvent>>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/42/events"), Args.EmptyDictionary);
-                Assert.Equal(1, eventInfos.Count);
+                Assert.Single(eventInfos);
             }
 
             [Fact]
@@ -87,7 +87,7 @@ public async Task RequestsCorrectUrlWithApiOptions()
                 var eventInfos = await client.GetAllForIssue("fake", "repo", 42, options).ToList();
 
                 connection.Received().Get<List<IssueEvent>>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/42/events"), Arg.Is<Dictionary<string, string>>(d => d.Count == 2));
-                Assert.Equal(1, eventInfos.Count);
+                Assert.Single(eventInfos);
             }
 
             [Fact]
@@ -114,7 +114,7 @@ public async Task RequestsCorrectUrlWithRepositoryIdWithApiOptions()
                 var eventInfos = await client.GetAllForIssue(1, 42, options).ToList();
 
                 connection.Received().Get<List<IssueEvent>>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/42/events"), Arg.Is<Dictionary<string, string>>(d => d.Count == 2));
-                Assert.Equal(1, eventInfos.Count);
+                Assert.Single(eventInfos);
             }
 
             [Fact]
@@ -155,7 +155,7 @@ public async Task RequestsCorrectUrl()
                 var issueEvents = await client.GetAllForRepository("fake", "repo").ToList();
 
                 connection.Received().Get<List<IssueEvent>>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/events"), Args.EmptyDictionary);
-                Assert.Equal(1, issueEvents.Count);
+                Assert.Single(issueEvents);
             }
 
             [Fact]
@@ -174,7 +174,7 @@ public async Task RequestsCorrectUrlWithRepositoryId()
                 var issueEvents = await client.GetAllForRepository(1).ToList();
 
                 connection.Received().Get<List<IssueEvent>>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/events"), Args.EmptyDictionary);
-                Assert.Equal(1, issueEvents.Count);
+                Assert.Single(issueEvents);
             }
 
             [Fact]
@@ -200,7 +200,7 @@ public async Task RequestsCorrectUrlWithApiOptions()
                 var issueEvents = await client.GetAllForRepository("fake", "repo", options).ToList();
 
                 connection.Received().Get<List<IssueEvent>>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/issues/events"), Arg.Is<Dictionary<string, string>>(d => d.Count == 2));
-                Assert.Equal(1, issueEvents.Count);
+                Assert.Single(issueEvents);
             }
 
             [Fact]
@@ -226,7 +226,7 @@ public async Task RequestsCorrectUrlWithRepositoryIdWithApiOptions()
                 var issueEvents = await client.GetAllForRepository(1, options).ToList();
 
                 connection.Received().Get<List<IssueEvent>>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/issues/events"), Arg.Is<Dictionary<string, string>>(d => d.Count == 2));
-                Assert.Equal(1, issueEvents.Count);
+                Assert.Single(issueEvents);
             }
 
             [Fact]
diff --git a/Octokit.Tests/Reactive/ObservablePullRequestsClientTests.cs b/Octokit.Tests/Reactive/ObservablePullRequestsClientTests.cs
index c6b2932df6..d02912588a 100644
--- a/Octokit.Tests/Reactive/ObservablePullRequestsClientTests.cs
+++ b/Octokit.Tests/Reactive/ObservablePullRequestsClientTests.cs
@@ -647,7 +647,7 @@ public async Task FetchesAllCommitsForPullRequest()
 
                 var commits = await client.Commits("fake", "repo", 42).ToList();
 
-                Assert.Equal(1, commits.Count);
+                Assert.Single(commits);
                 Assert.Same(commit, commits[0]);
                 connection.Received().Get<List<PullRequestCommit>>(new Uri(expectedUrl, UriKind.Relative), null);
             }
@@ -671,7 +671,7 @@ public async Task FetchesAllCommitsForPullRequestWithRepositoryId()
 
                 var commits = await client.Commits(1, 42).ToList();
 
-                Assert.Equal(1, commits.Count);
+                Assert.Single(commits);
                 Assert.Same(commit, commits[0]);
                 connection.Received().Get<List<PullRequestCommit>>(new Uri(expectedUrl, UriKind.Relative), null);
             }
@@ -711,7 +711,7 @@ public async Task FetchesAllFilesForPullRequest()
 
                 var files = await client.Files("fake", "repo", 42).ToList();
 
-                Assert.Equal(1, files.Count);
+                Assert.Single(files);
                 Assert.Same(file, files[0]);
                 connection.Received().Get<List<PullRequestFile>>(new Uri(expectedUrl, UriKind.Relative), Arg.Any<IDictionary<string, string>>());
             }
@@ -735,7 +735,7 @@ public async Task FetchesAllFilesForPullRequestWithRepositoryId()
 
                 var files = await client.Files(1, 42).ToList();
 
-                Assert.Equal(1, files.Count);
+                Assert.Single(files);
                 Assert.Same(file, files[0]);
                 connection.Received().Get<List<PullRequestFile>>(new Uri(expectedUrl, UriKind.Relative), Arg.Any<IDictionary<string, string>>());
             }
diff --git a/Octokit.Tests/Reactive/ObservableRepositoryContentsClientTests.cs b/Octokit.Tests/Reactive/ObservableRepositoryContentsClientTests.cs
index 4339adc41e..94a9cc3a13 100644
--- a/Octokit.Tests/Reactive/ObservableRepositoryContentsClientTests.cs
+++ b/Octokit.Tests/Reactive/ObservableRepositoryContentsClientTests.cs
@@ -179,7 +179,7 @@ public async Task ReturnsContents()
                 var contents = await contentsClient.GetAllContents("fake", "repo").ToList();
 
                 connection.Received().Get<List<RepositoryContent>>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/contents/"), null);
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -198,7 +198,7 @@ public async Task ReturnsContentsWithRepositoryId()
                 var contents = await contentsClient.GetAllContents(1).ToList();
 
                 connection.Received().Get<List<RepositoryContent>>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/contents/"), null);
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -217,7 +217,7 @@ public async Task ReturnsAllContents()
                 var contents = await contentsClient.GetAllContents("fake", "repo").ToList();
 
                 connection.Received().Get<List<RepositoryContent>>(Arg.Is<Uri>(u => u.ToString() == "repos/fake/repo/contents/"), null);
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -235,7 +235,7 @@ public async Task ReturnsAllContentsWithRepositoryId()
                 var contents = await contentsClient.GetAllContents(1).ToList();
 
                 connection.Received().Get<List<RepositoryContent>>(Arg.Is<Uri>(u => u.ToString() == "repositories/1/contents/"), null);
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -315,7 +315,7 @@ public async Task ReturnsContentsByRef()
                 var contents = await contentsClient.GetAllContentsByRef("fake", "repo", GitHubConstants.DefaultBranchName, "readme.md").ToList();
 
                 connection.Received().Get<List<RepositoryContent>>(Arg.Is<Uri>(u => u.ToString() == $"repos/fake/repo/contents/readme.md?ref={GitHubConstants.DefaultBranchName}"), null);
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -333,7 +333,7 @@ public async Task ReturnsContentsByRefWithRepositoryId()
                 var contents = await contentsClient.GetAllContentsByRef(1, GitHubConstants.DefaultBranchName, "readme.md").ToList();
 
                 connection.Received().Get<List<RepositoryContent>>(Arg.Is<Uri>(u => u.ToString() == $"repositories/1/contents/readme.md?ref={GitHubConstants.DefaultBranchName}"), null);
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -351,7 +351,7 @@ public async Task ReturnsAllContentsByRef()
                 var contents = await contentsClient.GetAllContentsByRef("fake", "repo", GitHubConstants.DefaultBranchName).ToList();
 
                 connection.Received().Get<List<RepositoryContent>>(Arg.Is<Uri>(u => u.ToString() == $"repos/fake/repo/contents/?ref={GitHubConstants.DefaultBranchName}"), null);
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]
@@ -369,7 +369,7 @@ public async Task ReturnsAllContentsByRefWithRepositoryId()
                 var contents = await contentsClient.GetAllContentsByRef(1, GitHubConstants.DefaultBranchName).ToList();
 
                 connection.Received().Get<List<RepositoryContent>>(Arg.Is<Uri>(u => u.ToString() == $"repositories/1/contents/?ref={GitHubConstants.DefaultBranchName}"), null);
-                Assert.Equal(1, contents.Count);
+                Assert.Single(contents);
             }
 
             [Fact]