Fix troubles with UTF-8
Add more tests