Merge change 20905

* changes:
  git rid of the "x" prefixes for test