diff --git a/.node-version b/.node-version
index f22d756da3..2b0aa21219 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-6.5.0
+8.2.1
diff --git a/circle.yml b/circle.yml
index a153df362c..af2aaac565 100644
--- a/circle.yml
+++ b/circle.yml
@@ -2,21 +2,13 @@ version: 2
 
 defaults: &defaults
   parallelism: 1
-  working_directory: ~/cypress-monorepo
+  working_directory: ~/cypress
   docker:
     # the Docker image with Cypress dependencies and Chrome browser
-    - image: cypress/browsers:chrome62
+    - image: cypress/browsers:chrome64
       environment:
-        ## this enables colors + fixes failing unit tests
-        TERM: xterm
-
         CIRCLE_ARTIFACTS: /tmp/artifacts ## store artifacts here
 
-        npm_config_loglevel: warn
-        # even when running as non-root user
-        # need to set unsafe perm to be able to do `npm postinstall`
-        npm_config_unsafe-perm: true
-
 jobs:
   ## code checkout and NPM installs
   build:
@@ -24,8 +16,12 @@ jobs:
     steps:
       - checkout
 
-      # print global NPM cache path
-      - run: echo $(npm -g bin)
+      - run:
+          name: Print working folder
+          command: echo $PWD
+      - run:
+          name: print global NPM cache path
+          command: echo $(npm -g bin)
 
       ## make sure the TERM is set to 'xterm' in node
       ## else colors (and tests) will fail
@@ -167,15 +163,15 @@ jobs:
       ## hmm, do not see a good way to cache it, since all code
       ## might change
       - save_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}-{{ checksum "circle.yml" }}
           paths:
-            - /home/person/cypress-monorepo
+            - /root/cypress
 
   lint:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run: npm run lint
       - run: npm run all lint
 
@@ -184,7 +180,7 @@ jobs:
     parallelism: 1
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       # make sure mocha runs
       - run: npm run test-mocha
       # make sure our snapshots are compared correctly
@@ -201,88 +197,88 @@ jobs:
       - run: npm run all test -- --package socket
       - run: npm run all test -- --package static
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
 
   "server-unit-tests":
     <<: *defaults
     parallelism: 2
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run: npm run all test-unit -- --package server
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
 
   "server-integration-tests":
     <<: *defaults
     parallelism: 2
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run: npm run all test-integration -- --package server
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
 
   "server-e2e-tests-1":
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm run test-e2e -- --parallel 5 --index 0
           working_directory: packages/server
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
 
   "server-e2e-tests-2":
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm run test-e2e -- --parallel 5 --index 1
           working_directory: packages/server
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
 
   "server-e2e-tests-3":
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm run test-e2e -- --parallel 5 --index 2
           working_directory: packages/server
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
 
   "server-e2e-tests-4":
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm run test-e2e -- --parallel 5 --index 3
           working_directory: packages/server
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
 
   "server-e2e-tests-5":
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm run test-e2e -- --parallel 5 --index 4
           working_directory: packages/server
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
 
   "driver-integration-tests-1":
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm start
           background: true
@@ -294,7 +290,7 @@ jobs:
           command: npm run cypress:run -- --parallel 5 --index 0
           working_directory: packages/driver
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
       - store_artifacts:
           path: /tmp/artifacts
 
@@ -302,7 +298,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm start
           working_directory: packages/driver
@@ -314,7 +310,7 @@ jobs:
           command: npm run cypress:run -- --parallel 5 --index 1
           working_directory: packages/driver
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
       - store_artifacts:
           path: /tmp/artifacts
 
@@ -322,7 +318,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm start
           working_directory: packages/driver
@@ -334,7 +330,7 @@ jobs:
           command: npm run cypress:run -- --parallel 5 --index 2
           working_directory: packages/driver
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
       - store_artifacts:
           path: /tmp/artifacts
 
@@ -342,7 +338,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm start
           working_directory: packages/driver
@@ -354,7 +350,7 @@ jobs:
           command: npm run cypress:run -- --parallel 5 --index 3
           working_directory: packages/driver
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
       - store_artifacts:
           path: /tmp/artifacts
 
@@ -362,7 +358,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm start
           working_directory: packages/driver
