Add some basic unit tests for events
More unit tests and longer timeouts for travis-ci
Fix issue #8580
More tests
Fix typo
Merge pull request #8961 from olliewalsh/eventfix

Fix issue #8580