Fixed tests, added more

Fixed unicode handling
Fixed unit test with unicode
Added test with plus