diff --git a/testing/tests/scheduling/3010-PUT-with-attendees.result b/testing/tests/scheduling/3010-PUT-with-attendees.result
index 026b8859..8869028a 100644
--- a/testing/tests/scheduling/3010-PUT-with-attendees.result
+++ b/testing/tests/scheduling/3010-PUT-with-attendees.result
@@ -131,56 +131,56 @@ END:VCALENDAR
       logged_user: >10<
           summary: >Multiple Beard Meeting<
           user_no: >11<
-        vcalendar: >BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 3.0//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYMONTH=3;BYDAY=3SU
-TZNAME:NZST
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-DTSTART:20070930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
-TZNAME:NZDT
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-TZNAME:NZST
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-SEQUENCE:7
-DESCRIPTION:Masses of Lunch will be needed
-UID:PUT-attendees
-TRANSP:OPAQUE
-DTSTART;TZID=Pacific/Auckland:20101123T110000
-DTEND;TZID=Pacific/Auckland:20101123T160000
-DTSTAMP:20101124T221900Z
-SUMMARY:Multiple Beard Meeting
-CREATED:20071124T221521Z
-RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=4TU
-ORGANIZER;CN=User 1:MAILTO:user1@example.net
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;
- RSVP=TRUE;CN=User 1;LANGUAGE=en:MAILTO:user1@example.net
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;
- RSVP=TRUE;CN=User 2;LANGUAGE=en:MAILTO:user2@example.net
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;
- RSVP=TRUE;CN=User 3;LANGUAGE=en:MAILTO:user3@example.net
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;
- RSVP=TRUE;CN=User 4;LANGUAGE=en:MAILTO:user4@example.net
-END:VEVENT
-END:VCALENDAR
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 3.0//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYMONTH=3;BYDAY=3SU
+TZNAME:NZST
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:20070930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+TZNAME:NZDT
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZNAME:NZST
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+SEQUENCE:7
+DESCRIPTION:Masses of Lunch will be needed
+UID:PUT-attendees
+TRANSP:OPAQUE
+DTSTART;TZID=Pacific/Auckland:20101123T110000
+DTEND;TZID=Pacific/Auckland:20101123T160000
+DTSTAMP:20101124T221900Z
+SUMMARY:Multiple Beard Meeting
+CREATED:20071124T221521Z
+RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=4TU
+ORGANIZER;CN=User 1:MAILTO:user1@example.net
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=User 1;LANGUAGE=en:MAILTO:user1@example.net
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=User 2;LANGUAGE=en:MAILTO:user2@example.net
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=User 3;LANGUAGE=en:MAILTO:user3@example.net
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=User 4;LANGUAGE=en:MAILTO:user4@example.net
+END:VEVENT
+END:VCALENDAR
 <
 
       caldav_type: >VEVENT<
@@ -246,56 +246,56 @@ END:VCALENDAR
       logged_user: >10<
           summary: >Multiple Beard Meeting<
           user_no: >12<
-        vcalendar: >BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 3.0//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYMONTH=3;BYDAY=3SU
-TZNAME:NZST
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-DTSTART:20070930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
-TZNAME:NZDT
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-TZNAME:NZST
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-SEQUENCE:7
-DESCRIPTION:Masses of Lunch will be needed
-UID:PUT-attendees
-TRANSP:OPAQUE
-DTSTART;TZID=Pacific/Auckland:20101123T110000
-DTEND;TZID=Pacific/Auckland:20101123T160000
-DTSTAMP:20101124T221900Z
-SUMMARY:Multiple Beard Meeting
-CREATED:20071124T221521Z
-RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=4TU
-ORGANIZER;CN=User 1:MAILTO:user1@example.net
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;
- RSVP=TRUE;CN=User 1;LANGUAGE=en:MAILTO:user1@example.net
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;
- RSVP=TRUE;CN=User 2;LANGUAGE=en:MAILTO:user2@example.net
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;
- RSVP=TRUE;CN=User 3;LANGUAGE=en:MAILTO:user3@example.net
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;
- RSVP=TRUE;CN=User 4;LANGUAGE=en:MAILTO:user4@example.net
-END:VEVENT
-END:VCALENDAR
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 3.0//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYMONTH=3;BYDAY=3SU
+TZNAME:NZST
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:20070930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+TZNAME:NZDT
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZNAME:NZST
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+SEQUENCE:7
+DESCRIPTION:Masses of Lunch will be needed
+UID:PUT-attendees
+TRANSP:OPAQUE
+DTSTART;TZID=Pacific/Auckland:20101123T110000
+DTEND;TZID=Pacific/Auckland:20101123T160000
+DTSTAMP:20101124T221900Z
+SUMMARY:Multiple Beard Meeting
+CREATED:20071124T221521Z
+RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=4TU
+ORGANIZER;CN=User 1:MAILTO:user1@example.net
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=User 1;LANGUAGE=en:MAILTO:user1@example.net
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=User 2;LANGUAGE=en:MAILTO:user2@example.net
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=User 3;LANGUAGE=en:MAILTO:user3@example.net
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=User 4;LANGUAGE=en:MAILTO:user4@example.net
+END:VEVENT
+END:VCALENDAR
 <
 
       caldav_type: >VEVENT<
