Update the traces and add some tests and examples