more tests, fixed events