Improve avatar acceptance testing