Use safer unicode call and add now passing test.