diff --git a/Octokit.Tests.Integration/Clients/AssigneesClientTests.cs b/Octokit.Tests.Integration/Clients/AssigneesClientTests.cs
index cc0c2f3e..584bd51e 100644
--- a/Octokit.Tests.Integration/Clients/AssigneesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/AssigneesClientTests.cs
@@ -50,7 +50,7 @@ public class AssigneesClientTests
     {
         // Repository owner is always an assignee
         var assignees = await _github.Issue.Assignee.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName);
-        Assert.True(assignees.Any(u => u.Login == Helper.UserName));
+        Assert.Contains(assignees, u => u.Login == Helper.UserName);
     }
 
     [IntegrationTest]
@@ -69,19 +69,20 @@ public class AssigneesClientTests
         Assert.IsType<Issue>(addAssignees);
 
         //Check if assignee was added to issue
-        Assert.True(addAssignees.Assignees.Any(x => x.Login == _context.RepositoryOwner));
+        Assert.Contains(addAssignees.Assignees, x => x.Login == _context.RepositoryOwner);
 
         //Test to remove assignees
         var removeAssignees = await _github.Issue.Assignee.RemoveAssignees(_context.RepositoryOwner, _context.RepositoryName, issue.Number, newAssignees);
 
         //Check if assignee was removed
-        Assert.False(removeAssignees.Assignees.Any(x => x.Login == _context.RepositoryOwner));
+        Assert.DoesNotContain(removeAssignees.Assignees, x => x.Login == _context.RepositoryOwner);
     }
 
+    [IntegrationTest]
     public async Task CanListAssigneesWithRepositoryId()
     {
         // Repository owner is always an assignee
         var assignees = await _github.Issue.Assignee.GetAllForRepository(_context.Repository.Id);
-        Assert.True(assignees.Any(u => u.Login == Helper.UserName));
+        Assert.Contains(assignees, u => u.Login == Helper.UserName);
     }
 }
\ No newline at end of file
diff --git a/Octokit.Tests.Integration/Clients/AuthorizationClientTests.cs b/Octokit.Tests.Integration/Clients/AuthorizationClientTests.cs
index f84d1b7e..2dba5124 100644
--- a/Octokit.Tests.Integration/Clients/AuthorizationClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/AuthorizationClientTests.cs
@@ -69,7 +69,7 @@ namespace Octokit.Tests.Integration.Clients
                 new[] { "user" });
 
             var error = await Assert.ThrowsAsync<ForbiddenException>(() => github.Authorization.Create(newAuthorization));
-            Assert.True(error.Message.Contains("username and password Basic Auth"));
+            Assert.Contains("username and password Basic Auth", error.Message);
         }
 
         [BasicAuthenticationTest(Skip = "See https://github.com/octokit/octokit.net/issues/1000 for issue to investigate this further")]
diff --git a/Octokit.Tests.Integration/Clients/CheckSuitesClientTests.cs b/Octokit.Tests.Integration/Clients/CheckSuitesClientTests.cs
index 1512dc8e..52a97b03 100644
--- a/Octokit.Tests.Integration/Clients/CheckSuitesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/CheckSuitesClientTests.cs
@@ -131,7 +131,7 @@ namespace Octokit.Tests.Integration.Clients
 
                     Assert.Equal(repoContext.RepositoryId, result.Repository.Id);
                     Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId);
-                    Assert.Equal(false, result.Preferences.AutoTriggerChecks[0].Setting);
+                    Assert.False(result.Preferences.AutoTriggerChecks[0].Setting);
                 }
             }
 
@@ -148,7 +148,7 @@ namespace Octokit.Tests.Integration.Clients
 
                     Assert.Equal(repoContext.RepositoryId, result.Repository.Id);
                     Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId);
-                    Assert.Equal(false, result.Preferences.AutoTriggerChecks[0].Setting);
+                    Assert.False(result.Preferences.AutoTriggerChecks[0].Setting);
                 }
             }
         }
diff --git a/Octokit.Tests.Integration/Clients/CommitsClientTests.cs b/Octokit.Tests.Integration/Clients/CommitsClientTests.cs
index c75eb16b..c2759a7f 100644
--- a/Octokit.Tests.Integration/Clients/CommitsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/CommitsClientTests.cs
@@ -52,13 +52,13 @@ public class CommitsClientTests
         var commit = await github.Git.Commit.Get("noonari", "Signature-Verification", "1965d149ce1151cf411300d15f8d890d9259bd21");
 
         Assert.False(commit.Verification.Verified);
-        Assert.Equal(commit.Verification.Signature,
- "-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1\n\niQEcBAABAgAGBQJXYT2BAAoJEJyZ1vxIV0+N9ZwIAKlf3dk9n1q1mD5AT3Ahtj9o\nF4H25zsHynJk2lnH4YxVvDBEc/uMCXzX6orihZiSdA5UXE7tPyEEZddQdp8pxulX\ncIsFKcrfQqHJnTbT90z5PhAk94lyN9fFngzPW1tgZZVjp2YiiqgXduBWWm6EREOh\nS1Iu9wBqScQomhTXoksmNZyGTZ0LviSi0pkqRY64pQhKnpLlu1OFXaeDvhYocB+E\nY5URZsXodvIkBuzCkWCu8ra4eaXIIARkas4+jIvn0FIx9CzEVz0Zau/5Fk+BR+Te\n7a3/7JH7yuObPB0hqPSuFYyxtvPfxtayvhkGD3YkQqDAkWCpISGyVFzxrrC7z0Y=\n=kbih\n-----END PGP SIGNATURE-----");
+        Assert.Equal("-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1\n\niQEcBAABAgAGBQJXYT2BAAoJEJyZ1vxIV0+N9ZwIAKlf3dk9n1q1mD5AT3Ahtj9o\nF4H25zsHynJk2lnH4YxVvDBEc/uMCXzX6orihZiSdA5UXE7tPyEEZddQdp8pxulX\ncIsFKcrfQqHJnTbT90z5PhAk94lyN9fFngzPW1tgZZVjp2YiiqgXduBWWm6EREOh\nS1Iu9wBqScQomhTXoksmNZyGTZ0LviSi0pkqRY64pQhKnpLlu1OFXaeDvhYocB+E\nY5URZsXodvIkBuzCkWCu8ra4eaXIIARkas4+jIvn0FIx9CzEVz0Zau/5Fk+BR+Te\n7a3/7JH7yuObPB0hqPSuFYyxtvPfxtayvhkGD3YkQqDAkWCpISGyVFzxrrC7z0Y=\n=kbih\n-----END PGP SIGNATURE-----",
+            commit.Verification.Signature);
 
-        Assert.Equal(commit.Verification.Payload,
-            "tree c91c844f37974093a3f0a864755441b577e7663a\nparent 6eb645f6badd46de65700b4d7b6fcdb97684ce5a\nauthor noonari <SarmadSattar1@gmail.com> 1465990529 +0500\ncommitter noonari <SarmadSattar1@gmail.com> 1465990529 +0500\n\ngpg stuff\n");
+        Assert.Equal("tree c91c844f37974093a3f0a864755441b577e7663a\nparent 6eb645f6badd46de65700b4d7b6fcdb97684ce5a\nauthor noonari <SarmadSattar1@gmail.com> 1465990529 +0500\ncommitter noonari <SarmadSattar1@gmail.com> 1465990529 +0500\n\ngpg stuff\n",
+            commit.Verification.Payload);
 
-        Assert.Equal(commit.Verification.Reason, VerificationReason.UnknownKey);
+        Assert.Equal(VerificationReason.UnknownKey, commit.Verification.Reason);
     }
 
     [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/FollowersClientTests.cs b/Octokit.Tests.Integration/Clients/FollowersClientTests.cs
index 6ced8794..56b174ec 100644
--- a/Octokit.Tests.Integration/Clients/FollowersClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/FollowersClientTests.cs
@@ -24,7 +24,7 @@ public class FollowersClientTests : IDisposable
         var following = await _github.User.Followers.GetAllFollowingForCurrent();
 
         Assert.NotNull(following);
-        Assert.True(following.Any(f => f.Login == "alfhenrik"));
+        Assert.Contains(following, f => f.Login == "alfhenrik");
     }
 
     [IntegrationTest]
@@ -44,7 +44,7 @@ public class FollowersClientTests : IDisposable
         var followers = await _github.User.Followers.GetAll("alfhenrik");
 
         Assert.NotEmpty(followers);
-        Assert.True(followers.Any(f => f.Login == _currentUser.Login));
+        Assert.Contains(followers, f => f.Login == _currentUser.Login);
     }
 
     [IntegrationTest]
@@ -73,7 +73,7 @@ public class FollowersClientTests : IDisposable
 
         Assert.True(result);
         Assert.NotEmpty(following);
-        Assert.True(following.Any(f => f.Login == "alfhenrik"));
+        Assert.Contains(following, f => f.Login == "alfhenrik");
     }
 
     [IntegrationTest]
@@ -81,18 +81,18 @@ public class FollowersClientTests : IDisposable
     {
         await _github.User.Followers.Follow("alfhenrik");
         var followers = await _github.User.Followers.GetAll("alfhenrik");
-        Assert.True(followers.Any(f => f.Login == _currentUser.Login));
+        Assert.Contains(followers, f => f.Login == _currentUser.Login);
 
         await _github.User.Followers.Unfollow("alfhenrik");
         followers = await _github.User.Followers.GetAll("alfhenrik");
-        Assert.False(followers.Any(f => f.Login == _currentUser.Login));
+        Assert.DoesNotContain(followers, f => f.Login == _currentUser.Login);
     }
 
     [IntegrationTest]
     public async Task UnfollowUserNotBeingFollowedTheUser()
     {
         var followers = await _github.User.Followers.GetAll("alfhenrik");
-        Assert.False(followers.Any(f => f.Login == _currentUser.Login));
+        Assert.DoesNotContain(followers, f => f.Login == _currentUser.Login);
 
         await _github.User.Followers.Unfollow("alfhenrik");
     }
diff --git a/Octokit.Tests.Integration/Clients/GistsClientTests.cs b/Octokit.Tests.Integration/Clients/GistsClientTests.cs
index c99c53c0..8cceb178 100644
--- a/Octokit.Tests.Integration/Clients/GistsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/GistsClientTests.cs
@@ -109,11 +109,11 @@ public class GistsClientTests
         var starredGists = await _fixture.GetAllStarred();
 
         Assert.NotNull(starredGists);
-        Assert.True(starredGists.Any(x => x.Id == createdGist.Id));
+        Assert.Contains(starredGists, x => x.Id == createdGist.Id);
 
         var starredGistsSinceStartTime = await _fixture.GetAllStarred(startTime);
         Assert.NotNull(starredGistsSinceStartTime);
