Re-arrange flaky tests