@@ -32,7 +32,7 @@
 BEGIN:VCARD
 VERSION:3.0
 NICKNAME:user12
-NOTE:ampersand entity &amp\; less-than entity &lt\;
+NOTE:ampersand entity &amp less-than entity &lt
 FN:xml entities
 N:xml;entities;;;
 X-EVOLUTION-FILE-AS:xml\, entities
@@ -88,9 +88,9 @@
   mailing address)\n- long lines (in this note)\n- special characters (in
   this note)\n- tabs (in this note)\n\nVery long line\, very very long th
  is time... still not finished... blah blah blah blah blah 1 2 3 4 5 6 7 
- 8 9 10 11 12 13 14 15 16\n\ncomma \,\ncolon :\nsemicolon \;\nbackslash 
+ 8 9 10 11 12 13 14 15 16\n\ncomma \,\ncolon :\nbackslash 
  \\\n\nThe same\, in the middle of a line:\ncomma \, comma\ncolon : col
- on\nsemicolon \; semicolon\nbackslash \\ backslash\n\nA tab 	tab done\n	
+ on\nbackslash \\ backslash\n\nA tab 	tab done\n	
  line starts with tab
 FN:Umlaut Ä Ö Ü ß
 N:Ü;Ä;Ö;Umlaut;ß
@@ -115,7 +115,7 @@
 X-EVOLUTION-ASSISTANT:
 NICKNAME:user8
 X-EVOLUTION-SPOUSE:
-NOTE:Here are some special characters: comma \, colon : semicolon \;
+NOTE:Here are some special characters: comma \, colon : no semicolon
 FN:special characters
 N:characters;special;;;
 X-EVOLUTION-FILE-AS:characters\, special
@@ -156,7 +156,7 @@
 VERSION:3.0
 URL:http://john.doe.com
 TITLE:Senior Tester
-ORG:Test Inc.;Testing;test#1
+ORG:Test Inc.
 ROLE:professional test case
 X-EVOLUTION-MANAGER:John Doe Senior
 X-EVOLUTION-ASSISTANT:John Doe Junior
@@ -168,7 +168,7 @@
 X-EVOLUTION-SPOUSE:Joan Doe
 NOTE:This is a test case which uses almost all Evolution fields.
 FN:John Doe
-N:Doe;John;;;
+N:NewDoe;John;;;
 X-EVOLUTION-FILE-AS:Doe\, John
 CATEGORIES:TEST
 X-EVOLUTION-BLOG-URL:web log
@@ -288,7 +288,7 @@
 X-EVOLUTION-ASSISTANT:
 NICKNAME:user6
 X-EVOLUTION-SPOUSE:
-NOTE:The first name is "First \; special \;".
+NOTE:The first name is "First <semicolon> special <semicolon>".
 FN:Mr. First \; special \; middle Last
 N:Last;First \; special \;;middle;Mr.;
 X-EVOLUTION-FILE-AS:Last\, First \; special \;