@@ -361,55 +361,55 @@ END:VCALENDAR
       logged_user: >10<
           summary: >Multiple Beard Meeting<
           user_no: >13<
-        vcalendar: >BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 3.0//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-DTSTART:19900318T030000
-RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYMONTH=3;BYDAY=3SU
-TZNAME:NZST
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-DTSTART:20070930T020000
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
-TZNAME:NZDT
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-DTSTART:20080406T030000
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-TZNAME:NZST
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-SEQUENCE:7
-DESCRIPTION:Masses of Lunch will be needed
-UID:PUT-attendees
-TRANSP:OPAQUE
-DTSTART;TZID=Pacific/Auckland:20101123T110000
-DTEND;TZID=Pacific/Auckland:20101123T160000
-DTSTAMP:20101124T221900Z
-SUMMARY:Multiple Beard Meeting
-CREATED:20071124T221521Z
-RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=4TU
-ORGANIZER;CN=User 1:MAILTO:user1@example.net
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;
- RSVP=TRUE;CN=User 1;LANGUAGE=en:MAILTO:user1@example.net
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;
- RSVP=TRUE;CN=User 2;LANGUAGE=en:MAILTO:user2@example.net
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;
- RSVP=TRUE;CN=User 3;LANGUAGE=en:MAILTO:user3@example.net
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;
- RSVP=TRUE;CN=User 4;LANGUAGE=en:MAILTO:user4@example.net
-END:VEVENT
-END:VCALENDAR
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 3.0//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:19900318T030000
+RRULE:FREQ=YEARLY;UNTIL=20070317T140000Z;BYMONTH=3;BYDAY=3SU
+TZNAME:NZST
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+DTSTART:20070930T020000
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+TZNAME:NZDT
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+DTSTART:20080406T030000
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+TZNAME:NZST
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+SEQUENCE:7
+DESCRIPTION:Masses of Lunch will be needed
+UID:PUT-attendees
+TRANSP:OPAQUE
+DTSTART;TZID=Pacific/Auckland:20101123T110000
+DTEND;TZID=Pacific/Auckland:20101123T160000
+DTSTAMP:20101124T221900Z
+SUMMARY:Multiple Beard Meeting
+CREATED:20071124T221521Z
+RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=4TU
+ORGANIZER;CN=User 1:MAILTO:user1@example.net
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=User 1;LANGUAGE=en:MAILTO:user1@example.net
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=User 2;LANGUAGE=en:MAILTO:user2@example.net
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=User 3;LANGUAGE=en:MAILTO:user3@example.net
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=User 4;LANGUAGE=en:MAILTO:user4@example.net
+END:VEVENT
+END:VCALENDAR
 <
 
diff --git a/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result
index 743fc248..80a4b730 100644
--- a/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result
@@ -44,7 +44,7 @@ TRANSP:OPAQUE
 SUMMARY:Meeting with User1
 DTSTART;TZID=Pacific/Auckland:20111019T100000
 DTSTAMP:20111018T200107Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+ORGANIZER;CN=Manager 1:mailto:manager1@example.net
 SEQUENCE:4
 END:VEVENT
 END:VCALENDAR
diff --git a/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result
index acaecba6..036863b8 100644
--- a/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result
@@ -49,7 +49,7 @@ TRANSP:OPAQUE
 SUMMARY:Meeting with User1
 DTSTART;TZID=Pacific/Auckland:20111019T100000
 DTSTAMP:20111018T200107Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+ORGANIZER;CN=Manager 1:mailto:manager1@example.net
 SEQUENCE:5
 END:VEVENT
 END:VCALENDAR
@@ -106,43 +106,43 @@ END:VCALENDAR
       logged_user: >20<
           summary: >Meeting with User1<
           user_no: >10<
