nest comments inside events, and update tests to reflect this change