fixing utf support test cases
Merge branch 'master' of https://github.com/krishanthasamaraweera/product-greg