@@ -374,7 +370,7 @@ jobs:
           command: npm run cypress:run -- --parallel 5 --index 4
           working_directory: packages/driver
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
       - store_artifacts:
           path: /tmp/artifacts
 
@@ -382,7 +378,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm run build-prod
           working_directory: packages/desktop-gui
@@ -390,7 +386,7 @@ jobs:
           command: npm run cypress:run -- --parallel 3 --index 0
           working_directory: packages/desktop-gui
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
       - store_artifacts:
           path: /tmp/artifacts
 
@@ -398,7 +394,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm run build-prod
           working_directory: packages/desktop-gui
@@ -406,7 +402,7 @@ jobs:
           command: npm run cypress:run -- --parallel 3 --index 1
           working_directory: packages/desktop-gui
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
       - store_artifacts:
           path: /tmp/artifacts
 
@@ -414,7 +410,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: npm run build-prod
           working_directory: packages/desktop-gui
@@ -422,7 +418,7 @@ jobs:
           command: npm run cypress:run -- --parallel 3 --index 2
           working_directory: packages/desktop-gui
       - store_test_results:
-          path: /tmp/cypress-monorepo
+          path: /tmp/cypress
       - store_artifacts:
           path: /tmp/artifacts
 
@@ -430,7 +426,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           command: node index.js
           working_directory: packages/launcher
@@ -439,7 +435,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run: $(npm bin)/print-arch
       - run: npm run binary-build -- --platform linux --version $NEXT_DEV_VERSION
       - run: npm run binary-zip -- --platform linux
@@ -465,7 +461,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           name: Cloning test project
           command: git clone https://github.com/cypress-io/cypress-example-kitchensink.git /tmp/repo
@@ -491,7 +487,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           name: Cloning test project
           command: git clone https://github.com/cypress-io/cypress-test-tiny.git /tmp/repo
@@ -507,7 +503,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - run:
           name: bump NPM version
           command: npm --no-git-tag-version version $NEXT_DEV_VERSION
@@ -549,7 +545,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - attach_workspace:
           at: /tmp/urls
       - run: ls -la /tmp/urls
@@ -583,7 +579,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - attach_workspace:
           at: /tmp/urls
       # make sure we have cypress.zip received
@@ -613,7 +609,7 @@ jobs:
     <<: *defaults
     steps:
       - restore_cache:
-          key: cypress-monorepo-{{ .Branch }}-{{ .Revision }}
+          key: cypress-{{ .Branch }}-{{ .Revision }}
       - attach_workspace:
           at: /tmp/urls
       # make sure we have the binary
@@ -715,6 +711,7 @@ workflows:
             branches:
               only:
                 - develop
+                - issue-895
           requires:
             - build
       - build-binary:
@@ -722,6 +719,7 @@ workflows:
             branches:
               only:
                 - develop
+                - issue-895
           requires:
             - build
       - test-next-version:
@@ -729,6 +727,7 @@ workflows:
             branches:
               only:
                 - develop
+                - issue-895
           requires:
             - build-npm-package
             - build-binary
@@ -745,6 +744,7 @@ workflows:
             branches:
               only:
                 - develop
+                - issue-895
           requires:
             - build-npm-package
             - build-binary
diff --git a/mocha-reporter-config.json b/mocha-reporter-config.json
index baaecf4b24..03a3455db1 100644
--- a/mocha-reporter-config.json
+++ b/mocha-reporter-config.json
@@ -1,6 +1,6 @@
 {
   "reporterEnabled": "spec, mocha-junit-reporter",
   "mochaJunitReporterReporterOptions": {
-    "mochaFile": "/tmp/cypress-monorepo/junit/test-results.[hash].xml"
+    "mochaFile": "/tmp/cypress/junit/test-results.[hash].xml"
   }
 }
diff --git a/package.json b/package.json
index 36be138962..822c17b1fe 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "description": "Cypress.io end to end testing tool",
   "private": true,
   "engines": {
-    "node": ">=6.5.0"
+    "node": ">=8.2.1"
   },
   "scripts": {
     "start": "node ./cli/bin/cypress open --dev --global",
diff --git a/packages/desktop-gui/package.json b/packages/desktop-gui/package.json
index 81f2f710a8..67bf2ba2f5 100644
--- a/packages/desktop-gui/package.json
+++ b/packages/desktop-gui/package.json
@@ -43,6 +43,6 @@
     "react-bootstrap-modal": "3.0.1",
     "react-dom": "^15.6.1",
     "react-loader": "^2.4.0",
-    "zunder": "5.5.2"
+    "zunder": "5.6.5"
   }
 }
