Merge "Adding some utility test rules" into udc-qpr-dev