stable version with all tests updated
remove all direct xpath