Unreviewed, fix a few tests that became flaky after r230919.