Cleanup tests

These are jshint & jscs fixes for the tests to resolve issue #585 


Is this because of lines like `cb && cb()`? I'd prefer to fix those lines and avoid the need to supress jshint [warning W030](https://jslinterrors.com/expected-an-assignment-or-function-call).