Merge "Simplifying some test utility methods" into udc-qpr-dev