Fix controller unit tests, create Image service