Fixed flacky tests