Added unit test for u_xml and fixed yet another unit test break.