Merge "Rework ApiUploadTest"