Fix test regressions