HELIX-41: fix intermittent test failures
HELIX-41: fix intermittent test failures
HELIX-41: fix intermittent test failures