Upload now completes without errors in some test cases