Client Xml and Xsd config tests and fixes

fixes  #2587