Fix unit tests
Fixup jshint
Fix jshint problems