Fix broken tests after rebase.