fixed emitter, added on test