More event emitter tests
Removed return statements generated by coffeescript