Fix tests and jshint!