Added some more event handling tests