Rearranged test so upload & download files are tested by the same functions.