IOSCE-373 Moved attribute to tag in xml.