Added Code for Event Testing