fixup! fix flaky tests