-        Assert.True(starredGistsSinceStartTime.Any(x => x.Id == createdGist.Id));
+        Assert.Contains(starredGistsSinceStartTime, x => x.Id == createdGist.Id);
 
         await _fixture.Delete(createdGist.Id);
     }
diff --git a/Octokit.Tests.Integration/Clients/GitHubClientTests.cs b/Octokit.Tests.Integration/Clients/GitHubClientTests.cs
index 7526afc7..bf3c6190 100644
--- a/Octokit.Tests.Integration/Clients/GitHubClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/GitHubClientTests.cs
@@ -32,7 +32,7 @@ public class GitHubClientTests
                 Assert.False(string.IsNullOrEmpty(result.Etag));
                 Assert.True(result.RateLimit.Limit > 0);
                 Assert.True(result.RateLimit.Remaining > -1);
-                Assert.NotNull(result.RateLimit.Reset);
+                Assert.NotEqual(default, result.RateLimit.Reset);
             }
         }
 
@@ -53,7 +53,7 @@ public class GitHubClientTests
             Assert.False(string.IsNullOrEmpty(result.Etag));
             Assert.True(result.RateLimit.Limit > 0);
             Assert.True(result.RateLimit.Remaining > -1);
-            Assert.NotNull(result.RateLimit.Reset);
+            Assert.NotEqual(default, result.RateLimit.Reset);
         }
 
         [PersonalAccessTokenTest]
@@ -73,7 +73,7 @@ public class GitHubClientTests
             Assert.False(string.IsNullOrEmpty(result.Etag));
             Assert.True(result.RateLimit.Limit > 0);
             Assert.True(result.RateLimit.Remaining > -1);
-            Assert.NotNull(result.RateLimit.Reset);
+            Assert.NotEqual(default, result.RateLimit.Reset);
         }
     }
 }
diff --git a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs
index 54e5187c..2d887ed0 100644
--- a/Octokit.Tests.Integration/Clients/IssuesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/IssuesClientTests.cs
@@ -200,9 +200,9 @@ public class IssuesClientTests : IDisposable
             Assert.True(retrieved.Assignees.Count == 1);
             Assert.True(retrieved.Assignees[0].Login == _context.RepositoryOwner);
             var all = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName);
-            Assert.True(all.Any(i => i.Number == retrieved.Number));
-            Assert.True(all.Any(i => i.Assignees.Count == 1));
-            Assert.True(all.Any(i => i.Assignees[0].Login == _context.RepositoryOwner));
+            Assert.Contains(all, i => i.Number == retrieved.Number);
+            Assert.Contains(all, i => i.Assignees.Count == 1);
+            Assert.Contains(all, i => i.Assignees[0].Login == _context.RepositoryOwner);
         }
         finally
         {
@@ -225,7 +225,7 @@ public class IssuesClientTests : IDisposable
             var retrieved = await _issuesClient.Get(_context.Repository.Id, issue.Number);
             var all = await _issuesClient.GetAllForRepository(_context.Repository.Id);
             Assert.NotNull(retrieved);
-            Assert.True(all.Any(i => i.Number == retrieved.Number));
+            Assert.Contains(all, i => i.Number == retrieved.Number);
         }
         finally
         {
@@ -462,10 +462,10 @@ public class IssuesClientTests : IDisposable
         var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request, options);
 
         Assert.Equal(4, retrieved.Count);
-        Assert.True(retrieved.Any(i => i.Number == issue1.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue2.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue3.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue4.Number));
+        Assert.Contains(retrieved, i => i.Number == issue1.Number);
+        Assert.Contains(retrieved, i => i.Number == issue2.Number);
+        Assert.Contains(retrieved, i => i.Number == issue3.Number);
+        Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
     [IntegrationTest]
@@ -492,10 +492,10 @@ public class IssuesClientTests : IDisposable
         var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request, options);
 
         Assert.Equal(4, retrieved.Count);
-        Assert.True(retrieved.Any(i => i.Number == issue1.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue2.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue3.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue4.Number));
+        Assert.Contains(retrieved, i => i.Number == issue1.Number);
+        Assert.Contains(retrieved, i => i.Number == issue2.Number);
+        Assert.Contains(retrieved, i => i.Number == issue3.Number);
+        Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
     [IntegrationTest]
@@ -523,7 +523,7 @@ public class IssuesClientTests : IDisposable
         var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request, options);
 
         Assert.Equal(1, retrieved.Count);
-        Assert.True(retrieved.Any(i => i.Number == issue4.Number));
+        Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
     [IntegrationTest]
@@ -551,7 +551,7 @@ public class IssuesClientTests : IDisposable
         var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request, options);
 
         Assert.Equal(1, retrieved.Count);
-        Assert.True(retrieved.Any(i => i.Number == issue4.Number));
+        Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
     [IntegrationTest]
@@ -572,10 +572,10 @@ public class IssuesClientTests : IDisposable
         var retrieved = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request);
 
         Assert.Equal(4, retrieved.Count);
-        Assert.True(retrieved.Any(i => i.Number == issue1.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue2.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue3.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue4.Number));
+        Assert.Contains(retrieved, i => i.Number == issue1.Number);
+        Assert.Contains(retrieved, i => i.Number == issue2.Number);
+        Assert.Contains(retrieved, i => i.Number == issue3.Number);
+        Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
     [IntegrationTest]
@@ -597,7 +597,7 @@ public class IssuesClientTests : IDisposable
         var request = new RepositoryIssueRequest { State = ItemStateFilter.All };
         var issues = await _issuesClient.GetAllForRepository(_context.RepositoryOwner, _context.RepositoryName, request);
 
-        Assert.True(issues.Any(x => x.Assignees.Count > 0));
+        Assert.Contains(issues, x => x.Assignees.Count > 0);
     }
 
     [IntegrationTest]
@@ -657,10 +657,10 @@ public class IssuesClientTests : IDisposable
         var retrieved = await _issuesClient.GetAllForRepository(_context.Repository.Id, request);
 
         Assert.Equal(4, retrieved.Count);
-        Assert.True(retrieved.Any(i => i.Number == issue1.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue2.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue3.Number));
-        Assert.True(retrieved.Any(i => i.Number == issue4.Number));
+        Assert.Contains(retrieved, i => i.Number == issue1.Number);
+        Assert.Contains(retrieved, i => i.Number == issue2.Number);
+        Assert.Contains(retrieved, i => i.Number == issue3.Number);
+        Assert.Contains(retrieved, i => i.Number == issue4.Number);
     }
 
     [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs b/Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs
index fa8e5eec..cebfbe93 100644
--- a/Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/MiscellaneousClientTests.cs
@@ -85,21 +85,21 @@ public class MiscellaneousClientTests
             Assert.True(result.Resources.Core.Remaining > -1);
             Assert.True(result.Resources.Core.Remaining <= result.Resources.Core.Limit);
             Assert.True(result.Resources.Core.ResetAsUtcEpochSeconds > 0);
-            Assert.NotNull(result.Resources.Core.Reset);
+            Assert.NotEqual(default, result.Resources.Core.Reset);
 
             // Test the search limits
             Assert.True(result.Resources.Search.Limit > 0);
             Assert.True(result.Resources.Search.Remaining > -1);
             Assert.True(result.Resources.Search.Remaining <= result.Resources.Search.Limit);
             Assert.True(result.Resources.Search.ResetAsUtcEpochSeconds > 0);
-            Assert.NotNull(result.Resources.Search.Reset);
+            Assert.NotEqual(default, result.Resources.Search.Reset);
 
             // Test the depreciated rate limits
             Assert.True(result.Rate.Limit > 0);
             Assert.True(result.Rate.Remaining > -1);
             Assert.True(result.Rate.Remaining <= result.Rate.Limit);
             Assert.True(result.Resources.Search.ResetAsUtcEpochSeconds > 0);
-            Assert.NotNull(result.Resources.Search.Reset);
+            Assert.NotEqual(default, result.Resources.Search.Reset);
         }
     }
 
diff --git a/Octokit.Tests.Integration/Clients/OrganizationOutsideCollaboratorsClientTests.cs b/Octokit.Tests.Integration/Clients/OrganizationOutsideCollaboratorsClientTests.cs
index 1c71a107..57ffce1e 100644
--- a/Octokit.Tests.Integration/Clients/OrganizationOutsideCollaboratorsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/OrganizationOutsideCollaboratorsClientTests.cs
@@ -261,10 +261,7 @@ namespace Octokit.Tests.Integration.Clients
                 var ex = await Assert.ThrowsAsync<UserIsOrganizationMemberException>(()
                     => _gitHub.Organization.OutsideCollaborator.Delete(Helper.Organization, Helper.UserName));
 
-                Assert.True(string.Equals(
-                    "You cannot specify an organization member to remove as an outside collaborator.",
-                    ex.Message,
-                    StringComparison.OrdinalIgnoreCase));
+                Assert.Equal("You cannot specify an organization member to remove as an outside collaborator.", ex.Message, ignoreCase: true);
             }
         }
 
@@ -296,10 +293,7 @@ namespace Octokit.Tests.Integration.Clients
                 var ex = await Assert.ThrowsAsync<UserIsNotMemberOfOrganizationException>(()
                     => _gitHub.Organization.OutsideCollaborator.ConvertFromMember(Helper.Organization, _fixtureCollaborator));
 
-                Assert.True(string.Equals(
-                    $"{_fixtureCollaborator} is not a member of the {Helper.Organization} organization.",
-                    ex.Message,
-                    StringComparison.OrdinalIgnoreCase));
+                Assert.Equal($"{_fixtureCollaborator} is not a member of the {Helper.Organization} organization.", ex.Message, ignoreCase: true);
             }
 
             [OrganizationTest]
@@ -308,10 +302,7 @@ namespace Octokit.Tests.Integration.Clients
                 var ex = await Assert.ThrowsAsync<UserIsLastOwnerOfOrganizationException>(()
                     => _gitHub.Organization.OutsideCollaborator.ConvertFromMember(Helper.Organization, Helper.UserName));
 
-                Assert.True(string.Equals(
-                    "Cannot convert the last owner to an outside collaborator",
-                    ex.Message,
-                    StringComparison.OrdinalIgnoreCase));
+                Assert.Equal("Cannot convert the last owner to an outside collaborator", ex.Message, ignoreCase: true);
             }
         }
     }
diff --git a/Octokit.Tests.Integration/Clients/PullRequestReviewsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestReviewsClientTests.cs
index 8505687c..3b7d5217 100644
--- a/Octokit.Tests.Integration/Clients/PullRequestReviewsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/PullRequestReviewsClientTests.cs
@@ -398,7 +398,7 @@ public class PullRequestReviewsClientTests
 
                 var retrievedReviews = await _client.GetAll(context.RepositoryOwner, context.RepositoryName, pullRequest.Number);
 
