Clean up to pass jshint; add jshint to test script