Adding Events and adding more tests