Enhance xml utils UTs for charging addresses