Align test with Encoding and HTML updates

A further change might be needed here once hz-gb-2312 dies, but that has not happened yet.