diff --git a/PetaPoco.Tests.Integration/Databases/BaseDbContext.cs b/PetaPoco.Tests.Integration/Databases/BaseDbContext.cs
index e5c9a22a..fa3e75db 100644
--- a/PetaPoco.Tests.Integration/Databases/BaseDbContext.cs
+++ b/PetaPoco.Tests.Integration/Databases/BaseDbContext.cs
@@ -18,13 +18,10 @@ protected BaseDbContext(BaseDbProviderFactory provider)
 
         public void Dispose()
         {
-            if (DB != null)
-            {
-                _provider.Dispose();
-                _provider = null;
-                DB.Dispose();
-                DB = null;
-            }
+            _provider?.Dispose();
+            _provider = null;
+            DB?.Dispose();
+            DB = null;
         }
     }
 }
diff --git a/PetaPoco.Tests.Integration/Databases/BaseDbProviderFactory.cs b/PetaPoco.Tests.Integration/Databases/BaseDbProviderFactory.cs
index 749db66a..53f5b633 100644
--- a/PetaPoco.Tests.Integration/Databases/BaseDbProviderFactory.cs
+++ b/PetaPoco.Tests.Integration/Databases/BaseDbProviderFactory.cs
@@ -38,28 +38,28 @@ public virtual void ExecuteBuildScript(IDatabase database, string script)
             database.Execute(script);
         }
 
-        protected virtual IDatabaseBuildConfiguration BuildFromConnectionName(string name)
+        protected virtual IDatabase LoadFromConnectionName(string connectionName)
+        {
+            return BuildFromConnectionName(connectionName).Create();
+        }
+
+        protected virtual IDatabaseBuildConfiguration BuildFromConnectionName(string connectionName)
         {
 #if NETCOREAPP
             return DatabaseConfiguration.Build()
-                .UsingConnectionString(AppSetting.Instance.ConnectionStringFor(name).ConnectionString)
-                .UsingProviderName(AppSetting.Instance.ConnectionStringFor(name).ProviderName);
+                .UsingConnectionString(AppSetting.Instance.ConnectionStringFor(connectionName).ConnectionString)
+                .UsingProviderName(AppSetting.Instance.ConnectionStringFor(connectionName).ProviderName);
 #else
-            return DatabaseConfiguration.Build().UsingConnectionStringName(name);
+            return DatabaseConfiguration.Build().UsingConnectionStringName(connectionName);
 #endif
         }
 
-        protected virtual IDatabase LoadFromConnectionName(string name)
-        {
-            return BuildFromConnectionName(name).Create();
-        }
-
-        public string GetProviderName(string name)
+        protected string GetProviderName(string connectionName)
         {
 #if NETCOREAPP
-            return AppSetting.Instance.ConnectionStringFor(name).ProviderName;
+            return AppSetting.Instance.ConnectionStringFor(connectionName).ProviderName;
 #else
-            return ConfigurationManager.ConnectionStrings[name].ProviderName;
+            return ConfigurationManager.ConnectionStrings[connectionName].ProviderName;
 #endif
         }
     }
diff --git a/PetaPoco.Tests.Integration/Databases/UpdateTests.cs b/PetaPoco.Tests.Integration/Databases/UpdateTests.cs
index 55250807..2a8557bb 100644
--- a/PetaPoco.Tests.Integration/Databases/UpdateTests.cs
+++ b/PetaPoco.Tests.Integration/Databases/UpdateTests.cs
@@ -706,7 +706,7 @@ public async Task UpdateAsync_GivenTablePrimaryKeyNameAndDynamicType_ShouldNotTh
 #if !NETCOREAPP
             Should.NotThrow(async () => await Task.Run(() => DB.UpdateAsync("Note", "Id", (object)entity)));
 #else
-            Should.NotThrow(async () => await Task.Run(() => DB.UpdateAsync("Note", "Id", entity)));
+            await Should.NotThrowAsync(() => DB.UpdateAsync("Note", "Id", entity));
 #endif
         }