diff --git a/.eslintrc.json b/.eslintrc.json
index 14a24bba16..7a14b67e4a 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -1,7 +1,7 @@
 {
   "root": true,
   "parserOptions": {
-    "ecmaVersion": 2017
+    "ecmaVersion": 2015
   },
   "plugins": [
     "prettier",
diff --git a/test/benchmarks/driverBench/.eslintrc.json b/test/benchmarks/driverBench/.eslintrc.json
new file mode 100644
index 0000000000..4ddbb2d2e4
--- /dev/null
+++ b/test/benchmarks/driverBench/.eslintrc.json
@@ -0,0 +1,6 @@
+{
+    "extends": "../../.eslintrc.json",
+    "parserOptions": {
+        "ecmaVersion": 2017
+    }
+}
diff --git a/test/examples/.eslintrc.json b/test/examples/.eslintrc.json
new file mode 100644
index 0000000000..3dc47774aa
--- /dev/null
+++ b/test/examples/.eslintrc.json
@@ -0,0 +1,6 @@
+{
+    "extends": "../.eslintrc.json",
+    "parserOptions": {
+        "ecmaVersion": 2017
+    }
+}
diff --git a/test/functional/apm.test.js b/test/functional/apm.test.js
index 70c825561c..a0bcb53932 100644
--- a/test/functional/apm.test.js
+++ b/test/functional/apm.test.js
@@ -1143,8 +1143,8 @@ describe('APM', function() {
         for (const test of loadedSpec.tests) {
           it(String(test.description), {
             metadata: { sessions: { skipLeakTests: true } },
-            test: async function() {
-              await runUnifiedTest(this, loadedSpec, test, testsToSkip);
+            test() {
+              return runUnifiedTest(this, loadedSpec, test, testsToSkip);
             }
           });
         }
diff --git a/test/manual/atlas_connectivity.test.js b/test/manual/atlas_connectivity.test.js
index 19201b2222..718c74805c 100644
--- a/test/manual/atlas_connectivity.test.js
+++ b/test/manual/atlas_connectivity.test.js
@@ -1,6 +1,20 @@
 'use strict';
 const MongoClient = require('../..').MongoClient;
 
+/**
+ * ATLAS_CONNECTIVITY env variable is JSON
+ * Here's some typescript describing the shape:
+ *
+ * ```typescript
+ * interface AtlasConnectivity {
+ *  [atlasDeployment: string]: [normalUri: string, srvUri: string]
+ * }
+ * ```
+ *
+ * It should be an object with descriptive strings about the deployment type and version (i.e. sharded_cluster_3_4)
+ * that map to a two string tuple that are the normal URI and SRV URI, order doesn't matter, but it should be that order.
+ */
+
 describe('Atlas Connectivity', function() {
   if (process.env.ATLAS_CONNECTIVITY == null) {
     console.log(
@@ -24,6 +38,7 @@ describe('Atlas Connectivity', function() {
 
 function makeConnectionTest(connectionString, clientOptions) {
   return function() {
+    this.timeout(40000);
     const client = new MongoClient(connectionString, clientOptions);
 
     return client