Merge "Fix flaky schedule tests"