Merge "Re-enabling a couple of tests" into udc-qpr-dev