Reduce cruft in avatar test