Merge "Use trap + async timeout for tests"