Fix tests that were broken after vCard changes