Fix spec/requests/avatar specs
Fix controller specs