cc: fix tests and trace word generator