fixed tests
Merge pull request #17 from ItsAsbreuk/this-as-emitterNAME

fixed tests