-                Assert.False(retrievedReviews.Any(x => x.Id == createdReview.Id));
+                Assert.DoesNotContain(retrievedReviews, x => x.Id == createdReview.Id);
             }
         }
 
@@ -415,7 +415,7 @@ public class PullRequestReviewsClientTests
 
                 var retrievedReviews = await _client.GetAll(context.RepositoryId, pullRequest.Number);
 
-                Assert.False(retrievedReviews.Any(x => x.Id == createdReview.Id));
+                Assert.DoesNotContain(retrievedReviews, x => x.Id == createdReview.Id);
             }
         }
     }
diff --git a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
index f76afd1f..b8a18936 100644
--- a/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/PullRequestsClientTests.cs
@@ -97,7 +97,7 @@ public class PullRequestsClientTests : IDisposable
         Assert.Equal(result.Title, pullRequests[0].Title);
         Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login);
         Assert.Equal(1, pullRequests[0].Assignees.Count);
-        Assert.True(pullRequests[0].Assignees.Any(x => x.Login == Helper.UserName));
+        Assert.Contains(pullRequests[0].Assignees, x => x.Login == Helper.UserName);
     }
 
     [IntegrationTest]
@@ -120,7 +120,7 @@ public class PullRequestsClientTests : IDisposable
         Assert.Equal(result.Title, pullRequests[0].Title);
         Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login);
         Assert.Equal(1, pullRequests[0].Assignees.Count);
-        Assert.True(pullRequests[0].Assignees.Any(x => x.Login == Helper.UserName));
+        Assert.Contains(pullRequests[0].Assignees, x => x.Login == Helper.UserName);
     }
 
     [IntegrationTest]
@@ -143,7 +143,7 @@ public class PullRequestsClientTests : IDisposable
         Assert.Equal(result.Title, pullRequests[0].Title);
         Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login);
         Assert.Equal(1, pullRequests[0].Labels.Count);
-        Assert.True(pullRequests[0].Labels.Any(x => x.Name == labelName));
+        Assert.Contains(pullRequests[0].Labels, x => x.Name == labelName);
     }
 
     [IntegrationTest]
@@ -166,7 +166,7 @@ public class PullRequestsClientTests : IDisposable
         Assert.Equal(result.Title, pullRequests[0].Title);
         Assert.Equal(Helper.UserName, pullRequests[0].Assignee.Login);
         Assert.Equal(1, pullRequests[0].Labels.Count);
-        Assert.True(pullRequests[0].Labels.Any(x => x.Name == labelName));
+        Assert.Contains(pullRequests[0].Labels, x => x.Name == labelName);
     }
 
     [IntegrationTest]
@@ -775,7 +775,7 @@ public class PullRequestsClientTests : IDisposable
         var merge = new MergePullRequest { Sha = fakeSha };
         var ex = await Assert.ThrowsAsync<PullRequestMismatchException>(() => _fixture.Merge(Helper.UserName, _context.RepositoryName, pullRequest.Number, merge));
 
-        Assert.True(ex.Message.StartsWith("Head branch was modified"));
+        Assert.StartsWith("Head branch was modified", ex.Message);
     }
 
     [IntegrationTest]
@@ -796,12 +796,12 @@ public class PullRequestsClientTests : IDisposable
         var updatedPullRequest = await _fixture.Get(Helper.UserName, _context.RepositoryName, pullRequest.Number);
 
         Assert.False(updatedPullRequest.Mergeable);
-        Assert.Equal(updatedPullRequest.MergeableState, MergeableState.Dirty);
+        Assert.Equal(MergeableState.Dirty, updatedPullRequest.MergeableState);
 
         var merge = new MergePullRequest { Sha = pullRequest.Head.Sha };
         var ex = await Assert.ThrowsAsync<PullRequestNotMergeableException>(() => _fixture.Merge(Helper.UserName, _context.RepositoryName, pullRequest.Number, merge));
 
-        Assert.True(ex.Message.Equals("Pull Request is not mergeable"));
+        Assert.Equal("Pull Request is not mergeable", ex.Message);
     }
 
     [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/ReferencesClientTests.cs b/Octokit.Tests.Integration/Clients/ReferencesClientTests.cs
index 35299d20..ff6f930a 100644
--- a/Octokit.Tests.Integration/Clients/ReferencesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/ReferencesClientTests.cs
@@ -111,7 +111,7 @@ public class ReferencesClientTests : IDisposable
         var firstRefsPage = await _fixture.GetAll("octokit", "octokit.net", startOptions);
         var secondRefsPage = await _fixture.GetAll("octokit", "octokit.net", skipStartOptions);
 
-        Assert.False(firstRefsPage.Any(x => secondRefsPage.Contains(x)));
+        Assert.DoesNotContain(firstRefsPage, x => secondRefsPage.Contains(x));
     }
 
     [IntegrationTest(Skip = "This is paging for a long long time")]
@@ -169,7 +169,7 @@ public class ReferencesClientTests : IDisposable
         var firstRefsPage = await _fixture.GetAll(7528679, startOptions);
         var secondRefsPage = await _fixture.GetAll(7528679, skipStartOptions);
 
-        Assert.False(firstRefsPage.Any(x => secondRefsPage.Contains(x)));
+        Assert.DoesNotContain(firstRefsPage, x => secondRefsPage.Contains(x));
     }
 
     [IntegrationTest]
@@ -227,7 +227,7 @@ public class ReferencesClientTests : IDisposable
         var firstRefsPage = await _fixture.GetAllForSubNamespace("octokit", "octokit.net", "heads", startOptions);
         var secondRefsPage = await _fixture.GetAllForSubNamespace("octokit", "octokit.net", "heads", skipStartOptions);
 
-        Assert.False(firstRefsPage.Any(x => secondRefsPage.Contains(x)));
+        Assert.DoesNotContain(firstRefsPage, x => secondRefsPage.Contains(x));
     }
 
     [IntegrationTest]
@@ -285,7 +285,7 @@ public class ReferencesClientTests : IDisposable
         var firstRefsPage = await _fixture.GetAllForSubNamespace(7528679, "heads", startOptions);
         var secondRefsPage = await _fixture.GetAllForSubNamespace(7528679, "heads", skipStartOptions);
 
-        Assert.False(firstRefsPage.Any(x => secondRefsPage.Contains(x)));
+        Assert.DoesNotContain(firstRefsPage, x => secondRefsPage.Contains(x));
     }
 
     [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/ReleasesClientTests.cs b/Octokit.Tests.Integration/Clients/ReleasesClientTests.cs
index 176fd924..7a9c08e2 100644
--- a/Octokit.Tests.Integration/Clients/ReleasesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/ReleasesClientTests.cs
@@ -124,7 +124,7 @@ public class ReleasesClientTests
             var releases = await _releaseClient.GetAll("git-tfs", "git-tfs");
 
             Assert.True(releases.Count > 5);
-            Assert.True(releases.Any(release => release.TagName == "v0.18.0"));
+            Assert.Contains(releases, release => release.TagName == "v0.18.0");
         }
 
         [IntegrationTest]
@@ -133,7 +133,7 @@ public class ReleasesClientTests
             var releases = await _releaseClient.GetAll(252774);
 
             Assert.True(releases.Count > 5);
-            Assert.True(releases.Any(release => release.TagName == "v0.18.0"));
+            Assert.Contains(releases, release => release.TagName == "v0.18.0");
         }
 
         [IntegrationTest]
@@ -184,9 +184,9 @@ public class ReleasesClientTests
         {
             var releaseByTag = await _releaseClient.Get("octokit", "octokit.net", "v0.28.0");
 
-            Assert.Equal(releaseByTag.Id, 8396883);
-            Assert.Equal(releaseByTag.Name, "v0.28 - Get to the Chopper!!!");
-            Assert.Equal(releaseByTag.TagName, "v0.28.0");
+            Assert.Equal(8396883, releaseByTag.Id);
+            Assert.Equal("v0.28 - Get to the Chopper!!!", releaseByTag.Name);
+            Assert.Equal("v0.28.0", releaseByTag.TagName);
         }
 
         [IntegrationTest]
@@ -194,9 +194,9 @@ public class ReleasesClientTests
         {
             var releaseByTag = await _releaseClient.Get(7528679, "v0.28.0");
 
-            Assert.Equal(releaseByTag.Id, 8396883);
-            Assert.Equal(releaseByTag.Name, "v0.28 - Get to the Chopper!!!");
-            Assert.Equal(releaseByTag.TagName, "v0.28.0");
+            Assert.Equal(8396883, releaseByTag.Id);
+            Assert.Equal("v0.28 - Get to the Chopper!!!", releaseByTag.Name);
+            Assert.Equal("v0.28.0", releaseByTag.TagName);
         }
 
         [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs
index aaad44d2..820b56ca 100644
--- a/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoriesClientTests.cs
@@ -460,7 +460,7 @@ public class RepositoriesClientTests
 
             _repository = await github.Repository.Edit(Helper.UserName, repoName, update);
 
-            Assert.Equal(true, _repository.Private);
+            Assert.True(_repository.Private);
         }
 
         [PaidAccountTest]
@@ -480,7 +480,7 @@ public class RepositoriesClientTests
 
             _repository = await github.Repository.Edit(_repository.Id, update);
 
-            Assert.Equal(true, _repository.Private);
+            Assert.True(_repository.Private);
         }
 
         [IntegrationTest]
@@ -493,7 +493,7 @@ public class RepositoriesClientTests
 
             _repository = await github.Repository.Edit(Helper.UserName, repoName, update);
 
-            Assert.Equal(false, _repository.HasDownloads);
+            Assert.False(_repository.HasDownloads);
         }
 
         [IntegrationTest]
@@ -506,7 +506,7 @@ public class RepositoriesClientTests
 
             _repository = await github.Repository.Edit(_repository.Id, update);
 
-            Assert.Equal(false, _repository.HasDownloads);
+            Assert.False(_repository.HasDownloads);
         }
 
         [IntegrationTest]
@@ -519,7 +519,7 @@ public class RepositoriesClientTests
 
             _repository = await github.Repository.Edit(Helper.UserName, repoName, update);
 
-            Assert.Equal(false, _repository.HasIssues);
+            Assert.False(_repository.HasIssues);
         }
 
         [IntegrationTest]
@@ -532,7 +532,7 @@ public class RepositoriesClientTests
 
             _repository = await github.Repository.Edit(_repository.Id, update);
 
-            Assert.Equal(false, _repository.HasIssues);
+            Assert.False(_repository.HasIssues);
         }
 
         [IntegrationTest]
@@ -545,7 +545,7 @@ public class RepositoriesClientTests
 
             _repository = await github.Repository.Edit(Helper.UserName, repoName, update);
 
-            Assert.Equal(false, _repository.HasWiki);
+            Assert.False(_repository.HasWiki);
         }
 
         [IntegrationTest]
