fixes to upload tests