Fix-up of tests to work with events

Change-Id: I8e0b431da97b6b9e43c31a259f9cbb1730140c62