Merge "Moves deviceless tests to new directory" into udc-qpr-dev