Some tests were failing due to moved xpath initialisation sequence. Fixed.