Merge "Increase test timeouts"