event test fixes