Fix test failures that appeared in rebase