Fix test failures after merge.