Refactor and test fixes
Work on cmds: char edit, char new