fix(tests) Fix a merge conflict test (#16567)
fix(tests) Fix a merge conflict test (#16567)

Two PRs got merged at the same time, one adding this test and another modifying
tests like it. So this one got out of date.
beeftornado/sentry,beeftornado/sentry,beeftornado/sentry