More refactoring and test development on Photo
Refactor image uploading and harmonise the routing for them