Fix tests after last change