Bug 813372 - Tweaking the test a bit to try to avoid intermittent failures.