Importer commits from suite upload-support branch

[rmarianski]

These were some fixes/tests that I added to the suite's upload-support branch before the re-organization.