@@ -558,7 +558,7 @@ public class RepositoriesClientTests
 
             _repository = await github.Repository.Edit(_repository.Id, update);
 
-            Assert.Equal(false, _repository.HasWiki);
+            Assert.False(_repository.HasWiki);
         }
 
         [IntegrationTest]
@@ -933,7 +933,7 @@ public class RepositoriesClientTests
 
             var contributors = await github.Repository.GetAllContributors("octokit", "octokit.net");
 
-            Assert.True(contributors.Any(c => c.Login == "pmacn"));
+            Assert.Contains(contributors, c => c.Login == "pmacn");
         }
 
         [IntegrationTest]
@@ -943,7 +943,7 @@ public class RepositoriesClientTests
 
             var contributors = await github.Repository.GetAllContributors(7528679);
 
-            Assert.True(contributors.Any(c => c.Login == "pmacn"));
+            Assert.Contains(contributors, c => c.Login == "pmacn");
         }
 
         [IntegrationTest]
@@ -1085,7 +1085,7 @@ public class RepositoriesClientTests
 
             var contributors = await github.Repository.GetAllContributors("ruby", "ruby", true);
 
-            Assert.True(contributors.Any(c => c.Type == "Anonymous"));
+            Assert.Contains(contributors, c => c.Type == "Anonymous");
         }
 
         [IntegrationTest]
@@ -1095,7 +1095,7 @@ public class RepositoriesClientTests
 
             var contributors = await github.Repository.GetAllContributors(538746, true);
 
-            Assert.True(contributors.Any(c => c.Type == "Anonymous"));
+            Assert.Contains(contributors, c => c.Type == "Anonymous");
         }
 
         [IntegrationTest]
@@ -1330,7 +1330,7 @@ public class RepositoriesClientTests
             var languages = await github.Repository.GetAllLanguages("octokit", "octokit.net");
 
             Assert.NotEmpty(languages);
-            Assert.True(languages.Any(l => l.Name == "C#"));
+            Assert.Contains(languages, l => l.Name == "C#");
         }
 
         [IntegrationTest]
@@ -1341,7 +1341,7 @@ public class RepositoriesClientTests
             var languages = await github.Repository.GetAllLanguages(7528679);
 
             Assert.NotEmpty(languages);
-            Assert.True(languages.Any(l => l.Name == "C#"));
+            Assert.Contains(languages, l => l.Name == "C#");
         }
 
         [IntegrationTest]
@@ -1378,7 +1378,7 @@ public class RepositoriesClientTests
 
             var tags = await github.Repository.GetAllTags("octokit", "octokit.net");
 
-            Assert.True(tags.Any(t => t.Name == "v0.1.0"));
+            Assert.Contains(tags, t => t.Name == "v0.1.0");
         }
 
         [IntegrationTest]
@@ -1388,7 +1388,7 @@ public class RepositoriesClientTests
 
             var tags = await github.Repository.GetAllTags(7528679);
 
-            Assert.True(tags.Any(t => t.Name == "v0.1.0"));
+            Assert.Contains(tags, t => t.Name == "v0.1.0");
         }
 
         [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/RepositoryBranchesClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryBranchesClientTests.cs
index cbc465bb..b4bb1481 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryBranchesClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryBranchesClientTests.cs
@@ -553,7 +553,7 @@ public class RepositoryBranchesClientTests
 
             Assert.NotNull(requiredStatusChecks);
             Assert.NotNull(requiredStatusChecks.Contexts);
-            Assert.True(requiredStatusChecks.Contexts.Contains("new"));
+            Assert.Contains("new", requiredStatusChecks.Contexts);
             Assert.True(requiredStatusChecks.Strict);
             Assert.Equal(1, requiredStatusChecks.Contexts.Count);
         }
@@ -567,7 +567,7 @@ public class RepositoryBranchesClientTests
 
             Assert.NotNull(requiredStatusChecks);
             Assert.NotNull(requiredStatusChecks.Contexts);
-            Assert.True(requiredStatusChecks.Contexts.Contains("new"));
+            Assert.Contains("new", requiredStatusChecks.Contexts);
             Assert.True(requiredStatusChecks.Strict);
             Assert.Equal(1, requiredStatusChecks.Contexts.Count);
         }
@@ -720,7 +720,6 @@ public class RepositoryBranchesClientTests
             var requiredStatusChecksContexts = await _client.AddRequiredStatusChecksContexts(repoOwner, repoName, "master", update);
 
             Assert.NotNull(requiredStatusChecksContexts);
-            Assert.NotNull(requiredStatusChecksContexts.Count);
             Assert.Equal(4, requiredStatusChecksContexts.Count);
         }
 
@@ -732,7 +731,6 @@ public class RepositoryBranchesClientTests
             var requiredStatusChecksContexts = await _client.AddRequiredStatusChecksContexts(repoId, "master", update);
 
             Assert.NotNull(requiredStatusChecksContexts);
-            Assert.NotNull(requiredStatusChecksContexts.Count);
             Assert.Equal(4, requiredStatusChecksContexts.Count);
         }
 
@@ -765,7 +763,7 @@ public class RepositoryBranchesClientTests
                 var deleted = await _client.DeleteRequiredStatusChecksContexts(repoOwner, repoName, "master", contextsToRemove);
 
                 Assert.NotNull(deleted);
-                Assert.True(deleted.Contains("test"));
+                Assert.Contains("test", deleted);
             }
         }
 
@@ -779,7 +777,7 @@ public class RepositoryBranchesClientTests
                 var deleted = await _client.DeleteRequiredStatusChecksContexts(repoId, "master", contextsToRemove);
 
                 Assert.NotNull(deleted);
-                Assert.True(deleted.Contains("test"));
+                Assert.Contains("test", deleted);
             }
         }
     }
diff --git a/Octokit.Tests.Integration/Clients/RepositoryCommitsClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryCommitsClientTests.cs
index eb6aff0e..3332d56d 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryCommitsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryCommitsClientTests.cs
@@ -59,7 +59,7 @@ public class RepositoryCommitsClientTests
         {
             var commit = await _fixture.Get(octokitNetRepositoryOwner, octokitNetRepositorName, "65a22f4d2cff94a286ac3e96440c810c5509196f");
 
-            Assert.True(commit.Files.Any(file => file.Filename.EndsWith("IConnection.cs")));
+            Assert.Contains(commit.Files, file => file.Filename.EndsWith("IConnection.cs"));
         }
 
         [IntegrationTest]
@@ -67,7 +67,7 @@ public class RepositoryCommitsClientTests
         {
             var commit = await _fixture.Get(octokitNetRepositoryId, "65a22f4d2cff94a286ac3e96440c810c5509196f");
 
-            Assert.True(commit.Files.Any(file => file.Filename.EndsWith("IConnection.cs")));
+            Assert.Contains(commit.Files, file => file.Filename.EndsWith("IConnection.cs"));
         }
 
         [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Clients/RepositoryContentsClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryContentsClientTests.cs
index 6d7f653a..2afea59c 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryContentsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryContentsClientTests.cs
@@ -18,7 +18,7 @@ namespace Octokit.Tests.Integration.Clients
                 var readme = await github.Repository.Content.GetReadme("octokit", "octokit.net");
                 Assert.Equal("README.md", readme.Name);
                 string readmeHtml = await readme.GetHtmlContent();
-                Assert.True(readmeHtml.StartsWith("<div id="));
+                Assert.StartsWith("<div id=", readmeHtml);
                 Assert.Contains("data-path=\"README.md\"", readmeHtml);
                 Assert.Contains("Octokit - GitHub API Client Library for .NET", readmeHtml);
             }
@@ -31,7 +31,7 @@ namespace Octokit.Tests.Integration.Clients
                 var readme = await github.Repository.Content.GetReadme(7528679);
                 Assert.Equal("README.md", readme.Name);
                 string readmeHtml = await readme.GetHtmlContent();
-                Assert.True(readmeHtml.StartsWith("<div id="));
+                Assert.StartsWith("<div id=", readmeHtml);
                 Assert.Contains("data-path=\"README.md\"", readmeHtml);
                 Assert.Contains("Octokit - GitHub API Client Library for .NET", readmeHtml);
             }
@@ -42,7 +42,7 @@ namespace Octokit.Tests.Integration.Clients
                 var github = Helper.GetAuthenticatedClient();
 
                 var readmeHtml = await github.Repository.Content.GetReadmeHtml("octokit", "octokit.net");
-                Assert.True(readmeHtml.StartsWith("<div id="));
+                Assert.StartsWith("<div id=", readmeHtml);
                 Assert.Contains("data-path=\"README.md\"", readmeHtml);
                 Assert.Contains("Octokit - GitHub API Client Library for .NET", readmeHtml);
             }
@@ -53,7 +53,7 @@ namespace Octokit.Tests.Integration.Clients
                 var github = Helper.GetAuthenticatedClient();
 
                 var readmeHtml = await github.Repository.Content.GetReadmeHtml(7528679);
-                Assert.True(readmeHtml.StartsWith("<div id="));
+                Assert.StartsWith("<div id=", readmeHtml);
                 Assert.Contains("data-path=\"README.md\"", readmeHtml);
                 Assert.Contains("Octokit - GitHub API Client Library for .NET", readmeHtml);
             }
diff --git a/Octokit.Tests.Integration/Clients/RepositoryForksClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryForksClientTests.cs
index 243dbfef..836b1c55 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryForksClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryForksClientTests.cs
@@ -417,7 +417,7 @@ namespace Octokit.Tests.Integration.Clients
 
                 Assert.NotNull(forkCreated);
                 Assert.Equal(string.Format("{0}/octokit.net", Helper.UserName), forkCreated.FullName);
-                Assert.Equal(true, forkCreated.Fork);
+                Assert.True(forkCreated.Fork);
             }
 
             [IntegrationTest]
@@ -434,7 +434,7 @@ namespace Octokit.Tests.Integration.Clients
 
                 Assert.NotNull(forkCreated);
                 Assert.Equal(string.Format("{0}/octokit.net", Helper.UserName), forkCreated.FullName);
-                Assert.Equal(true, forkCreated.Fork);
+                Assert.True(forkCreated.Fork);
             }
 
             [OrganizationTest]
@@ -451,7 +451,7 @@ namespace Octokit.Tests.Integration.Clients
 
                 Assert.NotNull(forkCreated);
                 Assert.Equal(string.Format("{0}/octokit.net", Helper.Organization), forkCreated.FullName);
-                Assert.Equal(true, forkCreated.Fork);
+                Assert.True(forkCreated.Fork);
             }
 
             [OrganizationTest]
@@ -468,7 +468,7 @@ namespace Octokit.Tests.Integration.Clients
 
                 Assert.NotNull(forkCreated);
                 Assert.Equal(string.Format("{0}/octokit.net", Helper.Organization), forkCreated.FullName);
