Merge "Fix various Charset tests, clean up the implementation."