Cleanup tests

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