diff --git a/.aegir.js b/.aegir.js
index 406b48ef5..125c71c66 100644
--- a/.aegir.js
+++ b/.aegir.js
@@ -4,7 +4,7 @@ module.exports = {
   lint: {
     files: [
       'src/**/*.js',
-      'test/**/*.js'
+      'test/*.js'
     ]
   }
 }
diff --git a/package.json b/package.json
index 090a3ee17..fd4ad91f9 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "through2": "^3.0.0"
   },
   "devDependencies": {
-    "aegir": "^18.1.1"
+    "aegir": "^19.0.3"
   },
   "contributors": [
     "Alan Shaw <alan.shaw@protocol.ai>",
diff --git a/src/block/put.js b/src/block/put.js
index 205b93f32..4100e3668 100644
--- a/src/block/put.js
+++ b/src/block/put.js
@@ -94,7 +94,5 @@ module.exports = (createCommon, options) => {
         done()
       })
     })
-
-    // TODO it.skip('Promises support', (done) => {})
   })
 }
diff --git a/src/block/stat.js b/src/block/stat.js
index a420dc286..bc251dc95 100644
--- a/src/block/stat.js
+++ b/src/block/stat.js
@@ -43,7 +43,5 @@ module.exports = (createCommon, options) => {
         done()
       })
     })
-
-    // TODO it.skip('Promises support', (done) => {})
   })
 }
diff --git a/src/dag/put.js b/src/dag/put.js
index 41fca0b62..f368b140b 100644
--- a/src/dag/put.js
+++ b/src/dag/put.js
@@ -137,7 +137,5 @@ module.exports = (createCommon, options) => {
     })
 
     it.skip('should put by passing the cid instead of format and hashAlg', (done) => {})
-
-    // TODO it.skip('Promises support', (done) => {})
   })
 }
diff --git a/src/files-regular/refs-tests.js b/src/files-regular/refs-tests.js
index 1c9728d99..efb324304 100644
--- a/src/files-regular/refs-tests.js
+++ b/src/files-regular/refs-tests.js
@@ -381,7 +381,14 @@ function loadContent (ipfs, store, node, callback) {
 
   if (typeof node === 'object') {
     const entries = Object.entries(node)
-    const sorted = entries.sort((a, b) => a[0] > b[0] ? 1 : a[0] < b[0] ? -1 : 0)
+    const sorted = entries.sort((a, b) => {
+      if (a[0] > b[0]) {
+        return 1
+      } else if (a[0] < b[0]) {
+        return -1
+      }
+      return 0
+    })
     mapSeries(sorted, ([name, child], cb) => {
       loadContent(ipfs, store, child, (err, cid) => {
         cb(err, { name, cid: cid && cid.toString() })
diff --git a/src/pubsub/subscribe.js b/src/pubsub/subscribe.js
index d8c63589f..06645c01c 100644
--- a/src/pubsub/subscribe.js
+++ b/src/pubsub/subscribe.js
@@ -360,6 +360,7 @@ module.exports = (createCommon, options) => {
             const duration = new Date().getTime() - startTime
             const opsPerSec = Math.floor(count / (duration / 1000))
 
+            // eslint-disable-next-line
             console.log(`Send/Receive 100 messages took: ${duration} ms, ${opsPerSec} ops / s`)
 
             check()