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