Fix random test failures for servers that aren't as fast
Merged Pull Request #407

* pull-request/407:
  Fix random test failures for servers that aren't as fast