Merge "More Charset test fixes."