Fix tests after utils rename