Correcting conflicted avatar test results from merge.