Merge pull request #805 from apache/hotfix/shaky-test-timeout

Use promises for event queue handling in tests