Minor cosmetic changes
Fixed avatar filename

added .jpg extension at the end
Removed unnecessary if statements
Added new tests for new methods