diff --git a/README.md b/README.md
index 4403de4..3a1ab03 100644
--- a/README.md
+++ b/README.md
@@ -36,13 +36,13 @@ Along with many Gulp libraries (these can be seen in either `package.json`, or a
 
 1. If you haven't already, follow steps 1 & 2 above
 2. If you haven't already run `gulp dev` or `gulp prod` at least once, run `gulp prod`
-3. Run all tests in the `__tests__/` directory with the `gulp test` command
+3. Run all tests in the `tests/` directory with the `gulp test` command
   * A single file can be run by specifing an `-f` flag: `gulp test -f <PATH_TO_TEST_FILE>`
-    * In the `PATH_TO_TEST_FILE`, it is possible to omit the `__tests__/` prefix, as well as the `.test.js` suffix. They will be automatically added if not detected.
+    * In the `PATH_TO_TEST_FILE`, it is possible to omit the `tests/` prefix, as well as the `.test.js` suffix. They will be automatically added if not detected.
 
 ##### Code coverage
 
-When running tests, code coverage will be automatically calculated and output to an HTML file using the [Istanbul](https://github.com/gotwarlost/istanbul) library. These files can be seen in the generated `__coverage__/` directory.
+When running tests, code coverage will be automatically calculated and output to an HTML file using the [Istanbul](https://github.com/gotwarlost/istanbul) library. These files can be seen in the generated `coverage/` directory.
 
 ---
 
diff --git a/__tests__/App.test.js b/__tests__/App.test.js
deleted file mode 100644
index 6a7b185..0000000
--- a/__tests__/App.test.js
+++ /dev/null
@@ -1,59 +0,0 @@
-'use strict';
-
-import React              from 'react';
-import TestUtils          from 'react-addons-test-utils';
-
-import App                from '../app/js/App';
-import CurrentUserStore   from '../app/js/stores/CurrentUserStore';
-import CurrentUserActions from '../app/js/actions/CurrentUserActions';
-import {ListenerMixin}    from 'reflux';
-import TestHelpers        from '../utils/testHelpers';
-
-describe('App', function() {
-
-  it('#componentDidMount should listen to the user store and check login status', function() {
-    sandbox.mock(ListenerMixin).expects('listenTo').withArgs(CurrentUserStore, App._onUserChange).once();
-    sandbox.mock(CurrentUserActions).expects('checkLoginStatus').once();
-
-    TestUtils.renderIntoDocument(
-      <App params={{}} query={{}}>
-        <div />
-      </App>
-    );
-  });
-
-  it('#onUserChange should set the error state if an error is received', function() {
-    const err = { message: 'Test error message.' };
-    const app = TestUtils.renderIntoDocument(
-      <App params={{}} query={{}}>
-        <div />
-      </App>
-    );
-
-    app.onUserChange(err, null);
-    app.state.error.should.eql(err);
-  });
-
-  it('#onUserChange should set the user state and clear error if a new user is received', function() {
-    const user = TestHelpers.fixtures.user;
-    const app = TestUtils.renderIntoDocument(
-      <App params={{}} query={{}}>
-        <div />
-      </App>
-    );
-
-    app.onUserChange(null, user);
-    app.state.currentUser.should.eql(user);
-    Should(app.state.error).be.null();
-  });
-
-  it('#renderChildren should return all the cloned children', function() {
-    const app = TestUtils.renderIntoDocument(
-      <App params={{}} query={{}}>
-        <div className="test-child" />
-      </App>
-    );
-
-    TestUtils.findRenderedDOMComponentWithClass(app, 'test-child').should.not.throw();
-  });
-});
\ No newline at end of file
diff --git a/__tests__/components/Footer.test.js b/__tests__/components/Footer.test.js
deleted file mode 100644
index a055baf..0000000
--- a/__tests__/components/Footer.test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-
-import React     from 'react';
-import TestUtils from 'react-addons-test-utils';
-
-import Footer    from '../../app/js/components/Footer';
-
-describe('Component: Footer', function() {
-
-  it('should render properly', function() {
-    const footer = TestUtils.renderIntoDocument(
-      <Footer />
-    );
-
-    TestUtils.findRenderedDOMComponentWithTag.bind(null, footer, 'footer').should.not.throw();
-  });
-
-});
\ No newline at end of file
diff --git a/__tests__/components/Header.test.js b/__tests__/components/Header.test.js
deleted file mode 100644
index 58ea77f..0000000
--- a/__tests__/components/Header.test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-
-import React     from 'react';
-import TestUtils from 'react-addons-test-utils';
-
-import Header    from '../../app/js/components/Header';
-
-describe('Component: Header', function() {
-
-  it('should render properly', function() {
-    const header = TestUtils.renderIntoDocument(
-      <Header />
-    );
-
-    TestUtils.findRenderedDOMComponentWithTag.bind(null, header, 'header').should.not.throw();
-  });
-
-});
\ No newline at end of file
diff --git a/__tests__/pages/HomePage.test.js b/__tests__/pages/HomePage.test.js
deleted file mode 100644
index 54cde5c..0000000
--- a/__tests__/pages/HomePage.test.js
+++ /dev/null
@@ -1,31 +0,0 @@
-'use strict';
-
-import ReactDOM    from 'react-dom';
-import TestUtils   from 'react-addons-test-utils';
-
-import TestHelpers from '../../utils/testHelpers';
-import HomePage    from '../../app/js/pages/HomePage';
-
-describe('Page: Home', function() {
-
-  this.timeout(5000);
-
-  beforeEach(function(done) {
-    this.container = document.createElement('div');
-
-    TestHelpers.testRouteHandler('/', {}, {}, {}, HomePage, this.container, (component) => {
-      this.page = component;
-      sandbox.restore();
-      done();
-    });
-  });
-
-  it('should render properly', function() {
-    TestUtils.findRenderedDOMComponentWithClass.bind(null, this.page, 'home-page').should.not.throw();
-  });
-
-  afterEach(function() {
-    if ( this.container ) { ReactDOM.unmountComponentAtNode(this.container); }
-  });
-
-});
\ No newline at end of file
diff --git a/__tests__/pages/NotFoundPage.test.js b/__tests__/pages/NotFoundPage.test.js
deleted file mode 100644
index 5b5b520..0000000
--- a/__tests__/pages/NotFoundPage.test.js
+++ /dev/null
@@ -1,31 +0,0 @@
-'use strict';
-
-import ReactDOM     from 'react-dom';
-import TestUtils    from 'react-addons-test-utils';
-
-import TestHelpers  from '../../utils/testHelpers';
-import NotFoundPage from '../../app/js/pages/NotFoundPage';
-
-describe('Page: Not Found', function() {
-
-  this.timeout(5000);
-
-  beforeEach(function(done) {
-    this.container = document.createElement('div');
-
-    TestHelpers.testRouteHandler('/', {}, {}, {}, NotFoundPage, this.container, (component) => {
-      this.page = component;
-      sandbox.restore();
-      done();
-    });
-  });
-
-  it('should render properly', function() {
-    TestUtils.findRenderedDOMComponentWithClass.bind(null, this.page, 'not-found-page').should.not.throw();
-  });
-
-  afterEach(function() {
-    if ( this.container ) { ReactDOM.unmountComponentAtNode(this.container); }
-  });
-
-});
\ No newline at end of file
diff --git a/__tests__/pages/SearchPage.test.js b/__tests__/pages/SearchPage.test.js
deleted file mode 100644
index d3a6af0..0000000
--- a/__tests__/pages/SearchPage.test.js
+++ /dev/null
@@ -1,52 +0,0 @@
-'use strict';
-
-import ReactDOM    from 'react-dom';
-import TestUtils   from 'react-addons-test-utils';
-
-import TestHelpers from '../../utils/testHelpers';
-import SearchPage  from '../../app/js/pages/SearchPage';
-
-describe('Page: Search', function() {
-
-  this.timeout(5000);
-
-  beforeEach(function(done) {
-    this.container = document.createElement('div');
-
-    TestHelpers.testRouteHandler('/', {}, {}, {}, SearchPage, this.container, (component) => {
-      this.page = component;
-      sandbox.restore();
-      done();
-    });
-  });
-
-  it('should render properly', function() {
-    TestUtils.findRenderedDOMComponentWithClass.bind(null, this.page, 'search-page').should.not.throw();
-  });
-
-  it('should update state on input box change', function() {
-    const input = this.page.refs.searchInput;
-    const newValue = 'giraffe';
-
-    input.value = newValue;
-    TestUtils.Simulate.change(input);
-
-    this.page.state.query.should.eql(newValue);
-  });
-
-  it('should render the updated state in the related span', function() {
-    const input = this.page.refs.searchInput;
-    const span = this.page.refs.queryDisplay;
-    const newValue = 'giraffe';
-
-    input.value = newValue;
-    TestUtils.Simulate.change(input);
-
-    span.innerHTML.should.eql(newValue);
-  });
-
-  afterEach(function() {
-    if ( this.container ) { ReactDOM.unmountComponentAtNode(this.container); }
-  });
-
-});
\ No newline at end of file
diff --git a/__tests__/stores/CurrentUserStore.test.js b/__tests__/stores/CurrentUserStore.test.js
deleted file mode 100644
index 4381768..0000000
--- a/__tests__/stores/CurrentUserStore.test.js
+++ /dev/null
@@ -1,47 +0,0 @@
-'use strict';
-
-import when               from 'when';
-
-import TestHelpers        from '../../utils/testHelpers';
-import CurrentUserStore   from '../../app/js/stores/CurrentUserStore';
-import CurrentUserActions from '../../app/js/actions/CurrentUserActions';
-import AuthAPI            from '../../app/js/utils/AuthAPI';
-
-describe('Store: CurrentUser', function() {
-
-  const user = TestHelpers.fixtures.user;
-
-  it('#setUser should set this.user and trigger the store', function() {
-    sandbox.mock(CurrentUserStore).expects('trigger').withArgs(null, user).once();
-    CurrentUserStore.setUser(user);
-  });
-
-  it('#throwError should trigger the store', function() {
-    const err = { message: 'Test error' };
-
-    sandbox.mock(CurrentUserStore).expects('trigger').withArgs(err).once();
-    CurrentUserStore.throwError(err);
-  });
-
-  it('#checkLoginStatus should check user\'s login status on action', function() {
-    sandbox.mock(AuthAPI).expects('checkLoginStatus').returns(when(user));
-    sandbox.mock(CurrentUserStore).expects('setUser').withArgs(user).once();
-
-    CurrentUserActions.checkLoginStatus();
-  });
-
-  it('#loginUser should log user in on action if API response is successful', function() {
-    sandbox.mock(AuthAPI).expects('login').withArgs(user).returns(when(user));
-    sandbox.mock(CurrentUserStore).expects('setUser').withArgs(user).once();
-
-    CurrentUserActions.login(user);
-  });
-
-  it('#logoutUser should log user out on action', function() {
-    sandbox.mock(AuthAPI).expects('logout').once().returns(when());
-    sandbox.mock(CurrentUserStore).expects('setUser').withArgs(null).once();
-
-    CurrentUserActions.logout();
-  });
-
-});
\ No newline at end of file
diff --git a/__tests__/utils/APIUtils.test.js b/__tests__/utils/APIUtils.test.js
deleted file mode 100644
index 923e109..0000000
--- a/__tests__/utils/APIUtils.test.js
+++ /dev/null
@@ -1,72 +0,0 @@
-'use strict';
-
-import request        from 'superagent';
-import {camelizeKeys} from 'humps';
-import APIUtils       from '../../app/js/utils/APIUtils';
-
-describe('Util: APIUtils', function() {
-
-  it('should normalize the body of a response object with varying keys', function() {
-    let testResponse = {
-      status: 200,
-      body: {
-        camel_case: 'test', //eslint-disable-line camelcase
-        PascalCase: 'test',
-        camelCase: 'test'
-      }
-    };
-
-    APIUtils.normalizeResponse(testResponse).should.eql(camelizeKeys(testResponse.body));
-  });
-
-  it('should make a GET request', function() {
-    let path = 'auth/check';
-
-    sandbox.mock(request).expects('get').withArgs('http://localhost:3000/api/' + path);
-
-    APIUtils.get(path);
-  });
-
-  it('should make a POST request', function() {
-    let path = 'auth/login';
-    let user = {
-      username: 'test',
-      password: 'test'
-    };
-
-    sandbox.mock(request).expects('post').withArgs('http://localhost:3000/api/' + path, user);
-
-    APIUtils.post(path, user);
-  });
-
-  it('should make a PATCH request', function() {
-    let path = 'user/1';
-    let user = {
-      email: 'new@test.com'
-    };
-
-    sandbox.mock(request).expects('patch').withArgs('http://localhost:3000/api/' + path, user);
-
-    APIUtils.patch(path, user);
-  });
-
-  it('should make a PUT request', function() {
-    let path = 'user/1';
-    let user = {
-      email: 'new@test.com'
-    };
-
-    sandbox.mock(request).expects('put').withArgs('http://localhost:3000/api/' + path, user);
-
-    APIUtils.put(path, user);
-  });
-
-  it('should make a DEL request', function() {
-    let path = 'user/1';
-
-    sandbox.mock(request).expects('del').withArgs('http://localhost:3000/api/' + path);
-
-    APIUtils.del(path);
-  });
-
-});
\ No newline at end of file
diff --git a/__tests__/utils/AuthAPI.test.js b/__tests__/utils/AuthAPI.test.js
deleted file mode 100644
index 3d56252..0000000
--- a/__tests__/utils/AuthAPI.test.js
+++ /dev/null
@@ -1,41 +0,0 @@
-'use strict';
-
-import APIUtils    from '../../app/js/utils/APIUtils';
-import AuthAPI     from '../../app/js/utils/AuthAPI';
-import TestHelpers from '../../utils/testHelpers';
-
-describe('Util: AuthAPI', function() {
-
-  const user = TestHelpers.fixtures.user;
-
-  it('should make a request to check a user\'s login status', function(done) {
-    let path = 'auth/check';
-
-    sandbox.mock(APIUtils).expects('get').withArgs(path);
-
-    AuthAPI.checkLoginStatus();
-
-    done();
-  });
-
-  it('should make a request to login a user', function(done) {
-    let path = 'auth/login';
-
-    sandbox.mock(APIUtils).expects('post').withArgs(path, user);
-
-    AuthAPI.login(user);
-
-    done();
-  });
-
-  it('should make a request to log a user out', function(done) {
-    let path = 'auth/logout';
-
-    sandbox.mock(APIUtils).expects('post').withArgs(path);
-
-    AuthAPI.logout();
-
-    done();
-  });
-
-});
\ No newline at end of file
diff --git a/app/js/stores/CurrentUserStore.js b/app/js/stores/CurrentUserStore.js
index e55766d..0cf37e7 100644
--- a/app/js/stores/CurrentUserStore.js
+++ b/app/js/stores/CurrentUserStore.js
@@ -29,7 +29,7 @@ const CurrentUserStore = Reflux.createStore({
     if ( this.user ) {
       this.setUser(this.user);
     } else {
-      AuthAPI.checkLoginStatus().then(user => {
+      AuthAPI.checkLoginStatus().then((user) => {
         this.hasBeenChecked = true;
         this.setUser(user);
       }).catch(err => {
@@ -40,7 +40,7 @@ const CurrentUserStore = Reflux.createStore({
   },
 
   loginUser(user) {
-    AuthAPI.login(user).then(user => {
+    AuthAPI.login(user).then((user) => {
       this.setUser(user);
     }).catch(err => {
       this.throwError(err);
@@ -55,4 +55,4 @@ const CurrentUserStore = Reflux.createStore({
 
 });
 
-export default CurrentUserStore;
\ No newline at end of file
+export default CurrentUserStore;
diff --git a/app/js/utils/APIUtils.js b/app/js/utils/APIUtils.js
index 5e27fc9..1f28404 100644
--- a/app/js/utils/APIUtils.js
+++ b/app/js/utils/APIUtils.js
@@ -1,14 +1,15 @@
 'use strict';
 
-import {camelizeKeys} from 'humps';
-import request        from 'superagent';
+import request from 'superagent';
+import {camel} from 'change-case';
+import helpers from './Helpers';
 
 const APIUtils = {
 
   root: '//localhost:3000/api/',
 
   normalizeResponse(response) {
-    return camelizeKeys(response.body);
+    return helpers.processObjectKeys(response, key => { return camel(key); });
   },
 
   get(path) {
@@ -84,4 +85,4 @@ const APIUtils = {
 
 };
 
-export default APIUtils;
\ No newline at end of file
+export default APIUtils;
diff --git a/app/js/utils/Helpers.js b/app/js/utils/Helpers.js
new file mode 100644
index 0000000..07921da
--- /dev/null
+++ b/app/js/utils/Helpers.js
@@ -0,0 +1,28 @@
+'use strict';
+
+import _ from 'lodash';
+
+const Helpers = {
+
+  processObjectKeys(obj, convert) {
+    let output;
+
+    if ( _.isDate(obj) || _.isRegExp(obj) || !_.isObject(obj) ) {
+      return obj;
+    } else if ( _.isArray(obj) ) {
+      output = _.map(obj, item => {
+        return this.processObjectKeys(item, convert);
+      });
+    } else {
+      output = {};
+      _.forOwn(obj, (value, key) => {
+        output[convert(key)] = this.processObjectKeys(obj[key], convert);
+      });
+    }
+
+    return output;
+  }
+
+};
+
+export default Helpers;
diff --git a/gulp/config.js b/gulp/config.js
index d85f5e7..c2f9f60 100644
--- a/gulp/config.js
+++ b/gulp/config.js
@@ -24,7 +24,7 @@ const config = {
 
   buildDir: './build/',
 
-  testFiles: './__tests__/**/*.{js,jsx}',
+  testFiles: './tests/**/*.{js,jsx}',
 
   assetExtensions: [
     'js',
@@ -42,4 +42,4 @@ const config = {
 
 };
 
-export default config;
\ No newline at end of file
+export default config;
diff --git a/gulp/tasks/test.js b/gulp/tasks/test.js
index a04ef70..8436ddd 100644
--- a/gulp/tasks/test.js
+++ b/gulp/tasks/test.js
@@ -15,11 +15,11 @@ gulp.task('test', () => {
     let singleFile = argv.f || argv.file;
 
     // Allow omission of directory and/or extension
-    if ( singleFile.indexOf('__tests__/') === -1 ) { singleFile = `__tests__/${singleFile}`; }
+    if ( singleFile.indexOf('tests/') === -1 ) { singleFile = `tests/${singleFile}`; }
     if ( singleFile.indexOf('.test.js') === -1 ) { singleFile += '.test.js'; }
 
     // Include top-level helper even when running specific tests
-    files = ['__tests__/helper.js', singleFile];
+    files = ['tests/helper.js', singleFile];
   } else {
     // Default to all test files
     files = [config.testFiles];
@@ -27,24 +27,25 @@ gulp.task('test', () => {
 
   // Ensure that all window/DOM related properties
   // are available to all tests
-  global.document = jsdom('<!DOCTYPE html><html><body></body></html>');
-  global.window = document.parentWindow;
-  global.location = { href: '' };
-  global.navigator = {};
-  global.navigator.userAgent = 'jsdom';
-  global.navigator.appVersion = '';
-
-  // Ensure that 'should' and 'sinon' library methods will be
+  global.document = jsdom('<!DOCTYPE html><html><body></body></html>', {
+    url: 'http://localhost'
+  });
+  global.window = document.defaultView;
+  global.navigator = window.navigator;
+  global.KeyboardEvent = window.KeyboardEvent;
+
+  // Ensure that 'sinon' and 'chai' library methods will be
   // available to all tests
-  global.Should = require('should');
   global.sinon = require('sinon');
+  global.assert = require('chai').assert;
+  require('sinon-as-promised');
 
   return (gjc.createTask({
     src: files,
 
     istanbul: {
       coverageVariable: '__MY_TEST_COVERAGE__',
-      exclude: /node_modules|__tests__|build|gulp|testHelpers/
+      exclude: /node_modules|tests|build|gulp|testHelpers/
     },
 
     transpile: {
@@ -72,4 +73,4 @@ gulp.task('test', () => {
     }
   }))();
 
-});
\ No newline at end of file
+});
diff --git a/package.json b/package.json
index 9279770..9baa798 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,8 @@
     "babelify": "^7.2.0",
     "browser-sync": "^2.7.13",
     "browserify": "^12.0.1",
+    "chai": "^3.5.0",
+    "change-case": "^2.3.1",
     "debowerify": "^1.3.1",
     "del": "^2.2.0",
     "eslint-plugin-react": "^3.6.3",
@@ -46,7 +48,6 @@
     "gulp-uglify": "^1.2.0",
     "gulp-util": "^3.0.6",
     "history": "^1.17.0",
-    "humps": "^1.0.0",
     "istanbul": "^0.4.0",
     "jsdom": "3.1.2",
     "lodash": "^3.10.0",
@@ -58,12 +59,11 @@
     "react-router": "^1.0.0-rc1",
     "reflux": "^0.3.0",
     "run-sequence": "^1.1.1",
-    "should": "^8.0.0",
     "sinon": "^1.17.1",
+    "sinon-as-promised": "^4.0.0",
     "superagent": "^1.2.0",
     "vinyl-source-stream": "^1.1.0",
     "watchify": "^3.2.x",
-    "when": "^3.7.4",
     "yargs": "^3.27.0"
   },
   "scripts": {
diff --git a/__tests__/.eslintrc b/tests/.eslintrc
similarity index 100%
rename from __tests__/.eslintrc
rename to tests/.eslintrc
diff --git a/tests/App.test.js b/tests/App.test.js
new file mode 100644
index 0000000..bde3c92
--- /dev/null
+++ b/tests/App.test.js
@@ -0,0 +1,64 @@
+'use strict';
+
+import React              from 'react';
+import TestUtils          from 'react-addons-test-utils';
+
+import fixtures           from '../utils/fixtures';
+import copyObject         from '../utils/copyObject';
+import App                from '../app/js/App';
+import CurrentUserStore   from '../app/js/stores/CurrentUserStore';
+import CurrentUserActions from '../app/js/actions/CurrentUserActions';
+
+describe('App', function() {
+
+  const USER = copyObject(fixtures.user);
+  let rendered;
+  let props;
+
+  function renderComponent() {
+    rendered = TestUtils.renderIntoDocument(
+      <App {...props}>
+        <div className="test-child" />
+      </App>
+    );
+  }
+
+  beforeEach(function() {
+    props = {
+      params: {},
+      query: {}
+    };
+
+    renderComponent();
+  });
+
+  it('#componentDidMount should listen to the user store and check login status', function() {
+    sandbox.stub(CurrentUserStore, 'listen');
+    sandbox.stub(CurrentUserActions, 'checkLoginStatus');
+
+    rendered.componentDidMount();
+
+    sinon.assert.calledOnce(CurrentUserStore.listen);
+    sinon.assert.calledWith(CurrentUserStore.listen, rendered.onUserChange);
+    sinon.assert.calledOnce(CurrentUserActions.checkLoginStatus);
+  });
+
+  it('#onUserChange should set the error state if an error is received', function() {
+    const err = { message: 'Test error message.' };
+
+    rendered.onUserChange(err, null);
+
+    assert.deepEqual(rendered.state.error, err);
+  });
+
+  it('#onUserChange should set the user state and clear error if a new user is received', function() {
+    rendered.onUserChange(null, USER);
+
+    assert.strictEqual(rendered.state.currentUser, USER);
+    assert.isNull(rendered.state.error);
+  });
+
+  it('#renderChildren should return all the cloned children', function() {
+    assert.doesNotThrow(TestUtils.findRenderedDOMComponentWithClass.bind(null, rendered, 'test-child'));
+  });
+});
diff --git a/tests/components/Footer.test.js b/tests/components/Footer.test.js
new file mode 100644
index 0000000..50ccf34
--- /dev/null
+++ b/tests/components/Footer.test.js
@@ -0,0 +1,28 @@
+'use strict';
+
+import React     from 'react';
+import TestUtils from 'react-addons-test-utils';
+
+import Footer    from '../../app/js/components/Footer';
+
+describe('Component: Footer', function() {
+
+  let rendered;
+  let props;
+
+  function renderComponent() {
+    rendered = TestUtils.renderIntoDocument(
+      <Footer {...props} />
+    );
+  }
+
+  beforeEach(function() {
+    props = {};
+    renderComponent();
+  });
+
+  it('should render properly', function() {
+    assert.doesNotThrow(TestUtils.findRenderedDOMComponentWithTag.bind(null, rendered, 'footer'));
+  });
+
+});
diff --git a/tests/components/Header.test.js b/tests/components/Header.test.js
new file mode 100644
index 0000000..4c7c1b1
--- /dev/null
+++ b/tests/components/Header.test.js
@@ -0,0 +1,28 @@
+'use strict';
+
+import React     from 'react';
+import TestUtils from 'react-addons-test-utils';
+
+import Header    from '../../app/js/components/Header';
+
+describe('Component: Header', function() {
+
+  let rendered;
+  let props;
+
+  function renderComponent() {
+    rendered = TestUtils.renderIntoDocument(
+      <Header {...props} />
+    );
+  }
+
+  beforeEach(function() {
+    props = {};
+    renderComponent();
+  });
+
+  it('should render properly', function() {
+    assert.doesNotThrow(TestUtils.findRenderedDOMComponentWithTag.bind(null, rendered, 'header'));
+  });
+
+});
diff --git a/__tests__/helper.js b/tests/helper.js
similarity index 100%
rename from __tests__/helper.js
rename to tests/helper.js
diff --git a/tests/pages/HomePage.test.js b/tests/pages/HomePage.test.js
new file mode 100644
index 0000000..af35846
--- /dev/null
+++ b/tests/pages/HomePage.test.js
@@ -0,0 +1,28 @@
+'use strict';
+
+import React     from 'react';
+import TestUtils from 'react-addons-test-utils';
+
+import HomePage  from '../../app/js/pages/HomePage';
+
+describe('Page: Home', function() {
+
+  let rendered;
+  let props;
+
+  function renderComponent() {
+    rendered = TestUtils.renderIntoDocument(
+      <HomePage {...props} />
+    );
+  }
+
+  beforeEach(function() {
+    props = {};
+    renderComponent();
+  });
+
+  it('should render properly', function() {
+    assert.doesNotThrow(TestUtils.findRenderedDOMComponentWithClass.bind(null, rendered, 'home-page'));
+  });
+
+});
diff --git a/tests/pages/NotFoundPage.test.js b/tests/pages/NotFoundPage.test.js
new file mode 100644
index 0000000..1cf7bfb
--- /dev/null
+++ b/tests/pages/NotFoundPage.test.js
@@ -0,0 +1,28 @@
+'use strict';
+
+import React        from 'react';
+import TestUtils    from 'react-addons-test-utils';
+
+import NotFoundPage from '../../app/js/pages/NotFoundPage';
+
+describe('Page: Not Found', function() {
+
+  let rendered;
+  let props;
+
+  function renderComponent() {
+    rendered = TestUtils.renderIntoDocument(
+      <NotFoundPage {...props} />
+    );
+  }
+
+  beforeEach(function() {
+    props = {};
+    renderComponent();
+  });
+
+  it('should render properly', function() {
+    assert.doesNotThrow(TestUtils.findRenderedDOMComponentWithClass.bind(null, rendered, 'not-found-page'));
+  });
+
+});
diff --git a/tests/pages/SearchPage.test.js b/tests/pages/SearchPage.test.js
new file mode 100644
index 0000000..261e0f4
--- /dev/null
+++ b/tests/pages/SearchPage.test.js
@@ -0,0 +1,49 @@
+'use strict';
+
+import React      from 'react';
+import TestUtils  from 'react-addons-test-utils';
+
+import SearchPage from '../../app/js/pages/SearchPage';
+
+describe('Page: Search', function() {
+
+  let rendered;
+  let props;
+
+  function renderComponent() {
+    rendered = TestUtils.renderIntoDocument(
+      <SearchPage {...props} />
+    );
+  }
+
+  beforeEach(function() {
+    props = {};
+    renderComponent();
+  });
+
+  it('should render properly', function() {
+    assert.doesNotThrow(TestUtils.findRenderedDOMComponentWithClass.bind(null, rendered, 'search-page'));
+  });
+
+  it('should update state on input box change', function() {
+    const input = rendered.refs.searchInput;
+    const newValue = 'giraffe';
+
+    input.value = newValue;
+    TestUtils.Simulate.change(input);
+
+    assert.strictEqual(rendered.state.query, newValue);
+  });
+
+  it('should render the updated state in the related span', function() {
+    const input = rendered.refs.searchInput;
+    const span = rendered.refs.queryDisplay;
+    const newValue = 'giraffe';
+
+    input.value = newValue;
+    TestUtils.Simulate.change(input);
+
+    assert.strictEqual(span.textContent, newValue);
+  });
+
+});
diff --git a/tests/stores/CurrentUserStore.test.js b/tests/stores/CurrentUserStore.test.js
new file mode 100644
index 0000000..7ae54e3
--- /dev/null
+++ b/tests/stores/CurrentUserStore.test.js
@@ -0,0 +1,83 @@
+'use strict';
+
+import fixtures           from '../../utils/fixtures';
+import copyObject         from '../../utils/copyObject';
+import CurrentUserStore   from '../../app/js/stores/CurrentUserStore';
+import CurrentUserActions from '../../app/js/actions/CurrentUserActions';
+import AuthAPI            from '../../app/js/utils/AuthAPI';
+
+describe('Store: CurrentUser', function() {
+
+  const USER = copyObject(fixtures.user);
+
+  beforeEach(function() {
+    CurrentUserStore.user = null;
+  });
+
+  it('#setUser should set this.user and trigger the store', function() {
+    sandbox.stub(CurrentUserStore, 'trigger');
+
+    CurrentUserStore.setUser(USER);
+
+    sinon.assert.calledOnce(CurrentUserStore.trigger);
+    sinon.assert.calledWith(CurrentUserStore.trigger, null, USER);
+  });
+
+  it('#throwError should trigger the store', function() {
+    const err = { message: 'Test error' };
+
+    sandbox.stub(CurrentUserStore, 'trigger');
+
+    CurrentUserStore.throwError(err);
+
+    sinon.assert.calledOnce(CurrentUserStore.trigger);
+    sinon.assert.calledWith(CurrentUserStore.trigger, err);
+  });
+
+  it('#checkLoginStatus should check user\'s login status on action', function(done) {
+    sandbox.stub(AuthAPI, 'checkLoginStatus').resolves(USER);
+    sandbox.spy(CurrentUserStore, 'setUser');
+
+    sandbox.stub(CurrentUserStore, 'trigger', () => {
+      sinon.assert.calledOnce(AuthAPI.checkLoginStatus);
+      sinon.assert.calledOnce(CurrentUserStore.setUser);
+      sinon.assert.calledWith(CurrentUserStore.setUser, USER);
+
+      done();
+    });
+
+    CurrentUserActions.checkLoginStatus();
+  });
+
+  it('#loginUser should log user in on action if API response is successful', function(done) {
+    sandbox.stub(AuthAPI, 'login').resolves(USER);
+    sandbox.spy(CurrentUserStore, 'setUser');
+
+    sandbox.stub(CurrentUserStore, 'trigger', () => {
+      sinon.assert.calledOnce(AuthAPI.login);
+      sinon.assert.calledWith(AuthAPI.login, USER);
+      sinon.assert.calledOnce(CurrentUserStore.setUser);
+      sinon.assert.calledWith(CurrentUserStore.setUser, USER);
+
+      done();
+    });
+
+    CurrentUserActions.login(USER);
+  });
+
+  it('#logoutUser should log user out on action', function(done) {
+    sandbox.stub(AuthAPI, 'logout').resolves();
+    sandbox.spy(CurrentUserStore, 'setUser');
+
+    sandbox.stub(CurrentUserStore, 'trigger', () => {
+      sinon.assert.calledOnce(AuthAPI.logout);
+      sinon.assert.calledOnce(CurrentUserStore.setUser);
+      sinon.assert.calledWith(CurrentUserStore.setUser, null);
+
+      done();
+    });
+
+    CurrentUserActions.logout();
+  });
+
+});
diff --git a/tests/utils/APIUtils.test.js b/tests/utils/APIUtils.test.js
new file mode 100644
index 0000000..b71d04e
--- /dev/null
+++ b/tests/utils/APIUtils.test.js
@@ -0,0 +1,83 @@
+'use strict';
+
+import request  from 'superagent';
+import APIUtils from '../../app/js/utils/APIUtils';
+
+describe('Util: APIUtils', function() {
+
+  it('#normalizeResponse should normalize the body of a response object with varying keys', function() {
+    const beforeObj = {
+        camel_case: 'yes', //eslint-disable-line camelcase
+        WhatIsThisCase: 'yes'
+    };
+    const afterObj = { camelCase: 'yes', whatIsThisCase: 'yes' };
+
+    assert.deepEqual(APIUtils.normalizeResponse(beforeObj), afterObj);
+  });
+
+  it('#get should make a GET request', function() {
+    const path = 'auth/check';
+
+    sandbox.stub(request, 'get');
+
+    APIUtils.get(path);
+
+    sinon.assert.calledOnce(request.get);
+    sinon.assert.calledWith(request.get, APIUtils.root + path);
+  });
+
+  it('#post should make a POST request', function() {
+    const path = 'auth/login';
+    const user = {
+      username: 'test',
+      password: 'test'
+    };
+
+    sandbox.stub(request, 'post');
+
+    APIUtils.post(path, user);
+
+    sinon.assert.calledOnce(request.post);
+    sinon.assert.calledWith(request.post, APIUtils.root + path, user);
+  });
+
+  it('#patch should make a PATCH request', function() {
+    const path = 'user/1';
+    const user = {
+      email: 'new@test.com'
+    };
+
+    sandbox.stub(request, 'patch');
+
+    APIUtils.patch(path, user);
+
+    sinon.assert.calledOnce(request.patch);
+    sinon.assert.calledWith(request.patch, APIUtils.root + path, user);
+  });
+
+  it('#put should make a PUT request', function() {
+    const path = 'user/1';
+    const user = {
+      email: 'new@test.com'
+    };
+
+    sandbox.stub(request, 'put');
+
+    APIUtils.put(path, user);
+
+    sinon.assert.calledOnce(request.put);
+    sinon.assert.calledWith(request.put, APIUtils.root + path, user);
+  });
+
+  it('#del should make a DELETE request', function() {
+    const path = 'user/1';
+
+    sandbox.stub(request, 'del');
+
+    APIUtils.del(path);
+
+    sinon.assert.calledOnce(request.del);
+    sinon.assert.calledWith(request.del, APIUtils.root + path);
+  });
+
+});
diff --git a/tests/utils/AuthAPI.test.js b/tests/utils/AuthAPI.test.js
new file mode 100644
index 0000000..90c5ce2
--- /dev/null
+++ b/tests/utils/AuthAPI.test.js
@@ -0,0 +1,45 @@
+'use strict';
+
+import fixtures   from '../../utils/fixtures';
+import copyObject from '../../utils/copyObject';
+import APIUtils   from '../../app/js/utils/APIUtils';
+import AuthAPI    from '../../app/js/utils/AuthAPI';
+
+describe('Util: AuthAPI', function() {
+
+  const USER = copyObject(fixtures.user);
+
+  it('#checkLoginStatus should make a request to check a user\'s login status', function() {
+    const path = 'auth/check';
+
+    sandbox.stub(APIUtils, 'get');
+
+    AuthAPI.checkLoginStatus();
+
+    sinon.assert.calledOnce(APIUtils.get);
+    sinon.assert.calledWith(APIUtils.get, path);
+  });
+
+  it('#login should make a request to login a user', function() {
+    const path = 'auth/login';
+
+    sandbox.stub(APIUtils, 'post');
+
+    AuthAPI.login(USER);
+
+    sinon.assert.calledOnce(APIUtils.post);
+    sinon.assert.calledWith(APIUtils.post, path, USER);
+  });
+
+  it('#logout should make a request to log a user out', function() {
+    const path = 'auth/logout';
+
+    sandbox.stub(APIUtils, 'post');
+
+    AuthAPI.logout();
+
+    sinon.assert.calledOnce(APIUtils.post);
+    sinon.assert.calledWith(APIUtils.post, path);
+  });
+
+});
diff --git a/utils/copyObject.js b/utils/copyObject.js
new file mode 100644
index 0000000..126a631
--- /dev/null
+++ b/utils/copyObject.js
@@ -0,0 +1,7 @@
+'use strict';
+
+function copyObject(obj) {
+  return JSON.parse(JSON.stringify(obj));
+}
+
+export default copyObject;
diff --git a/utils/fixtures.js b/utils/fixtures.js
new file mode 100644
index 0000000..ff13177
--- /dev/null
+++ b/utils/fixtures.js
@@ -0,0 +1,15 @@
+'use strict';
+
+const USER = {
+  id: 1,
+  email: 'test@test.com',
+  username: 'test',
+  firstName: 'John',
+  lastName: 'Doe'
+};
+
+const FIXTURES = {
+  user: USER
+};
+
+export default FIXTURES;
diff --git a/utils/testHelpers.js b/utils/testHelpers.js
index e88c98b..dc476db 100644
--- a/utils/testHelpers.js
+++ b/utils/testHelpers.js
@@ -1,110 +1,7 @@
 'use strict';
 
-import {Router, Route} from 'react-router';
-import React           from 'react';
-import ReactDOM        from 'react-dom';
-import TestUtils       from 'react-addons-test-utils';
-import createHistory   from 'history/lib/createMemoryHistory';
-import _               from 'lodash';
-
 const testHelpers = {
 
-  fixtures: {
-    user: {
-      id: 1,
-      email: 'test@test.com',
-      username: 'test',
-      firstName: 'John',
-      lastName: 'Doe'
-    }
-  },
-
-  testRouteHandler(initialPath, params = {}, query = {}, props = {}, routeHandler, container, cb) {
-    const fixtures = this.fixtures;
-
-    const ParentComponent = React.createClass({
-      propTypes: {
-        params: React.PropTypes.object,
-        location: React.PropTypes.object,
-        children: React.PropTypes.object
-      },
-
-      renderChildren() {
-        return this.props.children && React.cloneElement(this.props.children, _.merge(props, {
-          params: _.merge(this.props.params, params),
-          location: _.merge(this.props.location, { query: query }),
-          currentUser: fixtures.user
-        }));
-      },
-
-      render() {
-        return this.renderChildren();
-      }
-    });
-
-    ReactDOM.render((
-      <Router history={createHistory(initialPath)}>
-        <Route component={ParentComponent}>
-          <Route path={initialPath} component={routeHandler} />
-        </Route>
-      </Router>
-    ), container, function() {
-      cb(TestUtils.findRenderedComponentWithType(this, routeHandler));
-    });
-  },
-
-  renderStubbedComponent(Component, props) {
-    const StubbedParent = React.createClass({
-      childContextTypes: {
-        router: React.PropTypes.object
-      },
-
-      propTypes: {
-        children: React.PropTypes.func
-      },
-
-      getChildContext() {
-        return {
-          router: {
-            makePath(pathname, query) { },
-            makeHref(pathname, query) { },
-            transitionTo(pathname, query, state=null) { },
-            replaceWith(pathname, query, state=null) { },
-            go(n) { },
-            goBack() { },
-            goForward() { },
-            isActive(pathname, query) { }
-          }
-        };
-      },
-
-      render() {
-        return this.props.children();
-      }
-    });
-
-    return TestUtils.findRenderedComponentWithType(TestUtils.renderIntoDocument(
-      <StubbedParent>
-        {() => <Component {...props} />}
-      </StubbedParent>
-    ), Component);
-  },
-
-  renderComponentForMixin(Mixin, dependencies, container, cb = function() {}) {
-    if ( !_.isArray(dependencies) ) {
-      cb = container;
-      container = dependencies;
-      dependencies = [];
-    }
-
-    let Component = React.createClass({
-      mixins: [Mixin, {...dependencies}],
-      render () { return null; }
-    });
-
-    return this.testRouteHandler('/', {}, {}, {}, Component, container, cb);
-  },
-
   createNativeClickEvent() {
     let evt = document.createEvent('HTMLEvents');
     evt.initEvent('click', false, true);
@@ -131,4 +28,4 @@ const testHelpers = {
 
 };
 
-export default testHelpers;
\ No newline at end of file
+export default testHelpers;