fixing @deprecated convention and removing request info from event
fixing tests