improve test code organization
improve test code organization

Extract shared code into a new method, submit().
Avoid calling tests from one another, so that tested aspects are clearly
separated.

ClusterHQ/benchmark-server,ClusterHQ/benchmark-server