updates to add event registration and event support. Cleaned-up some tests and artifacts. Improved the testing structure