Fixed tests due to engine utilitary changes
Merge branch 'CoreProduct'