More tests for vcard and some corrections