fix tests (can't use unicode chars to encode/persist name)
Merge remote-tracking branch 'origin/perf' into perf