Updated CharsetTest