Some flaky tests were previously removed: - cabaac5ce42a347e04e964b8645ce3bb4b268ba2 - e038f920610043a5b7696630a7394f3c0ac26a53 We should consider fixing these so that they're not flaky and restoring them.
