changes to tests and events