Merge "Fixed test - segmented upload of file"