diff --git a/.eslintrc b/.eslintrc
index 9393df8..bf7863a 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -22,15 +22,15 @@ env:
 
 rules:
   arrow-body-style: 0
-  arrow-parens: 0
+  arrow-parens: "error"
   class-methods-use-this: 0
   func-names: 0
   indent: ["warn", 2]
   indent-legacy: "off"
   max-len: ["error", 120]
-  new-cap: 0
+  new-cap: "warn"
   no-plusplus: 0
-  no-return-assign: 0
+  no-return-assign: "error"
   quote-props: 0
   template-curly-spacing: [2, "always"]
   comma-dangle: ["error", {
@@ -41,12 +41,12 @@ rules:
     "functions": "never"
   }]
   jsx-quotes: [1, "prefer-single"]
-  react/forbid-prop-types: 0
+  react/forbid-prop-types: "error"
   react/jsx-curly-spacing: [2, "always"]
   react/jsx-filename-extension: 0
   react/jsx-boolean-value: 0
   react/prefer-stateless-function: 0
-  import/extensions: 0
-  import/no-extraneous-dependencies: 0
-  import/no-unresolved: 0
+  import/extensions: 'error'
+  import/no-extraneous-dependencies: ["error", {"devDependencies": true}]
+  import/no-unresolved: 'error'
   import/prefer-default-export: 0
diff --git a/package.json b/package.json
index 26cf21c..f47f65e 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,8 @@
     "react-dom": "^15.6.1",
     "react-moment": "^0.6.0",
     "react-router": "^4.1.2",
-    "react-router-dom": "^4.1.2"
+    "react-router-dom": "^4.1.2",
+    "history": "latest"
   },
   "jest": {
     "collectCoverageFrom": [
diff --git a/src/app/components/HomePage/HomePage.spec.js b/src/app/components/HomePage/HomePage.spec.js
index f33e9d8..0afbd44 100644
--- a/src/app/components/HomePage/HomePage.spec.js
+++ b/src/app/components/HomePage/HomePage.spec.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import HomePage from './HomePage.jsx';
+import HomePage from './HomePage';
 
 describe('HomePage', () => {
   test('it should display the Watch component', () => {
diff --git a/src/framework/components/Button/Button.spec.js b/src/framework/components/Button/Button.spec.js
index 38cac59..345fe2c 100644
--- a/src/framework/components/Button/Button.spec.js
+++ b/src/framework/components/Button/Button.spec.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import Button from './Button.jsx';
+import Button from './Button';
 
 describe('Button component', () => {
   const buttonId = 'button-id';
diff --git a/src/framework/components/GenericList/GenericList.jsx b/src/framework/components/GenericList/GenericList.jsx
index 77a90c1..5538ce9 100644
--- a/src/framework/components/GenericList/GenericList.jsx
+++ b/src/framework/components/GenericList/GenericList.jsx
@@ -11,7 +11,7 @@ class GenericList extends React.Component {
     const objToListItem = (obj, index) => {
       return (
         <li key={ index }>
-          {Object.keys(obj).map(key => {
+          {Object.keys(obj).map((key) => {
             const value = obj[key];
             return <ListItem key={ key } className='block' text={ value } label={ `${ key }: ` } />;
           })}
diff --git a/src/framework/components/GenericList/GenericList.spec.js b/src/framework/components/GenericList/GenericList.spec.js
index cc02e83..7e738d1 100644
--- a/src/framework/components/GenericList/GenericList.spec.js
+++ b/src/framework/components/GenericList/GenericList.spec.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import GenericList from './GenericList.jsx';
+import GenericList from './GenericList';
 
 describe('GenericList component', () => {
   describe('When a list of objects is passed to the [items] props', () => {
diff --git a/src/framework/components/ScreenLayout/ScreenLayout.jsx b/src/framework/components/ScreenLayout/ScreenLayout.jsx
index e5552fb..ca93897 100644
--- a/src/framework/components/ScreenLayout/ScreenLayout.jsx
+++ b/src/framework/components/ScreenLayout/ScreenLayout.jsx
@@ -4,14 +4,14 @@ import { Route } from 'react-router-dom';
 import './screen_layout.scss';
 
 class ScreenLayout extends React.Component {
-  injectHandlerMap = child => {
+  injectHandlerMap = (child) => {
     return React.cloneElement(child, {
-      handlerMapper: newMap => { this.props.handlerMapper(newMap); },
+      handlerMapper: (newMap) => { this.props.handlerMapper(newMap); },
     });
   };
 
   render() {
-    const wrapChild = child => {
+    const wrapChild = (child) => {
       const clonedChild = this.injectHandlerMap(child);
       if (clonedChild.props.path) {
         return (<Route
diff --git a/src/framework/components/Time/Time.spec.js b/src/framework/components/Time/Time.spec.js
index dc42f95..930ff0c 100644
--- a/src/framework/components/Time/Time.spec.js
+++ b/src/framework/components/Time/Time.spec.js
@@ -4,7 +4,7 @@ import { shallow } from 'enzyme';
 import Time from './Time';
 
 describe('Time component', () => {
-  const composeComponent = (props) => shallow(
+  const composeComponent = props => shallow(
     <Time { ...props } />
   ).find('t');
 
diff --git a/src/framework/components/Watch/Watch.spec.js b/src/framework/components/Watch/Watch.spec.js
index b18dbee..d557547 100644
--- a/src/framework/components/Watch/Watch.spec.js
+++ b/src/framework/components/Watch/Watch.spec.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { shallow } from 'enzyme';
-import Watch from './Watch.jsx';
+import Watch from './Watch';
 import history from '../../../framework/Router/BrowserHistory';
 import ScreenLayout from '../ScreenLayout/ScreenLayout';
 
@@ -12,7 +12,9 @@ describe('Watch component', () => {
   const dummyNotificationEvent = { displayNotification: true, text: 'test' };
   beforeEach(() => {
     WatchComponent = shallow(
-      <Watch notificationEvent={ dummyNotificationEvent } />);
+      <Watch notificationEvent={ dummyNotificationEvent }>
+        <div>Mock</div>
+      </Watch>);
   });
 
   const verifyClickingButtonEvent = (result, resultPath) => {
diff --git a/src/index.js b/src/index.js
index 374a3f0..078f1fd 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 
-import HomePage from './app/components/HomePage/HomePage.jsx';
+import HomePage from './app/components/HomePage/HomePage';
 
 ReactDOM.render(<HomePage />, document.getElementById('root'));