Make tests pass AND test refactor love!