-                Assert.Equal(true, forkCreated.Fork);
+                Assert.True(forkCreated.Fork);
             }
         }
     }
diff --git a/Octokit.Tests.Integration/Clients/RepositoryHooksClientTests.cs b/Octokit.Tests.Integration/Clients/RepositoryHooksClientTests.cs
index 49a8c0fa..2556de91 100644
--- a/Octokit.Tests.Integration/Clients/RepositoryHooksClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/RepositoryHooksClientTests.cs
@@ -233,11 +233,11 @@ namespace Octokit.Tests.Integration.Clients
                 Assert.Equal(baseHookUrl, hook.Url);
                 Assert.Equal(baseHookUrl + "/test", hook.TestUrl);
                 Assert.Equal(baseHookUrl + "/pings", hook.PingUrl);
-                Assert.NotNull(hook.CreatedAt);
-                Assert.NotNull(hook.UpdatedAt);
+                Assert.NotEqual(default, hook.CreatedAt);
+                Assert.NotEqual(default, hook.UpdatedAt);
                 Assert.Equal(webHookConfig.Keys.OrderBy(x => x), hook.Config.Keys.OrderBy(x => x));
                 Assert.Equal(webHookConfig.Values.OrderBy(x => x), hook.Config.Values.OrderBy(x => x));
-                Assert.Equal(false, hook.Active);
+                Assert.False(hook.Active);
             }
 
             [IntegrationTest]
@@ -277,11 +277,11 @@ namespace Octokit.Tests.Integration.Clients
                 Assert.Equal(baseHookUrl, hook.Url);
                 Assert.Equal(baseHookUrl + "/test", hook.TestUrl);
                 Assert.Equal(baseHookUrl + "/pings", hook.PingUrl);
-                Assert.NotNull(hook.CreatedAt);
-                Assert.NotNull(hook.UpdatedAt);
+                Assert.NotEqual(default, hook.CreatedAt);
+                Assert.NotEqual(default, hook.UpdatedAt);
                 Assert.Equal(webHookConfig.Keys.OrderBy(x => x), hook.Config.Keys.OrderBy(x => x));
                 Assert.Equal(webHookConfig.Values.OrderBy(x => x), hook.Config.Values.OrderBy(x => x));
-                Assert.Equal(false, hook.Active);
+                Assert.False(hook.Active);
             }
 
             Dictionary<string, string> CreateExpectedConfigDictionary(Dictionary<string, string> config, string url, WebHookContentType contentType, string secret)
diff --git a/Octokit.Tests.Integration/Clients/SearchClientTests.cs b/Octokit.Tests.Integration/Clients/SearchClientTests.cs
index a4104878..616b04ae 100644
--- a/Octokit.Tests.Integration/Clients/SearchClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/SearchClientTests.cs
@@ -32,7 +32,7 @@ public class SearchClientTests
         };
         var repos = await _gitHubClient.Search.SearchRepo(request);
 
-        Assert.True(repos.Items.Any(x => x.Fork));
+        Assert.Contains(repos.Items, x => x.Fork);
     }
 
     [IntegrationTest]
@@ -112,7 +112,7 @@ public class SearchClientTests
 
         foreach (var code in searchResults.Items)
         {
-            Assert.True(code.Name.EndsWith(".cs"));
+            Assert.EndsWith(".cs", code.Name);
         }
     }
 
diff --git a/Octokit.Tests.Integration/Clients/TagsClientTests.cs b/Octokit.Tests.Integration/Clients/TagsClientTests.cs
index a74320cd..3fc83ee5 100644
--- a/Octokit.Tests.Integration/Clients/TagsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/TagsClientTests.cs
@@ -36,8 +36,8 @@ namespace Octokit.Tests.Integration.Clients
 
                 var tag = await fixture.Create(context.Repository.Id, newTag);
 
-                Assert.Equal(tag.Object.Type, TaggedType.Blob);
-                Assert.Equal(tag.Message, "Hello");
+                Assert.Equal(TaggedType.Blob, tag.Object.Type);
+                Assert.Equal("Hello", tag.Message);
                 Assert.Equal(tag.Object.Sha, sha);
             }
 
@@ -48,8 +48,8 @@ namespace Octokit.Tests.Integration.Clients
 
                 var tag = await fixture.Create(context.Repository.Id, newTag);
 
-                Assert.Equal(tag.Object.Type, TaggedType.Blob);
-                Assert.Equal(tag.Message, "Hello");
+                Assert.Equal(TaggedType.Blob, tag.Object.Type);
+                Assert.Equal("Hello", tag.Message);
                 Assert.Equal(tag.Object.Sha, sha);
             }
         }
@@ -86,8 +86,8 @@ namespace Octokit.Tests.Integration.Clients
                 var gitTag = await fixture.Get(context.RepositoryOwner, context.RepositoryName, tag.Sha);
 
                 Assert.NotNull(gitTag);
-                Assert.Equal(gitTag.Object.Type, TaggedType.Blob);
-                Assert.Equal(gitTag.Message, "Hello");
+                Assert.Equal(TaggedType.Blob, gitTag.Object.Type);
+                Assert.Equal("Hello", gitTag.Message);
                 Assert.Equal(gitTag.Object.Sha, sha);
             }
 
@@ -103,8 +103,8 @@ namespace Octokit.Tests.Integration.Clients
                 var gitTag = await github.Git.Tag.Get(context.Repository.Id, tag.Sha);
 
                 Assert.NotNull(gitTag);
-                Assert.Equal(gitTag.Object.Type, TaggedType.Blob);
-                Assert.Equal(gitTag.Message, "Hello");
+                Assert.Equal(TaggedType.Blob, gitTag.Object.Type);
+                Assert.Equal("Hello", gitTag.Message);
                 Assert.Equal(gitTag.Object.Sha, sha);
             }
 
@@ -122,7 +122,7 @@ namespace Octokit.Tests.Integration.Clients
                 Assert.NotNull(gitTag);
 
                 Assert.False(gitTag.Verification.Verified);
-                Assert.Equal(gitTag.Verification.Reason, VerificationReason.Unsigned);
+                Assert.Equal(VerificationReason.Unsigned, gitTag.Verification.Reason);
                 Assert.Null(gitTag.Verification.Signature);
                 Assert.Null(gitTag.Verification.Payload);
             }
diff --git a/Octokit.Tests.Integration/Clients/TeamsClientTests.cs b/Octokit.Tests.Integration/Clients/TeamsClientTests.cs
index bc6563ca..ec6252c0 100644
--- a/Octokit.Tests.Integration/Clients/TeamsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/TeamsClientTests.cs
@@ -72,8 +72,8 @@ public class TeamsClientTests
                 var teams = await _github.Organization.Team.GetAllChildTeams(parentTeamContext.TeamId);
 
                 Assert.Equal(2, teams.Count);
-                Assert.True(teams.Any(x => x.Id == team1.Id));
-                Assert.True(teams.Any(x => x.Id == team2.Id));
+                Assert.Contains(teams, x => x.Id == team1.Id);
+                Assert.Contains(teams, x => x.Id == team2.Id);
             }
         }
 
diff --git a/Octokit.Tests.Integration/Clients/UserGpgKeysClientTests.cs b/Octokit.Tests.Integration/Clients/UserGpgKeysClientTests.cs
index 18beafa6..b0b270fc 100644
--- a/Octokit.Tests.Integration/Clients/UserGpgKeysClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/UserGpgKeysClientTests.cs
@@ -44,7 +44,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
                 Assert.NotEmpty(keys);
 
                 var first = keys[0];
-                Assert.NotNull(first.Id);
+                Assert.NotEqual(default, first.Id);
                 Assert.NotNull(first.KeyId);
                 Assert.NotNull(first.PublicKey);
                 Assert.Null(first.PrimaryKeyId);
@@ -81,7 +81,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
 
             // Verify key no longer exists
             var keys = await github.User.GpgKey.GetAllForCurrent();
-            Assert.False(keys.Any(k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey));
+            Assert.DoesNotContain(keys, k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey);
         }
 
         [IntegrationTest]
@@ -96,7 +96,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
 
             await github.User.GpgKey.Delete(key.Id);
             var keys = await github.User.GpgKey.GetAllForCurrent();
-            Assert.False(keys.Any(k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey));
+            Assert.DoesNotContain(keys, k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey);
         }
     }
 }
diff --git a/Octokit.Tests.Integration/Clients/UserKeysClientTests.cs b/Octokit.Tests.Integration/Clients/UserKeysClientTests.cs
index 4bf48d3a..4ca95d49 100644
--- a/Octokit.Tests.Integration/Clients/UserKeysClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/UserKeysClientTests.cs
@@ -18,7 +18,7 @@ namespace Octokit.Tests.Integration.Clients
                 Assert.NotEmpty(keys);
 
                 var first = keys[0];
-                Assert.NotNull(first.Id);
+                Assert.NotEqual(default, first.Id);
                 Assert.NotNull(first.Key);
                 Assert.NotNull(first.Title);
                 Assert.NotNull(first.Url);
@@ -34,7 +34,7 @@ namespace Octokit.Tests.Integration.Clients
             Assert.NotEmpty(keys);
 
             var first = keys[0];
-            Assert.NotNull(first.Id);
+            Assert.NotEqual(default, first.Id);
             Assert.NotNull(first.Key);
             Assert.Null(first.Title);
             Assert.Null(first.Url);
@@ -75,7 +75,7 @@ namespace Octokit.Tests.Integration.Clients
 
             // Verify key no longer exists
             var keys = await github.User.GitSshKey.GetAllForCurrent();
-            Assert.False(keys.Any(k => k.Title == keyTitle && k.Key == keyData));
+            Assert.DoesNotContain(keys, k => k.Title == keyTitle && k.Key == keyData);
         }
     }
 }
diff --git a/Octokit.Tests.Integration/Helpers/ApplicationTestAttribute.cs b/Octokit.Tests.Integration/Helpers/ApplicationTestAttribute.cs
index b51693c5..f460ebf1 100644
--- a/Octokit.Tests.Integration/Helpers/ApplicationTestAttribute.cs
+++ b/Octokit.Tests.Integration/Helpers/ApplicationTestAttribute.cs
@@ -25,7 +25,7 @@ namespace Octokit.Tests.Integration
                 return Enumerable.Empty<IXunitTestCase>();
             }
 
-            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) };
+            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
         }
     }
 
diff --git a/Octokit.Tests.Integration/Helpers/BasicAuthenticationTestAttribute.cs b/Octokit.Tests.Integration/Helpers/BasicAuthenticationTestAttribute.cs
index e1ced818..2719603a 100644
--- a/Octokit.Tests.Integration/Helpers/BasicAuthenticationTestAttribute.cs
+++ b/Octokit.Tests.Integration/Helpers/BasicAuthenticationTestAttribute.cs
@@ -22,7 +22,7 @@ namespace Octokit.Tests.Integration
                 return Enumerable.Empty<IXunitTestCase>();
             }
 