diff --git a/packages/driver/test/cypress/integration/commands/waiting_spec.coffee b/packages/driver/test/cypress/integration/commands/waiting_spec.coffee
index 0daa391bef..c681a1a119 100644
--- a/packages/driver/test/cypress/integration/commands/waiting_spec.coffee
+++ b/packages/driver/test/cypress/integration/commands/waiting_spec.coffee
@@ -125,7 +125,7 @@ describe "src/cy/commands/waiting", ->
             null
           .wait("@fetch")
 
-      ## https://github.com/cypress-io/cypress-monorepo/issues/369
+      ## https://github.com/cypress-io/cypress/issues/369
       it "does not mutate 2nd route methods when using shorthand route", ->
         cy
           .server()
@@ -565,7 +565,7 @@ describe "src/cy/commands/waiting", ->
             expect(xhr.responseBody).to.deep.eq resp
 
       ## TODO: fixme failing in CI sometimes
-      ## https://circleci.com/gh/cypress-io/cypress-monorepo/5655
+      ## https://circleci.com/gh/cypress-io/cypress/5655
       it.skip "waits for the 4th request before resolving", ->
         resp = {foo: "foo"}
         response = 0
diff --git a/packages/driver/test/cypress/integration/e2e/zonejs_spec.coffee b/packages/driver/test/cypress/integration/e2e/zonejs_spec.coffee
index 82ab04e285..07cc004a21 100644
--- a/packages/driver/test/cypress/integration/e2e/zonejs_spec.coffee
+++ b/packages/driver/test/cypress/integration/e2e/zonejs_spec.coffee
@@ -3,7 +3,7 @@ describe "zone.js", ->
   it "can serialize XHRs without blowing out the stack", ->
     cy
     .visit("/fixtures/zonejs.html")
-    .window().then (win) ->
+    .window().then { timeout: 30000 }, (win) ->
       new Promise (resolve, reject) ->
         xhr = new win.XMLHttpRequest()
 
diff --git a/packages/electron/package.json b/packages/electron/package.json
index df1db4dcf9..69bdc302cb 100644
--- a/packages/electron/package.json
+++ b/packages/electron/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@packages/electron",
   "version": "0.0.0",
-  "electronVersion": "1.4.6",
+  "electronVersion": "1.8.2",
   "private": true,
   "main": "index.js",
   "scripts": {
diff --git a/packages/reporter/package.json b/packages/reporter/package.json
index 869c58578a..a4c2d02d67 100644
--- a/packages/reporter/package.json
+++ b/packages/reporter/package.json
@@ -64,6 +64,6 @@
     "rebuild-node-sass": "^1.1.0",
     "sinon": "^1.17.4",
     "sinon-chai": "^2.8.0",
-    "zunder": "5.5.2"
+    "zunder": "5.6.5"
   }
 }
diff --git a/packages/runner/package.json b/packages/runner/package.json
index 491f180f77..9a7d632447 100644
--- a/packages/runner/package.json
+++ b/packages/runner/package.json
@@ -42,6 +42,6 @@
     "rebuild-node-sass": "^1.1.0",
     "sinon": "^1.17.5",
     "sinon-chai": "^2.8.0",
-    "zunder": "5.5.2"
+    "zunder": "5.6.5"
   }
 }
