Original commit message from CVS: fix headers on tests
Original commit message from CVS: Add xml tests