-        vcalendar: >BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 4.0.4//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
-DTSTART:20070930T020000
-TZNAME:GMT+13:00
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-DTSTART:20080406T030000
-TZNAME:GMT+12:00
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-CREATED:20111018T195845Z
-UID:E1A13F04-iCal-schedule
-DTEND;TZID=Pacific/Auckland:20111019T110000
-ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
- er1@example.net
-ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
- et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
- ample.net
-TRANSP:OPAQUE
-SUMMARY:Meeting with User1
-DTSTART;TZID=Pacific/Auckland:20111019T100000
-DTSTAMP:20111018T200107Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
-SEQUENCE:5
-END:VEVENT
-END:VCALENDAR
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T110000
+ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
+ er1@example.net
+ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
+ ample.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T100000
+DTSTAMP:20111018T200107Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:5
+END:VEVENT
+END:VCALENDAR
 <
 
diff --git a/testing/tests/scheduling/3026-PUT-Accept.result b/testing/tests/scheduling/3026-PUT-Accept.result
index 73ec3062..bd87cb0a 100644
--- a/testing/tests/scheduling/3026-PUT-Accept.result
+++ b/testing/tests/scheduling/3026-PUT-Accept.result
@@ -33,7 +33,7 @@ TRANSP:OPAQUE
 SUMMARY:Meeting with User1
 DTSTART;TZID=Pacific/Auckland:20111019T100000
 DTSTAMP:20111018T200107Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+ORGANIZER;CN=Manager 1:mailto:manager1@example.net
 SEQUENCE:5
 ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
  mailto:manager1@example.net
@@ -81,8 +81,8 @@ TRANSP:OPAQUE
 SUMMARY:Meeting with User1
 DTSTART;TZID=Pacific/Auckland:20111019T100000
 DTSTAMP:20111018T200107Z
-ORGANIZER;CN=Manager 1;SCHEDULE-STATUS=1.2:mailto:manager1@example.net
 SEQUENCE:5
+ORGANIZER;CN=Manager 1;SCHEDULE-STATUS=1.2:mailto:manager1@example.net
 END:VEVENT
 END:VCALENDAR
 <
diff --git a/testing/tests/scheduling/3026-PUT-Accept.test b/testing/tests/scheduling/3026-PUT-Accept.test
index aab1ac2e..d2606e26 100644
--- a/testing/tests/scheduling/3026-PUT-Accept.test
+++ b/testing/tests/scheduling/3026-PUT-Accept.test
@@ -5,7 +5,7 @@ TYPE=PUT
 URL=http://regression.host/user1/home/E1A13F04-iCal-schedule.ics
 
 HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549)
-HEADER=If-Match: "905cdcc0d1a76ef63ef8d238575c3856"
+HEADER=If-Match: "46e5c5b3530da1b0d6fd8a08bb38a3b3"
 HEADER=Content-Type: text/calendar
 
 # REPLACE=#<creationdate>\d{8}T\d{6}</creationdate>#<creationdate>YYYYMMDDThhmmss</creationdate>#
diff --git a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result
index b49dbf54..1603abca 100644
--- a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result
@@ -44,7 +44,7 @@ TRANSP:OPAQUE
 SUMMARY:Meeting with User1
 DTSTART;TZID=Pacific/Auckland:20111019T130000
 DTSTAMP:20111024T035702Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+ORGANIZER;CN=Manager 1:mailto:manager1@example.net
 SEQUENCE:6
 END:VEVENT
 END:VCALENDAR
@@ -55,44 +55,44 @@ END:VCALENDAR
       logged_user: >20<
           summary: >Meeting with User1<
           user_no: >10<
-        vcalendar: >BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 4.0.4//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
-DTSTART:20070930T020000
-TZNAME:GMT+13:00
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-DTSTART:20080406T030000
-TZNAME:GMT+12:00
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-CREATED:20111018T195845Z
-UID:E1A13F04-iCal-schedule
-DTEND;TZID=Pacific/Auckland:20111019T140000
-ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
- er1@example.net
-ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
- et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
- ample.net
-TRANSP:OPAQUE
-SUMMARY:Meeting with User1
-DTSTART;TZID=Pacific/Auckland:20111019T130000
-DTSTAMP:20111024T035702Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
-SEQUENCE:6
-END:VEVENT
-END:VCALENDAR
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
+ er1@example.net
+ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
+ ample.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:20111024T035702Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:6
+END:VEVENT
+END:VCALENDAR
 <
 
       caldav_type: >VEVENT<
