B-58092 addressing test pull request feedback