Merged Pull Request #406

* pull-request/406:
  This field doesn't exist pre 2.4.0
  This test actually has been broken forever as it didn't use the
Fix random test failures for servers that aren't as fast