[#22] 100% Coverage + Correct User avatar