diff --git a/.travis.yml b/.travis.yml
index 6de9cef13..53650bd89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ install: npm install
 deployg: grunt release
 before_script: grunt setup
 script:
-  - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then echo "grunt test"; grunt test; fi
+  - if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then echo "grunt test coverage"; grunt test coverage; fi
   #- if [ "$TRAVIS_PULL_REQUEST" = "false" ]; then echo "grunt sauce"; grunt sauce; fi
 env:
   global:
diff --git a/README.md b/README.md
index ed35448d4..d65410998 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@ bumblebee
 =========
 
 [![Build Status](https://travis-ci.org/adsabs/bumblebee.svg?branch=master)](https://travis-ci.org/adsabs/bumblebee)
+[![Coverage Status](https://coveralls.io/repos/github/adsabs/bumblebee/badge.svg?branch=fix-code-coverage)](https://coveralls.io/github/adsabs/bumblebee?branch=fix-code-coverage)
 
 Bumblebee is a platform for building UI interface(s) - it was designed for Astrophysics Data System (https://ui.adsabs.harvard.edu) and its API.
 
diff --git a/grunt/aliases.yaml b/grunt/aliases.yaml
index 0a20dc26d..4726547c7 100644
--- a/grunt/aliases.yaml
+++ b/grunt/aliases.yaml
@@ -96,31 +96,11 @@ test: 'test:once'
 coverage:
   description: 'Generate the test coverage report'
   tasks:
-    - 'env:dev'
-    - 'express:dev'
-    - 'blanket_mocha:full'
-
-testfunc: 'testfunc:local'
-
-'testfunc:local':
-  description: 'Run the local functional tests'
-  tasks:
-  - 'env:dev'
-  - 'sass'
-  - 'autoprefixer'
-  - 'exec:git_describe'
-  - 'express:dev'
-  - 'intern:local'
-
-'testfunc:remote':
-  description: 'Run the remote functional tests'
-  tasks:
-  - 'env:dev'
-  - 'sass'
-  - 'autoprefixer'
-  - 'exec:git_describe'
-  - 'express:dev'
-  - 'intern:remote'
+    - 'clean:coverage'
+    - 'exec:nyc-instrument'
+    - 'mocha-runner:coverage'
+    - 'coverage-report:coveralls'
+    - 'exec:coveralls-report'
 
 sauce:
   description: 'Run the SauceLabs tests'
diff --git a/grunt/blanket_mocha.js b/grunt/blanket_mocha.js
deleted file mode 100644
index c512f1be4..000000000
--- a/grunt/blanket_mocha.js
+++ /dev/null
@@ -1,80 +0,0 @@
-'use strict';
-/**
- * Options for the `blanket-mocha` grunt task
- *
- * @module grunt/blanket-mocha
- */
-module.exports = {
-  full: {
-    options: {
-      urls: [
-        'http://localhost:<%= local.port || 8000 %>/test/mocha/coverage.html?bbbSuite=discovery-suite'
-      ],
-      threshold: 0,
-      globalThreshold: 75,
-      log: true,
-      logErrors: true,
-      moduleThreshold: 80,
-      modulePattern: '../../js/(.*)',
-      customModuleThreshold: {
-
-        'components/api_query_updater.js': 78,
-        'widgets/facet/graph-facet/h_index_graph.js': 38,
-
-        'widgets/facet/graph-facet/widget.js': 60,
-        'widgets/facet/graph-facet/year_graph.js': 58,
-        'widgets/facet/graph-facet/h_index_graph.js ': 38,
-        'apps/discovery/navigator.js': 30,
-        'apps/discovery/router.js': 37,
-        'wraps/graph_tabs.js': 5,
-        'widgets/facet/graph-facet/base_graph.js': 8,
-        'widgets/export/widget.js': 23,
-        'mixins/widget_mixin_method.js': 37,
-        'page_managers/three_column_view.js': 60,
-        'mixins/widget_utility.js': 40,
-        'components/query_builder/rules_translator.js': 45,
-        'components/csrf_manager.js': 25,
-        'widgets/base/tree_view.js': 50,
-        'widgets/list_of_things/item_view.js': 50,
-        'widgets/base/base_widget.js': 51,
-        'widgets/breadcrumb/widget.js': 55,
-        'components/navigator.js': 60,
-        'mixins/dependon.js': 61,
-        'widgets/query_info/query_info_widget.js': 46,
-        'widgets/resources/widget.js': 72,
-        'wraps/table_of_contents.js': 73,
-        'bugutils/minimal_pubsub.js': 74,
-        'components/history_manager.js': 75,
-        'components/api_feedback.js': 77,
-        'components/transition.js': 77,
-        'widgets/dropdown-menu/widget.js': 78,
-        'wraps/paper_network.js': 77, // some tests don't run properly in phantomjs,
-        'wraps/paper_export.js': 68,
-        'widgets/recommender/widget.js': 65,
-        'wraps/discovery_mediator.js': 5, // these two guys are complex to test (but i've already started)
-        'mixins/feedback_handling.js': 35,
-        'mixins/discovery_bootstrap.js': 1,
-        'widgets/navbar/widget.js': 53,
-        'widgets/success/view.js': 60,
-        'components/library_controller.js': 74,
-        'widgets/wordcloud/widget.js': 78,
-        'components/analytics.js': 71,
-        'wraps/landing_page_manager/landing_page_manager': 48,
-        'widgets/libraries_all/views/view_all_libraries.js': 78
-      }
-    }
-  },
-  test: {
-    options : {
-      urls: [
-        'http://localhost:<%= local.port || 8000 %>/test/mocha/coverage.html?bbbSuite=core-suite'
-      ],
-      threshold : 0,
-      globalThreshold : 63,
-      log : true,
-      logErrors: true,
-      moduleThreshold : 0,
-      modulePattern : '../../src/js/(.*)'
-    }
-  }
-};
diff --git a/grunt/clean.js b/grunt/clean.js
index be95dd1f7..0c183f401 100644
--- a/grunt/clean.js
+++ b/grunt/clean.js
@@ -13,5 +13,8 @@ module.exports = {
       './bower_components',
       'test/reports'
     ]
+  },
+  coverage: {
+    src: ['test/coverage']
   }
 };
diff --git a/grunt/config/coverage-hook.js b/grunt/config/coverage-hook.js
new file mode 100644
index 000000000..f615c9612
--- /dev/null
+++ b/grunt/config/coverage-hook.js
@@ -0,0 +1,36 @@
+'use strict';
+
+// phantomjs's version of `fs`
+var fs = require('fs');
+var COVERAGE_FILE = 'test/coverage/coverage.json';
+
+var saveCoverage = function (page) {
+  var coverage = page.evaluate(function () {
+    return window.__coverage__;
+  });
+
+  // fail if we don't have coverage
+  if (!coverage) {
+    return;
+  }
+
+  // fix paths to files
+  var coverageKeys = Object.keys(coverage);
+  coverageKeys.forEach(function (key) {
+    coverage[key].path = 'src/js/' + coverage[key].path;
+  });
+
+  try {
+    fs.write(COVERAGE_FILE, JSON.stringify(coverage), 'w');
+    console.log('Coverage File Written');
+  } catch (e) {
+    console.log('Unable to write to file...');
+    console.error(e);
+  }
+};
+
+module.exports = {
+  afterEnd: function (runner) {
+    saveCoverage(runner.page);
+  }
+};
diff --git a/grunt/coverage-report.js b/grunt/coverage-report.js
new file mode 100644
index 000000000..ffe6e64c1
--- /dev/null
+++ b/grunt/coverage-report.js
@@ -0,0 +1,56 @@
+'use strict';
+/**
+ * creating coverage task
+ *
+ * @module grunt/coverage
+ */
+module.exports = function (grunt) {
+
+  var istanbul = require('istanbul');
+  var COVERAGE_HTML_OUTPUT_DIR = 'test/coverage/reports/html';
+  var COVERAGE_LCOV_OUTPUT_DIR = 'test/coverage/reports/lcov';
+  var COVERAGE_COLLECTION_FILE = 'test/coverage/coverage.json';
+
+  grunt.registerMultiTask('coverage-report', function () {
+
+    var options = this.options({ htmlReport: false });
+
+    // get the coverage object from the collection file generated
+    var coverageObject = grunt.file.readJSON(COVERAGE_COLLECTION_FILE);
+    var collector = new istanbul.Collector();
+    collector.add(coverageObject);
+
+    // Generate a quick summary to be shown in the output
+    var finalCoverage = collector.getFinalCoverage();
+    var summary = istanbul.utils.summarizeCoverage(finalCoverage);
+
+    // Output the percentages of the coverage
+    grunt.log.ok('Coverage:');
+    grunt.log.ok('-  Lines: ' + summary.lines.pct + '%');
+    grunt.log.ok('-  Statements: ' + summary.statements.pct + '%');
+    grunt.log.ok('-  Functions: ' + summary.functions.pct + '%');
+    grunt.log.ok('-  Branches: ' + summary.branches.pct + '%');
+
+    // write reports
+    if (options.htmlReport) {
+      istanbul.Report.create('html', {
+        dir: COVERAGE_HTML_OUTPUT_DIR
+      }).writeReport(collector, true);
+    }
+
+    istanbul.Report.create('lcov', {
+      dir: COVERAGE_LCOV_OUTPUT_DIR
+    }).writeReport(collector, true);
+  });
+
+  return {
+    'coveralls': {
+      htmlReport: false
+    },
+    'html': {
+      htmlReport: true
+    }
+  }
+};
+
+
diff --git a/grunt/coveralls.js b/grunt/coveralls.js
deleted file mode 100644
index dd36ac3d5..000000000
--- a/grunt/coveralls.js
+++ /dev/null
@@ -1,12 +0,0 @@
-'use strict';
-/**
- * Options for the `coveralls` grunt task
- *
- * @module grunt/coveralls
- */
-module.exports = {
-  options: {
-    src: ['src/js/**/*.js'],
-    coverage_dir: 'test/coverage/PhantomJS 1.9.2 (Linux)/'
-  }
-};
diff --git a/grunt/exec.js b/grunt/exec.js
index 9cb5e6ba3..e7c0037d9 100644
--- a/grunt/exec.js
+++ b/grunt/exec.js
@@ -23,5 +23,11 @@ module.exports = {
   },
   convert_enzyme: {
     cmd: "mkdir src/libs/enzyme && ./node_modules/.bin/browserify --standalone enzyme -x 'react/addons' -x 'react/lib/ReactContext' -x 'react/lib/ExecutionEnvironment' node_modules/enzyme/build/index.js > src/libs/enzyme/enzyme.js"
+  },
+  'nyc-instrument': {
+    cmd: 'node_modules/.bin/nyc instrument src/js/ test/coverage/instrument'
+  },
+  'coveralls-report': {
+    cmd: 'cat test/coverage/reports/lcov/lcov.info | ./node_modules/coveralls/bin/coveralls.js'
   }
 };
diff --git a/grunt/intern.js b/grunt/intern.js
deleted file mode 100644
index f311a700c..000000000
--- a/grunt/intern.js
+++ /dev/null
@@ -1,22 +0,0 @@
-'use strict';
-/**
- * Options for the `intern` grunt task
- *
- * @module grunt/intern
- */
-module.exports = {
-  local: {
-    options: {
-      runType: 'runner', // defaults to 'client'
-      config: 'test/intern-local',
-      reporters: [ 'Console', 'Lcov' ]
-    }
-  },
-  remote: {
-    options: {
-      runType: 'runner', // defaults to 'client'
-      config: 'test/intern-remote',
-      reporters: [ 'Console', 'Lcov' ]
-    }
-  }
-};
diff --git a/grunt/mocha-runner.js b/grunt/mocha-runner.js
index 4cd7d73fe..d254d254c 100644
--- a/grunt/mocha-runner.js
+++ b/grunt/mocha-runner.js
@@ -9,6 +9,27 @@ module.exports = function (grunt) {
   var _ = require('lodash');
   var async = require('async');
   var spawn = require('child_process').spawn;
+  var INSTRUMENT_PREFIX = 'test/coverage/instrument/';
+  var COVERAGE_FILE_NAME = 'test/coverage/mapping.js';
+
+  /**
+   * Gather all the src paths and prefix them with the coverage path
+   * then generate mappings for requirejs to use to map to instrumented code
+   */
+  var storeCoveragePaths = function () {
+    var mappings = grunt.file.expand([
+      'src/js/**/*.js',
+      '!src/js/**/*.jsx.js' // exclude es6 files
+    ]).reduce(function (res, p) {
+      p = p.replace('src/', '').replace(/\.js$/, '');
+      res[p] = p.replace('js/', INSTRUMENT_PREFIX);
+      return res;
+    }, {});
+
+    var contents = 'define(' + JSON.stringify(mappings) + ');';
+
+    grunt.file.write(COVERAGE_FILE_NAME, contents);
+  };
 
   grunt.registerMultiTask('mocha-runner', 'find and run tests', function () {
     var done = this.async();
@@ -59,6 +80,11 @@ module.exports = function (grunt) {
           return u += '&' + param.key + '=' + param.value;
         }, url);
       });
+
+      // get coverage paths
+      if (options.urlParams.coverage) {
+        storeCoveragePaths();
+      }
     }
 
     // no errors to begin with
@@ -95,11 +121,13 @@ module.exports = function (grunt) {
 
     // spawn a new test for each url, output total failures
     async.eachSeries(options.urls, spawnTest, function () {
+
       if (errors > 0) {
         grunt.fail.warn(errors + ' tests failed :(\n');
       } else if (errors === 0) {
         grunt.log.writeln(errors + ' tests failed :)\n');
       }
+
       done();
     });
   });
