User model improvements & tests
Image controller improvements