Fixed up the xml info extractor and added unit tests for new situation.