SENTRY-53: Fix test failures caused by SENTRY-41 (Sravya Tirukkovalur via Shreepadma Venugopalan)