diff --git a/Octokit.Tests.Integration/Clients/MigrationsClientTests.cs b/Octokit.Tests.Integration/Clients/MigrationsClientTests.cs
index d4556fad..af28e60d 100644
--- a/Octokit.Tests.Integration/Clients/MigrationsClientTests.cs
+++ b/Octokit.Tests.Integration/Clients/MigrationsClientTests.cs
@@ -45,7 +45,7 @@ public class MigrationsClientTests : IDisposable
         }));
     }
 
-    public async Task StartNewMigration()
+    private async Task StartNewMigration()
     {
         var repoNames = _repos.Select(repo => repo.Repository.FullName).ToList();
         var migrationRequest = new StartMigrationRequest(repoNames);
diff --git a/Octokit.Tests/Http/ApiInfoParserTests.cs b/Octokit.Tests/Http/ApiInfoParserTests.cs
index 8f4882e0..00e3215b 100644
--- a/Octokit.Tests/Http/ApiInfoParserTests.cs
+++ b/Octokit.Tests/Http/ApiInfoParserTests.cs
@@ -100,8 +100,10 @@ namespace Octokit.Tests
             }
 
             [Theory]
-            [MemberData("PagingMethods")]
+            [MemberData(nameof(PagingMethods))]
+#pragma warning disable xUnit1026 // Theory methods should use all of their parameters
             public void ReturnsNullIfThereIsNoMatchingPagingLink(string ignored, Func<ApiInfo, Uri> pagingMethod)
+#pragma warning restore xUnit1026 // Theory methods should use all of their parameters
             {
                 var links = new Dictionary<string, Uri>();
                 var info = BuildApiInfo(links);
diff --git a/Octokit.Tests/Http/ApiInfoTests.cs b/Octokit.Tests/Http/ApiInfoTests.cs
index 97bbe314..21fedeba 100644
--- a/Octokit.Tests/Http/ApiInfoTests.cs
+++ b/Octokit.Tests/Http/ApiInfoTests.cs
@@ -86,13 +86,9 @@ namespace Octokit.Tests.Http
 
                 Assert.NotSame(original.RateLimit, clone.RateLimit);
                 Assert.Equal(original.RateLimit.Limit, clone.RateLimit.Limit);
-                Assert.NotSame(original.RateLimit.Limit, clone.RateLimit.Limit);
                 Assert.Equal(original.RateLimit.Remaining, clone.RateLimit.Remaining);
-                Assert.NotSame(original.RateLimit.Remaining, clone.RateLimit.Remaining);
                 Assert.Equal(original.RateLimit.ResetAsUtcEpochSeconds, clone.RateLimit.ResetAsUtcEpochSeconds);
-                Assert.NotSame(original.RateLimit.ResetAsUtcEpochSeconds, clone.RateLimit.ResetAsUtcEpochSeconds);
                 Assert.Equal(original.RateLimit.Reset, clone.RateLimit.Reset);
-                Assert.NotSame(original.RateLimit.Reset, clone.RateLimit.Reset);
             }
 
             [Fact]
diff --git a/Octokit.Tests/Http/ConnectionTests.cs b/Octokit.Tests/Http/ConnectionTests.cs
index f6c0618e..2f1edef9 100644
--- a/Octokit.Tests/Http/ConnectionTests.cs
+++ b/Octokit.Tests/Http/ConnectionTests.cs
@@ -753,7 +753,7 @@ namespace Octokit.Tests.Http
                 var connection = new Connection(new ProductHeaderValue("OctokitTests"), new Uri("https://github.com/"));
 
                 Assert.Equal(new Uri("https://github.com/"), connection.BaseAddress);
-                Assert.True(connection.UserAgent.StartsWith("OctokitTests ("));
+                Assert.StartsWith("OctokitTests (", connection.UserAgent);
             }
         }
 
