Avatar validations and factories reworked