-fixed chars in utf-8
-changed some tests to put expected and current value in correct order