Attempt to fix some places where unicode characters got mangled, and reenabled one test that was failing due to that.