7 files changed, 13 insertions, 21 deletions
diff --git a/e2e/ambassador/src/background/index.js b/e2e/ambassador/src/background/index.js
index 5264c16..db2deb3 100644
--- a/e2e/ambassador/src/background/index.js
+++ b/e2e/ambassador/src/background/index.js
@@ -1,6 +1,6 @@
 import {
   WINDOWS_CREATE, WINDOWS_REMOVE, WINDOWS_GET,
-  TABS_CREATE, TABS_REMOVE, TABS_SELECT_AT, TABS_GET_ZOOM, TABS_SET_ZOOM,
+  TABS_CREATE, TABS_SELECT_AT, TABS_GET_ZOOM, TABS_SET_ZOOM,
   EVENT_KEYPRESS, EVENT_KEYDOWN, EVENT_KEYUP,
   SCROLL_GET, SCROLL_SET,
 } from '../shared/messages';
@@ -20,8 +20,6 @@ receiveContentMessage((message) => {
       url: message.url,
       windowId: message.windowId,
     });
-  case TABS_REMOVE:
-    return browser.tabs.remove(message.tabId);
   case TABS_SELECT_AT:
     return tabs.selectAt({
       windowId: message.windowId,
diff --git a/e2e/ambassador/webpack.config.js b/e2e/ambassador/webpack.config.js
index 2a544bf..d292317 100644
--- a/e2e/ambassador/webpack.config.js
+++ b/e2e/ambassador/webpack.config.js
@@ -14,19 +14,6 @@ config = {
     filename: '[name].js'
   },
 
-  module: {
-    loaders: [
-      {
-        test: [ /\.js$/ ],
-        exclude: /node_modules/,
-        loader: 'babel-loader',
-        query: {
-          presets: ['es2015']
-        }
-      }
-    ]
-  },
-
   resolve: {
     extensions: [ '.js' ],
     modules: [path.join(__dirname, 'src'), 'node_modules']
diff --git a/e2e/contents/scroll.test.js b/e2e/contents/scroll.test.js
index 070529a..0a896b3 100644
--- a/e2e/contents/scroll.test.js
+++ b/e2e/contents/scroll.test.js
@@ -1,4 +1,3 @@
-import { expect } from "chai";
 import * as windows from "../ambassador/src/client/windows";
 import * as tabs from "../ambassador/src/client/tabs";
 import * as keys from "../ambassador/src/client/keys";
diff --git a/e2e/contents/tab.test.js b/e2e/contents/tab.test.js
index be4288f..880deb8 100644
--- a/e2e/contents/tab.test.js
+++ b/e2e/contents/tab.test.js
@@ -1,4 +1,3 @@
-import { expect } from "chai";
 import * as windows from "../ambassador/src/client/windows";
 import * as tabs from "../ambassador/src/client/tabs";
 import * as keys from "../ambassador/src/client/keys";
@@ -52,7 +51,7 @@ describe("tab test", () => {
     });
   })
 
-  it('makes pinned by zd', () => {
+  it('makes pinned by zp', () => {
     let before;
     let targetTab;
     return tabs.create(targetWindow.id, SERVER_URL).then((tab) => {
diff --git a/e2e/contents/zoom.test.js b/e2e/contents/zoom.test.js
index c2e787f..10b7cca 100644
--- a/e2e/contents/zoom.test.js
+++ b/e2e/contents/zoom.test.js
@@ -1,11 +1,10 @@
-import { expect } from "chai";
 import * as windows from "../ambassador/src/client/windows";
 import * as tabs from "../ambassador/src/client/tabs";
 import * as keys from "../ambassador/src/client/keys";
 
 const SERVER_URL = "localhost:11111/";
 
-describe("tab test", () => {
+describe("zoom test", () => {
   let targetWindow;
   let targetTab;
 
diff --git a/e2e/karma.conf.js b/e2e/karma.conf.js
index 2b60ca9..fcda415 100644
--- a/e2e/karma.conf.js
+++ b/e2e/karma.conf.js
@@ -4,11 +4,13 @@ module.exports = function (config) {
     basePath: '',
     frameworks: ['mocha'],
     files: [
+      'main.js',
       'karma-delay.js',
       '**/*.test.js'
     ],
 
     preprocessors: {
+      '**/main.js': ['webpack'],
       '**/*.test.js': ['webpack']
     },
 
@@ -41,5 +43,11 @@ module.exports = function (config) {
       'karma-webpack',
       'karma-mocha-reporter',
     ],
+
+    client: {
+      mocha: {
+        timeout: 5000
+      }
+    }
   })
 }
diff --git a/e2e/main.js b/e2e/main.js
new file mode 100644
index 0000000..d923aaa
--- /dev/null
+++ b/e2e/main.js
@@ -0,0 +1,2 @@
+import chai from 'chai';
+global.expect = chai.expect;