unit test has been changed
unicode fix has been added