bad tests working
Merge branch 'master' into tests
[tests]
[travis] stop karma watch
Merge pull request #1 from onesime/tests

Tests