Merge "Use new tempest option to verify redirects"