ENG-4411 Fix unit test, eliminate non-determinism that caused intermittent test failures.