added support and tests for non ASCII characters