Adding Events and adding more tests
Merge branch 'development'