Added image uploading, with tests