Use a storage id to determine where the file is stored.
Refactor.
Refactor.
Do not upload files a second time.
Mark some broken tests as pending.