Merge "Simplify pip tests" into udc-qpr-dev