Fix tests after last merge