Merge "Add timeout to async test-cases"