fixed flaky tests