Increase test timeout to allow for async processes to complete, as it looks as if the test failed because an async event hadn't completed.
Merge origin/master