code review: test refactor etc