jshint fix and fix tests