fixed setupEvents()
code fix
added unit test for events listener
Merge pull request #79 from dpiccone/master

fixed setupEvents()