Updates - Improve some tests, events and small feature addition