Fix up all test regressions