Fixing test regressions in the last commit