Merge "Make tests less flaky?"