more flaky test fixes