fix to emitter bubbling and tests