Fix tests after merge.