modify some xpath for new build
Revert "modify some xpath for new build"

This reverts commit bfee5225a91f03b2b7928b13bf7c745a8fd37f5b.