Instead of TEST_1_SERVER etc. Just follow the convention we use everywhere

IIUC the reason for this was to be able to test the "promote" functions, which download content from one server and upload to another. But I think you could actually just use the same server for that.

Could also remove the logic in the connect() function that does things with prefix, as I believe this is the only reason for it.