adding tests and infrastructure for new events