Slight refactoring of avatar service tests