bug fixes new xpath, test cases adjusted