Fix test failures after rebase.