Update tests and fix jshint
Add more tests