Replaced google guava lib and updated affected methods, test include
xml format