diff --git a/packages/server/__snapshots__/async_timeouts_spec.coffee b/packages/server/__snapshots__/async_timeouts_spec.coffee
index 3142503cb0..8135859514 100644
--- a/packages/server/__snapshots__/async_timeouts_spec.coffee
+++ b/packages/server/__snapshots__/async_timeouts_spec.coffee
@@ -44,3 +44,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/base_url_spec.coffee b/packages/server/__snapshots__/base_url_spec.coffee
index a8f5dd0dc2..3be1d688fc 100644
--- a/packages/server/__snapshots__/base_url_spec.coffee
+++ b/packages/server/__snapshots__/base_url_spec.coffee
@@ -67,3 +67,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/browserify_babel_es2015_spec.coffee b/packages/server/__snapshots__/browserify_babel_es2015_spec.coffee
index 76573348f3..1bff5b0f82 100644
--- a/packages/server/__snapshots__/browserify_babel_es2015_spec.coffee
+++ b/packages/server/__snapshots__/browserify_babel_es2015_spec.coffee
@@ -78,3 +78,4 @@ Fix the error in your code and re-run your tests.
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/busted_support_file_spec.coffee b/packages/server/__snapshots__/busted_support_file_spec.coffee
index 8eac13ebe8..3e087ed9f3 100644
--- a/packages/server/__snapshots__/busted_support_file_spec.coffee
+++ b/packages/server/__snapshots__/busted_support_file_spec.coffee
@@ -39,3 +39,4 @@ Fix the error in your code and re-run your tests.
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/cache_spec.coffee b/packages/server/__snapshots__/cache_spec.coffee
index 2f41cd4d2c..2a903e000d 100644
--- a/packages/server/__snapshots__/cache_spec.coffee
+++ b/packages/server/__snapshots__/cache_spec.coffee
@@ -35,3 +35,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/caught_uncaught_hook_errors_spec.coffee b/packages/server/__snapshots__/caught_uncaught_hook_errors_spec.coffee
index 80554a90b6..8c8654d19d 100644
--- a/packages/server/__snapshots__/caught_uncaught_hook_errors_spec.coffee
+++ b/packages/server/__snapshots__/caught_uncaught_hook_errors_spec.coffee
@@ -34,6 +34,7 @@ Because this error occurred during a 'before each' hook we are skipping the rema
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
@@ -243,3 +244,4 @@ Because this error occurred during a 'before each' hook we are skipping the rema
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/commands_outside_of_test_spec.coffee b/packages/server/__snapshots__/commands_outside_of_test_spec.coffee
index 773e12fff1..8f93d4790e 100644
--- a/packages/server/__snapshots__/commands_outside_of_test_spec.coffee
+++ b/packages/server/__snapshots__/commands_outside_of_test_spec.coffee
@@ -64,3 +64,4 @@ We dynamically generated a new test to display this failure.
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/config_spec.coffee b/packages/server/__snapshots__/config_spec.coffee
index 0b15aa58d9..4d9d891aff 100644
--- a/packages/server/__snapshots__/config_spec.coffee
+++ b/packages/server/__snapshots__/config_spec.coffee
@@ -63,6 +63,7 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
@@ -93,3 +94,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/cookies_spec.coffee b/packages/server/__snapshots__/cookies_spec.coffee
index 1522bc091b..2b72483bca 100644
--- a/packages/server/__snapshots__/cookies_spec.coffee
+++ b/packages/server/__snapshots__/cookies_spec.coffee
@@ -37,3 +37,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/form_submissions_spec.coffee b/packages/server/__snapshots__/form_submissions_spec.coffee
index bdc3322c07..85c5618e80 100644
--- a/packages/server/__snapshots__/form_submissions_spec.coffee
+++ b/packages/server/__snapshots__/form_submissions_spec.coffee
@@ -63,6 +63,7 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
@@ -93,3 +94,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/go_spec.coffee b/packages/server/__snapshots__/go_spec.coffee
index 02a810a82a..7dc6712a5e 100644
--- a/packages/server/__snapshots__/go_spec.coffee
+++ b/packages/server/__snapshots__/go_spec.coffee
@@ -33,3 +33,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/iframe_spec.coffee b/packages/server/__snapshots__/iframe_spec.coffee
index 26cab3ee26..c71d76848a 100644
--- a/packages/server/__snapshots__/iframe_spec.coffee
+++ b/packages/server/__snapshots__/iframe_spec.coffee
@@ -39,3 +39,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/images_spec.coffee b/packages/server/__snapshots__/images_spec.coffee
index 8b93992c08..eedb817bdd 100644
--- a/packages/server/__snapshots__/images_spec.coffee
+++ b/packages/server/__snapshots__/images_spec.coffee
@@ -33,3 +33,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/issue_149_spec.coffee b/packages/server/__snapshots__/issue_149_spec.coffee
index ff76cd8bc2..c31c811aca 100644
--- a/packages/server/__snapshots__/issue_149_spec.coffee
+++ b/packages/server/__snapshots__/issue_149_spec.coffee
@@ -43,3 +43,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/issue_173_spec.coffee b/packages/server/__snapshots__/issue_173_spec.coffee
index 0933759c8c..d0c872cb62 100644
--- a/packages/server/__snapshots__/issue_173_spec.coffee
+++ b/packages/server/__snapshots__/issue_173_spec.coffee
@@ -25,6 +25,7 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
@@ -55,3 +56,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/js_error_handling_spec.coffee b/packages/server/__snapshots__/js_error_handling_spec.coffee
index 7d43a30e4a..95a1f45507 100644
--- a/packages/server/__snapshots__/js_error_handling_spec.coffee
+++ b/packages/server/__snapshots__/js_error_handling_spec.coffee
@@ -118,3 +118,4 @@ https://on.cypress.io/uncaught-exception-from-application
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/new_project_spec.coffee b/packages/server/__snapshots__/new_project_spec.coffee
index 11018c08a3..adc366e5cf 100644
--- a/packages/server/__snapshots__/new_project_spec.coffee
+++ b/packages/server/__snapshots__/new_project_spec.coffee
@@ -30,3 +30,4 @@ Started video recording: /foo/bar/.projects/no-scaffolding/cypress/videos/abc123
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/only_spec.coffee b/packages/server/__snapshots__/only_spec.coffee
index c73d62218d..f540908a5b 100644
--- a/packages/server/__snapshots__/only_spec.coffee
+++ b/packages/server/__snapshots__/only_spec.coffee
@@ -32,3 +32,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/page_loading_spec.coffee b/packages/server/__snapshots__/page_loading_spec.coffee
index bb7cbea761..1f1f3fc4c6 100644
--- a/packages/server/__snapshots__/page_loading_spec.coffee
+++ b/packages/server/__snapshots__/page_loading_spec.coffee
@@ -34,3 +34,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/plugins_spec.coffee b/packages/server/__snapshots__/plugins_spec.coffee
index da8942e510..33ecddbb0e 100644
--- a/packages/server/__snapshots__/plugins_spec.coffee
+++ b/packages/server/__snapshots__/plugins_spec.coffee
@@ -20,6 +20,7 @@ Error: Async error from plugins file
     at stack trace line
     at stack trace line
     at stack trace line
