fix(tests): Avatar functional test updates
Merge pull request #1548 from vladikoff/avatar-test-fix

fix(tests): Avatar functional test updates