Small edits to simple upload tests
Merge branch 'master' of https://github.com/surevine/gateway