Validation now uses new xpaths