Fixed tests due to engine utilitary changes