-            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) };
+            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
         }
     }
 
diff --git a/Octokit.Tests.Integration/Helpers/DualAccountTestAttribute.cs b/Octokit.Tests.Integration/Helpers/DualAccountTestAttribute.cs
index 9d93604d..79235d39 100644
--- a/Octokit.Tests.Integration/Helpers/DualAccountTestAttribute.cs
+++ b/Octokit.Tests.Integration/Helpers/DualAccountTestAttribute.cs
@@ -22,7 +22,7 @@ namespace Octokit.Tests.Integration
                 return Enumerable.Empty<IXunitTestCase>();
             }
 
-            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) };
+            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
         }
     }
 
diff --git a/Octokit.Tests.Integration/Helpers/GitHubAppsTestAttribute.cs b/Octokit.Tests.Integration/Helpers/GitHubAppsTestAttribute.cs
index cdecf74a..e644aa5e 100644
--- a/Octokit.Tests.Integration/Helpers/GitHubAppsTestAttribute.cs
+++ b/Octokit.Tests.Integration/Helpers/GitHubAppsTestAttribute.cs
@@ -35,7 +35,7 @@ namespace Octokit.Tests.Integration
                 return Enumerable.Empty<IXunitTestCase>();
             }
 
-            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) };
+            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None,  testMethod) };
         }
     }
 
diff --git a/Octokit.Tests.Integration/Helpers/GitHubEnterpriseTestAttribute.cs b/Octokit.Tests.Integration/Helpers/GitHubEnterpriseTestAttribute.cs
index 938bfb46..c53df6e1 100644
--- a/Octokit.Tests.Integration/Helpers/GitHubEnterpriseTestAttribute.cs
+++ b/Octokit.Tests.Integration/Helpers/GitHubEnterpriseTestAttribute.cs
@@ -23,7 +23,7 @@ namespace Octokit.Tests.Integration
             if (!EnterpriseHelper.IsGitHubEnterpriseEnabled)
                 return Enumerable.Empty<IXunitTestCase>();
 
-            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) };
+            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
         }
     }
 
diff --git a/Octokit.Tests.Integration/Helpers/IntegrationTestAttribute.cs b/Octokit.Tests.Integration/Helpers/IntegrationTestAttribute.cs
index 15efa980..fd7ec243 100644
--- a/Octokit.Tests.Integration/Helpers/IntegrationTestAttribute.cs
+++ b/Octokit.Tests.Integration/Helpers/IntegrationTestAttribute.cs
@@ -19,7 +19,7 @@ namespace Octokit.Tests.Integration
         {
             return Helper.Credentials == null
                 ? Enumerable.Empty<IXunitTestCase>()
-                : new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) };
+                : new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
         }
     }
 
diff --git a/Octokit.Tests.Integration/Helpers/OrganizationTestAttribute.cs b/Octokit.Tests.Integration/Helpers/OrganizationTestAttribute.cs
index 9798ecb5..2d886f07 100644
--- a/Octokit.Tests.Integration/Helpers/OrganizationTestAttribute.cs
+++ b/Octokit.Tests.Integration/Helpers/OrganizationTestAttribute.cs
@@ -22,7 +22,7 @@ namespace Octokit.Tests.Integration
                 return Enumerable.Empty<IXunitTestCase>();
             }
 
-            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) };
+            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
         }
     }
 
diff --git a/Octokit.Tests.Integration/Helpers/PaidAccountTestAttribute.cs b/Octokit.Tests.Integration/Helpers/PaidAccountTestAttribute.cs
index 332fec10..01d1ae16 100644
--- a/Octokit.Tests.Integration/Helpers/PaidAccountTestAttribute.cs
+++ b/Octokit.Tests.Integration/Helpers/PaidAccountTestAttribute.cs
@@ -23,7 +23,7 @@ namespace Octokit.Tests.Integration
             if (!Helper.IsPaidAccount)
                 return Enumerable.Empty<IXunitTestCase>();
 
-            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) };
+            return new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) };
         }
     }
 
diff --git a/Octokit.Tests.Integration/Helpers/PersonalAccessTokenTestAttribute.cs b/Octokit.Tests.Integration/Helpers/PersonalAccessTokenTestAttribute.cs
index fabd5b90..87f5d9e0 100644
--- a/Octokit.Tests.Integration/Helpers/PersonalAccessTokenTestAttribute.cs
+++ b/Octokit.Tests.Integration/Helpers/PersonalAccessTokenTestAttribute.cs
@@ -18,7 +18,7 @@ namespace Octokit.Tests.Integration
         public IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute)
         {
             return Helper.IsUsingToken
-                ? new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), testMethod) }
+                ? new[] { new XunitTestCase(diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), TestMethodDisplayOptions.None, testMethod) }
                 : Enumerable.Empty<IXunitTestCase>();
         }
     }
diff --git a/Octokit.Tests.Integration/Reactive/ObservableCheckSuitesClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableCheckSuitesClientTests.cs
index f4e752d6..68cc68df 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableCheckSuitesClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableCheckSuitesClientTests.cs
@@ -133,7 +133,7 @@ namespace Octokit.Tests.Integration.Reactive
 
                     Assert.Equal(repoContext.RepositoryId, result.Repository.Id);
                     Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId);
-                    Assert.Equal(false, result.Preferences.AutoTriggerChecks[0].Setting);
+                    Assert.False(result.Preferences.AutoTriggerChecks[0].Setting);
                 }
             }
 
@@ -150,7 +150,7 @@ namespace Octokit.Tests.Integration.Reactive
 
                     Assert.Equal(repoContext.RepositoryId, result.Repository.Id);
                     Assert.Equal(Helper.GitHubAppId, result.Preferences.AutoTriggerChecks[0].AppId);
-                    Assert.Equal(false, result.Preferences.AutoTriggerChecks[0].Setting);
+                    Assert.False(result.Preferences.AutoTriggerChecks[0].Setting);
                 }
             }
         }
diff --git a/Octokit.Tests.Integration/Reactive/ObservableReleaseClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableReleaseClientTests.cs
index c5349c85..537ba782 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableReleaseClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableReleaseClientTests.cs
@@ -101,9 +101,9 @@ namespace Octokit.Tests.Integration.Reactive
             {
                 var releaseByTag = await _releaseClient.Get("octokit", "octokit.net", "v0.28.0");
 
-                Assert.Equal(releaseByTag.Id, 8396883);
-                Assert.Equal(releaseByTag.Name, "v0.28 - Get to the Chopper!!!");
-                Assert.Equal(releaseByTag.TagName, "v0.28.0");
+                Assert.Equal(8396883, releaseByTag.Id);
+                Assert.Equal("v0.28 - Get to the Chopper!!!", releaseByTag.Name);
+                Assert.Equal("v0.28.0", releaseByTag.TagName);
             }
 
             [IntegrationTest]
@@ -111,9 +111,9 @@ namespace Octokit.Tests.Integration.Reactive
             {
                 var releaseByTag = await _releaseClient.Get(7528679, "v0.28.0");
 
-                Assert.Equal(releaseByTag.Id, 8396883);
-                Assert.Equal(releaseByTag.Name, "v0.28 - Get to the Chopper!!!");
-                Assert.Equal(releaseByTag.TagName, "v0.28.0");
+                Assert.Equal(8396883, releaseByTag.Id);
+                Assert.Equal("v0.28 - Get to the Chopper!!!", releaseByTag.Name);
+                Assert.Equal("v0.28.0", releaseByTag.TagName);
             }
 
             [IntegrationTest]
diff --git a/Octokit.Tests.Integration/Reactive/ObservableTeamsClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableTeamsClientTests.cs
index bcc97ec3..0e813365 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableTeamsClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableTeamsClientTests.cs
@@ -30,8 +30,8 @@ public class ObservableTeamsClientTests
                 var teams = await _github.Organization.Team.GetAllChildTeams(parentTeamContext.TeamId).ToList();
 
                 Assert.Equal(2, teams.Count);
-                Assert.True(teams.Any(x => x.Id == team1.Id));
-                Assert.True(teams.Any(x => x.Id == team2.Id));
+                Assert.Contains(teams, x => x.Id == team1.Id);
+                Assert.Contains(teams, x => x.Id == team2.Id);
             }
         }
 
diff --git a/Octokit.Tests.Integration/Reactive/ObservableUserGpgKeysClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableUserGpgKeysClientTests.cs
index 0d6878c4..eb10a3c5 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableUserGpgKeysClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableUserGpgKeysClientTests.cs
@@ -33,7 +33,7 @@ namespace Octokit.Tests.Integration.Reactive
                 Assert.NotEmpty(keys);
 
                 var first = keys[0];
-                Assert.NotNull(first.Id);
+                Assert.NotEqual(default, first.Id);
                 Assert.Null(first.PrimaryKeyId);
                 Assert.NotNull(first.KeyId);
                 Assert.NotNull(first.PublicKey);
@@ -89,7 +89,7 @@ VO/+BCBsaoT4g1FFOmJhbBAD3G72yslBnUJmqKP/39pi
 
             // Verify key no longer exists
             var keys = await _gitHubClient.User.GpgKey.GetAllForCurrent().ToList();
-            Assert.False(keys.Any(k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey));
+            Assert.DoesNotContain(keys, k => k.KeyId == knownKeyId && k.PublicKey == knownPublicKey);
         }
     }
 }
diff --git a/Octokit.Tests.Integration/Reactive/ObservableUserKeysClientTests.cs b/Octokit.Tests.Integration/Reactive/ObservableUserKeysClientTests.cs
index 61cbf862..d35aee12 100644
--- a/Octokit.Tests.Integration/Reactive/ObservableUserKeysClientTests.cs
+++ b/Octokit.Tests.Integration/Reactive/ObservableUserKeysClientTests.cs
@@ -27,7 +27,7 @@ namespace Octokit.Tests.Integration.Clients
                 Assert.NotEmpty(keys);
 
                 var first = keys[0];
-                Assert.NotNull(first.Id);
+                Assert.True(first.Id > 0);
                 Assert.NotNull(first.Key);
                 Assert.NotNull(first.Title);
                 Assert.NotNull(first.Url);
@@ -43,7 +43,7 @@ namespace Octokit.Tests.Integration.Clients
             Assert.NotEmpty(keys);
 
             var first = keys[0];
-            Assert.NotNull(first.Id);
+            Assert.True(first.Id > 0);
             Assert.NotNull(first.Key);
             Assert.Null(first.Title);
             Assert.Null(first.Url);
