Fixes for some racey tests.

+review REVIEW-5311