Fix event emitter spec and thereby fix all