Merge "Increase test timeout for failing expensiveobjects test."