Revert to a single response event
Update tests