diff --git a/Octokit.Tests/Http/JsonHttpPipelineTests.cs b/Octokit.Tests/Http/JsonHttpPipelineTests.cs
index 704665a4..874cb4e3 100644
--- a/Octokit.Tests/Http/JsonHttpPipelineTests.cs
+++ b/Octokit.Tests/Http/JsonHttpPipelineTests.cs
@@ -149,7 +149,7 @@ namespace Octokit.Tests.Http
 
                 var response = jsonPipeline.DeserializeResponse<List<SomeObject>>(httpResponse);
 
-                Assert.Equal(1, response.Body.Count);
+                Assert.Single(response.Body);
                 Assert.Equal("Haack", response.Body.First().Name);
             }
 
diff --git a/Octokit.Tests/Http/RateLimitTests.cs b/Octokit.Tests/Http/RateLimitTests.cs
index c538f1ea..2012ec29 100644
--- a/Octokit.Tests/Http/RateLimitTests.cs
+++ b/Octokit.Tests/Http/RateLimitTests.cs
@@ -117,17 +117,13 @@ namespace Octokit.Tests.Http
 
                 var clone = original.Clone();
 
-                // Note the use of Assert.NotSame tests for value types - this should continue to test should the underlying 
-                // model are changed to Object types
+                // We want to ensure the original and clone are different objects but with
+                // the same values populated
                 Assert.NotSame(original, clone);
                 Assert.Equal(original.Limit, clone.Limit);
-                Assert.NotSame(original.Limit, clone.Limit);
                 Assert.Equal(original.Remaining, clone.Remaining);
-                Assert.NotSame(original.Remaining, clone.Remaining);
                 Assert.Equal(original.ResetAsUtcEpochSeconds, clone.ResetAsUtcEpochSeconds);
-                Assert.NotSame(original.ResetAsUtcEpochSeconds, clone.ResetAsUtcEpochSeconds);
                 Assert.Equal(original.Reset, clone.Reset);
-                Assert.NotSame(original.Reset, clone.Reset);
             }
         }
     }
diff --git a/Octokit.Tests/Http/RedirectHandlerTests.cs b/Octokit.Tests/Http/RedirectHandlerTests.cs
index 87d271df..fca1a901 100644
--- a/Octokit.Tests/Http/RedirectHandlerTests.cs
+++ b/Octokit.Tests/Http/RedirectHandlerTests.cs
@@ -21,8 +21,8 @@ namespace Octokit.Tests.Http
 
             var response = await adapter.SendAsync(httpRequestMessage, new CancellationToken());
 
-            Assert.Equal(response.StatusCode, HttpStatusCode.OK);
-            Assert.Same(response.RequestMessage, httpRequestMessage);
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
+            Assert.Same(httpRequestMessage, response.RequestMessage);
         }
 
         [Theory]
diff --git a/Octokit.Tests/Models/NewReferenceTests.cs b/Octokit.Tests/Models/NewReferenceTests.cs
index 48cc90ca..7f56d45d 100644
--- a/Octokit.Tests/Models/NewReferenceTests.cs
+++ b/Octokit.Tests/Models/NewReferenceTests.cs
@@ -11,7 +11,7 @@ public class NewReferenceTests
         {
             var create = new NewReference("heads/develop", "sha");
 
-            Assert.Equal(create.Ref, "refs/heads/develop");
+            Assert.Equal("refs/heads/develop", create.Ref);
         }
 
         [Fact]
diff --git a/Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs b/Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs
index 6fd20001..7a740296 100644
--- a/Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs
+++ b/Octokit.Tests/Reactive/ObservableDeploymentStatusClientTests.cs
@@ -125,12 +125,12 @@ namespace Octokit.Tests.Reactive
             readonly IGitHubClient _githubClient = Substitute.For<IGitHubClient>();
             ObservableDeploymentStatusClient _client;
 
-            public void SetupWithoutNonReactiveClient()
+            private void SetupWithoutNonReactiveClient()
             {
                 _client = new ObservableDeploymentStatusClient(_githubClient);
             }
 
-            public void SetupWithNonReactiveClient()
+            private void SetupWithNonReactiveClient()
             {
                 var deploymentStatusClient = new DeploymentStatusClient(Substitute.For<IApiConnection>());
                 _githubClient.Repository.Deployment.Status.Returns(deploymentStatusClient);