diff --git a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.test b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.test
index 7954f17a..f80db33a 100644
--- a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.test
+++ b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.test
@@ -5,7 +5,7 @@ TYPE=PUT
 URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics
 HEADER=Content-Type: text/calendar
 HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549)
-HEADER=If-Match: "d60f8959edc5eee6e949a2e5b81dd746"
+HEADER=If-Match: "517bc78e1fcb5805dd4ca7e65ad04367"
 HEAD
 
 AUTH=manager1:manager1
diff --git a/testing/tests/scheduling/3030-DELETE-attendee-event.result b/testing/tests/scheduling/3030-DELETE-attendee-event.result
index 420b52dd..e2665528 100644
--- a/testing/tests/scheduling/3030-DELETE-attendee-event.result
+++ b/testing/tests/scheduling/3030-DELETE-attendee-event.result
@@ -35,7 +35,7 @@ TRANSP:OPAQUE
 SUMMARY:Meeting with User1
 DTSTART;TZID=Pacific/Auckland:20111019T130000
 DTSTAMP:looks good
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+ORGANIZER;CN=Manager 1:mailto:manager1@example.net
 SEQUENCE:6
 ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
  mailto:manager1@example.net
@@ -52,7 +52,6 @@ VERSION:2.0
 PRODID:-//Apple Inc.//iCal 4.0.4//EN
 CALSCALE:GREGORIAN
 METHOD:REPLY
-REQUEST-STATUS:2.0
 BEGIN:VEVENT
 UID:E1A13F04-iCal-schedule
 DTEND:20111019T010000Z
@@ -60,9 +59,10 @@ ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
  PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
  :mailto:user1@example.net
 DTSTART:20111019T000000Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+ORGANIZER;CN=Manager 1:mailto:manager1@example.net
 SEQUENCE:7
 DTSTAMP:looks good
+REQUEST-STATUS:2.0
 END:VEVENT
 END:VCALENDAR
 <
diff --git a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result
index d1827a5c..77f28619 100644
--- a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result
@@ -52,7 +52,7 @@ TRANSP:OPAQUE
 SUMMARY:Meeting with User1
 DTSTART;TZID=Pacific/Auckland:20111019T130000
 DTSTAMP:20111024T035702Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+ORGANIZER;CN=Manager 1:mailto:manager1@example.net
 SEQUENCE:7
 END:VEVENT
 END:VCALENDAR
@@ -115,50 +115,50 @@ END:VCALENDAR
       logged_user: >20<
           summary: >Meeting with User1<
           user_no: >10<
-        vcalendar: >BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 4.0.4//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
-DTSTART:20070930T020000
-TZNAME:GMT+13:00
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-DTSTART:20080406T030000
-TZNAME:GMT+12:00
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-CREATED:20111018T195845Z
-UID:E1A13F04-iCal-schedule
-DTEND;TZID=Pacific/Auckland:20111019T140000
-ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
- er1@example.net
-ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
- et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
- ample.net
-ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
- et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
- ample.net
-ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
- et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
- ample.net
-TRANSP:OPAQUE
-SUMMARY:Meeting with User1
-DTSTART;TZID=Pacific/Auckland:20111019T130000
-DTSTAMP:20111024T035702Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
-SEQUENCE:7
-END:VEVENT
-END:VCALENDAR
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
+ er1@example.net
+ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
+ ample.net
+ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
+ ample.net
+ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
+ ample.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:20111024T035702Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
 <
 
       caldav_type: >VEVENT<
@@ -218,50 +218,50 @@ END:VCALENDAR
       logged_user: >20<
           summary: >Meeting with User1<
           user_no: >11<
-        vcalendar: >BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 4.0.4//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
-DTSTART:20070930T020000
-TZNAME:GMT+13:00
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-DTSTART:20080406T030000
-TZNAME:GMT+12:00
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-CREATED:20111018T195845Z
-UID:E1A13F04-iCal-schedule
-DTEND;TZID=Pacific/Auckland:20111019T140000
-ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
- er1@example.net
-ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
- et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
- ample.net
-ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
- et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
- ample.net
-ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
- et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
- ample.net
-TRANSP:OPAQUE
-SUMMARY:Meeting with User1
-DTSTART;TZID=Pacific/Auckland:20111019T130000
-DTSTAMP:20111024T035702Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
-SEQUENCE:7
-END:VEVENT
-END:VCALENDAR
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
+ er1@example.net
+ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
+ ample.net
+ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
+ ample.net
+ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
+ ample.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:20111024T035702Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
 <
 
       caldav_type: >VEVENT<
