Added more tests to cope with even more complex XML.