Fix test to generate events and handle time