[Misc] Attempt to fix flickering tests.