[tests] - fix compile of TestCPUInfo after string changes
[test] - fix compile of TestCharsetConverter after 8f830c1b9a4446f9b68f0dbd693fcda2788eff26