Changes to events on all classes, tests all passing