Fixes for:
* grunt jshint (issues with mocha syntax and jshint)
* grunt test works still