Initial patch for UTF-8 test