Fix double call to next()
More work on test helper