Move listener to EventListener namespace
Add tests