Fix testing of uploading files

Also remove a number of unnecessary steps in the upload tests.