Fix UTF-8 test and un-todo it.