Added testing for event generation...