Fix tests after merge