+    at stack trace line
 
 
   (Tests Finished)
@@ -140,3 +141,4 @@ A video will not be recorded when using this browser.
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/promises_spec.coffee b/packages/server/__snapshots__/promises_spec.coffee
index a10bbe1851..6c1f37d7df 100644
--- a/packages/server/__snapshots__/promises_spec.coffee
+++ b/packages/server/__snapshots__/promises_spec.coffee
@@ -17,6 +17,7 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   2)  catches promise errors and calls done with err even when async:
      Error: foo
       at stack trace line
+      at stack trace line
 
 
 
@@ -48,3 +49,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/request_spec.coffee b/packages/server/__snapshots__/request_spec.coffee
index 1eb599b85c..feacf2a349 100644
--- a/packages/server/__snapshots__/request_spec.coffee
+++ b/packages/server/__snapshots__/request_spec.coffee
@@ -116,6 +116,7 @@ RequestError: Error: connect ECONNREFUSED 127.0.0.1:16795
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
@@ -212,6 +213,7 @@ Body: Service Unavailable
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
diff --git a/packages/server/__snapshots__/return_value_spec.coffee b/packages/server/__snapshots__/return_value_spec.coffee
index a50074ebd1..f26d324520 100644
--- a/packages/server/__snapshots__/return_value_spec.coffee
+++ b/packages/server/__snapshots__/return_value_spec.coffee
@@ -76,6 +76,7 @@ https://on.cypress.io/returning-value-and-commands-in-custom-command
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
@@ -107,3 +108,4 @@ https://on.cypress.io/returning-value-and-commands-in-custom-command
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/run_plugins_spec.coffee b/packages/server/__snapshots__/run_plugins_spec.coffee
index 9c6ff80ccb..a30ecddeef 100644
--- a/packages/server/__snapshots__/run_plugins_spec.coffee
+++ b/packages/server/__snapshots__/run_plugins_spec.coffee
@@ -4,7 +4,7 @@ exports['lib/plugins/child/run_plugins sends error message if pluginsFile is mis
     at Function.hookedLoader [as _load] <path>mockery.js
     at Module.require <path>module.js
     at require <path>module.js
-    at module.exports.err <path>run_plugins.js
+    at module.exports <path>run_plugins.js
     at Context.<anonymous> <path>run_plugins_spec.coffee
     at callFn <path>runnable.js
     at Test.Runnable.run <path>runnable.js
@@ -35,7 +35,7 @@ exports['lib/plugins/child/run_plugins sends error message if requiring pluginsF
     at Function.hookedLoader [as _load] <path>mockery.js
     at Module.require <path>module.js
     at require <path>module.js
-    at module.exports.err <path>run_plugins.js
+    at module.exports <path>run_plugins.js
     at Context.<anonymous> <path>run_plugins_spec.coffee
     at callFn <path>runnable.js
     at Test.Runnable.run <path>runnable.js
@@ -65,4 +65,3 @@ exports['lib/plugins/child/run_plugins on \'load\' message sends error if plugin
   "name": "ReferenceError",
   "message": "foo is not defined"
 }
-
diff --git a/packages/server/__snapshots__/screenshots_spec.coffee b/packages/server/__snapshots__/screenshots_spec.coffee
index d1a97fa523..1f6ab1cda9 100644
--- a/packages/server/__snapshots__/screenshots_spec.coffee
+++ b/packages/server/__snapshots__/screenshots_spec.coffee
@@ -75,3 +75,4 @@ Because this error occurred during a 'after each' hook we are skipping the remai
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/stdout_spec.coffee b/packages/server/__snapshots__/stdout_spec.coffee
index 3ce5538614..5d179852e8 100644
--- a/packages/server/__snapshots__/stdout_spec.coffee
+++ b/packages/server/__snapshots__/stdout_spec.coffee
@@ -49,6 +49,7 @@ Because this error occurred during a 'before each' hook we are skipping the rema
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
   3) stdout_failing_spec passing hook is failing:
      CypressError: cy.visit() failed trying to load:
@@ -76,6 +77,7 @@ The internal Cypress web server responded with:
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
@@ -198,3 +200,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/uncaught_spec_errors_spec.coffee b/packages/server/__snapshots__/uncaught_spec_errors_spec.coffee
index bee93ccc9b..838bc13b0e 100644
--- a/packages/server/__snapshots__/uncaught_spec_errors_spec.coffee
+++ b/packages/server/__snapshots__/uncaught_spec_errors_spec.coffee
@@ -286,3 +286,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/uncaught_support_file_spec.coffee b/packages/server/__snapshots__/uncaught_support_file_spec.coffee
index 178e74edb4..58b1b33575 100644
--- a/packages/server/__snapshots__/uncaught_support_file_spec.coffee
+++ b/packages/server/__snapshots__/uncaught_support_file_spec.coffee
@@ -53,3 +53,4 @@ We dynamically generated a new test to display this failure.
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/viewport_spec.coffee b/packages/server/__snapshots__/viewport_spec.coffee
index c78e2110e9..9ab7c0423c 100644
--- a/packages/server/__snapshots__/viewport_spec.coffee
+++ b/packages/server/__snapshots__/viewport_spec.coffee
@@ -34,3 +34,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/visit_spec.coffee b/packages/server/__snapshots__/visit_spec.coffee
index cfbfa4b214..50c9fbc85c 100644
--- a/packages/server/__snapshots__/visit_spec.coffee
+++ b/packages/server/__snapshots__/visit_spec.coffee
@@ -101,6 +101,7 @@ Error: connect ECONNREFUSED 127.0.0.1:16795
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
@@ -171,6 +172,7 @@ If you do not want status codes to cause failures pass the option: 'failOnStatus
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
@@ -241,6 +243,7 @@ The internal Cypress web server responded with:
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
@@ -313,6 +316,7 @@ cy.request() will automatically get and set cookies and enable you to parse resp
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
@@ -383,6 +387,7 @@ When this 'load' event occurs, Cypress will continue running commands.
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
   2) when visit times out fails timeout exceeds timeout option:
      CypressError: Timed out after waiting '500ms' for your remote page to load.
