Simplify UploadFileProcessContext + Testfix