TRQ-2219. Fix an error with removing the newer xml functions - I was reading the child from the wrong xml element. Also add a unit test for the error I made.