Improved modularity of the XML CardDAV test contacts for reuse.