fix jshint issues in tests, some simplifying