removed lib/emitter.js, fixed tests