Small change to TestEventListener
More testing refactoring:
- Finished initial work on TestEvenListener
- Split out inner classes
- Refactored relevant tests