UNICODE aware now, including test