Fix tests & jshint