Merge pull request #604 from shakedown/burgundy

Fix test to generate events and handle time
(PE-948) Store containment path and class