Merge "Move shared test code into separate directory" into udc-qpr-dev