XPATH: Substantially improved testing.