Revert "[#846] unicode test fix?"

This reverts commit 004743020e217469e999f8dfc50b6fcc5c720cd0.
[#846] Better unicode fix