Fix failing tests and make less fussy
Remove XML attributes that are no longer returned by the API