Added tests for the events enhancements