Made sure that tests can run via grunt test
Merge branch 'dev'