@@ -409,6 +414,7 @@ When this 'load' event occurs, Cypress will continue running commands.
       at stack trace line
       at stack trace line
       at stack trace line
+      at stack trace line
 
 
 
@@ -440,3 +446,4 @@ When this 'load' event occurs, Cypress will continue running commands.
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/web_security_spec.coffee b/packages/server/__snapshots__/web_security_spec.coffee
index 81a2ffbf41..a7d5cec0a7 100644
--- a/packages/server/__snapshots__/web_security_spec.coffee
+++ b/packages/server/__snapshots__/web_security_spec.coffee
@@ -177,3 +177,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/__snapshots__/xhr_spec.coffee b/packages/server/__snapshots__/xhr_spec.coffee
index 5ffc20df53..1f8d21df72 100644
--- a/packages/server/__snapshots__/xhr_spec.coffee
+++ b/packages/server/__snapshots__/xhr_spec.coffee
@@ -40,3 +40,4 @@ Started video recording: /foo/bar/.projects/e2e/cypress/videos/abc123.mp4
   (All Done)
 
 `
+
diff --git a/packages/server/lib/util/args.coffee b/packages/server/lib/util/args.coffee
index 861555aeed..162ab45bf6 100644
--- a/packages/server/lib/util/args.coffee
+++ b/packages/server/lib/util/args.coffee
@@ -30,7 +30,7 @@ normalizeBackslashes = (options) ->
   ## remove stray double quote from runProject and other path properties
   ## due to bug in NPM passing arguments with
   ## backslash at the end
-  ## https://github.com/cypress-io/cypress-monorepo/issues/535
+  ## https://github.com/cypress-io/cypress/issues/535
   # these properties are paths and likely to have backslash on Windows
   pathProperties = ["runProject", "project", "appPath", "execPath"]
 
diff --git a/packages/server/test/integration/cypress_spec.coffee b/packages/server/test/integration/cypress_spec.coffee
index 746c06a018..d6ac639df4 100644
--- a/packages/server/test/integration/cypress_spec.coffee
+++ b/packages/server/test/integration/cypress_spec.coffee
@@ -563,6 +563,11 @@ describe "lib/cypress", ->
     ## also make sure we test the rest of the integration functionality
     ## for headed errors! <-- not unit tests, but integration tests!
     it "logs error and exits when project folder has read permissions only and cannot write cypress.json", ->
+      if process.env.CI
+        ## Gleb: disabling this because Node 8 docker image runs as root
+        ## which makes accessing everything possible.
+        return
+
       permissionsPath = path.resolve("./permissions")
 
       cypressJson = path.join(permissionsPath, "cypress.json")
diff --git a/packages/server/test/integration/http_requests_spec.coffee b/packages/server/test/integration/http_requests_spec.coffee
index 9b61339b89..d95e5d5a17 100644
--- a/packages/server/test/integration/http_requests_spec.coffee
+++ b/packages/server/test/integration/http_requests_spec.coffee
@@ -1318,7 +1318,7 @@ describe "Routes", ->
           expect(res.body).to.include("The error was:")
           expect(res.body).to.include("incorrect header check")
           expect(res.body).to.include("The stack trace was:")
-          expect(res.body).to.include("at Zlib._handle.onerror")
+          expect(res.body).to.include("at Gunzip.zlibOnError")
           expect(res.body).to.include("<html>\n<head> <script")
           expect(res.body).to.include("</script> </head> <body>")
           expect(res.body).to.include("document.domain = 'github.com';") ## should continue to inject
diff --git a/packages/server/test/integration/server_spec.coffee b/packages/server/test/integration/server_spec.coffee
index a5ca82cc10..09120b01cb 100644
--- a/packages/server/test/integration/server_spec.coffee
+++ b/packages/server/test/integration/server_spec.coffee
@@ -543,7 +543,7 @@ describe "Server", ->
         @server._onResolveUrl("http://localhost:64646", {}, @automationRequest)
         .catch (err) ->
           expect(err.message).to.eq("connect ECONNREFUSED 127.0.0.1:64646")
-          expect(err.stack).to.include("Object.exports._errnoException")
+          expect(err.stack).to.include("._errnoException")
           expect(err.port).to.eq(64646)
           expect(err.code).to.eq("ECONNREFUSED")
 
diff --git a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/domain_spec.coffee b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/domain_spec.coffee
index 441fc59b07..9fb9aefd9a 100644
--- a/packages/server/test/support/fixtures/projects/e2e/cypress/integration/domain_spec.coffee
+++ b/packages/server/test/support/fixtures/projects/e2e/cypress/integration/domain_spec.coffee
@@ -8,5 +8,5 @@ describe "com.au", ->
 
 describe "herokuapp.com", ->
   it "can visit", ->
-    cy.visit("https://example.herokuapp.com")
-    cy.contains("Example Heroku App")
+    cy.visit("https://cypress-example.herokuapp.com")
+    cy.contains("Getting Started with Node on Heroku")
diff --git a/packages/server/test/support/helpers/e2e.coffee b/packages/server/test/support/helpers/e2e.coffee
index 785f423d12..1a379f806e 100644
--- a/packages/server/test/support/helpers/e2e.coffee
+++ b/packages/server/test/support/helpers/e2e.coffee
@@ -11,6 +11,7 @@ morgan       = require("morgan")
 express      = require("express")
 Promise      = require("bluebird")
 snapshot     = require("snap-shot-it")
+debug        = require("debug")("cypress:support:e2e")
 Fixtures     = require("./fixtures")
 allowDestroy = require("#{root}../lib/util/server_destroy")
 user         = require("#{root}../lib/user")
@@ -112,9 +113,15 @@ module.exports = {
           fs.removeAsync(Fixtures.path("projects/e2e/node_modules/.bin"))
 
       after ->
+        ## now cleanup the node modules after because these add a lot
+        ## of copy time for the Fixtures scaffolding
         fs.removeAsync(Fixtures.path("projects/e2e/node_modules"))
 
     beforeEach ->
+      ## after installing node modules copying all of the fixtures
+      ## can take a long time (5-15 secs)
+      @timeout(human("2 minutes"))
+
       Fixtures.scaffold()
 
       @sandbox.stub(process, "exit")
@@ -129,10 +136,14 @@ module.exports = {
         else
           @servers = null
       .then =>
+
         if s = options.settings
           settings.write(e2ePath, s)
+      .then =>
 
     afterEach ->
+      @timeout(human("2 minutes"))
+
       Fixtures.remove()
 
       if s = @servers
diff --git a/packages/server/test/unit/args_spec.coffee b/packages/server/test/unit/args_spec.coffee
index 065bf29001..ddf5c01100 100644
--- a/packages/server/test/unit/args_spec.coffee
+++ b/packages/server/test/unit/args_spec.coffee
@@ -28,7 +28,7 @@ describe "lib/util/args", ->
       expect(options.projectPath).to.eq projectPath
 
     it "strips single double quote from the end", ->
-      # https://github.com/cypress-io/cypress-monorepo/issues/535
+      # https://github.com/cypress-io/cypress/issues/535
       # NPM does not pass correctly options that end with backslash
       options = @setup("--run-project", "C:\\foo\"")
       expect(options.runProject).to.eq("C:\\foo")
diff --git a/scripts/build-linux-binary.sh b/scripts/build-linux-binary.sh
index 0a9b25bb4a..3426bba794 100755
--- a/scripts/build-linux-binary.sh
+++ b/scripts/build-linux-binary.sh
@@ -13,7 +13,7 @@ echo Command npm run binary-deploy -- "$@"
 
 docker run \
   -e npm_config_loglevel='warn' \
-  -v $PWD:/home/person/cypress-monorepo \
-  -w /home/person/cypress-monorepo \
+  -v $PWD:/home/person/cypress \
+  -w /home/person/cypress \
   -it $name \
   npm run binary-deploy -- "$@"
diff --git a/scripts/run-docker-local.sh b/scripts/run-docker-local.sh
index 199895709c..c84ffcf898 100755
--- a/scripts/run-docker-local.sh
+++ b/scripts/run-docker-local.sh
@@ -2,7 +2,7 @@ set e+x
 
 echo "This script should be run from cypress's root"
 
-name=cypress/browsers:chrome62
+name=cypress/browsers:chrome64
 echo "Pulling CI container $name"
 
 docker pull $name