Fix avatar tests