Even better event testing, including some that don't pass yet