Fix tests from recent sentry and pipeline reorg changes.