Improve testing of events
Merge pull request #72 from noplay/improve_tests

Improve testing of events