fix jshint tests
WIP, to rebase