Fixed test regressions