cleanup
Added back some codecvt_utf8 test code