Fix failing tests related to charset conversion
Merge pull request #432 from madhuracj/fixTests

Fix failing tests related to charset conversion