add test changes to make sure events are firing correctly