adopt newer properties
Modify tests and xpath query to accomodate xml format as agreed with Nordunet