@@ -321,49 +321,49 @@ END:VCALENDAR
       logged_user: >20<
           summary: >Meeting with User1<
           user_no: >12<
-        vcalendar: >BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Apple Inc.//iCal 4.0.4//EN
-CALSCALE:GREGORIAN
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
-DTSTART:20070930T020000
-TZNAME:GMT+13:00
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
-DTSTART:20080406T030000
-TZNAME:GMT+12:00
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-CREATED:20111018T195845Z
-UID:E1A13F04-iCal-schedule
-DTEND;TZID=Pacific/Auckland:20111019T140000
-ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
- er1@example.net
-ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
- et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
- ample.net
-ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
- et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
- ample.net
-ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
- et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
- ample.net
-TRANSP:OPAQUE
-SUMMARY:Meeting with User1
-DTSTART;TZID=Pacific/Auckland:20111019T130000
-DTSTAMP:20111024T035702Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
-SEQUENCE:7
-END:VEVENT
-END:VCALENDAR
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
+ er1@example.net
+ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
+ ample.net
+ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
+ ample.net
+ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
+ ample.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:20111024T035702Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
 <
 
diff --git a/testing/tests/scheduling/3033-DELETE-organizer-event.result b/testing/tests/scheduling/3033-DELETE-organizer-event.result
index 303231a4..be34858c 100644
--- a/testing/tests/scheduling/3033-DELETE-organizer-event.result
+++ b/testing/tests/scheduling/3033-DELETE-organizer-event.result
@@ -13,7 +13,6 @@ VERSION:2.0
 PRODID:-//Apple Inc.//iCal 4.0.4//EN
 CALSCALE:GREGORIAN
 METHOD:CANCEL
-REQUEST-STATUS:2.0
 BEGIN:VEVENT
 UID:E1A13F04-iCal-schedule
 DTEND:20111019T010000Z
@@ -29,8 +28,9 @@ ATTENDEE;CN=user3@example.net;CUTYPE=INDIVIDUAL;EMAIL=user3@example.net;
  PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
  :mailto:user3@example.net
 DTSTART:20111019T000000Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+ORGANIZER;CN=Manager 1:mailto:manager1@example.net
 SEQUENCE:7
+REQUEST-STATUS:2.0
 END:VEVENT
 END:VCALENDAR
 <
@@ -41,7 +41,6 @@ VERSION:2.0
 PRODID:-//Apple Inc.//iCal 4.0.4//EN
 CALSCALE:GREGORIAN
 METHOD:CANCEL
-REQUEST-STATUS:2.0
 BEGIN:VEVENT
 UID:E1A13F04-iCal-schedule
 DTEND:20111019T010000Z
@@ -57,8 +56,9 @@ ATTENDEE;CN=user3@example.net;CUTYPE=INDIVIDUAL;EMAIL=user3@example.net;
  PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
  :mailto:user3@example.net
 DTSTART:20111019T000000Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+ORGANIZER;CN=Manager 1:mailto:manager1@example.net
 SEQUENCE:7
+REQUEST-STATUS:2.0
 END:VEVENT
 END:VCALENDAR
 <
@@ -69,7 +69,6 @@ VERSION:2.0
 PRODID:-//Apple Inc.//iCal 4.0.4//EN
 CALSCALE:GREGORIAN
 METHOD:CANCEL
-REQUEST-STATUS:2.0
 BEGIN:VEVENT
 UID:E1A13F04-iCal-schedule
 DTEND:20111019T010000Z
@@ -85,8 +84,9 @@ ATTENDEE;CN=user3@example.net;CUTYPE=INDIVIDUAL;EMAIL=user3@example.net;
  PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
  :mailto:user3@example.net
 DTSTART:20111019T000000Z
-ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+ORGANIZER;CN=Manager 1:mailto:manager1@example.net
 SEQUENCE:7
+REQUEST-STATUS:2.0
 END:VEVENT
 END:VCALENDAR
 <
diff --git a/testing/tests/scheduling/Restore-Database.result b/testing/tests/scheduling/Restore-Database.result
index 7c637f64..d9369f29 100644
--- a/testing/tests/scheduling/Restore-Database.result
+++ b/testing/tests/scheduling/Restore-Database.result
@@ -1,7 +1,7 @@
 psql:tests/scheduling/initial.dbdump:28: ERROR:  must be owner of extension plpgsql
  setval 
 --------
-   1645
+   1648
 (1 row)
 
  setval