Fix test regressions after upstream.