Fixes flacky failing tests