Merge "Trim output before testing" into oc-dev