@@ -81,7 +81,7 @@ namespace Octokit.Tests.Integration.Clients
 
             // Verify key no longer exists
             var keys = await _github.User.GitSshKey.GetAllForCurrent().ToList();
-            Assert.False(keys.Any(k => k.Title == keyTitle && k.Key == keyData));
+            Assert.DoesNotContain(keys, k => k.Title == keyTitle && k.Key == keyData);
         }
     }
 }
diff --git a/Octokit.Tests.Integration/RedirectTests.cs b/Octokit.Tests.Integration/RedirectTests.cs
index 012be7a8..a024399d 100644
--- a/Octokit.Tests.Integration/RedirectTests.cs
+++ b/Octokit.Tests.Integration/RedirectTests.cs
@@ -31,7 +31,7 @@ namespace Octokit.Tests.Integration
             var issue = await client.Issue.Create(owner, oldRepoName, newIssue);
             Assert.NotNull(issue);
 
-            Assert.True(issue.Url.Contains("repository-after-rename"));
+            Assert.Contains("repository-after-rename", issue.Url);
 
             var resolvedIssue = await client.Issue.Get(owner, newRepoName, issue.Number);
 
diff --git a/Octokit.Tests/Clients/AuthorizationsClientTests.cs b/Octokit.Tests/Clients/AuthorizationsClientTests.cs
index 8314fdda..58510712 100644
--- a/Octokit.Tests/Clients/AuthorizationsClientTests.cs
+++ b/Octokit.Tests/Clients/AuthorizationsClientTests.cs
@@ -271,7 +271,7 @@ namespace Octokit.Tests.Clients
                 authEndpoint.GetOrCreateApplicationAuthentication("clientId", "secret", data);
 
                 Assert.NotNull(calledUri);
-                Assert.Equal(calledUri.ToString(), "authorizations/clients/clientId");
+                Assert.Equal("authorizations/clients/clientId", calledUri.ToString());
 
                 Assert.NotNull(calledBody);
                 var fingerprintProperty = ((IEnumerable<PropertyInfo>)calledBody.GetType().DeclaredProperties).FirstOrDefault(x => x.Name == "fingerprint");
diff --git a/Octokit.Tests/Clients/MiscellaneousClientTests.cs b/Octokit.Tests/Clients/MiscellaneousClientTests.cs
index 07e50660..dd4c0282 100644
--- a/Octokit.Tests/Clients/MiscellaneousClientTests.cs
+++ b/Octokit.Tests/Clients/MiscellaneousClientTests.cs
@@ -160,8 +160,8 @@ namespace Octokit.Tests.Clients
 
                 var result = await client.GetMetadata();
 
-                Assert.Equal(result.VerifiablePasswordAuthentication, false);
-                Assert.Equal(result.GitHubServicesSha, "12345ABCDE");
+                Assert.False(result.VerifiablePasswordAuthentication);
+                Assert.Equal("12345ABCDE", result.GitHubServicesSha);
                 Assert.Equal(result.Hooks, new[] { "1.1.1.1/24", "1.1.1.2/24" });
                 Assert.Equal(result.Git, new[] { "1.1.2.1/24", "1.1.2.2/24" });
                 Assert.Equal(result.Pages, new[] { "1.1.3.1/24", "1.1.3.2/24" });
diff --git a/Octokit.Tests/Clients/OauthClientTests.cs b/Octokit.Tests/Clients/OauthClientTests.cs
index 1bb680e6..b2bf4228 100644
--- a/Octokit.Tests/Clients/OauthClientTests.cs
+++ b/Octokit.Tests/Clients/OauthClientTests.cs
@@ -140,10 +140,10 @@ public class OauthClientTests
 
             var token = strategy.Deserialize<OauthToken>(responseText);
 
-            Assert.Equal(token.AccessToken, "token-goes-here");
-            Assert.Equal(token.TokenType, "bearer");
-            Assert.True(token.Scope.Contains("notifications"));
-            Assert.True(token.Scope.Contains("user:email"));
+            Assert.Equal("token-goes-here", token.AccessToken);
+            Assert.Equal("bearer", token.TokenType);
+            Assert.Contains("notifications", token.Scope);
+            Assert.Contains("user:email", token.Scope);
         }
     }
 }
diff --git a/Octokit.Tests/Helpers/StringExtensionsTests.cs b/Octokit.Tests/Helpers/StringExtensionsTests.cs
index c90d9468..f342199e 100644
--- a/Octokit.Tests/Helpers/StringExtensionsTests.cs
+++ b/Octokit.Tests/Helpers/StringExtensionsTests.cs
@@ -70,7 +70,7 @@ namespace Octokit.Tests.Helpers
             [Fact]
             public void EscapeDoubleQuotesReturnsNullForNullInput()
             {
-                Assert.Equal(null, (null as string).EscapeDoubleQuotes());
+                Assert.Null((null as string).EscapeDoubleQuotes());
             }
 
             [Fact]
diff --git a/Octokit.Tests/Http/ApiInfoParserTests.cs b/Octokit.Tests/Http/ApiInfoParserTests.cs
index 5fbb3bf1..8f4882e0 100644
--- a/Octokit.Tests/Http/ApiInfoParserTests.cs
+++ b/Octokit.Tests/Http/ApiInfoParserTests.cs
@@ -86,7 +86,7 @@ namespace Octokit.Tests
         public class ThePageUrlMethods
         {
             [Theory]
-            [MemberData("PagingMethods")]
+            [MemberData(nameof(PagingMethods))]
             public void RetrievesTheCorrectPagePage(string linkName, Func<ApiInfo, Uri> pagingMethod)
             {
                 var pageUri = new Uri("https://api.github.com/user/repos?page=2");
diff --git a/Octokit.Tests/Models/MigrationTests.cs b/Octokit.Tests/Models/MigrationTests.cs
index 128606dc..c4765a35 100644
--- a/Octokit.Tests/Models/MigrationTests.cs
+++ b/Octokit.Tests/Models/MigrationTests.cs
@@ -152,7 +152,7 @@ namespace Octokit.Tests.Models
 
             Assert.Equal("octocat/Hello-World", _migrationReuqest.Repositories[0]);
             Assert.Equal(1, _migrationReuqest.Repositories.Count);
-            Assert.Equal(true, _migrationReuqest.LockRepositories);
+            Assert.True(_migrationReuqest.LockRepositories);
         }
     }
 }
diff --git a/Octokit.Tests/Models/NewRepositoryWebHookTests.cs b/Octokit.Tests/Models/NewRepositoryWebHookTests.cs
index 287e8aa4..46332783 100644
--- a/Octokit.Tests/Models/NewRepositoryWebHookTests.cs
+++ b/Octokit.Tests/Models/NewRepositoryWebHookTests.cs
@@ -11,23 +11,23 @@ namespace Octokit.Tests.Models
             public void UsesDefaultValuesForDefaultConfig()
             {
                 var create = new NewRepositoryWebHook("windowsazure", new Dictionary<string, string>(), "http://test.com/example");
-                Assert.Equal(create.Url, "http://test.com/example");
-                Assert.Equal(create.ContentType, WebHookContentType.Form);
+                Assert.Equal("http://test.com/example", create.Url);
+                Assert.Equal(WebHookContentType.Form, create.ContentType);
                 Assert.Empty(create.Secret);
                 Assert.False(create.InsecureSsl);
 
                 var request = create.ToRequest();
-                Assert.Equal(request.Config.Count, 4);
+                Assert.Equal(4, request.Config.Count);
 
                 Assert.True(request.Config.ContainsKey("url"));
                 Assert.True(request.Config.ContainsKey("content_type"));
                 Assert.True(request.Config.ContainsKey("secret"));
                 Assert.True(request.Config.ContainsKey("insecure_ssl"));
 
-                Assert.Equal(request.Config["url"], "http://test.com/example");
+                Assert.Equal("http://test.com/example", request.Config["url"]);
                 Assert.Equal(request.Config["content_type"], WebHookContentType.Form.ToParameter());
-                Assert.Equal(request.Config["secret"], "");
-                Assert.Equal(request.Config["insecure_ssl"], "False");
+                Assert.Equal("", request.Config["secret"]);
+                Assert.Equal("False", request.Config["insecure_ssl"]);
             }
 
             [Fact]
@@ -47,23 +47,23 @@ namespace Octokit.Tests.Models
                     InsecureSsl = true
                 };
 
-                Assert.Equal(create.Url, "http://test.com/example");
-                Assert.Equal(create.ContentType, WebHookContentType.Json);
+                Assert.Equal("http://test.com/example", create.Url);
+                Assert.Equal(WebHookContentType.Json, create.ContentType);
                 Assert.Empty(create.Secret);
                 Assert.True(create.InsecureSsl);
 
                 var request = create.ToRequest();
 
-                Assert.Equal(request.Config.Count, 7);
+                Assert.Equal(7, request.Config.Count);
 
                 Assert.True(request.Config.ContainsKey("url"));
                 Assert.True(request.Config.ContainsKey("content_type"));
                 Assert.True(request.Config.ContainsKey("secret"));
                 Assert.True(request.Config.ContainsKey("insecure_ssl"));
 
-                Assert.Equal(request.Config["url"], "http://test.com/example");
+                Assert.Equal("http://test.com/example", request.Config["url"]);
                 Assert.Equal(request.Config["content_type"], WebHookContentType.Json.ToParameter());
-                Assert.Equal(request.Config["secret"], "");
+                Assert.Equal("", request.Config["secret"]);
                 Assert.Equal(request.Config["insecure_ssl"], true.ToString());
 
                 Assert.True(request.Config.ContainsKey("hostname"));
@@ -130,8 +130,8 @@ namespace Octokit.Tests.Models
                 var request = create.ToRequest();
                 var requestRepeated = create.ToRequest();
 
-                Assert.Equal(request.Config.Count, 4);
-                Assert.Equal(requestRepeated.Config.Count, 4);
+                Assert.Equal(4, request.Config.Count);
+                Assert.Equal(4, requestRepeated.Config.Count);
             }
 
             [Fact]
@@ -151,8 +151,8 @@ namespace Octokit.Tests.Models
                 var requestRepeated = create.ToRequest();
 
                 //This is not 8, because `url` used in config, is already part of the base config
-                Assert.Equal(request.Config.Count, 7);
-                Assert.Equal(requestRepeated.Config.Count, 7);
+                Assert.Equal(7, request.Config.Count);
+                Assert.Equal(7, requestRepeated.Config.Count);
             }
 
             [Fact]
@@ -167,10 +167,10 @@ namespace Octokit.Tests.Models
 
                 var request = create.ToRequest();
 
-                Assert.Equal(request.Config["url"], "http://test.com/example");
+                Assert.Equal("http://test.com/example", request.Config["url"]);
 
                 var subsequentRequest = create.ToRequest();
