Event refactoring and unit tests
Comments for EventHost