Merge "Increase test timeouts." into oc-dev