380765 - Fixes a test instability
5 files changed