Fix random test failures for servers that aren't as fast