delete events, fix tests