Add tests for emitter, add different delete function for emitter