add 'harder' unicode testcase & fix unicode stuff for 2.X