Before refactor to remove custom test helpers