HELIX-41: fix intermittent test failures