@@ -115,6 +143,18 @@ module.exports = function (grunt) {
       options: {
         suites: ['discovery']
       }
+    },
+    coverage: {
+      options: {
+        suites: ['discovery'],
+        urlParams: { coverage: true },
+        args: {
+          ignoreResourceErrors: true,
+          timeout: 10000,
+          hooks: '../../grunt/config/coverage-hook.js'
+        },
+        htmlReport: false
+      }
     }
   };
 };
diff --git a/package.json b/package.json
index fc23a1ca2..61cf899cf 100644
--- a/package.json
+++ b/package.json
@@ -19,9 +19,9 @@
   },
   "devDependencies": {
     "async": "^2.5.0",
-    "blanket": "1.1.7",
     "browserify": "^14.4.0",
     "chalk": "~0.4.0",
+    "coveralls": "^2.13.1",
     "enzyme": "^2.9.1",
     "express": "~3.4.8",
     "grunt": "~0.4.5",
@@ -50,10 +50,11 @@
     "grunt-sass": "^1.0.0",
     "grunt-saucelabs": "~8.6.1",
     "grunt-string-replace": "^1.2.0",
-    "intern": "~3.0.0",
+    "istanbul": "^0.4.5",
     "load-grunt-config": "^0.19.2",
     "mocha-phantomjs-core": "^2.1.2",
     "needle": "~0.7.1",
+    "nyc": "^11.2.1",
     "phantomjs": "^2.1.7",
     "react": "^15.6.1",
     "react-addons-test-utils": "^15.6.0",
diff --git a/src/discovery.config.js b/src/discovery.config.js
index 26dc21bc5..42782a75e 100644
--- a/src/discovery.config.js
+++ b/src/discovery.config.js
@@ -21,9 +21,9 @@ require.config({
   // see: http://requirejs.org/docs/api.html#config-moduleconfig
   config: {
 
-  'es6': {
-              'modules': undefined,
-      },
+    'es6': {
+      modules: undefined
+    },
 
     'js/widgets/export/widget': {
       url: 'http://adsabs-classic-exports-service.elasticbeanstalk.com',
@@ -203,6 +203,7 @@ require.config({
     'jquery-ui' : '//ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min',
     'marionette' : 'libs/marionette/backbone.marionette',
     'mathjax' : '//cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-AMS_HTML&amp;delayStartupUntil=configured',
+    'mocha': 'libs/mocha/mocha',
     'moment' : 'libs/momentjs/moment',
     'persist-js': 'libs/persist-js/src/persist',
     'react' : '//cdnjs.cloudflare.com/ajax/libs/react/15.6.1/react-with-addons.min',
@@ -218,19 +219,20 @@ require.config({
 
   },
 
-  hbs : {
+  hbs: {
     'templateExtension' : 'html',
     helpers: false
   },
 
-
   shim: {
 
     "Backbone": {
       deps: ["backbone"],
       exports: "Backbone"
     },
-
+    'mocha': {
+      exports: 'mocha'
+    },
     'backbone.stickit' : {
       deps : ['backbone']
     },
diff --git a/src/js/apps/bumblebox/page_manager.js b/src/js/apps/bumblebox/page_manager.js
index e695a2d88..a0621d643 100644
--- a/src/js/apps/bumblebox/page_manager.js
+++ b/src/js/apps/bumblebox/page_manager.js
@@ -1,7 +1,7 @@
 define([
   'js/page_managers/controller',
   'js/page_managers/one_column_view',
-  'hbs!./templates/embedded-page'
+  'hbs!js/apps/bumblebox/templates/embedded-page'
 ], function (
   PageManagerController,
   PageManagerView,
@@ -18,4 +18,4 @@ define([
 
   return PageManager;
 
-});
\ No newline at end of file
+});
diff --git a/src/js/apps/discovery/navigator.js b/src/js/apps/discovery/navigator.js
index 85289df34..a3c0e258f 100644
--- a/src/js/apps/discovery/navigator.js
+++ b/src/js/apps/discovery/navigator.js
@@ -14,8 +14,8 @@ define([
     'js/components/api_query',
     'js/components/api_request',
     'js/components/api_targets',
-    'hbs!./../../../404',
-    'hbs!./templates/orcid-modal-template'
+    'hbs!404',
+    'hbs!js/apps/discovery/templates/orcid-modal-template'
   ],
 
   function (
diff --git a/src/js/components/query_builder/plugin.js b/src/js/components/query_builder/plugin.js
index ab85f7ba2..6a9ff69b4 100644
--- a/src/js/components/query_builder/plugin.js
+++ b/src/js/components/query_builder/plugin.js
@@ -16,8 +16,8 @@ define([
     'js/components/generic_module',
     'js/components/query_builder/rules_translator',
     'js/components/api_query',
-    'hbs!./templates/group_template',
-    'hbs!./templates/rule_template',
+    'hbs!js/components/query_builder/templates/group_template',
+    'hbs!js/components/query_builder/templates/rule_template',
     'js/mixins/dependon'
 
   ],
diff --git a/src/js/modules/orcid/widget/widget.js b/src/js/modules/orcid/widget/widget.js
index 2128f8cd4..23f46dfeb 100644
--- a/src/js/modules/orcid/widget/widget.js
+++ b/src/js/modules/orcid/widget/widget.js
@@ -11,11 +11,11 @@ define([
       'js/mixins/add_stable_index_to_collection',
       'js/mixins/link_generator_mixin',
       'js/mixins/formatter',
-      'hbs!./templates/container-template',
+      'hbs!js/modules/orcid/widget/templates/container-template',
       'js/mixins/papers_utils',
       'js/components/api_query',
       'js/components/json_response',
-      'hbs!./templates/empty-template',
+      'hbs!js/modules/orcid/widget/templates/empty-template',
       'js/modules/orcid/extension'
     ],
 
@@ -334,4 +334,4 @@ define([
       });
       return OrcidExtension(ResultsWidget);
 
-    });
\ No newline at end of file
+    });
diff --git a/src/js/page_managers/controller.js b/src/js/page_managers/controller.js
index 32d27c721..c875cda57 100644
--- a/src/js/page_managers/controller.js
+++ b/src/js/page_managers/controller.js
@@ -2,8 +2,8 @@ define([
     'jquery',
     'underscore',
     "marionette",
-    "hbs!./templates/results-page-layout",
-    'hbs!./templates/results-control-row',
+    "hbs!js/page_managers/templates/results-page-layout",
+    'hbs!js/page_managers/templates/results-control-row',
     'js/widgets/base/base_widget',
     './three_column_view',
     './view_mixin',
diff --git a/src/js/page_managers/master.js b/src/js/page_managers/master.js
index 57c763255..3f7787277 100644
--- a/src/js/page_managers/master.js
+++ b/src/js/page_managers/master.js
@@ -13,8 +13,8 @@ define([
   'js/widgets/base/base_widget',
   'js/components/generic_module',
   'js/page_managers/controller',
-  'hbs!./templates/aria-announcement',
-  'hbs!./templates/master-page-manager',
+  'hbs!js/page_managers/templates/aria-announcement',
+  'hbs!js/page_managers/templates/master-page-manager',
   'marionette',
   'js/mixins/dependon'
 
@@ -233,4 +233,4 @@ define([
 
   _.extend(MasterPageManager.prototype, Dependon.App);
   return MasterPageManager;
-});
\ No newline at end of file
+});
diff --git a/src/js/page_managers/three_column_view.js b/src/js/page_managers/three_column_view.js
index 504b72d4e..ad500e829 100644
--- a/src/js/page_managers/three_column_view.js
+++ b/src/js/page_managers/three_column_view.js
@@ -1,8 +1,8 @@
 define([
       "underscore",
       "marionette",
-      "hbs!./templates/results-page-layout",
-      'hbs!./templates/results-control-row',
+      "hbs!js/page_managers/templates/results-page-layout",
+      'hbs!js/page_managers/templates/results-control-row',
       'js/widgets/base/base_widget'
     ],
     function (
@@ -172,4 +172,4 @@ define([
       });
       return ThreeColumnView;
 
-    });
\ No newline at end of file
+    });
diff --git a/src/js/widgets/abstract/widget.js b/src/js/widgets/abstract/widget.js
index 59ce8084f..fa192ab19 100644
--- a/src/js/widgets/abstract/widget.js
+++ b/src/js/widgets/abstract/widget.js
@@ -8,12 +8,12 @@ define([
     'underscore',
     'cache',
     'js/widgets/base/base_widget',
-    'hbs!./templates/abstract_template',
+    'hbs!js/widgets/abstract/templates/abstract_template',
     'js/components/api_query',
     'js/mixins/link_generator_mixin',
     'js/mixins/papers_utils',
     'mathjax',
-    'bootstrap',
+    'bootstrap'
   ],
   function (
     Marionette,
diff --git a/src/js/widgets/alerts/modal_view.js b/src/js/widgets/alerts/modal_view.js
index 23b95bd0c..c71a59595 100644
--- a/src/js/widgets/alerts/modal_view.js
+++ b/src/js/widgets/alerts/modal_view.js
@@ -1,7 +1,7 @@
 
 define([
     'marionette',
-  'hbs!./templates/modal_template',
+  'hbs!js/widgets/alerts/templates/modal_template'
 ], function(
     Marionette,
     ModalTemplate
@@ -51,4 +51,4 @@ define([
 
   return ModalView
 
-});
\ No newline at end of file
+});
diff --git a/src/js/widgets/alerts/page_top_alert.js b/src/js/widgets/alerts/page_top_alert.js
index 2f432a7ce..1162225d3 100644
--- a/src/js/widgets/alerts/page_top_alert.js
+++ b/src/js/widgets/alerts/page_top_alert.js
@@ -1,6 +1,6 @@
 define([
     'marionette',
-    'hbs!./templates/page_top_alert'
+    'hbs!js/widgets/alerts/templates/page_top_alert'
 ], function(
     Marionette,
     BannerTemplate
diff --git a/src/js/widgets/api_query/widget.js b/src/js/widgets/api_query/widget.js
index 0c7b74a6b..e17aad2da 100644
--- a/src/js/widgets/api_query/widget.js
+++ b/src/js/widgets/api_query/widget.js
@@ -9,8 +9,8 @@ define([
   'marionette',
   'js/components/api_query',
   'js/components/pubsub_events',
-  'hbs!./templates/widget-view',
-  'hbs!./templates/item-view',
+  'hbs!js/widgets/api_query/templates/widget-view',
+  'hbs!js/widgets/api_query/templates/item-view',
   'js/mixins/dependon'
   ],
   function(
diff --git a/src/js/widgets/api_request/widget.js b/src/js/widgets/api_request/widget.js
index aa39930a8..233f12304 100644
--- a/src/js/widgets/api_request/widget.js
+++ b/src/js/widgets/api_request/widget.js
@@ -6,8 +6,8 @@ define(['underscore', 'jquery', 'backbone', 'marionette',
   'js/components/api_request',
   'js/components/api_query',
   'js/components/pubsub_events',
-  'hbs!./templates/widget-view',
-  'hbs!./templates/item-view',
+  'hbs!js/widgets/api_request/templates/widget-view',
+  'hbs!js/widgets/api_request/templates/item-view',
   'js/mixins/dependon'
 ],
 
diff --git a/src/js/widgets/api_response/widget.js b/src/js/widgets/api_response/widget.js
index 66783968f..c06ae93a2 100644
--- a/src/js/widgets/api_response/widget.js
+++ b/src/js/widgets/api_response/widget.js
@@ -13,7 +13,7 @@ define([
     'backbone',
     'marionette',
     'js/components/api_response',
-    'hbs!./templates/widget-view',
+    'hbs!js/widgets/api_response/templates/widget-view',
     'js/components/pubsub_events',
     'js/mixins/dependon'
   ],
diff --git a/src/js/widgets/authentication/widget.js b/src/js/widgets/authentication/widget.js
index 01a7be94d..6015a4cf3 100644
--- a/src/js/widgets/authentication/widget.js
+++ b/src/js/widgets/authentication/widget.js
@@ -5,11 +5,11 @@ define([
   'js/mixins/form_view_functions',
   'js/widgets/success/view',
   'js/components/api_targets',
-  'hbs!./templates/log-in',
-  'hbs!./templates/register',
-  'hbs!./templates/container',
-  'hbs!./templates/reset-password-1',
-  'hbs!./templates/reset-password-2',
+  'hbs!js/widgets/authentication/templates/log-in',
+  'hbs!js/widgets/authentication/templates/register',
+  'hbs!js/widgets/authentication/templates/container',
+  'hbs!js/widgets/authentication/templates/reset-password-1',
+  'hbs!js/widgets/authentication/templates/reset-password-2',
   'js/components/user',
   'backbone-validation',
   'backbone.stickit',
@@ -515,4 +515,4 @@ define([
 
   return AuthenticationWidget;
 
-});
\ No newline at end of file
+});
diff --git a/src/js/widgets/breadcrumb/widget.js b/src/js/widgets/breadcrumb/widget.js
index 8b1c410a5..d4f4fb51d 100644
--- a/src/js/widgets/breadcrumb/widget.js
+++ b/src/js/widgets/breadcrumb/widget.js
@@ -19,8 +19,8 @@ define([
     'marionette',
     'js/components/api_query',
     'js/components/pubsub_events',
-    'hbs!./templates/widget-view',
-    'hbs!./templates/item-view',
+    'hbs!js/widgets/breadcrumb/templates/widget-view',
+    'hbs!js/widgets/breadcrumb/templates/item-view',
     'js/mixins/dependon'
   ],
 
diff --git a/src/js/widgets/bubble_chart/widget.js b/src/js/widgets/bubble_chart/widget.js
index efc51c582..310fa3c4f 100644
--- a/src/js/widgets/bubble_chart/widget.js
+++ b/src/js/widgets/bubble_chart/widget.js
@@ -3,8 +3,8 @@ define([
   'marionette',
   'js/widgets/base/base_widget',
   'js/components/api_request',
-  'hbs!./templates/container',
-  'hbs!./templates/tooltip',
+  'hbs!js/widgets/bubble_chart/templates/container',
+  'hbs!js/widgets/bubble_chart/templates/tooltip',
   'js/components/api_targets',
   "js/components/api_query_updater",
   "js/components/api_query"
diff --git a/src/js/widgets/citation_helper/widget.js b/src/js/widgets/citation_helper/widget.js
index 0ba36f186..9d6ad0014 100644
--- a/src/js/widgets/citation_helper/widget.js
+++ b/src/js/widgets/citation_helper/widget.js
@@ -6,7 +6,7 @@ define([
   'js/components/api_request',
   'js/components/api_query',
   'js/mixins/dependon',
-  'hbs!./templates/citation_helper_template',
+  'hbs!js/widgets/citation_helper/templates/citation_helper_template',
   'bootstrap',
   'js/components/api_feedback',
   'js/components/api_targets',
diff --git a/src/js/widgets/classic_form/widget.js b/src/js/widgets/classic_form/widget.js
index 2a682b1cc..cee765aac 100644
--- a/src/js/widgets/classic_form/widget.js
+++ b/src/js/widgets/classic_form/widget.js
@@ -2,7 +2,7 @@ define([
   "js/widgets/base/base_widget",
   "js/components/api_query",
   "js/components/api_query_updater",
-  "hbs!./form",
+  "hbs!js/widgets/classic_form/form",
   "jquery-ui",
   "js/widgets/paper_search_form/topterms",
   "analytics"
diff --git a/src/js/widgets/dropdown-menu/widget.js b/src/js/widgets/dropdown-menu/widget.js
index bd670a5dd..b0eeff1fd 100644
--- a/src/js/widgets/dropdown-menu/widget.js
+++ b/src/js/widgets/dropdown-menu/widget.js
@@ -1,8 +1,8 @@
 define([
     'marionette',
     'js/widgets/base/base_widget',
-    'hbs!./templates/dropdown',
-    'hbs!./templates/dropdown-item'
+    'hbs!js/widgets/dropdown-menu/templates/dropdown',
+    'hbs!js/widgets/dropdown-menu/templates/dropdown-item'
   ],
   function (Marionette, BaseWidget, dropdownTemplate, dropdownItemTemplate) {
 
diff --git a/src/js/widgets/export/widget.js b/src/js/widgets/export/widget.js
index 2176ad41a..a8537c4bd 100644
--- a/src/js/widgets/export/widget.js
+++ b/src/js/widgets/export/widget.js
@@ -8,9 +8,9 @@ define([
     'marionette',
     'js/widgets/base/base_widget',
     'js/components/api_query',
-    'hbs!./templates/export_template',
-    "hbs!../network_vis/templates/loading-template",
-    "hbs!./templates/classic_submit_form",
+    'hbs!js/widgets/export/templates/export_template',
+    "hbs!js/widgets/loading/loading-template",
+    "hbs!js/widgets/export/templates/classic_submit_form",
     'js/components/api_feedback',
     'js/components/api_targets',
     'jquery',
diff --git a/src/js/widgets/facet/facet-container.js b/src/js/widgets/facet/facet-container.jsx.js
similarity index 99%
rename from src/js/widgets/facet/facet-container.js
rename to src/js/widgets/facet/facet-container.jsx.js
index 7ed80a44d..c1f2f53cd 100644
--- a/src/js/widgets/facet/facet-container.js
+++ b/src/js/widgets/facet/facet-container.jsx.js
@@ -2,7 +2,7 @@ define([
   'react',
   'react-redux',
   'underscore',
-  'es6!./toggle_list',
+  'es6!./toggle_list.jsx',
   './reducers'
 ],  function(
     React,
diff --git a/src/js/widgets/facet/graph-facet/base_graph.js b/src/js/widgets/facet/graph-facet/base_graph.js
index 0f6ba3804..6e5bd6cd8 100644
--- a/src/js/widgets/facet/graph-facet/base_graph.js
+++ b/src/js/widgets/facet/graph-facet/base_graph.js
@@ -2,7 +2,7 @@ define(['marionette',
     'd3',
     'jquery',
     'jquery-ui',
-    'hbs!./templates/graph'
+    'hbs!js/widgets/facet/graph-facet/templates/graph'
   ],
   function (Marionette,
             d3,
diff --git a/src/js/widgets/facet/graph-facet/h_index_graph.js b/src/js/widgets/facet/graph-facet/h_index_graph.js
index 03e4818f2..954ffab3c 100644
--- a/src/js/widgets/facet/graph-facet/h_index_graph.js
+++ b/src/js/widgets/facet/graph-facet/h_index_graph.js
@@ -1,8 +1,8 @@
 
 
 define(['./base_graph',
-    'hbs!./templates/h-index-graph-legend',
-    'hbs!./templates/h-index-slider-window',
+    'hbs!js/widgets/facet/graph-facet/templates/h-index-graph-legend',
+    'hbs!js/widgets/facet/graph-facet/templates/h-index-slider-window',
     'marionette'
   ],
 
@@ -384,4 +384,4 @@ define(['./base_graph',
     return HIndexGraphView
 
 
-  })
\ No newline at end of file
+  })
diff --git a/src/js/widgets/facet/graph-facet/year_graph.js b/src/js/widgets/facet/graph-facet/year_graph.js
index 30cc43adb..1c4708e3d 100644
--- a/src/js/widgets/facet/graph-facet/year_graph.js
+++ b/src/js/widgets/facet/graph-facet/year_graph.js
@@ -1,6 +1,6 @@
 define([
     './base_graph',
-    'hbs!./templates/year-graph-legend',
+    'hbs!js/widgets/facet/graph-facet/templates/year-graph-legend',
     'marionette',
     'jquery-ui'
   ],
@@ -375,4 +375,4 @@ define([
   return YearGraphView
 
 
-})
\ No newline at end of file
+})
diff --git a/src/js/widgets/facet/toggle_list.js b/src/js/widgets/facet/toggle_list.jsx.js
similarity index 100%
rename from src/js/widgets/facet/toggle_list.js
rename to src/js/widgets/facet/toggle_list.jsx.js
diff --git a/src/js/widgets/facet/widget.js b/src/js/widgets/facet/widget.js
index 934ab39a6..3d32c729a 100644
--- a/src/js/widgets/facet/widget.js
+++ b/src/js/widgets/facet/widget.js
@@ -8,7 +8,7 @@ define([
       'react',
       'react-dom',
       'react-redux',
-      'es6!./facet-container',
+      'es6!./facet-container.jsx',
       './actions',
       './reducers',
       './create_store'
diff --git a/src/js/widgets/filter_visualizer/widget.js b/src/js/widgets/filter_visualizer/widget.js
index e576c40de..ab77a1ef4 100644
--- a/src/js/widgets/filter_visualizer/widget.js
+++ b/src/js/widgets/filter_visualizer/widget.js
@@ -16,8 +16,8 @@ define([
     'marionette',
     'js/components/api_query',
     'js/components/pubsub_events',
-    'hbs!./templates/widget-view',
-    'hbs!./templates/item-view',
+    'hbs!js/widgets/filter_visualizer/templates/widget-view',
+    'hbs!js/widgets/filter_visualizer/templates/item-view',
     'js/components/api_feedback',
     'js/mixins/dependon'
   ],
diff --git a/src/js/widgets/footer/widget.js b/src/js/widgets/footer/widget.js
index 6b52c3778..d32cfec72 100644
--- a/src/js/widgets/footer/widget.js
+++ b/src/js/widgets/footer/widget.js
@@ -1,23 +1,15 @@
 define([
   "marionette",
-  "hbs!./footer"
+  "hbs!js/widgets/footer/footer"
 ], function(
   Marionette,
   FooterTemplate
   ){
 
-
-
   var Footer = Marionette.ItemView.extend({
-
     template : FooterTemplate,
-
     className : "footer s-footer"
-
-  })
-
+  });
 
   return Footer
-
-
-})
\ No newline at end of file
+});
diff --git a/src/js/widgets/graphics/widget.js b/src/js/widgets/graphics/widget.js
index 082d40fac..f79aac6cd 100644
--- a/src/js/widgets/graphics/widget.js
+++ b/src/js/widgets/graphics/widget.js
@@ -4,8 +4,8 @@ define([
   'js/components/api_request',
   'js/components/api_response',
   'js/components/api_query',
-  'hbs!./templates/grid',
-  'hbs!./templates/sidebar',
+  'hbs!js/widgets/graphics/templates/grid',
+  'hbs!js/widgets/graphics/templates/sidebar',
   'js/components/api_targets'
 
 
diff --git a/src/js/widgets/green_button/widget.js b/src/js/widgets/green_button/widget.js
index e0eddb871..6ac24b6b0 100644
--- a/src/js/widgets/green_button/widget.js
+++ b/src/js/widgets/green_button/widget.js
@@ -16,9 +16,9 @@ define([
     'js/components/alerts',
 
     'js/widgets/base/base_widget',
-    'hbs!./templates/widget-view',
-    'hbs!./templates/item-view',
-    'hbs!./templates/empty-view'
+    'hbs!js/widgets/green_button/templates/widget-view',
+    'hbs!js/widgets/green_button/templates/item-view',
+    'hbs!js/widgets/green_button/templates/empty-view'
   ],
   function(
     _,
@@ -503,4 +503,4 @@ define([
 
 
     return Controller;
-  });
\ No newline at end of file
+  });
diff --git a/src/js/widgets/libraries_all/views/view_all_libraries.js b/src/js/widgets/libraries_all/views/view_all_libraries.js
index 72ae839b3..68209a106 100644
--- a/src/js/widgets/libraries_all/views/view_all_libraries.js
+++ b/src/js/widgets/libraries_all/views/view_all_libraries.js
@@ -1,12 +1,10 @@
 define([
   "marionette",
-  "hbs!../templates/libraries-list-container",
-  "hbs!../templates/library-item",
-  "hbs!../templates/no-libraries",
-  "hbs!../templates/loading-libraries",
+  "hbs!js/widgets/libraries_all/templates/libraries-list-container",
+  "hbs!js/widgets/libraries_all/templates/library-item",
+  "hbs!js/widgets/libraries_all/templates/no-libraries",
+  "hbs!js/widgets/libraries_all/templates/loading-libraries",
   "moment"
-
-
 ], function(
   Marionette,
   LibraryContainer,
@@ -116,4 +114,4 @@ define([
 
   return LibraryCollectionView;
 
-})
\ No newline at end of file
+})
diff --git a/src/js/widgets/library_import/widget.js b/src/js/widgets/library_import/widget.js
index ce05024de..b9081317f 100644
--- a/src/js/widgets/library_import/widget.js
+++ b/src/js/widgets/library_import/widget.js
@@ -2,10 +2,10 @@ define([
   'js/widgets/base/base_widget',
   'js/components/api_request',
   'js/components/api_targets',
-  'hbs!./templates/tab-container',
-  'hbs!./templates/import-view-labs',
-  'hbs!./templates/import-view-classic',
-  'hbs!./templates/success-template',
+  'hbs!js/widgets/library_import/templates/tab-container',
+  'hbs!js/widgets/library_import/templates/import-view-labs',
+  'hbs!js/widgets/library_import/templates/import-view-classic',
+  'hbs!js/widgets/library_import/templates/success-template',
   'bootstrap'
 
 ], function (BaseWidget,
diff --git a/src/js/widgets/library_individual/views/library_header.js b/src/js/widgets/library_individual/views/library_header.js
index 1755061bf..55933741b 100644
--- a/src/js/widgets/library_individual/views/library_header.js
+++ b/src/js/widgets/library_individual/views/library_header.js
@@ -1,6 +1,6 @@
 define([
   "marionette",
-  "hbs!../templates/library-header",
+  "hbs!js/widgets/library_individual/templates/library-header",
   "moment",
   "bootstrap"
 
diff --git a/src/js/widgets/library_individual/views/manage_permissions.js b/src/js/widgets/library_individual/views/manage_permissions.js
index f7fcac43e..8a20865d4 100644
--- a/src/js/widgets/library_individual/views/manage_permissions.js
+++ b/src/js/widgets/library_individual/views/manage_permissions.js
@@ -1,7 +1,7 @@
 define([
   "marionette",
-  "hbs!../templates/manage-permissions-container",
-  "hbs!../templates/make-public",
+  "hbs!js/widgets/library_individual/templates/manage-permissions-container",
+  "hbs!js/widgets/library_individual/templates/make-public",
   "bootstrap"
 ], function(
   Marionette,
@@ -64,4 +64,4 @@ define([
   return ManagePermissionsView
 
 
-});
\ No newline at end of file
+});
diff --git a/src/js/widgets/library_individual/widget.js b/src/js/widgets/library_individual/widget.js
index 82173e605..e2be1c8a8 100644
--- a/src/js/widgets/library_individual/widget.js
+++ b/src/js/widgets/library_individual/widget.js
@@ -4,8 +4,8 @@ define([
     "js/widgets/base/base_widget",
     "./views/library_header",
     "./views/manage_permissions",
-    "hbs!./templates/layout-container",
-    "hbs!./templates/loading-library"
+    "hbs!js/widgets/library_individual/templates/layout-container",
+    "hbs!js/widgets/library_individual/templates/loading-library"
   ],
   function(
     Marionette,
diff --git a/src/js/widgets/library_list/widget.js b/src/js/widgets/library_list/widget.js
index 68ae86044..a9cada293 100644
--- a/src/js/widgets/library_list/widget.js
+++ b/src/js/widgets/library_list/widget.js
@@ -4,9 +4,9 @@ define([
   "js/widgets/list_of_things/widget",
   "js/widgets/list_of_things/paginated_view",
   "js/widgets/list_of_things/model",
-  "hbs!./templates/library-container",
-  "hbs!./templates/library-item-edit",
-  "hbs!./templates/empty-collection",
+  "hbs!js/widgets/library_list/templates/library-container",
+  "hbs!js/widgets/library_list/templates/library-item-edit",
+  "hbs!js/widgets/library_list/templates/empty-collection",
   'js/mixins/link_generator_mixin',
   'js/mixins/papers_utils',
   'js/mixins/formatter',
@@ -310,4 +310,4 @@ define([
 
   return LibraryCollectionView;
 
-})
\ No newline at end of file
+})
diff --git a/src/js/widgets/list_of_things/infinite_view.js b/src/js/widgets/list_of_things/infinite_view.js
index 3c03ce4d5..dc5484046 100644
--- a/src/js/widgets/list_of_things/infinite_view.js
+++ b/src/js/widgets/list_of_things/infinite_view.js
@@ -8,8 +8,8 @@
 define([
     'marionette',
     'backbone',
-    'hbs!./templates/expanding-item-template',
-    'hbs!./templates/expanding-results-container-template',
+    'hbs!js/widgets/list_of_things/templates/expanding-item-template',
+    'hbs!js/widgets/list_of_things/templates/expanding-results-container-template',
   ],
 
   function (Marionette,
@@ -151,4 +151,4 @@ define([
 
     });
     return ListView;
-  });
\ No newline at end of file
+  });
diff --git a/src/js/widgets/list_of_things/item_view.js b/src/js/widgets/list_of_things/item_view.js
index aa6a6fe28..cefdb36c0 100644
--- a/src/js/widgets/list_of_things/item_view.js
+++ b/src/js/widgets/list_of_things/item_view.js
@@ -4,7 +4,7 @@ define([
     'js/components/api_request',
     'js/components/api_query',
     'js/widgets/base/base_widget',
-    'hbs!./templates/item-template',
+    'hbs!js/widgets/list_of_things/templates/item-template',
     'analytics',
     'mathjax'
   ],
@@ -194,4 +194,4 @@ define([
     });
 
     return ItemView;
-  });
\ No newline at end of file
+  });
diff --git a/src/js/widgets/list_of_things/paginated_view.js b/src/js/widgets/list_of_things/paginated_view.js
index 04e1e7f93..5b0651a69 100644
--- a/src/js/widgets/list_of_things/paginated_view.js
+++ b/src/js/widgets/list_of_things/paginated_view.js
@@ -9,12 +9,12 @@ define([
     'js/components/api_request',
     'js/components/api_query',
     'js/widgets/base/base_widget',
-    'hbs!./templates/item-template',
-    'hbs!./templates/results-container-template',
+    'hbs!js/widgets/list_of_things/templates/item-template',
+    'hbs!js/widgets/list_of_things/templates/results-container-template',
     'js/mixins/link_generator_mixin',
     'js/mixins/add_stable_index_to_collection',
-    'hbs!./templates/empty-view-template',
-    'hbs!./templates/initial-view-template',
+    'hbs!js/widgets/list_of_things/templates/empty-view-template',
+    'hbs!js/widgets/list_of_things/templates/initial-view-template',
     './item_view',
     'analytics',
     'mathjax'
@@ -223,4 +223,4 @@ define([
 
     return ListOfThingsView;
 
-  });
\ No newline at end of file
+  });
diff --git a/src/js/widgets/list_of_things/widget.js b/src/js/widgets/list_of_things/widget.js
index 8cfe77f8c..ab0e017bc 100644
--- a/src/js/widgets/list_of_things/widget.js
+++ b/src/js/widgets/list_of_things/widget.js
@@ -20,8 +20,8 @@ define([
     'js/components/api_query',
     'js/components/api_feedback',
     'js/widgets/base/base_widget',
-    'hbs!./templates/item-template',
-    'hbs!./templates/results-container-template',
+    'hbs!js/widgets/list_of_things/templates/item-template',
+    'hbs!js/widgets/list_of_things/templates/results-container-template',
     'js/mixins/add_stable_index_to_collection',
     './model',
     './paginated_view'
diff --git a/src/js/widgets/meta_tags/widget.js b/src/js/widgets/meta_tags/widget.js
index 0f3c7ed7c..3404a8d3b 100644
--- a/src/js/widgets/meta_tags/widget.js
+++ b/src/js/widgets/meta_tags/widget.js
@@ -3,7 +3,7 @@ define([
   'backbone',
   'underscore',
   'js/widgets/base/base_widget',
-  'hbs!./template/metatags',
+  'hbs!js/widgets/meta_tags/template/metatags',
   'js/mixins/link_generator_mixin'
 ], function ($, Backbone, _, BaseWidget, metatagsTemplate, LinkGenerator) {
 
diff --git a/src/js/widgets/metrics/widget.js b/src/js/widgets/metrics/widget.js
index 7e8241e61..8a79c298a 100644
--- a/src/js/widgets/metrics/widget.js
+++ b/src/js/widgets/metrics/widget.js
@@ -9,12 +9,12 @@ define([
   'js/components/api_request',
   'js/components/api_query',
   'js/mixins/dependon',
-  'hbs!./templates/metrics_container',
-  'hbs!./templates/graph_template',
-  'hbs!./templates/paper_table',
-  'hbs!./templates/citations_table',
-  'hbs!./templates/indices_table',
-  'hbs!./templates/reads_table',
+  'hbs!js/widgets/metrics/templates/metrics_container',
+  'hbs!js/widgets/metrics/templates/graph_template',
+  'hbs!js/widgets/metrics/templates/paper_table',
+  'hbs!js/widgets/metrics/templates/citations_table',
+  'hbs!js/widgets/metrics/templates/indices_table',
+  'hbs!js/widgets/metrics/templates/reads_table',
   'bootstrap',
   'js/components/api_feedback',
   'js/components/api_targets',
diff --git a/src/js/widgets/navbar/widget.js b/src/js/widgets/navbar/widget.js
index 7f1234f67..4a460d964 100644
--- a/src/js/widgets/navbar/widget.js
+++ b/src/js/widgets/navbar/widget.js
@@ -1,14 +1,13 @@
 define([
   'marionette',
   'js/widgets/base/base_widget',
-  'hbs!./template/navbar',
-  'hbs!./template/feedback',
+  'hbs!js/widgets/navbar/template/navbar',
+  'hbs!js/widgets/navbar/template/feedback',
   'js/components/api_query_updater',
   'js/components/api_query',
   'js/components/api_request',
   'js/components/api_targets',
   'bootstrap'
-
 ], function (
   Marionette,
   BaseWidget,
diff --git a/src/js/widgets/network_vis/network_widget.js b/src/js/widgets/network_vis/network_widget.js
index eb5f35e81..400d870b6 100644
--- a/src/js/widgets/network_vis/network_widget.js
+++ b/src/js/widgets/network_vis/network_widget.js
@@ -7,15 +7,15 @@ define([
     "js/components/api_query",
     "js/widgets/base/base_widget",
     "js/components/api_query_updater",
-    "hbs!./templates/author-details-template",
-    "hbs!./templates/container-template",
-    "hbs!./templates/filter-container-template",
-    "hbs!./templates/graph-container-template",
-    "hbs!./templates/group-details-template",
-    'hbs!./templates/not-enough-data-template',
-    'hbs!./templates/network_metadata',
-    'hbs!./templates/loading-template',
-    'hbs!./templates/default-details-template',
+    "hbs!js/widgets/network_vis/templates/author-details-template",
+    "hbs!js/widgets/network_vis/templates/container-template",
+    "hbs!js/widgets/network_vis/templates/filter-container-template",
+    "hbs!js/widgets/network_vis/templates/graph-container-template",
+    "hbs!js/widgets/network_vis/templates/group-details-template",
+    'hbs!js/widgets/network_vis/templates/not-enough-data-template',
+    'hbs!js/widgets/network_vis/templates/network_metadata',
+    'hbs!js/widgets/network_vis/templates/loading-template',
+    'hbs!js/widgets/network_vis/templates/default-details-template',
     'bootstrap'
   ],
   function (Marionette,
diff --git a/src/js/widgets/paper_search_form/widget.js b/src/js/widgets/paper_search_form/widget.js
index 347fc5a90..7755ccb1d 100644
--- a/src/js/widgets/paper_search_form/widget.js
+++ b/src/js/widgets/paper_search_form/widget.js
@@ -2,7 +2,7 @@ define([
   "js/widgets/base/base_widget",
   "js/components/api_query",
   'js/components/api_feedback',
-  "hbs!./form",
+  "hbs!js/widgets/paper_search_form/form",
   "./topterms",
   "jquery-ui"
 ], function(
@@ -142,4 +142,4 @@ define([
 
   return FormWidget;
 
-})
\ No newline at end of file
+})
diff --git a/src/js/widgets/preferences/views/openurl.js b/src/js/widgets/preferences/views/openurl.js
index 48168f553..7b40e3285 100644
--- a/src/js/widgets/preferences/views/openurl.js
+++ b/src/js/widgets/preferences/views/openurl.js
@@ -1,6 +1,6 @@
 define([
   "marionette",
-  "hbs!../templates/openurl",
+  "hbs!js/widgets/preferences/templates/openurl",
   "bootstrap",
   "select2"
 ], function(
@@ -72,4 +72,4 @@ define([
 
   return OpenURLView;
 
-});
\ No newline at end of file
+});
diff --git a/src/js/widgets/preferences/views/orcid.js b/src/js/widgets/preferences/views/orcid.js
index 1f4a51b4f..8466a3736 100644
--- a/src/js/widgets/preferences/views/orcid.js
+++ b/src/js/widgets/preferences/views/orcid.js
@@ -1,7 +1,7 @@
 define([
   "marionette",
-  "hbs!../templates/orcid",
-  "hbs!../templates/orcid-name-row-template"
+  "hbs!js/widgets/preferences/templates/orcid",
+  "hbs!js/widgets/preferences/templates/orcid-name-row-template"
 ], function(
     Marionette,
     orcidTemplate,
@@ -68,4 +68,4 @@ define([
 
   return OrcidView;
 
-});
\ No newline at end of file
+});
diff --git a/src/js/widgets/preferences/widget.js b/src/js/widgets/preferences/widget.js
index ea56bbc14..3284a2478 100644
--- a/src/js/widgets/preferences/widget.js
+++ b/src/js/widgets/preferences/widget.js
@@ -4,7 +4,7 @@ define([
   "./views/openurl",
   "./views/orcid",
   "js/components/api_feedback",
-  "hbs!./templates/orcid-form-submit-modal"
+  "hbs!js/widgets/preferences/templates/orcid-form-submit-modal"
 ], function (
   Marionette,
   BaseWidget,
@@ -203,4 +203,4 @@ define([
 
   return PreferencesWidget
 
-});
\ No newline at end of file
+});
diff --git a/src/js/widgets/query_info/query_info_widget.js b/src/js/widgets/query_info/query_info_widget.js
index 704bdc281..ee607c1ac 100644
--- a/src/js/widgets/query_info/query_info_widget.js
+++ b/src/js/widgets/query_info/query_info_widget.js
@@ -4,7 +4,7 @@ define(['marionette',
     'js/components/api_request',
     'js/components/api_query',
     'js/widgets/base/base_widget',
-    'hbs!./query_info_template',
+    'hbs!js/widgets/query_info/query_info_template',
     'js/mixins/formatter',
     'bootstrap',
     'js/components/api_feedback'
diff --git a/src/js/widgets/recommender/widget.js b/src/js/widgets/recommender/widget.js
index 3e2046b71..3040469e1 100644
--- a/src/js/widgets/recommender/widget.js
+++ b/src/js/widgets/recommender/widget.js
@@ -4,7 +4,7 @@ define([
   'js/components/api_targets',
   'js/components/api_request',
   'js/widgets/base/base_widget',
-  'hbs!./templates/recommender_template',
+  'hbs!js/widgets/recommender/templates/recommender_template',
   'bootstrap',
   'analytics'
 ], function(
diff --git a/src/js/widgets/results/widget.js b/src/js/widgets/results/widget.js
index 6b32605b3..331c5423d 100644
--- a/src/js/widgets/results/widget.js
+++ b/src/js/widgets/results/widget.js
@@ -10,7 +10,7 @@ define([
     'js/mixins/add_stable_index_to_collection',
     'js/mixins/link_generator_mixin',
     'js/mixins/formatter',
-    'hbs!./templates/container-template',
+    'hbs!js/widgets/results/templates/container-template',
     'js/mixins/papers_utils',
     'js/modules/orcid/extension',
     'js/mixins/dependon',
diff --git a/src/js/widgets/search_bar/search_bar_widget.js b/src/js/widgets/search_bar/search_bar_widget.js
index c010a4f93..29d7dd385 100644
--- a/src/js/widgets/search_bar/search_bar_widget.js
+++ b/src/js/widgets/search_bar/search_bar_widget.js
@@ -3,9 +3,9 @@ define([
       'marionette',
       'js/components/api_query',
       'js/widgets/base/base_widget',
-      'hbs!./templates/search_bar_template',
-      'hbs!./templates/search_form_template',
-      'hbs!./templates/option-dropdown',
+      'hbs!js/widgets/search_bar/templates/search_bar_template',
+      'hbs!js/widgets/search_bar/templates/search_form_template',
+      'hbs!js/widgets/search_bar/templates/option-dropdown',
       'js/components/query_builder/plugin',
       'js/components/api_request',
       'js/components/api_targets',
diff --git a/src/js/widgets/sort/widget.js b/src/js/widgets/sort/widget.js
index b87e5afc6..f3645613c 100644
--- a/src/js/widgets/sort/widget.js
+++ b/src/js/widgets/sort/widget.js
@@ -5,7 +5,7 @@ define(['marionette',
   'backbone',
   'jquery',
   'js/widgets/base/base_widget',
-  'hbs!./templates/sort_template',
+  'hbs!js/widgets/sort/templates/sort_template',
   'bootstrap',
   'js/components/api_feedback',
   'analytics'
diff --git a/src/js/widgets/success/view.js b/src/js/widgets/success/view.js
index 1260159ab..4fc1fc22d 100644
--- a/src/js/widgets/success/view.js
+++ b/src/js/widgets/success/view.js
@@ -1,6 +1,6 @@
 define([
   'marionette',
-  'hbs!./success_template'
+  'hbs!js/widgets/success/success_template'
 ], function(
   Marionette,
   SuccessTemplate
@@ -24,4 +24,4 @@ define([
 
   return SuccessView;
 
-});
\ No newline at end of file
+});
diff --git a/src/js/widgets/tabs/tabs_widget.js b/src/js/widgets/tabs/tabs_widget.js
index b7a973c7d..ee395006f 100644
--- a/src/js/widgets/tabs/tabs_widget.js
+++ b/src/js/widgets/tabs/tabs_widget.js
@@ -5,9 +5,9 @@ define([
   'underscore',
   'marionette',
   'bootstrap',
-  'hbs!./templates/tabs_inner',
-  'hbs!./templates/tabs_outer',
-  'hbs!./templates/tabs_title'],
+  'hbs!js/widgets/tabs/templates/tabs_inner',
+  'hbs!js/widgets/tabs/templates/tabs_outer',
+  'hbs!js/widgets/tabs/templates/tabs_title'],
   function (
     _,
     Marionette,
@@ -107,4 +107,4 @@ define([
 
   return TabsWidget
 
-});
\ No newline at end of file
+});
diff --git a/src/js/widgets/user_navbar/widget.js b/src/js/widgets/user_navbar/widget.js
index dd08054c7..e12ccb439 100644
--- a/src/js/widgets/user_navbar/widget.js
+++ b/src/js/widgets/user_navbar/widget.js
@@ -1,6 +1,6 @@
 define([
   "marionette",
-  "hbs!./nav_template",
+  "hbs!js/widgets/user_navbar/nav_template",
   'js/mixins/dependon'
 ], function (Marionette, NavTemplate, Dependon) {
 
@@ -73,4 +73,4 @@ define([
 
   return NavWidget;
 
-});
\ No newline at end of file
+});
diff --git a/src/js/widgets/user_settings/widget.js b/src/js/widgets/user_settings/widget.js
index 7d0f2f411..c219d4c65 100644
--- a/src/js/widgets/user_settings/widget.js
+++ b/src/js/widgets/user_settings/widget.js
@@ -4,10 +4,10 @@ define([
   'js/mixins/form_view_functions',
   'js/widgets/success/view',
   'js/components/api_feedback',
-  'hbs!./templates/api_key',
-  'hbs!./templates/change_email',
-  'hbs!./templates/change_password',
-  'hbs!./templates/delete_account',
+  'hbs!js/widgets/user_settings/templates/api_key',
+  'hbs!js/widgets/user_settings/templates/change_email',
+  'hbs!js/widgets/user_settings/templates/change_password',
+  'hbs!js/widgets/user_settings/templates/delete_account',
   'backbone-validation',
   'backbone.stickit',
   'bootstrap'
diff --git a/src/js/widgets/wordcloud/widget.js b/src/js/widgets/wordcloud/widget.js
index c4b781c13..a5d4d2a22 100644
--- a/src/js/widgets/wordcloud/widget.js
+++ b/src/js/widgets/wordcloud/widget.js
@@ -5,8 +5,8 @@ define([
   'd3',
   'js/components/api_request',
   'js/widgets/base/base_widget',
-  'hbs!./templates/wordcloud-template',
-  'hbs!./templates/selected-list-template',
+  'hbs!js/widgets/wordcloud/templates/wordcloud-template',
+  'hbs!js/widgets/wordcloud/templates/selected-list-template',
   'js/components/api_targets',
   'js/components/api_query_updater',
   'js/components/api_query',
diff --git a/src/js/wraps/abstract_page_library_add/widget.js b/src/js/wraps/abstract_page_library_add/widget.js
index fb531b51e..bbc2682ed 100644
--- a/src/js/wraps/abstract_page_library_add/widget.js
+++ b/src/js/wraps/abstract_page_library_add/widget.js
@@ -1,7 +1,7 @@
 define([
     "js/widgets/query_info/query_info_widget",
     "js/widgets/base/base_widget",
-    "hbs!./template"
+    "hbs!js/wraps/abstract_page_library_add/template"
   ],
     function(
        QueryInfoWidget,
@@ -62,4 +62,4 @@ define([
 
       return AbstractLibraryWidget
 
-});
\ No newline at end of file
+});
diff --git a/src/js/wraps/abstract_page_manager/abstract_page_manager.js b/src/js/wraps/abstract_page_manager/abstract_page_manager.js
index c8d3e4cdc..87cd18b0b 100644
--- a/src/js/wraps/abstract_page_manager/abstract_page_manager.js
+++ b/src/js/wraps/abstract_page_manager/abstract_page_manager.js
@@ -1,8 +1,8 @@
 define([
   'js/page_managers/toc_controller',
   'js/page_managers/three_column_view',
-  'hbs!./abstract-page-layout',
-  'hbs!./abstract-nav'
+  'hbs!js/wraps/abstract_page_manager/abstract-page-layout',
+  'hbs!js/wraps/abstract_page_manager/abstract-nav'
   ], function (
   PageManagerController,
   PageManagerView,
@@ -77,4 +77,4 @@ define([
 
   });
   return PageManager;
-});
\ No newline at end of file
+});
diff --git a/src/js/wraps/error_page_manager/error_page_manager.js b/src/js/wraps/error_page_manager/error_page_manager.js
index a754b8eaf..520fff9ee 100644
--- a/src/js/wraps/error_page_manager/error_page_manager.js
+++ b/src/js/wraps/error_page_manager/error_page_manager.js
@@ -1,7 +1,7 @@
 define([
   'js/page_managers/controller',
   'js/page_managers/one_column_view',
-  'hbs!./404',
+  'hbs!js/wraps/error_page_manager/404'
 ], function (
     PageManagerController,
     PageManagerView,
@@ -19,4 +19,4 @@ define([
 
   });
   return PageManager;
-});
\ No newline at end of file
+});
diff --git a/src/js/wraps/home_page_manager/home_page_manager.js b/src/js/wraps/home_page_manager/home_page_manager.js
index bf6f05d95..fe788814b 100644
--- a/src/js/wraps/home_page_manager/home_page_manager.js
+++ b/src/js/wraps/home_page_manager/home_page_manager.js
@@ -1,8 +1,8 @@
 define([
   'js/page_managers/toc_controller',
   'js/page_managers/three_column_view',
-  'hbs!./home-page-layout',
-  'hbs!./home-nav'
+  'hbs!js/wraps/home_page_manager/home-page-layout',
+  'hbs!js/wraps/home_page_manager/home-nav'
 ], function (
   PageManagerController,
   PageManagerView,
@@ -25,4 +25,4 @@ define([
 
   });
   return PageManager;
-});
\ No newline at end of file
+});
diff --git a/src/js/wraps/landing_page_manager/landing_page_manager.js b/src/js/wraps/landing_page_manager/landing_page_manager.js
index 9054a3b67..3d859f846 100644
--- a/src/js/wraps/landing_page_manager/landing_page_manager.js
+++ b/src/js/wraps/landing_page_manager/landing_page_manager.js
@@ -1,8 +1,8 @@
 define([
   'js/page_managers/toc_controller',
   'js/page_managers/one_column_view',
-  'hbs!./landing-page-layout',
-  'hbs!./landing-page-nav'
+  'hbs!js/wraps/landing_page_manager/landing-page-layout',
+  'hbs!js/wraps/landing_page_manager/landing-page-nav'
 ], function (
   PageManagerController,
   PageManagerView,
@@ -30,4 +30,4 @@ define([
 
   });
   return PageManager;
-});
\ No newline at end of file
+});
diff --git a/src/js/wraps/libraries_page_manager/libraries_page_manager.js b/src/js/wraps/libraries_page_manager/libraries_page_manager.js
index 2c62c40e0..64357965d 100644
--- a/src/js/wraps/libraries_page_manager/libraries_page_manager.js
+++ b/src/js/wraps/libraries_page_manager/libraries_page_manager.js
@@ -2,8 +2,8 @@ define([
   'js/page_managers/toc_controller',
   'js/page_managers/toc_widget',
   'js/page_managers/three_column_view',
-  'hbs!./libraries-page-layout',
-  'hbs!./libraries-nav'
+  'hbs!js/wraps/libraries_page_manager/libraries-page-layout',
+  'hbs!js/wraps/libraries_page_manager/libraries-nav'
 ], function (
   TOCController,
   TOCView,
diff --git a/src/js/wraps/orcid-instructions-page-manager/manager.js b/src/js/wraps/orcid-instructions-page-manager/manager.js
index 0e954e6b1..d7f10656a 100644
--- a/src/js/wraps/orcid-instructions-page-manager/manager.js
+++ b/src/js/wraps/orcid-instructions-page-manager/manager.js
@@ -1,7 +1,7 @@
 define([
   'js/page_managers/controller',
   'js/page_managers/one_column_view',
-  'hbs!./orcid-instructions',
+  'hbs!js/wraps//orcid-instructions',
   'bootstrap'
 ], function (
     PageManagerController,
@@ -21,4 +21,4 @@ define([
 
   return PageManager;
 
-});
\ No newline at end of file
+});
diff --git a/src/js/wraps/orcid_page_manager.js b/src/js/wraps/orcid_page_manager.js
index 6757909ea..e075c6929 100644
--- a/src/js/wraps/orcid_page_manager.js
+++ b/src/js/wraps/orcid_page_manager.js
@@ -1,7 +1,7 @@
 define([
   'js/page_managers/controller',
   'js/page_managers/one_column_view',
-  'hbs!./templates/orcid-page-layout'
+  'hbs!js/wraps/templates/orcid-page-layout'
 ], function (
   PageManagerController,
   PageManagerView,
@@ -22,4 +22,4 @@ define([
 
   });
   return PageManager;
-});
\ No newline at end of file
+});
diff --git a/src/js/wraps/orcid_page_manager/orcid_page_manager.js b/src/js/wraps/orcid_page_manager/orcid_page_manager.js
index 327ae7230..c068eefc8 100644
--- a/src/js/wraps/orcid_page_manager/orcid_page_manager.js
+++ b/src/js/wraps/orcid_page_manager/orcid_page_manager.js
@@ -1,7 +1,7 @@
 define([
   'js/page_managers/controller',
   'js/page_managers/one_column_view',
-  'hbs!./orcid-page-layout'
+  'hbs!js/wraps/orcid_page_manager/orcid-page-layout'
 ], function (
   PageManagerController,
   PageManagerView,
@@ -18,4 +18,4 @@ define([
 
   return PageManager;
 
-});
\ No newline at end of file
+});
diff --git a/src/js/wraps/paper_network.js b/src/js/wraps/paper_network.js
index 419ca0ec3..eb3911245 100644
--- a/src/js/wraps/paper_network.js
+++ b/src/js/wraps/paper_network.js
@@ -2,10 +2,10 @@ define([
     'marionette',
     'js/widgets/network_vis/network_widget',
     'js/components/api_query_updater',
-    'hbs!./templates/paper-network-data',
-    'hbs!./templates/paper-network-container',
-    'hbs!../widgets/network_vis/templates/not-enough-data-template',
-    'hbs!./templates/paper-network-link-data',
+    'hbs!js/wraps/templates/paper-network-data',
+    'hbs!js/wraps/templates/paper-network-container',
+    'hbs!js/widgets/network_vis/templates/not-enough-data-template',
+    'hbs!js/wraps/templates/paper-network-link-data',
     'js/components/api_targets',
     'bootstrap'
   ],
@@ -741,4 +741,4 @@ define([
       return new NetworkWidget(options);
     };
 
-  });
\ No newline at end of file
+  });
diff --git a/src/js/wraps/public_libraries_page_manager/public_libraries_manager.js b/src/js/wraps/public_libraries_page_manager/public_libraries_manager.js
index 645dedbfa..75eb01d97 100644
--- a/src/js/wraps/public_libraries_page_manager/public_libraries_manager.js
+++ b/src/js/wraps/public_libraries_page_manager/public_libraries_manager.js
@@ -1,7 +1,7 @@
 define([
   'js/page_managers/controller',
   'js/page_managers/one_column_view',
-  'hbs!./public-libraries-page-layout'
+  'hbs!js/wraps/public_libraries_page_manager/public-libraries-page-layout'
 ], function (
   PageManagerController,
   PageManagerView,
@@ -18,4 +18,4 @@ define([
 
   return PageManager;
 
-});
\ No newline at end of file
+});
diff --git a/src/js/wraps/user_settings_page_manager/user_page_manager.js b/src/js/wraps/user_settings_page_manager/user_page_manager.js
index b2096aa35..874a0d061 100644
--- a/src/js/wraps/user_settings_page_manager/user_page_manager.js
+++ b/src/js/wraps/user_settings_page_manager/user_page_manager.js
@@ -1,8 +1,8 @@
 define([
   'js/page_managers/toc_controller',
   'js/page_managers/three_column_view',
-  'hbs!./user-settings-layout',
-  'hbs!./user_nav'
+  'hbs!js/wraps/user_settings_page_manager/user-settings-layout',
+  'hbs!js/wraps/user_settings_page_manager/user_nav'
 ], function (
   PageManagerController,
   PageManagerView,
diff --git a/test/intern-remote.js b/test/intern-remote.js
deleted file mode 100644
index 8bfc73e74..000000000
--- a/test/intern-remote.js
+++ /dev/null
@@ -1,53 +0,0 @@
-// Learn more about configuring this file at <https://theintern.github.io/intern/#configuration>.
-// These default settings work OK for most people. The options that *must* be changed below are the
-// packages, suites, excludeInstrumentation, and (if you want functional tests) functionalSuites
-define({
-	// Default desired capabilities for all environments. Individual capabilities can be overridden by any of the
-	// specified browser environments in the `environments` array below as well. See
-	// <https://theintern.github.io/intern/#option-capabilities> for links to the different capabilities options for
-	// different services.
-	//
-	// Note that the `build` capability will be filled in with the current commit ID or build tag from the CI
-	// environment automatically
-	capabilities: {
-		'browserstack.selenium_version': '2.47.1'
-	},
-
-	// Browsers to run integration testing against. Note that version numbers must be strings if used with Sauce
-	// OnDemand. Options that will be permutated are browserName, version, platform, and platformVersion; any other
-	// capabilities options specified for an environment will be copied as-is
-	environments: [
-		{ browserName: 'internet explorer', version: '11', platform: 'WIN8' },
-		{ browserName: 'internet explorer', version: '10', platform: 'WIN8' },
-		{ browserName: 'internet explorer', version: '9', platform: 'WINDOWS' },
-		{ browserName: 'firefox', version: '37', platform: [ 'WINDOWS', 'MAC' ] },
-		{ browserName: 'chrome', version: '43', platform: [ 'LINUX' ] },
-		{ browserName: 'safari', version: '8', platform: 'MAC' }
-	],
-
-	// Maximum number of simultaneous integration tests that should be executed on the remote WebDriver service
-	maxConcurrency: 2,
-
-	// Name of the tunnel class to use for WebDriver tests.
-	// See <https://theintern.github.io/intern/#option-tunnel> for built-in options
-	//tunnel: 'BrowserStackTunnel',
-  tunnel: 'SauceLabsTunnel',
-
-	// Configuration options for the module loader; any AMD configuration options supported by the AMD loader in use
-	// can be used here.
-	// If you want to use a different loader than the default loader, see
-	// <https://theintern.github.io/intern/#option-useLoader> for instruction
-	loaderOptions: {
-		// Packages that should be registered with the loader in each testing environment
-		packages: [ { name: 'myPackage', location: 'src' } ]
-	},
-
-	// Non-functional test suite(s) to run in each browser
-	suites: [ /* 'myPackage/tests/foo', 'myPackage/tests/bar' */ ],
-
-	// Functional test suite(s) to execute against each browser once non-functional tests are completed
-	functionalSuites: [  'test/functional/index' ],
-
-	// A regular expression matching URLs to files that should not be included in code coverage analysis
-	excludeInstrumentation: /^(?:test|node_modules)\//
-});
diff --git a/test/mocha/tests.html b/test/mocha/tests.html
index 5a406e5e1..d0e1b7ef5 100644
--- a/test/mocha/tests.html
+++ b/test/mocha/tests.html
@@ -8,20 +8,12 @@
 </head>
   <body>
     <div id="mocha"></div>
-    <script src="../../bower_components/mocha/mocha.js"></script>
     <script src="../../libs/requirejs/require.js"></script>
     <script>
 
       // this forces the require config to not start the bumblebee application
       window.skipMain = true;
 
-      // init phantomjs-mocha, if running headlessly
-      if (typeof window.initMochaPhantomJS === 'function') {
-          window.initMochaPhantomJS();
-      }
-
-      // mocha settings
-      mocha.setup('bdd');
     </script>
     <script src="../../discovery.config.js"></script>
     <script>
@@ -35,52 +27,88 @@
 
           // get chai and sinon which will be turned into globals in the tests
           [
+            'mocha',
             'chai',
             'sinon',
             '../../test/mocha/suites',
             '../../bower_components/es5-shim/es5-shim.js'
-          ], function (chai, sinon, suites) {
+          ], function (mocha, chai, sinon, suites) {
+
+            // mocha settings
+            mocha.setup('bdd');
+
+            // check if we are running headlessly
+            if (typeof global.initMochaPhantomJS === 'function') {
+
+              // init mochaPhantomJS
+              global.initMochaPhantomJS();
 
-          // check if we are running on phantomjs
-          if (typeof global.initMochaPhantomJS === 'function') {
+              // Stop console.log from cluttering up testing output
+              global.console = {
+                info: function () {},
+                warn: function () {},
+                log: function () {},
+                error: function () {}
+              };
+            }
 
-            // Stop console.log from cluttering up testing output
-            global.console = {
-              info: function () {},
-              warn: function () {},
-              log: function () {},
-              error: function () {}
+            // parse out url params, needed only to grab suite name
+            var getUrlParam = function (name) {
+              name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
+              var regex = new RegExp('[\\?&]' + name + '=([^&#]*)');
+              var results = regex.exec(location.search);
+              return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' '));
             };
-          }
-
-          // parse out url params, needed only to grab suite name
-          var getUrlParam = function (name) {
-            name = name.replace(/[\[]/, '\\[').replace(/[\]]/, '\\]');
-            var regex = new RegExp('[\\?&]' + name + '=([^&#]*)');
-            var results = regex.exec(location.search);
-            return results === null ? '' : decodeURIComponent(results[1].replace(/\+/g, ' '));
-          };
-
-          // define globals
-          global.expect = chai.expect;
-          global.assert = chai.assert;
-          global.should = chai.should;
-          global.normalizeSpace = function (str) {
-            return str.replace(/\s+/g, ' ').trim();
-          };
-
-          // pull the suite name from the query string, if able
-          var suite = getUrlParam('bbbSuite') || 'discovery';
-
-          // prefix the tests with the correct path
-          var tests = suites[suite].map(function (url) {
-            return '../../test/mocha/js' + url;
-          });
-
-          // load and run the test runner
-          require(tests, function () {
-            mocha.run();
-          });
+
+            // define globals
+            global.expect = chai.expect;
+            global.assert = chai.assert;
+            global.should = chai.should;
+            global.normalizeSpace = function (str) {
+              return str.replace(/\s+/g, ' ').trim();
+            };
+
+            // pull the suite name from the query string, if able
+            var suite = getUrlParam('bbbSuite') || 'discovery';
+
+            // prefix the tests with the correct path
+            var tests = suites[suite].map(function (url) {
+              return '../../test/mocha/js' + url;
+            });
+
+            var startTests = function (config) {
+
+              // load and run the test runner
+              require(config, tests, function () {
+                mocha.run();
+
+                // Make sure we get hold of the coverage variable, if necessary
+                global.__coverage__ = this.__coverage__;
+              });
+            };
+
+            if (getUrlParam('coverage')) {
+              require([
+                '../../test/coverage/mapping'
+              ], function (mapping) {
+
+                // start coverage tests
+                startTests({
+                  map: {
+                    '*': mapping
+                  },
+                  config: {
+                    'test/coverage/instrument/components/persistent_storage': {
+                      namespace: 'bumblebee'
+                    }
+                  }
+                });
+              });
+              return;
+            }
+
+            // start normal tests
+            startTests();
         });
       })(window);
     </script>