Fix jshint errors
Fix tests