Added timeouts to fix AS nightly tests
Merge pull request #1000 from shenrie/master

Added timeouts to fix AS nightly tests