Updated tests to use updated avatar helper