Cleans up upload.py
Fixes test which is expecting a different server