Fixed UTF-8 Encoding and tests