fix flaky apiserver tests