B-55868  changes to fix test flakiness