Added and integrated upstream messages into events

- Updated tests
Updated tests
Merge pull request #15 from sailthru/Updated-event-queue-to-support-upstream-messages

Updated event queue to support upstream messages