Update exceptions
Update unit tests to reflect changes in XmlElement