Fixed tests for EventsCtrl