simplify wording
Refactor tests, remove unused 'helpers'