diff --git a/packages/driver/cypress/integration/e2e/focus_blur_spec.js b/packages/driver/cypress/integration/e2e/focus_blur_spec.js
index 79d32d90768d..fa94533f9f1a 100644
--- a/packages/driver/cypress/integration/e2e/focus_blur_spec.js
+++ b/packages/driver/cypress/integration/e2e/focus_blur_spec.js
@@ -1,4 +1,3 @@
-/// <reference path="../../../../../cli/types/index.d.ts" />
 /* eslint arrow-body-style:'off' */
 
 /**
diff --git a/packages/driver/index.d.ts b/packages/driver/index.d.ts
index 5557a6c2ad35..b814a4d928e4 100644
--- a/packages/driver/index.d.ts
+++ b/packages/driver/index.d.ts
@@ -1,4 +1,4 @@
-/// <reference path="../../cli/types/cypress.d.ts" />
+/// <reference path="../../cli/types/index.d.ts" />
 /// <reference path="../ts/index.d.ts" />
 export const $Cypress: Cypress.Cypress
 
diff --git a/packages/driver/src/config/lodash.d.ts b/packages/driver/src/config/lodash.d.ts
deleted file mode 100644
index 636b03e4e7b3..000000000000
--- a/packages/driver/src/config/lodash.d.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// const _ = require('lodash')
-import _ from 'lodash'
-
-import clean from 'underscore.string/clean'
-import count from 'underscore.string/count'
-import isBlank from 'underscore.string/isBlank'
-import toBoolean from 'underscore.string/toBoolean'
-
-// only export exactly what we need, nothing more!
-_.mixin({
-  clean,
-  count,
-  isBlank,
-  toBoolean,
-})
-
-declare module 'lodash' {
-  export interface LoDashExplicitWrapper<TValue> {
-    clean(...args): LoDashExplicitWrapper<TValue>
-    count(...args): LoDashExplicitWrapper<TValue>
-    isBlank(...args): LoDashExplicitWrapper<TValue>
-    toBoolean(...args): LoDashExplicitWrapper<TValue>
-  }
-
-  export interface LodashStatic<TValue> {
-    clean(...args): LoDashExplicitWrapper<TValue>
-    count(...args): LoDashExplicitWrapper<TValue>
-    isBlank(...args): LoDashExplicitWrapper<TValue>
-    toBoolean(...args): LoDashExplicitWrapper<TValue>
-  }
-}
-
-export default _
diff --git a/packages/driver/tsconfig.json b/packages/driver/tsconfig.json
index 9255340ab9d0..c7029cdbbe91 100644
--- a/packages/driver/tsconfig.json
+++ b/packages/driver/tsconfig.json
@@ -18,6 +18,10 @@
     "allowSyntheticDefaultImports": true,
     "outDir": "dist",
     "esModuleInterop": true,
-    "noErrorTruncation": true
-  }
+    "noErrorTruncation": true,
+    "types": []
+  },
+  "exclude": [
+    "dist"
+  ]
 }
diff --git a/packages/driver/ts/internal-types.d.ts b/packages/driver/types/internal-types.d.ts
similarity index 100%
rename from packages/driver/ts/internal-types.d.ts
rename to packages/driver/types/internal-types.d.ts
diff --git a/packages/runner/jsconfig.json b/packages/runner/jsconfig.json
deleted file mode 100644
index 504cd646e149..000000000000
--- a/packages/runner/jsconfig.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "compilerOptions": {
-    "experimentalDecorators": true
-  }
-}
diff --git a/packages/runner/tsconfig.json b/packages/runner/tsconfig.json
index 0cee70cbaa64..0a551ff94e62 100644
--- a/packages/runner/tsconfig.json
+++ b/packages/runner/tsconfig.json
@@ -46,7 +46,7 @@
     // "baseUrl": "../",                       /* Base directory to resolve non-absolute module names. */
     // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
     // "rootDirs": ["../driver/src"],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
-    // "types": [],                           /* Type declaration files to be included in compilation. */
+    "types": [],                           /* Type declaration files to be included in compilation. */
     "allowSyntheticDefaultImports": true,
     "esModuleInterop": true,
     "noErrorTruncation": true,
@@ -54,6 +54,7 @@
     // "noResolve": true
   },
   "exclude": [
-    "dist"
+    "dist",
+    "test"
   ]
 }
diff --git a/packages/server/test/e2e/8_error_ui_spec.ts b/packages/server/test/e2e/8_error_ui_spec.ts
index 37ba21a227ca..43ac85af8da3 100644
--- a/packages/server/test/e2e/8_error_ui_spec.ts
+++ b/packages/server/test/e2e/8_error_ui_spec.ts
@@ -34,7 +34,7 @@ describe('e2e error ui', function () {
   e2e.it('displays correct UI for errors', {
     spec: 'various_failures_spec.js',
     expectedExitCode: VARIOUS_FAILURES_EXPECTED_FAILURES,
-    timeout: 180000, // 3 minutes
+    timeout: 240000, // 4 minutes
     noTypeScript: true,
     onRun (exec) {
       return exec().then(verifyPassedAndFailedAreSame(VARIOUS_FAILURES_EXPECTED_FAILURES))
@@ -44,7 +44,7 @@ describe('e2e error ui', function () {
   e2e.it('displays correct UI for errors in custom commands', {
     spec: 'various_failures_custom_commands_spec.js',
     expectedExitCode: VARIOUS_FAILURES_EXPECTED_FAILURES,
-    timeout: 180000, // 3 minutes
+    timeout: 240000, // 4 minutes
     noTypeScript: true,
     onRun (exec) {
       return exec().then(verifyPassedAndFailedAreSame(VARIOUS_FAILURES_EXPECTED_FAILURES))