Adding test coverage.  Adding more tests

Specifically added tests for EventHandler