Added some event tracing and unit tests