Tests added.  some slight alterations to xml files.