Merge "Use multiplied timeout for tests"