change event names, add more tests