Add tests around helpers for refactor