Fix mangled merge of UTF-8 vs. 'local' test changes 

The merge of the speedup branch clobbered some of the test changes for the UTF-8 fixes. This restores the union of the changes from both the branches