Clean up event types -- Part 2

Part 1 (#655) changed all old event types into the new event types
Part 2 makes sure new events that are added will have the new event types and will update all the unit tests