Added new event based test