More events, better tests