Fix test to generate events and handle time
Merge pull request #604 from shakedown/burgundy

Fix test to generate events and handle time