Mark couple of tests as not flaky