Fix cvan's flaky tests