Fixup avatar saving unit tests