use zeus instead of test-server
make sure we're on the branch we want before doing an upstream push