Improved flaky test