Fixes all XML tests and removed all remaining dependencies on Guava