Added XPathBuilder
Updated TestBase