Start fixing tests
Merge branch 'emberCli' of https://github.com/balanced/balanced-dashboard into emberCli