diff --git a/extension/src/browser/extension/inject/pageScriptWrap.js b/extension/src/browser/extension/inject/pageScriptWrap.js
index 92fcb45e..0a8cef09 100644
--- a/extension/src/browser/extension/inject/pageScriptWrap.js
+++ b/extension/src/browser/extension/inject/pageScriptWrap.js
@@ -7,7 +7,7 @@ if (process.env.NODE_ENV === 'production') {
   (document.head || document.documentElement).appendChild(s);
   s.parentNode.removeChild(s);
 } else {
-  s.src = chrome.extension.getURL('js/page.bundle.js');
+  s.src = chrome.extension.getURL('page.bundle.js');
   s.onload = function () {
     this.parentNode.removeChild(this);
   };
diff --git a/extension/test/app/containers/App.spec.js b/extension/test/app/containers/App.spec.js
index 183ede54..011054c5 100644
--- a/extension/test/app/containers/App.spec.js
+++ b/extension/test/app/containers/App.spec.js
@@ -18,7 +18,7 @@ describe('App container', () => {
 
   it('should contain an empty action list', () => {
     expect(component.find('ActionList').html()).toMatch(
-      /<div class="actionListRows-[0-9]+"><\/div>/
+      /<div class="actionListRows-[0-9-]+"><\/div>/
     );
   });
 });
diff --git a/extension/test/setup.js b/extension/test/setup.js
index a980a80a..5d1e0f2a 100644
--- a/extension/test/setup.js
+++ b/extension/test/setup.js
@@ -1,6 +1,6 @@
 require('@babel/polyfill');
 global.chrome = require('sinon-chrome');
 import Enzyme from 'enzyme';
-import Adapter from 'enzyme-adapter-react-15.4';
+import Adapter from 'enzyme-adapter-react-16';
 
 Enzyme.configure({ adapter: new Adapter() });
diff --git a/extension/test/utils/e2e.js b/extension/test/utils/e2e.js
index 5fd33abb..db6eea92 100644
--- a/extension/test/utils/e2e.js
+++ b/extension/test/utils/e2e.js
@@ -6,26 +6,28 @@ export const delay = (time) =>
 export const switchMonitorTests = {
   'should switch to Log Monitor': async function () {
     await this.driver
-      .findElement(webdriver.By.xpath('//div[text()="Inspector"]'))
+      .findElement(webdriver.By.xpath('//button[text()="Inspector"]'))
       .click();
     await delay(500); // Wait till menu is fully opened
     await this.driver
-      .findElement(webdriver.By.xpath('//div[text()="Log monitor"]'))
+      .findElement(webdriver.By.xpath('//button[text()="Log monitor"]'))
       .click();
     await delay(500);
     await this.driver.findElement(
-      webdriver.By.xpath('//div[a[text()="Reset"] and .//a[text()="Revert"]]')
+      webdriver.By.xpath(
+        '//div[div[button[text()="Reset"]] and .//div[button[text()="Revert"]]]'
+      )
     );
     await delay(500);
   },
 
   'should switch to Chart Monitor': async function () {
     await this.driver
-      .findElement(webdriver.By.xpath('//div[text()="Log monitor"]'))
+      .findElement(webdriver.By.xpath('//button[text()="Log monitor"]'))
       .click();
     await delay(500); // Wait till menu is fully opened
     await this.driver
-      .findElement(webdriver.By.xpath('//div[text()="Chart"]'))
+      .findElement(webdriver.By.xpath('//button[text()="Chart"]'))
       .click();
     await delay(500);
     await this.driver.findElement(
@@ -36,11 +38,11 @@ export const switchMonitorTests = {
 
   'should switch back to Inspector Monitor': async function () {
     await this.driver
-      .findElement(webdriver.By.xpath('//div[text()="Chart"]'))
+      .findElement(webdriver.By.xpath('//button[text()="Chart"]'))
       .click();
     await delay(1000); // Wait till menu is fully opened
     await this.driver
-      .findElement(webdriver.By.xpath('//div[text()="Inspector"]'))
+      .findElement(webdriver.By.xpath('//button[text()="Inspector"]'))
       .click();
     await delay(1500); // Wait till menu is closed
   },
diff --git a/extension/webpack/base.config.js b/extension/webpack/base.config.js
index bb4966d7..f2221bd9 100644
--- a/extension/webpack/base.config.js
+++ b/extension/webpack/base.config.js
@@ -7,7 +7,7 @@ const mock = `${extpath}chromeAPIMock.js`;
 
 const baseConfig = (params) => ({
   // devtool: 'source-map',
-  mode: 'production',
+  mode: params.mode,
   entry: params.input || {
     background: [mock, `${extpath}background/index`],
     options: [mock, `${extpath}options/index`],
diff --git a/extension/webpack/dev.config.babel.js b/extension/webpack/dev.config.babel.js
index 918b3865..cca1fa78 100644
--- a/extension/webpack/dev.config.babel.js
+++ b/extension/webpack/dev.config.babel.js
@@ -3,6 +3,7 @@ import webpack from 'webpack';
 import baseConfig from './base.config';
 
 let config = baseConfig({
+  mode: 'development',
   inputExtra: {
     page: [path.join(__dirname, '../src/browser/extension/inject/pageScript')],
   },
diff --git a/extension/webpack/prod.config.babel.js b/extension/webpack/prod.config.babel.js
index 3a84a8fd..ff04e735 100644
--- a/extension/webpack/prod.config.babel.js
+++ b/extension/webpack/prod.config.babel.js
@@ -2,6 +2,10 @@ import path from 'path';
 import baseConfig from './base.config';
 
 export default baseConfig({
+  mode: 'production',
+  inputExtra: {
+    page: [path.join(__dirname, '../src/browser/extension/inject/pageScript')],
+  },
   output: { path: path.join(__dirname, '../build/extension') },
   globals: {
     'process.env': {
diff --git a/extension/webpack/prod.firefox.config.babel.js b/extension/webpack/prod.firefox.config.babel.js
index 2dffc670..54fdf8b9 100644
--- a/extension/webpack/prod.firefox.config.babel.js
+++ b/extension/webpack/prod.firefox.config.babel.js
@@ -2,6 +2,7 @@ import path from 'path';
 import baseConfig from './base.config';
 
 export default baseConfig({
+  mode: 'production',
   output: { path: path.join(__dirname, '../build/extension') },
   globals: {
     'process.env': {
diff --git a/extension/webpack/wrap.config.babel.js b/extension/webpack/wrap.config.babel.js
index 5297ecf3..25b57d11 100644
--- a/extension/webpack/wrap.config.babel.js
+++ b/extension/webpack/wrap.config.babel.js
@@ -2,6 +2,7 @@ import path from 'path';
 import baseConfig from './base.config';
 
 export default baseConfig({
+  mode: 'production',
   input: {
     page: [path.join(__dirname, '../src/browser/extension/inject/pageScript')],
   },
diff --git a/jest.config.js b/jest.config.js
index 18639473..48f900e4 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-  projects: ['<rootDir>/packages/*'],
+  projects: ['extension', '<rootDir>/packages/*'],
 };