More test XML stuff; cleaned up old comments.