Merge "Fixed flaky tests"