XML utilities test and implementation small changes