improved test.event