Updating usage event processing to capture all listener events. Updatings tests and som logic/logging
Merge branch 'pur_branch' into usage-refactor