Fixed some of the xml for broken unit tests
Merge branch 'master' of git://github.com/BillysInterns/hv-client