-                Assert.Equal(subsequentRequest.Config["url"], "http://test.com/example");
+                Assert.Equal("http://test.com/example", subsequentRequest.Config["url"]);
             }
         }
     }
diff --git a/Octokit.Tests/Models/SearchIssuesRequestExclusionsTests.cs b/Octokit.Tests/Models/SearchIssuesRequestExclusionsTests.cs
index 2b31db6f..bfe9f8da 100644
--- a/Octokit.Tests/Models/SearchIssuesRequestExclusionsTests.cs
+++ b/Octokit.Tests/Models/SearchIssuesRequestExclusionsTests.cs
@@ -28,7 +28,7 @@ public class SearchIssuesRequestExclusionsTests
                 var request = new SearchIssuesRequestExclusions();
 
                 // Ensure the specified parameter does not exist when not set
-                Assert.False(request.MergedQualifiers().Any(x => x.Contains(property.Key)));
+                Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains(property.Key));
 
                 // Set the parameter
                 property.Value(request, "blah");
@@ -42,61 +42,61 @@ public class SearchIssuesRequestExclusionsTests
         public void HandlesStateAttributeCorrectly()
         {
             var request = new SearchIssuesRequestExclusions();
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("-state:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("-state:"));
 
             request.State = ItemState.Closed;
-            Assert.True(request.MergedQualifiers().Contains("-state:closed"));
+            Assert.Contains("-state:closed", request.MergedQualifiers());
         }
 
         [Fact]
         public void HandlesExcludeLabelsAttributeCorrectly()
         {
             var request = new SearchIssuesRequestExclusions();
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("-label:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("-label:"));
 
             request.Labels = new[] { "label1", "label2" };
 
-            Assert.True(request.MergedQualifiers().Contains("-label:label1"));
-            Assert.True(request.MergedQualifiers().Contains("-label:label2"));
+            Assert.Contains("-label:label1", request.MergedQualifiers());
+            Assert.Contains("-label:label2", request.MergedQualifiers());
         }
 
         [Fact]
         public void HandlesLanguageAttributeCorrectly()
         {
             var request = new SearchIssuesRequestExclusions();
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("-language:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("-language:"));
 
             request.Language = Language.CSharp;
 
-            Assert.True(request.MergedQualifiers().Contains("-language:CSharp"));
+            Assert.Contains("-language:CSharp", request.MergedQualifiers());
         }
 
         [Fact]
         public void HandlesStatusAttributeCorrectly()
         {
             var request = new SearchIssuesRequestExclusions();
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("-status:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("-status:"));
 
             request.Status = CommitState.Error;
 
-            Assert.True(request.MergedQualifiers().Contains("-status:error"));
+            Assert.Contains("-status:error", request.MergedQualifiers());
         }
 
         [Fact]
         public void HandlesMilestoneAttributeWithoutQuotes()
         {
             var request = new SearchIssuesRequestExclusions();
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("-milestone:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("-milestone:"));
 
             request.Milestone = "testMilestone";
-            Assert.True(request.MergedQualifiers().Contains("-milestone:\"testMilestone\""));
+            Assert.Contains("-milestone:\"testMilestone\"", request.MergedQualifiers());
         }
 
         [Fact]
         public void DoesntWrapMilestoneWithDoubleQuotesForQuotedMilestone()
         {
             var request = new SearchIssuesRequestExclusions();
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("-milestone:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("-milestone:"));
 
             request.Milestone = "\"testMilestone\"";
             Assert.Contains<string>("-milestone:\"\\\"testMilestone\\\"\"", request.MergedQualifiers());
diff --git a/Octokit.Tests/Models/SearchIssuesRequestTests.cs b/Octokit.Tests/Models/SearchIssuesRequestTests.cs
index c052ea13..cdd70032 100644
--- a/Octokit.Tests/Models/SearchIssuesRequestTests.cs
+++ b/Octokit.Tests/Models/SearchIssuesRequestTests.cs
@@ -50,7 +50,7 @@ public class SearchIssuesRequestTests
                 var request = new SearchIssuesRequest("query");
 
                 // Ensure the specified parameter does not exist when not set
-                Assert.False(request.MergedQualifiers().Any(x => x.Contains(property.Key)));
+                Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains(property.Key));
 
                 // Set the parameter
                 property.Value(request, "blah");
@@ -76,7 +76,7 @@ public class SearchIssuesRequestTests
                 var request = new SearchIssuesRequest("query");
 
                 // Ensure the specified parameter does not exist when not set
-                Assert.False(request.MergedQualifiers().Any(x => x.Contains(property.Key)));
+                Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains(property.Key));
 
                 // Set the parameter
                 property.Value(request, DateRange.GreaterThan(new DateTimeOffset(DateTime.Today.AddDays(-7))));
@@ -90,48 +90,48 @@ public class SearchIssuesRequestTests
         public void HandlesInAttributeCorrectly()
         {
             var request = new SearchIssuesRequest("test");
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("in:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("in:"));
 
             request.In = new List<IssueInQualifier> { IssueInQualifier.Body, IssueInQualifier.Comment };
-            Assert.True(request.MergedQualifiers().Contains("in:body,comment"));
+            Assert.Contains("in:body,comment", request.MergedQualifiers());
         }
 
         [Fact]
         public void HandlesStateAttributeCorrectly()
         {
             var request = new SearchIssuesRequest("test");
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("state:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("state:"));
 
             request.State = ItemState.Closed;
-            Assert.True(request.MergedQualifiers().Contains("state:closed"));
+            Assert.Contains("state:closed", request.MergedQualifiers());
         }
 
         [Fact]
         public void HandlesLabelsAttributeCorrectly()
         {
             var request = new SearchIssuesRequest("test");
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("label:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("label:"));
 
             request.Labels = new[] { "label1", "label2" };
-            Assert.True(request.MergedQualifiers().Contains("label:label1"));
-            Assert.True(request.MergedQualifiers().Contains("label:label2"));
+            Assert.Contains("label:label1", request.MergedQualifiers());
+            Assert.Contains("label:label2", request.MergedQualifiers());
         }
 
         [Fact]
         public void HandlesMilestoneAttributeWithoutQuotes()
         {
             var request = new SearchIssuesRequest("text");
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("milestone:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("milestone:"));
 
             request.Milestone = "testMilestone";
-            Assert.True(request.MergedQualifiers().Contains("milestone:\"testMilestone\""));
+            Assert.Contains("milestone:\"testMilestone\"", request.MergedQualifiers());
         }
 
         [Fact]
         public void DoesntWrapMilestoneWithDoubleQuotesForQuotedMilestone()
         {
             var request = new SearchIssuesRequest("text");
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("milestone:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("milestone:"));
 
             request.Milestone = "\"testMilestone\"";
             Assert.Contains<string>("milestone:\"\\\"testMilestone\\\"\"", request.MergedQualifiers());
@@ -141,63 +141,63 @@ public class SearchIssuesRequestTests
         public void HandlesNoMetadataAttributeCorrectly()
         {
             var request = new SearchIssuesRequest("test");
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("no:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("no:"));
 
             request.No = IssueNoMetadataQualifier.Milestone;
-            Assert.True(request.MergedQualifiers().Contains("no:milestone"));
+            Assert.Contains("no:milestone", request.MergedQualifiers());
         }
 
         [Fact]
         public void HandlesLanguageAttributeCorrectly()
         {
             var request = new SearchIssuesRequest("test");
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("language:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("language:"));
 
             request.Language = Language.CSharp;
-            Assert.True(request.MergedQualifiers().Contains("language:CSharp"));
+            Assert.Contains("language:CSharp", request.MergedQualifiers());
         }
 
         [Fact]
         public void HandlesIsAttributeCorrectly()
         {
             var request = new SearchIssuesRequest("test");
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("is:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("is:"));
 
             request.Is = new List<IssueIsQualifier> { IssueIsQualifier.Merged, IssueIsQualifier.PullRequest };
-            Assert.True(request.MergedQualifiers().Contains("is:merged"));
-            Assert.True(request.MergedQualifiers().Contains("is:pr"));
+            Assert.Contains("is:merged", request.MergedQualifiers());
+            Assert.Contains("is:pr", request.MergedQualifiers());
         }
 
         [Fact]
         public void HandlesStatusAttributeCorrectly()
         {
             var request = new SearchIssuesRequest("test");
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("status:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("status:"));
 
             request.Status = CommitState.Error;
-            Assert.True(request.MergedQualifiers().Contains("status:error"));
+            Assert.Contains("status:error", request.MergedQualifiers());
         }
 
         [Fact]
         public void HandlesCommentsAttributeCorrectly()
         {
             var request = new SearchIssuesRequest("test");
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("comments:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("comments:"));
 
             request.Comments = Range.GreaterThan(5);
-            Assert.True(request.MergedQualifiers().Contains("comments:>5"));
+            Assert.Contains("comments:>5", request.MergedQualifiers());
         }
 
         [Fact]
         public void HandlesRepoAttributeCorrectly()
         {
             var request = new SearchIssuesRequest("test");
-            Assert.False(request.MergedQualifiers().Any(x => x.Contains("repo:")));
+            Assert.DoesNotContain(request.MergedQualifiers(), x => x.Contains("repo:"));
 
             request.Repos.Add("myorg", "repo1");
             request.Repos.Add("myorg", "repo2");
-            Assert.True(request.MergedQualifiers().Contains("repo:myorg/repo1"));
-            Assert.True(request.MergedQualifiers().Contains("repo:myorg/repo2"));
+            Assert.Contains("repo:myorg/repo1", request.MergedQualifiers());
+            Assert.Contains("repo:myorg/repo2", request.MergedQualifiers());
         }
     }
 }
\ No newline at end of file
diff --git a/Octokit.Tests/SimpleJsonSerializerTests.cs b/Octokit.Tests/SimpleJsonSerializerTests.cs
index 0d7be509..daa1e8d0 100644
--- a/Octokit.Tests/SimpleJsonSerializerTests.cs
+++ b/Octokit.Tests/SimpleJsonSerializerTests.cs
@@ -91,7 +91,7 @@ namespace Octokit.Tests
 
                 var deserializeData = new SimpleJsonSerializer().Deserialize<string>(json);
 
-                Assert.True(lastTabCharacter.ToString().Equals("\\t"));
+                Assert.Equal("\\t", lastTabCharacter.ToString());
                 Assert.Equal(data, deserializeData);
             }
 
@@ -313,7 +313,7 @@ namespace Octokit.Tests
                 var sample = new SimpleJsonSerializer().Deserialize<Sample>(json);
 
                 Assert.Equal(0, sample.Id);
-                Assert.Equal(null, sample.FirstName);
+                Assert.Null(sample.FirstName);
                 Assert.False(sample.IsSomething);
                 Assert.True(sample.Private);
             }