Add tests for listener and refactor
Remove 'hello world' message