Add XHR spies; Rename xhr events