Fix bug in final 2 tests for xml parser; fix bugs in parser, all tests pass.