Cleanup tests

jshint and fixup arg passing