The CW - Xpath updates, fix TestURLs