fix test, small event improvment