fix new flaky tests