Cosmetic changes  to clear annoying test and script location failures that are inconsequential.