Refactor out test utils into a new ns