Address failing scenarios by narrowing down xpath