Making tests non-flaky