diff -r a8bed1c7df8e -r 3a32d2f57429 server/bo_client/tests/helpers/start-app.js
--- a/server/bo_client/tests/helpers/start-app.js	Fri Dec 02 03:30:51 2016 +0100
+++ b/server/bo_client/tests/helpers/start-app.js	Fri Dec 02 09:33:53 2016 +0100
@@ -5,8 +5,8 @@
 export default function startApp(attrs) {
   let application;
 
-  let attributes = Ember.merge({}, config.APP);
-  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+  // use defaults, but you can override
+  let attributes = Ember.assign({}, config.APP, attrs);
 
   Ember.run(() => {
     application = Application.create(attributes);