fixing event fields response formatting and tests