B-58092 test tweaks based on pull request feedback