If you're OK with a commit and there are unrelated test errors, feel free to make "test error" on the PR and merge. I don't want flaky tests to block us. If you want to be super awesome, open an issue for the flaky test and point to the PR(s).