diff --git a/client/app/components/info-modal.js b/client/app/components/info-modal.js
index 94a6c67f..39719fa4 100644
--- a/client/app/components/info-modal.js
+++ b/client/app/components/info-modal.js
@@ -2,6 +2,7 @@ import Component from '@ember/component';
 import { action } from '@ember/object';
 
 export default class InfoModalComponent extends Component {
+  // We have manually overridden this to hide the modal by default when running tests in tests/index.html
   open = !window.localStorage.hideMessage;
 
   dontShowModalAgain = false;
diff --git a/client/ember-cli-build.js b/client/ember-cli-build.js
index 712b5d05..48b76501 100644
--- a/client/ember-cli-build.js
+++ b/client/ember-cli-build.js
@@ -46,11 +46,13 @@ module.exports = function(defaults) {
       },
     },
   });
-
   // Use `app.import` to add additional libraries to the generated
   // output files.
-  //
-  app.import('node_modules/foundation-sites/dist/js/foundation.min.js', { type: 'vendor' });
+  if (app.env === 'test') {
+    app.import('node_modules/foundation-sites/dist/js/foundation.js', {type: "test"});
+  } else {
+    app.import('node_modules/foundation-sites/dist/js/foundation.min.js', {type: "vendor"});
+  }
   // If you need to use different assets in different
   // environments, specify an object as the first parameter. That
   // object's keys should be the environment name and the values
diff --git a/client/testem.js b/client/testem.js
index 8c0098c9..efc2ddd1 100644
--- a/client/testem.js
+++ b/client/testem.js
@@ -9,6 +9,7 @@ module.exports = {
   launch_in_dev: [
     'Chrome',
   ],
+  browser_start_timeout: 120,
   browser_args: {
     Chrome: {
       mode: 'ci',
diff --git a/client/tests/index.html b/client/tests/index.html
index e94d6dd6..20f91a63 100644
--- a/client/tests/index.html
+++ b/client/tests/index.html
@@ -7,6 +7,9 @@
     <meta name="description" content="">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <script>
+      // The below hides the default modal from showing when running tests
+      window.localStorage.hideMessage = true;
+
       window['_fs_host'] = 'fullstory.com';
       window['_fs_script'] = 'edge.fullstory.com/s/fs.js';
       window['_fs_org'] = 'o-19S9J2-na1';