Fix bad XML

Randomly saw some broken xml, fixed it.
Update phpunit.xml

Indenting!?
Remove xml config causing tests to fail
Merge pull request #3320 from garoevans/patch-1

Fix bad xml