fix unit tests;
use CDM.utfCharset where possible