rename variable
update event parsing, add event tests