Fix tests
Fix user avatar display