Fix tests
Fix jshint errors