Fix test regressions from 4e4b10f702