introduced event emitter to replace the custom listener, introduced a (custom directive - just for the fun of it)
tests fixed