Merge "Add tests to verify job scheduling on events"