diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4ceac59d9..6a651b6f3 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -17,9 +17,9 @@ jobs:
     name: "Linux Tests"
     strategy:
       matrix:
-        node: [14, 16]
+        node: [14, 16, 18]
     runs-on: ubuntu-latest
-    container: ubuntu:16.04
+    container: ubuntu:20.04
     steps:
       - name: Install Dependencies for Ubuntu
         # git >= 2.18 required for actions/checkout git support
@@ -57,7 +57,7 @@ jobs:
         # There is a race condition in node/generate that needs to be fixed
         run: |
           chown root .
-          npm set unsafe-perm true
+          npm set unsafe-perm true || true
           node utils/retry npm install
 
       - name: Test
@@ -86,7 +86,7 @@ jobs:
     name: "macOS Tests"
     strategy:
       matrix:
-        node: [14, 16]
+        node: [14, 16, 18]
     runs-on: macOS-10.15
   # This is mostly the same as the Linux steps, waiting for anchor support
   # https://github.com/actions/runner/issues/1182
diff --git a/package.json b/package.json
index 2fe2bbcfe..63e7c5134 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@figma/nodegit",
   "description": "Node.js libgit2 asynchronous native bindings",
-  "version": "0.28.0-figma.2",
+  "version": "0.28.0-figma.3",
   "homepage": "http://nodegit.org",
   "keywords": [
     "libgit2",
diff --git a/test/tests/clone.js b/test/tests/clone.js
index e69076f9d..6c84549c4 100644
--- a/test/tests/clone.js
+++ b/test/tests/clone.js
@@ -355,7 +355,10 @@ describe("Clone", function() {
     });
   });
 
-  it("can clone with git", function() {
+  // Since 15 March the unauthenticated git protocol on port 9418 is no longer
+  // supported in Github.
+  // https://github.blog/2021-09-01-improving-git-protocol-security-github/
+  it.skip("can clone with git", function() {
     var test = this;
     var url = "git://github.com/nodegit/test.git";
     var opts = {
diff --git a/test/tests/repository.js b/test/tests/repository.js
index 29f207509..833edf447 100644
--- a/test/tests/repository.js
+++ b/test/tests/repository.js
@@ -362,15 +362,15 @@ describe("Repository", function() {
     return this.constRepository.statistics()
     .then(function(analysisReport) {
 
-      assert.equal(analysisReport.repositorySize.commits.count, 992);
-      assert.equal(analysisReport.repositorySize.commits.size, 265544);
-      assert.equal(analysisReport.repositorySize.trees.count, 2416);
-      assert.equal(analysisReport.repositorySize.trees.size, 1188325);
-      assert.equal(analysisReport.repositorySize.trees.entries, 32571);
-      assert.equal(analysisReport.repositorySize.blobs.count, 4149);
-      assert.equal(analysisReport.repositorySize.blobs.size, 48489622);
+      assert.equal(analysisReport.repositorySize.commits.count, 993);
+      assert.equal(analysisReport.repositorySize.commits.size, 265772);
+      assert.equal(analysisReport.repositorySize.trees.count, 2418);
+      assert.equal(analysisReport.repositorySize.trees.size, 1189264);
+      assert.equal(analysisReport.repositorySize.trees.entries, 32590);
+      assert.equal(analysisReport.repositorySize.blobs.count, 4150);
+      assert.equal(analysisReport.repositorySize.blobs.size, 48489634);
       assert.equal(analysisReport.repositorySize.annotatedTags.count, 1);
-      assert.equal(analysisReport.repositorySize.references.count, 8);
+      assert.equal(analysisReport.repositorySize.references.count, 9);
 
       assert.equal(analysisReport.biggestObjects.commits.maxSize, 956);
       assert.equal(analysisReport.biggestObjects.commits.maxParents, 2);
@@ -382,7 +382,7 @@ describe("Repository", function() {
 
       assert.equal(analysisReport.biggestCheckouts.numDirectories, 128);
       assert.equal(analysisReport.biggestCheckouts.maxPathDepth, 10);
-      assert.equal(analysisReport.biggestCheckouts.maxPathLength, 107);
+      assert.equal(analysisReport.biggestCheckouts.maxPathLength, 277);
       assert.equal(analysisReport.biggestCheckouts.numFiles, 514);
       assert.equal(analysisReport.biggestCheckouts.totalFileSize, 5160886);
       assert.equal(analysisReport.biggestCheckouts.numSymlinks, 2);