Tests improvement
Added charset handling support