Add jshint expr=true rule for tests
Add next() to returned function, expand test