Slight refactor to improve clarity of several unit test