User can have no image
Fixed broken tests