Fixed all of @iHiDs broken tests
Merge pull request #2 from stuartbates/events

Fixed all of @iHiDs broken tests