Added complete bareword tests, and fixed up event emitter stuff