acu124393 -  Adds test and fix the encoding