Generalized the event tests, improved test description