Fix up tests, get jshint running