Fixed flacky tests.