BUG-12918 - fix flaky unit tests