Correctly test for avatars