From 6cf8d5f81dedadb90d7e18936936bc6aeed18c5a Mon Sep 17 00:00:00 2001
From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Tue, 12 Jul 2022 14:27:24 +1200
Subject: [PATCH] Another attempt to make the results deterministic

---
 inc/caldav-GET-functions.php                  |   4 +-
 testing/tests/binding/1035-GET-mashup.result  | 784 +++++++++---------
 .../binding/1040-GET-mashup-other-user.result | 376 ++++-----
 .../0901-GET-Collection.result                | 476 +++++------
 .../0903-GET-Collection.result                | 310 +++----
 5 files changed, 975 insertions(+), 975 deletions(-)

diff --git a/inc/caldav-GET-functions.php b/inc/caldav-GET-functions.php
index 8d20b456..7b002142 100644
--- a/inc/caldav-GET-functions.php
+++ b/inc/caldav-GET-functions.php
@@ -57,12 +57,12 @@ function export_iCalendar( DAVResource $dav_resource ) {
   }
   $sql = 'SELECT caldav_data, class, caldav_type, user_no, logged_user ';
   $sql .= 'FROM (';
-  $sql .= 'SELECT '.$distinct.' caldav_data, class, caldav_type, calendar_item.user_no, logged_user, calendar_item.dav_name, calendar_item.dtstart ';
+  $sql .= 'SELECT '.$distinct.' caldav_data, class, caldav_type, calendar_item.user_no, logged_user, calendar_item.dav_name, calendar_item.dtstart, calendar_item.dtend ';
   $sql .= 'FROM collection INNER JOIN caldav_data USING(collection_id) ';
   $sql .= 'INNER JOIN calendar_item USING ( dav_id ) WHERE '.$where;
   if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) $sql .= ' ORDER BY calendar_item.uid, calendar_item.dav_id';
   $sql .= ') AS s1';
-  if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) $sql .= ' ORDER BY user_no, dav_name, dtstart';
+  if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) $sql .= ' ORDER BY user_no, dtstart, dtend';
 
   $qry = new AwlQuery( $sql, $params );
   if ( !$qry->Exec("GET",__LINE__,__FILE__) ) {
diff --git a/testing/tests/binding/1035-GET-mashup.result b/testing/tests/binding/1035-GET-mashup.result
index 6895aa80..5eb0c94a 100644
--- a/testing/tests/binding/1035-GET-mashup.result
+++ b/testing/tests/binding/1035-GET-mashup.result
@@ -12,55 +12,6 @@ VERSION:2.0
 CALSCALE:GREGORIAN
 X-WR-CALNAME:A normal collection
 BEGIN:VEVENT
-CREATED:20111004T153507Z
-UID:0544-gzip-PUT
-TRANSP:OPAQUE
-SUMMARY:In Central Europe, 2pm, Oct 5th for 1 hour
-DTSTART;TZID=Somewhere_in_Central_Europe:20111005T140000
-DTEND;TZID=Somewhere_in_Central_Europe:20111005T150000
-DTSTAMP:20111004T153507Z
-SEQUENCE:1
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20111004T153507Z
-UID:0545-deflate-PUT
-TRANSP:OPAQUE
-SUMMARY:In Prague, 10am, Oct 7th for 1 hour
-DTSTART;TZID=Prague_in_Central_Europe:20111007T100000
-DURATION:PT1H
-DTSTAMP:20111004T153507Z
-SEQUENCE:1
-END:VEVENT
-BEGIN:VTODO
-CREATED:20070805T201647Z
-LAST-MODIFIED:20070805T201834Z
-DTSTAMP:20070805T201647Z
-UID:0575d895-a006-4ed8-9be6-0d1b6b6b1f96
-SUMMARY:Due 7/8/7 16:30\, completed
-STATUS:COMPLETED
-DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070807T163000
-COMPLETED:20070805T201737Z
-PERCENT-COMPLETE:100
-X-MOZ-LOCATIONPATH:0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics
-DESCRIPTION:Due on 7/8/7 at 4:30pm\, but completed alread on 6/8/7
-CATEGORIES:Projects
-END:VTODO
-BEGIN:VEVENT
-CREATED:20061223T031415Z
-LAST-MODIFIED:20061223T032305Z
-DTSTAMP:20061223T032305Z
-UID:1906b3ca-4890-468a-9b58-1de74bf2c716
-SUMMARY:Private Event
-PRIORITY:0
-STATUS:CONFIRMED
-CLASS:PRIVATE
-DTSTART;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061223T130000
-DTEND;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061223T150000
-X-MOZ-LOCATIONPATH:1906b3ca-4890-468a-9b58-1de74bf2c716.ics
-LOCATION:At a private location
-DESCRIPTION:Private and Confirmed
-END:VEVENT
-BEGIN:VEVENT
 UID:20061101T073000Z-10468-1000-1-7@ubu
 DTSTAMP:20061101T073000Z
 DTSTART;TZID=Pacific/Auckland:20061101T100000
@@ -73,25 +24,6 @@ TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
 DESCRIPTION:A Meeting
 END:VALARM
 END:VEVENT
-BEGIN:VTODO
-CREATED:20070805T200215Z
-LAST-MODIFIED:20070805T201531Z
-DTSTAMP:20070805T200215Z
-UID:2178279a-aec2-471f-832d-1f6df6203f2f
-SUMMARY:Incomplete\, uncancelled
-X-MOZ-LOCATIONPATH:2178279a-aec2-471f-832d-1f6df6203f2f.ics
-DESCRIPTION:This task is incomplete and has not been cancelled (has no s
- tatus at all)
-END:VTODO
-BEGIN:VEVENT
-DTSTAMP:20061102T090217Z
-DTSTART;TZID=New Zealand Standard Time:20061102T123000
-DURATION:PT1H
-LAST-MODIFIED:20061104T002921Z
-SEQUENCE:1
-SUMMARY:Lunch with David
-UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
-END:VEVENT
 BEGIN:VEVENT
 CREATED:20061120T041336Z
 LAST-MODIFIED:20061120T041709Z
@@ -107,14 +39,24 @@ CATEGORIES:Projects
 X-MOZ-LOCATIONPATH:4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics
 END:VEVENT
 BEGIN:VEVENT
-CREATED:20091006T225807Z
-UID:70D23799-4A68-4905-AB9F-4D47BA693CFD
-DTEND;TZID=Europe/Prague:20091005T150000
-TRANSP:OPAQUE
-SUMMARY:New Event
-DTSTART;TZID=Europe/Prague:20091005T140000
-DTSTAMP:20091006T225808Z
+DTSTAMP:20061102T090217Z
+DTSTART;TZID=New Zealand Standard Time:20061102T123000
+DURATION:PT1H
+LAST-MODIFIED:20061104T002921Z
 SEQUENCE:1
+SUMMARY:Lunch with David
+UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
+END:VEVENT
+BEGIN:VEVENT
+UID:da81c0ee-7871-11db-c6d6-f6927c144649
+DTSTAMP:20061024T115217Z
+DTSTART:20061103T073000
+DTEND:20061103T093000
+DESCRIPTION:
+LOCATION:Olivia's
+RRULE:FREQ=MONTHLY
+STATUS:CONFIRMED
+SUMMARY:Morning Mgmt Mtg
 END:VEVENT
 BEGIN:VEVENT
 UID:71e2ae82-7870-11db-c6d6-f6927c144649
@@ -127,18 +69,21 @@ RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=20071222T235900
 STATUS:CONFIRMED
 SUMMARY:Beer O'Clock
 END:VEVENT
-BEGIN:VTODO
-CREATED:20070805T201557Z
-LAST-MODIFIED:20070805T201643Z
-DTSTAMP:20070805T201557Z
-UID:917b9e47-b748-4550-a566-657fbe672447
-SUMMARY:50% Complete\, uncancelled
-STATUS:IN-PROCESS
-PERCENT-COMPLETE:50
-X-MOZ-LOCATIONPATH:917b9e47-b748-4550-a566-657fbe672447.ics
-DESCRIPTION:This task is in progress (50% complete) and has not been can
- celled.
-END:VTODO
+BEGIN:VEVENT
+CREATED:20061223T031415Z
+LAST-MODIFIED:20061223T032305Z
+DTSTAMP:20061223T032305Z
+UID:1906b3ca-4890-468a-9b58-1de74bf2c716
+SUMMARY:Private Event
+PRIORITY:0
+STATUS:CONFIRMED
+CLASS:PRIVATE
+DTSTART;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061223T130000
+DTEND;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061223T150000
+X-MOZ-LOCATIONPATH:1906b3ca-4890-468a-9b58-1de74bf2c716.ics
+LOCATION:At a private location
+DESCRIPTION:Private and Confirmed
+END:VEVENT
 BEGIN:VEVENT
 CREATED:20061223T032350Z
 LAST-MODIFIED:20061223T033144Z
@@ -154,6 +99,46 @@ X-MOZ-LOCATIONPATH:9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics
 LOCATION:In a confidential place
 END:VEVENT
 BEGIN:VEVENT
+CREATED:20061223T051646Z
+LAST-MODIFIED:20061223T051713Z
+DTSTAMP:20061223T051713Z
+UID:fbd57454-d966-4a14-8341-abe1edb1ae66
+SUMMARY:Tentative Event
+STATUS:TENTATIVE
+CLASS:PUBLIC
+DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T190000
+DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T210000
+X-MOZ-LOCATIONPATH:fbd57454-d966-4a14-8341-abe1edb1ae66.ics
+LOCATION:Never never land
+END:VEVENT
+BEGIN:VTODO
+CREATED:20070805T201647Z
+LAST-MODIFIED:20070805T201834Z
+DTSTAMP:20070805T201647Z
+UID:0575d895-a006-4ed8-9be6-0d1b6b6b1f96
+SUMMARY:Due 7/8/7 16:30\, completed
+STATUS:COMPLETED
+DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070807T163000
+COMPLETED:20070805T201737Z
+PERCENT-COMPLETE:100
+X-MOZ-LOCATIONPATH:0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics
+DESCRIPTION:Due on 7/8/7 at 4:30pm\, but completed alread on 6/8/7
+CATEGORIES:Projects
+END:VTODO
+BEGIN:VTODO
+CREATED:20070806T223244Z
+LAST-MODIFIED:20070806T223411Z
+DTSTAMP:20070806T223244Z
+UID:b1679f77-673d-4f46-b3eb-2420e1bba301
+SUMMARY:A Cancelled Task\, with a start and due date
+STATUS:CANCELLED
+DTSTART;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070808T111500
+DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070808T111500
+X-MOZ-LOCATIONPATH:b1679f77-673d-4f46-b3eb-2420e1bba301.ics
+DESCRIPTION:This is a task with a Start and a Due date\, but it has been
+  cancelled.
+END:VTODO
+BEGIN:VEVENT
 SEQUENCE:6
 TRANSP:OPAQUE
 UID:AAA9318E-37D9-4319-8626-95ECD3D3B243
@@ -171,39 +156,6 @@ ATTACH;VALUE=URI:Basso
 END:VALARM
 END:VEVENT
 BEGIN:VTODO
-CREATED:20070806T223244Z
-LAST-MODIFIED:20070806T223411Z
-DTSTAMP:20070806T223244Z
-UID:b1679f77-673d-4f46-b3eb-2420e1bba301
-SUMMARY:A Cancelled Task\, with a start and due date
-STATUS:CANCELLED
-DTSTART;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070808T111500
-DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070808T111500
-X-MOZ-LOCATIONPATH:b1679f77-673d-4f46-b3eb-2420e1bba301.ics
-DESCRIPTION:This is a task with a Start and a Due date\, but it has been
-  cancelled.
-END:VTODO
-BEGIN:VEVENT
-UID:da81c0ee-7871-11db-c6d6-f6927c144649
-DTSTAMP:20061024T115217Z
-DTSTART:20061103T073000
-DTEND:20061103T093000
-DESCRIPTION:
-LOCATION:Olivia's
-RRULE:FREQ=MONTHLY
-STATUS:CONFIRMED
-SUMMARY:Morning Mgmt Mtg
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION:Have a party. All the best parties are monthly!
-UID:DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74
-DTSTAMP:20081024T220925Z
-SUMMARY:Party all day!
-CREATED:20081024T220749Z
-DTSTART;TZID=Pacific/Auckland;VALUE=DATE:20081114
-RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=2FR
-END:VEVENT
-BEGIN:VTODO
 CREATED:20071203T202915Z
 LAST-MODIFIED:20071203T203021Z
 DTSTAMP:20071203T202915Z
@@ -240,17 +192,13 @@ ACTION:DISPLAY
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
-CREATED:20061223T051646Z
-LAST-MODIFIED:20061223T051713Z
-DTSTAMP:20061223T051713Z
-UID:fbd57454-d966-4a14-8341-abe1edb1ae66
-SUMMARY:Tentative Event
-STATUS:TENTATIVE
-CLASS:PUBLIC
-DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T190000
-DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T210000
-X-MOZ-LOCATIONPATH:fbd57454-d966-4a14-8341-abe1edb1ae66.ics
-LOCATION:Never never land
+DESCRIPTION:Have a party. All the best parties are monthly!
+UID:DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74
+DTSTAMP:20081024T220925Z
+SUMMARY:Party all day!
+CREATED:20081024T220749Z
+DTSTART;TZID=Pacific/Auckland;VALUE=DATE:20081114
+RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=2FR
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION:Have a microparty. All the best parties are monthly!
@@ -263,6 +211,16 @@ DURATION:PT3H
 RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=3FR
 END:VEVENT
 BEGIN:VEVENT
+CREATED:20091006T225807Z
+UID:70D23799-4A68-4905-AB9F-4D47BA693CFD
+DTEND;TZID=Europe/Prague:20091005T150000
+TRANSP:OPAQUE
+SUMMARY:New Event
+DTSTART;TZID=Europe/Prague:20091005T140000
+DTSTAMP:20091006T225808Z
+SEQUENCE:1
+END:VEVENT
+BEGIN:VEVENT
 UID:PUT-eastern-time
 DTSTAMP:20101009T214524Z
 SUMMARY;LANGUAGE=en-US:Psychic's Anonymous Meeting
@@ -273,6 +231,71 @@ CREATED:20101010T014639
 LAST-MODIFIED:20101010T014639
 END:VEVENT
 BEGIN:VEVENT
+CREATED:20111004T153507Z
+UID:0544-gzip-PUT
+TRANSP:OPAQUE
+SUMMARY:In Central Europe, 2pm, Oct 5th for 1 hour
+DTSTART;TZID=Somewhere_in_Central_Europe:20111005T140000
+DTEND;TZID=Somewhere_in_Central_Europe:20111005T150000
+DTSTAMP:20111004T153507Z
+SEQUENCE:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111004T153507Z
+UID:0545-deflate-PUT
+TRANSP:OPAQUE
+SUMMARY:In Prague, 10am, Oct 7th for 1 hour
+DTSTART;TZID=Prague_in_Central_Europe:20111007T100000
+DURATION:PT1H
+DTSTAMP:20111004T153507Z
+SEQUENCE:1
+END:VEVENT
+BEGIN:VTODO
+CREATED:20070805T200215Z
+LAST-MODIFIED:20070805T201531Z
+DTSTAMP:20070805T200215Z
+UID:2178279a-aec2-471f-832d-1f6df6203f2f
+SUMMARY:Incomplete\, uncancelled
+X-MOZ-LOCATIONPATH:2178279a-aec2-471f-832d-1f6df6203f2f.ics
+DESCRIPTION:This task is incomplete and has not been cancelled (has no s
+ tatus at all)
+END:VTODO
+BEGIN:VTODO
+CREATED:20070805T201557Z
+LAST-MODIFIED:20070805T201643Z
+DTSTAMP:20070805T201557Z
+UID:917b9e47-b748-4550-a566-657fbe672447
+SUMMARY:50% Complete\, uncancelled
+STATUS:IN-PROCESS
+PERCENT-COMPLETE:50
+X-MOZ-LOCATIONPATH:917b9e47-b748-4550-a566-657fbe672447.ics
+DESCRIPTION:This task is in progress (50% complete) and has not been can
+ celled.
+END:VTODO
+BEGIN:VTODO
+PRIORITY:0
+SEQUENCE:4
+DTSTART;TZID=Pacific/Auckland:20040101T120000
+UID:A51AC037-E6F9-4E03-872C-7DFE0B67D1FF
+DTSTAMP:20100318T210557Z
+SUMMARY:Release DAViCal 0.9.9
+CREATED:20100318T210457Z
+X-APPLE-SORT-ORDER:2147483647
+DUE;VALUE=DATE:20100326
+END:VTODO
+BEGIN:VEVENT
+LAST-MODIFIED:20080303T015422Z
+SEQUENCE:5
+UID:7d729xc0-0895-012d-124e-002421a2359e
+SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday
+RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1
+DESCRIPTION:An all day event on various days.
+DTSTART;TZID=America/Los_Angeles:20081006T000000
+CREATED:20080303T015329Z
+DTSTAMP:20080303T015422Z
+DURATION:P1D
+END:VEVENT
+BEGIN:VEVENT
 CREATED:20081023T054934Z
 LAST-MODIFIED:20081023T055059Z
 DTSTAMP:20081023T054934Z
@@ -295,6 +318,42 @@ DTEND;TZID=Pacific/Auckland:20081020T113000
 X-MOZ-GENERATION:2
 END:VEVENT
 BEGIN:VEVENT
+CREATED:20081023T055115Z
+LAST-MODIFIED:20081023T055139Z
+DTSTAMP:20081023T055115Z
+UID:9429a973-2b13-4b1a-be09-948d75425c45
+SUMMARY:Weekly catch-up
+RRULE:FREQ=WEEKLY;INTERVAL=1
+DTSTART;TZID=Pacific/Auckland:20081024T140000
+DTEND;TZID=Pacific/Auckland:20081024T150000
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20081123T210725Z
+SEQUENCE:6
+UID:bd262d20-1cdb-012d-1264-002421a2359e
+SUMMARY:Afternoon run
+DESCRIPTION:
+DTSTART;TZID=America/Los_Angeles:20081123T150000
+CREATED:20081123T210644Z
+DTSTAMP:20081123T210725Z
+DURATION:PT1H
+LOCATION:
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20100318T044409Z
+LAST-MODIFIED:20100318T044451Z
+DTSTAMP:20100318T044451Z
+UID:9f81cd8a-b1c2-4f72-9f12-1ddbddd69342
+SUMMARY:Test adding an event to a bound collection
+RRULE:FREQ=WEEKLY;INTERVAL=2
+DTSTART;TZID=Pacific/Auckland:20100322T180000
+DTEND;TZID=Pacific/Auckland:20100322T190000
+LOCATION:Somewhere else
+DESCRIPTION:This event is being added to a bound collection.
+END:VEVENT
+BEGIN:VEVENT
 LAST-MODIFIED:20110101T005414Z
 SEQUENCE:12
 URL;VALUE=URI:http://www.oregontrufflefestival.com
@@ -322,145 +381,6 @@ X-EMAIL-RSVP-UPDATES:true
 RRULE:FREQ=DAILY;COUNT=3;INTERVAL=1
 END:VEVENT
 BEGIN:VEVENT
-LAST-MODIFIED:20080303T015422Z
-SEQUENCE:5
-UID:7d729xc0-0895-012d-124e-002421a2359e
-SUMMARY:1st Monday, 2nd Tuesday, 3rd Thursday & Last Friday
-RRULE:FREQ=MONTHLY;BYDAY=1MO,2TU,3TH,-1FR;INTERVAL=1
-DESCRIPTION:An all day event on various days.
-DTSTART;TZID=America/Los_Angeles:20081006T000000
-CREATED:20080303T015329Z
-DTSTAMP:20080303T015422Z
-DURATION:P1D
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20081023T055115Z
-LAST-MODIFIED:20081023T055139Z
-DTSTAMP:20081023T055115Z
-UID:9429a973-2b13-4b1a-be09-948d75425c45
-SUMMARY:Weekly catch-up
-RRULE:FREQ=WEEKLY;INTERVAL=1
-DTSTART;TZID=Pacific/Auckland:20081024T140000
-DTEND;TZID=Pacific/Auckland:20081024T150000
-X-MOZ-GENERATION:2
-END:VEVENT
-BEGIN:VEVENT
-LAST-MODIFIED:20081123T210725Z
-SEQUENCE:6
-UID:bd262d20-1cdb-012d-1264-002421a2359e
-SUMMARY:Afternoon run
-DESCRIPTION:
-DTSTART;TZID=America/Los_Angeles:20081123T150000
-CREATED:20081123T210644Z
-DTSTAMP:20081123T210725Z
-DURATION:PT1H
-LOCATION:
-RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=SU
-END:VEVENT
-BEGIN:VTODO
-PRIORITY:0
-SEQUENCE:4
-DTSTART;TZID=Pacific/Auckland:20040101T120000
-UID:A51AC037-E6F9-4E03-872C-7DFE0B67D1FF
-DTSTAMP:20100318T210557Z
-SUMMARY:Release DAViCal 0.9.9
-CREATED:20100318T210457Z
-X-APPLE-SORT-ORDER:2147483647
-DUE;VALUE=DATE:20100326
-END:VTODO
-BEGIN:VEVENT
-CREATED:20100318T044409Z
-LAST-MODIFIED:20100318T044451Z
-DTSTAMP:20100318T044451Z
-UID:9f81cd8a-b1c2-4f72-9f12-1ddbddd69342
-SUMMARY:Test adding an event to a bound collection
-RRULE:FREQ=WEEKLY;INTERVAL=2
-DTSTART;TZID=Pacific/Auckland:20100322T180000
-DTEND;TZID=Pacific/Auckland:20100322T190000
-LOCATION:Somewhere else
-DESCRIPTION:This event is being added to a bound collection.
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20100319T103247Z
-LAST-MODIFIED:20100319T105620Z
-DTSTAMP:20100319T105620Z
-UID:70399cd7-50a4-4be4-a665-af593e19a7fd
-SUMMARY:An invited event.  Black tie with pink polka dots is essential. 
-  Do not bring a leopard.  Any leopards which do attend will be forcibly 
- chained to a nearby fence.
-ORGANIZER;RSVP=TRUE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:user4@example.ne
- t
-ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;SCHEDULE-S
- TATUS=1.2:mailto:user2@example.net
-ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;SCHEDULE-S
- TATUS=1.2:mailto:user3@example.net
-ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;SCHEDULE-S
- TATUS=3.8:mailto:user1@example.net
-ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;SCHEDULE-S
- TATUS=1.2:mailto:user5@example.net
-DTSTART:20100322T160000
-DTEND:20100322T170000
-X-MOZ-GENERATION:3
-TRANSP:OPAQUE
-X-MOZ-SEND-INVITATIONS:TRUE
-SEQUENCE:1
-END:VEVENT
-BEGIN:VEVENT
-LAST-MODIFIED:20100311T222451Z
-SEQUENCE:11
-URL;VALUE=URI:http://www.theoregonwineandartauction.org/
-UID:12cbff90-0f8a-012d-1259-002421a2359e
-SUMMARY:Youngberg Hill @ Uncorked\, Oregon Wine & Art Auction 
-DESCRIPTION:July 10th - Uncorked\, Oregon Wine & Art Auction\n\nCome joi
- n Youngberg Hill for this wonderful event.
-DTSTART;TZID=America/Los_Angeles:20100710T160000
-CREATED:20100311T221924Z
-DTSTAMP:20100311T222451Z
-DURATION:PT4H30M
-LOCATION:11400 Westland Lane\, Dayton OR
-X-VENUE:The Methven Family Vineyards
-END:VEVENT
-BEGIN:VEVENT
-LAST-MODIFIED:20100311T231118Z
-SEQUENCE:7
-UID:242afc80-0f8c-012d-1259-002421a2359e
-SUMMARY:Pre- IPNC Winemaker Dinner @ Youngberg Hill
-DESCRIPTION:July 22nd - PRE-IPNC Winemaker Dinner @ Youngberg Hill.\n\nD
- etails to follow.
-DTSTART;TZID=America/Los_Angeles:20100722T183000
-CREATED:20100311T223412Z
-DTSTAMP:20100311T231118Z
-DURATION:PT30M
-LOCATION:
-END:VEVENT
-BEGIN:VEVENT
-LAST-MODIFIED:20100311T231101Z
-SEQUENCE:0
-UID:4887b3b0-0f91-012d-1259-002421a2359e
-SUMMARY:New Event
-DESCRIPTION:
-DTSTART;TZID=America/Los_Angeles:20100716T150000
-CREATED:20100311T231101Z
-DTSTAMP:20100311T231101Z
-DURATION:PT1H
-LOCATION:
-END:VEVENT
-BEGIN:VEVENT
-LAST-MODIFIED:20100312T064055Z
-SEQUENCE:9
-URL;VALUE=URI:http://www.youngberghill.com
-UID:626c1f10-0f91-012d-1259-002421a2359e
-SUMMARY:Linfield Chamber Benefit @ Youngberg Hill
-DESCRIPTION:August 12th - Linfield Chamber Benefit @ Youngberg Hill\n\nD
- etails to follow
-DTSTART;TZID=America/Los_Angeles:20100812T180000
-CREATED:20100311T231144Z
-DTSTAMP:20100312T064055Z
-DURATION:PT2H30M
-LOCATION:10660 SW Youngberg Hill Road\, McMinniville OR
-X-VENUE:Youngberg Hill
-END:VEVENT
-BEGIN:VEVENT
 LAST-MODIFIED:20100125T214235Z
 SEQUENCE:1
 UID:73d1f980-ec28-012c-11f9-002421a2359e
@@ -488,6 +408,31 @@ LOCATION:
 X-VENUE:Evergreen Aviation\, McMnnville OR
 END:VEVENT
 BEGIN:VEVENT
+CREATED:20100319T103247Z
+LAST-MODIFIED:20100319T105620Z
+DTSTAMP:20100319T105620Z
+UID:70399cd7-50a4-4be4-a665-af593e19a7fd
+SUMMARY:An invited event.  Black tie with pink polka dots is essential. 
+  Do not bring a leopard.  Any leopards which do attend will be forcibly 
+ chained to a nearby fence.
+ORGANIZER;RSVP=TRUE;PARTSTAT=ACCEPTED;ROLE=CHAIR:mailto:user4@example.ne
+ t
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;SCHEDULE-S
+ TATUS=1.2:mailto:user2@example.net
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;SCHEDULE-S
+ TATUS=1.2:mailto:user3@example.net
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;SCHEDULE-S
+ TATUS=3.8:mailto:user1@example.net
+ATTENDEE;RSVP=TRUE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;SCHEDULE-S
+ TATUS=1.2:mailto:user5@example.net
+DTSTART:20100322T160000
+DTEND:20100322T170000
+X-MOZ-GENERATION:3
+TRANSP:OPAQUE
+X-MOZ-SEND-INVITATIONS:TRUE
+SEQUENCE:1
+END:VEVENT
+BEGIN:VEVENT
 LAST-MODIFIED:20100311T220308Z
 SEQUENCE:8
 URL;VALUE=URI:http://www.stephanie-inn.com
@@ -523,6 +468,33 @@ LOCATION:10660 SW Youngberg Hill Road
 X-VENUE:McMinnville\, OR
 END:VEVENT
 BEGIN:VEVENT
+LAST-MODIFIED:20100311T222451Z
+SEQUENCE:11
+URL;VALUE=URI:http://www.theoregonwineandartauction.org/
+UID:12cbff90-0f8a-012d-1259-002421a2359e
+SUMMARY:Youngberg Hill @ Uncorked\, Oregon Wine & Art Auction 
+DESCRIPTION:July 10th - Uncorked\, Oregon Wine & Art Auction\n\nCome joi
+ n Youngberg Hill for this wonderful event.
+DTSTART;TZID=America/Los_Angeles:20100710T160000
+CREATED:20100311T221924Z
+DTSTAMP:20100311T222451Z
+DURATION:PT4H30M
+LOCATION:11400 Westland Lane\, Dayton OR
+X-VENUE:The Methven Family Vineyards
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20100311T231101Z
+SEQUENCE:0
+UID:4887b3b0-0f91-012d-1259-002421a2359e
+SUMMARY:New Event
+DESCRIPTION:
+DTSTART;TZID=America/Los_Angeles:20100716T150000
+CREATED:20100311T231101Z
+DTSTAMP:20100311T231101Z
+DURATION:PT1H
+LOCATION:
+END:VEVENT
+BEGIN:VEVENT
 LAST-MODIFIED:20100311T223312Z
 SEQUENCE:9
 URL;VALUE=URI:http://www.mcminnvilleava.org/event.htm
@@ -539,6 +511,156 @@ DURATION:PT7H
 LOCATION:16250 SW Oldsville Rd\, McMinnville OR
 X-VENUE:Yamhill Valley Vineyards
 END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20100311T231118Z
+SEQUENCE:7
+UID:242afc80-0f8c-012d-1259-002421a2359e
+SUMMARY:Pre- IPNC Winemaker Dinner @ Youngberg Hill
+DESCRIPTION:July 22nd - PRE-IPNC Winemaker Dinner @ Youngberg Hill.\n\nD
+ etails to follow.
+DTSTART;TZID=America/Los_Angeles:20100722T183000
+CREATED:20100311T223412Z
+DTSTAMP:20100311T231118Z
+DURATION:PT30M
+LOCATION:
+END:VEVENT
+BEGIN:VEVENT
+LAST-MODIFIED:20100312T064055Z
+SEQUENCE:9
+URL;VALUE=URI:http://www.youngberghill.com
+UID:626c1f10-0f91-012d-1259-002421a2359e
+SUMMARY:Linfield Chamber Benefit @ Youngberg Hill
+DESCRIPTION:August 12th - Linfield Chamber Benefit @ Youngberg Hill\n\nD
+ etails to follow
+DTSTART;TZID=America/Los_Angeles:20100812T180000
+CREATED:20100311T231144Z
+DTSTAMP:20100312T064055Z
+DURATION:PT2H30M
+LOCATION:10660 SW Youngberg Hill Road\, McMinniville OR
+X-VENUE:Youngberg Hill
+END:VEVENT
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20050126_1/Pacific/Auckland
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:New Zealand Standard Time
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
+X-LIC-LOCATION:Antarctica/McMurdo
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20070129_1/Antarctica/McMurdo
+X-LIC-LOCATION:Antarctica/McMurdo
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:Europe/Prague
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+DTSTART:19810329T020000
+TZNAME:GMT+02:00
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+DTSTART:19961027T030000
+TZNAME:GMT+01:00
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:(UTC-05:00) Eastern Time (US & Canada)
+BEGIN:STANDARD
+DTSTART:16010101T020000
+TZOFFSETFROM:-0400
+TZOFFSETTO:-0500
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=11
+END:STANDARD
+BEGIN:DAYLIGHT
+DTSTART:16010101T020000
+TZOFFSETFROM:-0500
+TZOFFSETTO:-0400
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=2SU;BYMONTH=3
+END:DAYLIGHT
+END:VTIMEZONE
 BEGIN:VTIMEZONE
 TZID:Somewhere_in_Central_Europe
 X-MICROSOFT-CDO-TZID:4
@@ -576,128 +698,6 @@ TZOFFSETTO:+0100
 END:STANDARD
 END:VTIMEZONE
 BEGIN:VTIMEZONE
-TZID:/mozilla.org/20070129_1/Antarctica/McMurdo
-X-LIC-LOCATION:Antarctica/McMurdo
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:/mozilla.org/20050126_1/Pacific/Auckland
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:New Zealand Standard Time
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:Europe/Prague
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-DTSTART:19810329T020000
-TZNAME:GMT+02:00
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-DTSTART:19961027T030000
-TZNAME:GMT+01:00
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
-X-LIC-LOCATION:Antarctica/McMurdo
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:(UTC-05:00) Eastern Time (US & Canada)
-BEGIN:STANDARD
-DTSTART:16010101T020000
-TZOFFSETFROM:-0400
-TZOFFSETTO:-0500
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=11
-END:STANDARD
-BEGIN:DAYLIGHT
-DTSTART:16010101T020000
-TZOFFSETFROM:-0500
-TZOFFSETTO:-0400
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=2SU;BYMONTH=3
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
 TZID:America/Los_Angeles
 X-TZINFO:America/Los_Angeles[2007g/Partial@883612800000]
 BEGIN:DAYLIGHT
diff --git a/testing/tests/binding/1040-GET-mashup-other-user.result b/testing/tests/binding/1040-GET-mashup-other-user.result
index afb13f86..d298b6c7 100644
--- a/testing/tests/binding/1040-GET-mashup-other-user.result
+++ b/testing/tests/binding/1040-GET-mashup-other-user.result
@@ -15,6 +15,188 @@ X-WR-CALNAME:User 3
 BEGIN:VEVENT
 SUMMARY:Busy
 CLASS:CONFIDENTIAL
+DTSTART:20070611T131500
+DTEND:20070611T134500
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070611T140000
+DTEND:20070611T180000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070611T160000
+DTEND:20070611T180000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070611T180000
+DTEND:20070611T181500
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070612T110000
+DTEND:20070612T115000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070612T160000
+DTEND:20070612T172000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070612T180000
+DTEND:20070612T183000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070612T180000
+DTEND:20070612T200000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070612T180000
+DTEND:20070612T210000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070613T100000
+DTEND:20070613T111000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070613T180000
+DTEND:20070613T203000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070614
+DTEND;VALUE=DATE:20070622
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070614T100000
+DTEND:20070614T110000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070615
+DTEND;VALUE=DATE:20070618
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070616
+DTEND;VALUE=DATE:20070617
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070627T154500
+DTEND:20070627T234500
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070628
+DTEND;VALUE=DATE:20070629
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070628T193000
+DTEND:20070628T223000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070629
+DTEND;VALUE=DATE:20070630
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070630
+DTEND;VALUE=DATE:20070701
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070710T093000
+DTEND:20070710T120000
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070713
+DTEND;VALUE=DATE:20070714
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART:20070820T090000
+DTEND:20070820T151500
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070824
+DTEND;VALUE=DATE:20070825
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20070915
+DTEND;VALUE=DATE:20070916
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
+DTSTART;VALUE=DATE:20071111
+DTEND;VALUE=DATE:20071112
+UID:ignore_uid
+END:VEVENT
+BEGIN:VEVENT
+SUMMARY:Busy
+CLASS:CONFIDENTIAL
 DTSTART;TZID=Europe/Helsinki:20081024T084500
 RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=TU,FR
 DTEND;TZID=Europe/Helsinki:20081024T113000
@@ -41,29 +223,8 @@ END:VEVENT
 BEGIN:VEVENT
 SUMMARY:Busy
 CLASS:CONFIDENTIAL
-DTSTART:20070611T131500
-DTEND:20070611T134500
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070628T193000
-DTEND:20070628T223000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070615
-DTEND;VALUE=DATE:20070618
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070614T100000
-DTEND:20070614T110000
+DTSTART:20101228T201500
+DTEND:20101228T211500
 UID:ignore_uid
 END:VEVENT
 BEGIN:VEVENT
@@ -76,36 +237,8 @@ END:VEVENT
 BEGIN:VEVENT
 SUMMARY:Busy
 CLASS:CONFIDENTIAL
-DTSTART:20070611T180000
-DTEND:20070611T181500
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070820T090000
-DTEND:20070820T151500
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070612T180000
-DTEND:20070612T200000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070611T140000
-DTEND:20070611T180000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20110111T140000
-DTEND:20110111T160000
+DTSTART:20101231T112000
+DTEND:20101231T140500
 UID:ignore_uid
 END:VEVENT
 BEGIN:VEVENT
@@ -118,48 +251,6 @@ END:VEVENT
 BEGIN:VEVENT
 SUMMARY:Busy
 CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070629
-DTEND;VALUE=DATE:20070630
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070613T180000
-DTEND:20070613T203000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070824
-DTEND;VALUE=DATE:20070825
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20101228T201500
-DTEND:20101228T211500
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070613T100000
-DTEND:20070613T111000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070713
-DTEND;VALUE=DATE:20070714
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
 DTSTART:20110108T140000
 DTEND:20110109T000000
 UID:ignore_uid
@@ -167,99 +258,8 @@ END:VEVENT
 BEGIN:VEVENT
 SUMMARY:Busy
 CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20071111
-DTEND;VALUE=DATE:20071112
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070710T093000
-DTEND:20070710T120000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070915
-DTEND;VALUE=DATE:20070916
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070612T180000
-DTEND:20070612T183000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070612T180000
-DTEND:20070612T210000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070614
-DTEND;VALUE=DATE:20070622
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070616
-DTEND;VALUE=DATE:20070617
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070612T110000
-DTEND:20070612T115000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070630
-DTEND;VALUE=DATE:20070701
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20101231T112000
-DTEND:20101231T140500
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;VALUE=DATE:20070628
-DTEND;VALUE=DATE:20070629
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070627T154500
-DTEND:20070627T234500
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070611T160000
-DTEND:20070611T180000
-UID:ignore_uid
-END:VEVENT
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART:20070612T160000
-DTEND:20070612T172000
+DTSTART:20110111T140000
+DTEND:20110111T160000
 UID:ignore_uid
 END:VEVENT
 BEGIN:VTIMEZONE
diff --git a/testing/tests/regression-suite/0901-GET-Collection.result b/testing/tests/regression-suite/0901-GET-Collection.result
index 45ec407d..441c20ac 100644
--- a/testing/tests/regression-suite/0901-GET-Collection.result
+++ b/testing/tests/regression-suite/0901-GET-Collection.result
@@ -12,55 +12,6 @@ VERSION:2.0
 CALSCALE:GREGORIAN
 X-WR-CALNAME:User 1's Calendaranza
 BEGIN:VEVENT
-CREATED:20111004T153507Z
-UID:0544-gzip-PUT
-TRANSP:OPAQUE
-SUMMARY:In Central Europe, 2pm, Oct 5th for 1 hour
-DTSTART;TZID=Somewhere_in_Central_Europe:20111005T140000
-DTEND;TZID=Somewhere_in_Central_Europe:20111005T150000
-DTSTAMP:20111004T153507Z
-SEQUENCE:1
-END:VEVENT
-BEGIN:VEVENT
-CREATED:20111004T153507Z
-UID:0545-deflate-PUT
-TRANSP:OPAQUE
-SUMMARY:In Prague, 10am, Oct 7th for 1 hour
-DTSTART;TZID=Prague_in_Central_Europe:20111007T100000
-DURATION:PT1H
-DTSTAMP:20111004T153507Z
-SEQUENCE:1
-END:VEVENT
-BEGIN:VTODO
-CREATED:20070805T201647Z
-LAST-MODIFIED:20070805T201834Z
-DTSTAMP:20070805T201647Z
-UID:0575d895-a006-4ed8-9be6-0d1b6b6b1f96
-SUMMARY:Due 7/8/7 16:30\, completed
-STATUS:COMPLETED
-DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070807T163000
-COMPLETED:20070805T201737Z
-PERCENT-COMPLETE:100
-X-MOZ-LOCATIONPATH:0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics
-DESCRIPTION:Due on 7/8/7 at 4:30pm\, but completed alread on 6/8/7
-CATEGORIES:Projects
-END:VTODO
-BEGIN:VEVENT
-CREATED:20061223T031415Z
-LAST-MODIFIED:20061223T032305Z
-DTSTAMP:20061223T032305Z
-UID:1906b3ca-4890-468a-9b58-1de74bf2c716
-SUMMARY:Private Event
-PRIORITY:0
-STATUS:CONFIRMED
-CLASS:PRIVATE
-DTSTART;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061223T130000
-DTEND;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061223T150000
-X-MOZ-LOCATIONPATH:1906b3ca-4890-468a-9b58-1de74bf2c716.ics
-LOCATION:At a private location
-DESCRIPTION:Private and Confirmed
-END:VEVENT
-BEGIN:VEVENT
 UID:20061101T073000Z-10468-1000-1-7@ubu
 DTSTAMP:20061101T073000Z
 DTSTART;TZID=Pacific/Auckland:20061101T100000
@@ -73,25 +24,6 @@ TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
 DESCRIPTION:A Meeting
 END:VALARM
 END:VEVENT
-BEGIN:VTODO
-CREATED:20070805T200215Z
-LAST-MODIFIED:20070805T201531Z
-DTSTAMP:20070805T200215Z
-UID:2178279a-aec2-471f-832d-1f6df6203f2f
-SUMMARY:Incomplete\, uncancelled
-X-MOZ-LOCATIONPATH:2178279a-aec2-471f-832d-1f6df6203f2f.ics
-DESCRIPTION:This task is incomplete and has not been cancelled (has no s
- tatus at all)
-END:VTODO
-BEGIN:VEVENT
-DTSTAMP:20061102T090217Z
-DTSTART;TZID=New Zealand Standard Time:20061102T123000
-DURATION:PT1H
-LAST-MODIFIED:20061104T002921Z
-SEQUENCE:1
-SUMMARY:Lunch with David
-UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
-END:VEVENT
 BEGIN:VEVENT
 CREATED:20061120T041336Z
 LAST-MODIFIED:20061120T041709Z
@@ -107,14 +39,24 @@ CATEGORIES:Projects
 X-MOZ-LOCATIONPATH:4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics
 END:VEVENT
 BEGIN:VEVENT
-CREATED:20091006T225807Z
-UID:70D23799-4A68-4905-AB9F-4D47BA693CFD
-DTEND;TZID=Europe/Prague:20091005T150000
-TRANSP:OPAQUE
-SUMMARY:New Event
-DTSTART;TZID=Europe/Prague:20091005T140000
-DTSTAMP:20091006T225808Z
+DTSTAMP:20061102T090217Z
+DTSTART;TZID=New Zealand Standard Time:20061102T123000
+DURATION:PT1H
+LAST-MODIFIED:20061104T002921Z
 SEQUENCE:1
+SUMMARY:Lunch with David
+UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
+END:VEVENT
+BEGIN:VEVENT
+UID:da81c0ee-7871-11db-c6d6-f6927c144649
+DTSTAMP:20061024T115217Z
+DTSTART:20061103T073000
+DTEND:20061103T093000
+DESCRIPTION:
+LOCATION:Olivia's
+RRULE:FREQ=MONTHLY
+STATUS:CONFIRMED
+SUMMARY:Morning Mgmt Mtg
 END:VEVENT
 BEGIN:VEVENT
 UID:71e2ae82-7870-11db-c6d6-f6927c144649
@@ -127,18 +69,21 @@ RRULE:FREQ=WEEKLY;INTERVAL=2;UNTIL=20071222T235900
 STATUS:CONFIRMED
 SUMMARY:Beer O'Clock
 END:VEVENT
-BEGIN:VTODO
-CREATED:20070805T201557Z
-LAST-MODIFIED:20070805T201643Z
-DTSTAMP:20070805T201557Z
-UID:917b9e47-b748-4550-a566-657fbe672447
-SUMMARY:50% Complete\, uncancelled
-STATUS:IN-PROCESS
-PERCENT-COMPLETE:50
-X-MOZ-LOCATIONPATH:917b9e47-b748-4550-a566-657fbe672447.ics
-DESCRIPTION:This task is in progress (50% complete) and has not been can
- celled.
-END:VTODO
+BEGIN:VEVENT
+CREATED:20061223T031415Z
+LAST-MODIFIED:20061223T032305Z
+DTSTAMP:20061223T032305Z
+UID:1906b3ca-4890-468a-9b58-1de74bf2c716
+SUMMARY:Private Event
+PRIORITY:0
+STATUS:CONFIRMED
+CLASS:PRIVATE
+DTSTART;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061223T130000
+DTEND;TZID=/mozilla.org/20050126_1/Pacific/Auckland:20061223T150000
+X-MOZ-LOCATIONPATH:1906b3ca-4890-468a-9b58-1de74bf2c716.ics
+LOCATION:At a private location
+DESCRIPTION:Private and Confirmed
+END:VEVENT
 BEGIN:VEVENT
 CREATED:20061223T032350Z
 LAST-MODIFIED:20061223T033144Z
@@ -154,6 +99,46 @@ X-MOZ-LOCATIONPATH:9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics
 LOCATION:In a confidential place
 END:VEVENT
 BEGIN:VEVENT
+CREATED:20061223T051646Z
+LAST-MODIFIED:20061223T051713Z
+DTSTAMP:20061223T051713Z
+UID:fbd57454-d966-4a14-8341-abe1edb1ae66
+SUMMARY:Tentative Event
+STATUS:TENTATIVE
+CLASS:PUBLIC
+DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T190000
+DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T210000
+X-MOZ-LOCATIONPATH:fbd57454-d966-4a14-8341-abe1edb1ae66.ics
+LOCATION:Never never land
+END:VEVENT
+BEGIN:VTODO
+CREATED:20070805T201647Z
+LAST-MODIFIED:20070805T201834Z
+DTSTAMP:20070805T201647Z
+UID:0575d895-a006-4ed8-9be6-0d1b6b6b1f96
+SUMMARY:Due 7/8/7 16:30\, completed
+STATUS:COMPLETED
+DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070807T163000
+COMPLETED:20070805T201737Z
+PERCENT-COMPLETE:100
+X-MOZ-LOCATIONPATH:0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics
+DESCRIPTION:Due on 7/8/7 at 4:30pm\, but completed alread on 6/8/7
+CATEGORIES:Projects
+END:VTODO
+BEGIN:VTODO
+CREATED:20070806T223244Z
+LAST-MODIFIED:20070806T223411Z
+DTSTAMP:20070806T223244Z
+UID:b1679f77-673d-4f46-b3eb-2420e1bba301
+SUMMARY:A Cancelled Task\, with a start and due date
+STATUS:CANCELLED
+DTSTART;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070808T111500
+DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070808T111500
+X-MOZ-LOCATIONPATH:b1679f77-673d-4f46-b3eb-2420e1bba301.ics
+DESCRIPTION:This is a task with a Start and a Due date\, but it has been
+  cancelled.
+END:VTODO
+BEGIN:VEVENT
 SEQUENCE:6
 TRANSP:OPAQUE
 UID:AAA9318E-37D9-4319-8626-95ECD3D3B243
@@ -171,39 +156,6 @@ ATTACH;VALUE=URI:Basso
 END:VALARM
 END:VEVENT
 BEGIN:VTODO
-CREATED:20070806T223244Z
-LAST-MODIFIED:20070806T223411Z
-DTSTAMP:20070806T223244Z
-UID:b1679f77-673d-4f46-b3eb-2420e1bba301
-SUMMARY:A Cancelled Task\, with a start and due date
-STATUS:CANCELLED
-DTSTART;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070808T111500
-DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20070808T111500
-X-MOZ-LOCATIONPATH:b1679f77-673d-4f46-b3eb-2420e1bba301.ics
-DESCRIPTION:This is a task with a Start and a Due date\, but it has been
-  cancelled.
-END:VTODO
-BEGIN:VEVENT
-UID:da81c0ee-7871-11db-c6d6-f6927c144649
-DTSTAMP:20061024T115217Z
-DTSTART:20061103T073000
-DTEND:20061103T093000
-DESCRIPTION:
-LOCATION:Olivia's
-RRULE:FREQ=MONTHLY
-STATUS:CONFIRMED
-SUMMARY:Morning Mgmt Mtg
-END:VEVENT
-BEGIN:VEVENT
-DESCRIPTION:Have a party. All the best parties are monthly!
-UID:DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74
-DTSTAMP:20081024T220925Z
-SUMMARY:Party all day!
-CREATED:20081024T220749Z
-DTSTART;TZID=Pacific/Auckland;VALUE=DATE:20081114
-RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=2FR
-END:VEVENT
-BEGIN:VTODO
 CREATED:20071203T202915Z
 LAST-MODIFIED:20071203T203021Z
 DTSTAMP:20071203T202915Z
@@ -240,17 +192,13 @@ ACTION:DISPLAY
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
-CREATED:20061223T051646Z
-LAST-MODIFIED:20061223T051713Z
-DTSTAMP:20061223T051713Z
-UID:fbd57454-d966-4a14-8341-abe1edb1ae66
-SUMMARY:Tentative Event
-STATUS:TENTATIVE
-CLASS:PUBLIC
-DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T190000
-DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T210000
-X-MOZ-LOCATIONPATH:fbd57454-d966-4a14-8341-abe1edb1ae66.ics
-LOCATION:Never never land
+DESCRIPTION:Have a party. All the best parties are monthly!
+UID:DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74
+DTSTAMP:20081024T220925Z
+SUMMARY:Party all day!
+CREATED:20081024T220749Z
+DTSTART;TZID=Pacific/Auckland;VALUE=DATE:20081114
+RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=2FR
 END:VEVENT
 BEGIN:VEVENT
 DESCRIPTION:Have a microparty. All the best parties are monthly!
@@ -262,6 +210,165 @@ DTSTART;TZID=Pacific/Auckland:20081121T160000
 DURATION:PT3H
 RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=3FR
 END:VEVENT
+BEGIN:VEVENT
+CREATED:20091006T225807Z
+UID:70D23799-4A68-4905-AB9F-4D47BA693CFD
+DTEND;TZID=Europe/Prague:20091005T150000
+TRANSP:OPAQUE
+SUMMARY:New Event
+DTSTART;TZID=Europe/Prague:20091005T140000
+DTSTAMP:20091006T225808Z
+SEQUENCE:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111004T153507Z
+UID:0544-gzip-PUT
+TRANSP:OPAQUE
+SUMMARY:In Central Europe, 2pm, Oct 5th for 1 hour
+DTSTART;TZID=Somewhere_in_Central_Europe:20111005T140000
+DTEND;TZID=Somewhere_in_Central_Europe:20111005T150000
+DTSTAMP:20111004T153507Z
+SEQUENCE:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111004T153507Z
+UID:0545-deflate-PUT
+TRANSP:OPAQUE
+SUMMARY:In Prague, 10am, Oct 7th for 1 hour
+DTSTART;TZID=Prague_in_Central_Europe:20111007T100000
+DURATION:PT1H
+DTSTAMP:20111004T153507Z
+SEQUENCE:1
+END:VEVENT
+BEGIN:VTODO
+CREATED:20070805T201557Z
+LAST-MODIFIED:20070805T201643Z
+DTSTAMP:20070805T201557Z
+UID:917b9e47-b748-4550-a566-657fbe672447
+SUMMARY:50% Complete\, uncancelled
+STATUS:IN-PROCESS
+PERCENT-COMPLETE:50
+X-MOZ-LOCATIONPATH:917b9e47-b748-4550-a566-657fbe672447.ics
+DESCRIPTION:This task is in progress (50% complete) and has not been can
+ celled.
+END:VTODO
+BEGIN:VTODO
+CREATED:20070805T200215Z
+LAST-MODIFIED:20070805T201531Z
+DTSTAMP:20070805T200215Z
+UID:2178279a-aec2-471f-832d-1f6df6203f2f
+SUMMARY:Incomplete\, uncancelled
+X-MOZ-LOCATIONPATH:2178279a-aec2-471f-832d-1f6df6203f2f.ics
+DESCRIPTION:This task is incomplete and has not been cancelled (has no s
+ tatus at all)
+END:VTODO
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20050126_1/Pacific/Auckland
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:New Zealand Standard Time
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
+X-LIC-LOCATION:Antarctica/McMurdo
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:/mozilla.org/20070129_1/Antarctica/McMurdo
+X-LIC-LOCATION:Antarctica/McMurdo
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+TZNAME:NZST
+DTSTART:19700315T030000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
+END:STANDARD
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+TZNAME:NZDT
+DTSTART:19701004T020000
+RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTIMEZONE
+TZID:Europe/Prague
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
+DTSTART:19810329T020000
+TZNAME:GMT+02:00
+TZOFFSETTO:+0200
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
+DTSTART:19961027T030000
+TZNAME:GMT+01:00
+TZOFFSETTO:+0100
+END:STANDARD
+END:VTIMEZONE
 BEGIN:VTIMEZONE
 TZID:Somewhere_in_Central_Europe
 X-MICROSOFT-CDO-TZID:4
@@ -298,111 +405,4 @@ TZNAME:GMT+01:00
 TZOFFSETTO:+0100
 END:STANDARD
 END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:/mozilla.org/20070129_1/Antarctica/McMurdo
-X-LIC-LOCATION:Antarctica/McMurdo
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:/mozilla.org/20050126_1/Pacific/Auckland
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:Pacific/Auckland
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:New Zealand Standard Time
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:Europe/Prague
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-DTSTART:19810329T020000
-TZNAME:GMT+02:00
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-DTSTART:19961027T030000
-TZNAME:GMT+01:00
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VTIMEZONE
-TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
-X-LIC-LOCATION:Antarctica/McMurdo
-BEGIN:STANDARD
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-TZNAME:NZST
-DTSTART:19700315T030000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=3SU;BYMONTH=3
-END:STANDARD
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-TZNAME:NZDT
-DTSTART:19701004T020000
-RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
-END:DAYLIGHT
-END:VTIMEZONE
 END:VCALENDAR
diff --git a/testing/tests/regression-suite/0903-GET-Collection.result b/testing/tests/regression-suite/0903-GET-Collection.result
index 056fa149..9753b876 100644
--- a/testing/tests/regression-suite/0903-GET-Collection.result
+++ b/testing/tests/regression-suite/0903-GET-Collection.result
@@ -48,30 +48,6 @@ DESCRIPTION:Murray Flenshaw @ Copperstuff
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
-UID:20060905T231045Z-16025-1000-1-6@ubu
-DTSTAMP:20060905T231045Z
-DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060
- 919T090000
-DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006091
- 9T120000
-SUMMARY:NGOP Meeting
-X-EVOLUTION-CALDAV-HREF:http://regression.host:80/caldav.php/andrew/2006
- 0905T231053Z.ics
-X-EVOLUTION-CALDAV-ETAG:"4d37ed48425acb9f4245539e2d2b726b"
-X-EVOLUTION-MOVE-CALENDAR:1
-CREATED:20060907T093732
-LAST-MODIFIED:20060911T214556
-CLASS:PUBLIC
-TRANSP:OPAQUE
-SEQUENCE:1
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20060911T214556Z-21593-1000-1-6@ubu
-DESCRIPTION:NGOP Meeting
-ACTION:DISPLAY
-TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
 UID:20060906T123509Z-5231-1000-1-5@ubu
 DTSTAMP:20060906T123509Z
 DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060
@@ -93,6 +69,30 @@ DESCRIPTION:NGOP by-election readiness.
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
+UID:20060912T233427Z-12681-1000-1-5@ubu
+DTSTAMP:20060912T233427Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Helsinki:200609
+ 13T090000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Helsinki:20060913
+ T143000
+TRANSP:OPAQUE
+SEQUENCE:5
+SUMMARY:9:am - 2:30pm in Helsinki
+CLASS:PUBLIC
+X-EVOLUTION-CALDAV-HREF:http://regression.host:80/caldav.php/andrew/2006
+ 0912T233500Z.ics
+X-EVOLUTION-CALDAV-ETAG:"8d8ca5e838b7e088bf17d9916032eec6"
+X-EVOLUTION-MOVE-CALENDAR:1
+CREATED:20060913T003545
+LAST-MODIFIED:20060913T003631
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20060913T003631Z-12694-1000-1-24@ubu
+DESCRIPTION:9:am - 2:30pm in Helsinki
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
 UID:20060907T213951Z-5189-1001-1-0@dolmein
 DTSTAMP:20060914T042719Z
 DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060
@@ -120,30 +120,6 @@ TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
-UID:20060912T233427Z-12681-1000-1-5@ubu
-DTSTAMP:20060912T233427Z
-DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Helsinki:200609
- 13T090000
-DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Europe/Helsinki:20060913
- T143000
-TRANSP:OPAQUE
-SEQUENCE:5
-SUMMARY:9:am - 2:30pm in Helsinki
-CLASS:PUBLIC
-X-EVOLUTION-CALDAV-HREF:http://regression.host:80/caldav.php/andrew/2006
- 0912T233500Z.ics
-X-EVOLUTION-CALDAV-ETAG:"8d8ca5e838b7e088bf17d9916032eec6"
-X-EVOLUTION-MOVE-CALENDAR:1
-CREATED:20060913T003545
-LAST-MODIFIED:20060913T003631
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20060913T003631Z-12694-1000-1-24@ubu
-DESCRIPTION:9:am - 2:30pm in Helsinki
-ACTION:DISPLAY
-TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
 UID:20060914T212513Z-15783-1000-1-11@ubu
 DTSTAMP:20060914T212513Z
 DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060
@@ -165,6 +141,68 @@ DESCRIPTION:Donovan
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
+UID:20060905T231045Z-16025-1000-1-6@ubu
+DTSTAMP:20060905T231045Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060
+ 919T090000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006091
+ 9T120000
+SUMMARY:NGOP Meeting
+X-EVOLUTION-CALDAV-HREF:http://regression.host:80/caldav.php/andrew/2006
+ 0905T231053Z.ics
+X-EVOLUTION-CALDAV-ETAG:"4d37ed48425acb9f4245539e2d2b726b"
+X-EVOLUTION-MOVE-CALENDAR:1
+CREATED:20060907T093732
+LAST-MODIFIED:20060911T214556
+CLASS:PUBLIC
+TRANSP:OPAQUE
+SEQUENCE:1
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20060911T214556Z-21593-1000-1-6@ubu
+DESCRIPTION:NGOP Meeting
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:20060920T052705Z-28287-1000-1-5@ubu
+DTSTAMP:20060920T052705Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060
+ 921T160000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006092
+ 1T170000
+SUMMARY:Really Geeky Thoughts
+X-EVOLUTION-CALDAV-HREF:http://andrew@regression.host/caldav.php/andrew/
+ 20060920T052710Z.ics
+X-EVOLUTION-CALDAV-ETAG:"d9a4a80a3dbc76b947a3bf0f0672359c"
+X-EVOLUTION-MOVE-CALENDAR:1
+CREATED:20060920T052722
+LAST-MODIFIED:20060921T012657
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20060920T052705Z-28285-1000-1-7@ubu
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+DESCRIPTION:Really Geeky Thoughts
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
+UID:20060918T071919Z-21151-1000-1-13@ubu
+DTSTAMP:20060918T071919Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060
+ 925T120000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006092
+ 5T133000
+SUMMARY:Board Meeting
+CREATED:20060918T071921
+LAST-MODIFIED:20060918T071921
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20060918T071919Z-21149-1000-1-51@ubu
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+DESCRIPTION:Board Meeting
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
 UID:20060918T011217Z-21151-1000-1-9@ubu
 DTSTAMP:20060918T011217Z
 DTSTART;VALUE=DATE:20060928
@@ -197,44 +235,6 @@ DESCRIPTION:Summer Festival drinks at the loaded hog
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
-UID:20060918T071919Z-21151-1000-1-13@ubu
-DTSTAMP:20060918T071919Z
-DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060
- 925T120000
-DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006092
- 5T133000
-SUMMARY:Board Meeting
-CREATED:20060918T071921
-LAST-MODIFIED:20060918T071921
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20060918T071919Z-21149-1000-1-51@ubu
-ACTION:DISPLAY
-TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
-DESCRIPTION:Board Meeting
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
-UID:20060920T052705Z-28287-1000-1-5@ubu
-DTSTAMP:20060920T052705Z
-DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20060
- 921T160000
-DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006092
- 1T170000
-SUMMARY:Really Geeky Thoughts
-X-EVOLUTION-CALDAV-HREF:http://andrew@regression.host/caldav.php/andrew/
- 20060920T052710Z.ics
-X-EVOLUTION-CALDAV-ETAG:"d9a4a80a3dbc76b947a3bf0f0672359c"
-X-EVOLUTION-MOVE-CALENDAR:1
-CREATED:20060920T052722
-LAST-MODIFIED:20060921T012657
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20060920T052705Z-28285-1000-1-7@ubu
-ACTION:DISPLAY
-TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
-DESCRIPTION:Really Geeky Thoughts
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
 UID:20061009T214137Z-5718-1001-1-1@dolmein
 DTSTAMP:20061009T214524Z
 DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061
@@ -374,38 +374,6 @@ TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
-UID:20061026T222249Z-5029-1001-1-0@dolmein
-DTSTAMP:20061026T223020Z
-DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061
- 030T140000
-DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006103
- 0T160000
-TRANSP:OPAQUE
-SEQUENCE:3
-SUMMARY:ABC
-CLASS:PRIVATE
-CREATED:20061026T223700
-LAST-MODIFIED:20061026T223700
-DESCRIPTION:Mark and Tom from ABC would like to discuss the work require
- d and estimate for the work they would like us to do - \"start to become
-  specific about things\".  Expectations of work\, issues and solutions.
-ORGANIZER;CN=Ian Winsleigh:MAILTO:ian@example.org
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;RSVP=T
- RUE;CN=Ian Winsleigh;LANGUAGE=en:MAILTO:ian@example.org
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;RSVP=TRUE;CN=Andrew Moug
- htonbeigh;LANGUAGE=en;PARTSTAT=TENTATIVE:MAILTO:andrew@example.org
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
- VP=TRUE;CN=David Callenius;LANGUAGE=en:MAILTO:dcallenius@example.org
-ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
- VP=TRUE;CN=Andy Capp;LANGUAGE=en:MAILTO:andyc@example.org
-X-MICROSOFT-CDO-REPLYTIME:20061026T223700Z
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20061026T223608Z-4264-1000-1-0@ubu
-ACTION:DISPLAY
-TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
 UID:20061027T005242Z-5029-1001-1-1@dolmein
 DTSTAMP:20061027T010232Z
 DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061
@@ -452,6 +420,38 @@ DESCRIPTION:???
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
+UID:20061026T222249Z-5029-1001-1-0@dolmein
+DTSTAMP:20061026T223020Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061
+ 030T140000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006103
+ 0T160000
+TRANSP:OPAQUE
+SEQUENCE:3
+SUMMARY:ABC
+CLASS:PRIVATE
+CREATED:20061026T223700
+LAST-MODIFIED:20061026T223700
+DESCRIPTION:Mark and Tom from ABC would like to discuss the work require
+ d and estimate for the work they would like us to do - \"start to become
+  specific about things\".  Expectations of work\, issues and solutions.
+ORGANIZER;CN=Ian Winsleigh:MAILTO:ian@example.org
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=ACCEPTED;RSVP=T
+ RUE;CN=Ian Winsleigh;LANGUAGE=en:MAILTO:ian@example.org
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;RSVP=TRUE;CN=Andrew Moug
+ htonbeigh;LANGUAGE=en;PARTSTAT=TENTATIVE:MAILTO:andrew@example.org
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=David Callenius;LANGUAGE=en:MAILTO:dcallenius@example.org
+ATTENDEE;CUTYPE=INDIVIDUAL;ROLE=REQ-PARTICIPANT;PARTSTAT=NEEDS-ACTION;RS
+ VP=TRUE;CN=Andy Capp;LANGUAGE=en:MAILTO:andyc@example.org
+X-MICROSOFT-CDO-REPLYTIME:20061026T223700Z
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20061026T223608Z-4264-1000-1-0@ubu
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
 UID:20061029T195827Z-14356-1000-1-13@ubu
 DTSTAMP:20061029T195827Z
 DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061
@@ -548,6 +548,23 @@ TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
+UID:20061119T202229Z-5105-1000-5103-9@ubu
+DTSTAMP:20061119T202229Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061
+ 120T110000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006112
+ 0T120000
+SUMMARY:IZPAXY Review
+CREATED:20061119T202231
+LAST-MODIFIED:20061119T202231
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20061119T202229Z-5101-1000-1-18@ubu
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+DESCRIPTION:IZPAXY Review
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
 UID:20061119T201927Z-5105-1000-5103-8@ubu
 DTSTAMP:20061119T201927Z
 DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061
@@ -566,23 +583,6 @@ DESCRIPTION:Alan Wanston
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
-UID:20061119T202229Z-5105-1000-5103-9@ubu
-DTSTAMP:20061119T202229Z
-DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061
- 120T110000
-DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:2006112
- 0T120000
-SUMMARY:IZPAXY Review
-CREATED:20061119T202231
-LAST-MODIFIED:20061119T202231
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20061119T202229Z-5101-1000-1-18@ubu
-ACTION:DISPLAY
-TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
-DESCRIPTION:IZPAXY Review
-END:VALARM
-END:VEVENT
-BEGIN:VEVENT
 UID:20061210T214816Z-5064-1001-1-0@dolmein
 DTSTAMP:20061210T215058Z
 DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061
@@ -614,6 +614,26 @@ TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
 END:VALARM
 END:VEVENT
 BEGIN:VEVENT
+DTSTART;TZID=Pacific/Auckland:20061220T140000
+SUMMARY:Really Geeky round table
+UID:DC9C0944-D80A-426D-A4A4-6003C72BA7B5
+ORGANIZER;CN=Chris Dalgleish:mailto:chris@example.org
+SEQUENCE:2
+DTSTAMP:20061219T195427Z
+DURATION:PT1H
+TRANSP:OPAQUE
+X-LIC-ERROR;X-LIC-ERRORTYPE=VALUE-PARSE-ERROR:No value for ATTENDEE prop
+ erty. Removing entire property:
+X-MICROSOFT-CDO-REPLYTIME:20061219T225056Z
+CREATED:20061219T225056
+LAST-MODIFIED:20061219T225056
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20061219T225040Z-21169-1000-1-13@ubu
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+END:VALARM
+END:VEVENT
+BEGIN:VEVENT
 UID:20061219T104451Z-28207-1000-1-8@ubu
 DTSTAMP:20061219T104451Z
 DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:20061
@@ -654,26 +674,6 @@ ATTENDEE;RSVP=FALSE;CN=:andrew@example.org
 CREATED:20061005T230724
 LAST-MODIFIED:20061005T230724
 END:VEVENT
-BEGIN:VEVENT
-DTSTART;TZID=Pacific/Auckland:20061220T140000
-SUMMARY:Really Geeky round table
-UID:DC9C0944-D80A-426D-A4A4-6003C72BA7B5
-ORGANIZER;CN=Chris Dalgleish:mailto:chris@example.org
-SEQUENCE:2
-DTSTAMP:20061219T195427Z
-DURATION:PT1H
-TRANSP:OPAQUE
-X-LIC-ERROR;X-LIC-ERRORTYPE=VALUE-PARSE-ERROR:No value for ATTENDEE prop
- erty. Removing entire property:
-X-MICROSOFT-CDO-REPLYTIME:20061219T225056Z
-CREATED:20061219T225056
-LAST-MODIFIED:20061219T225056
-BEGIN:VALARM
-X-EVOLUTION-ALARM-UID:20061219T225040Z-21169-1000-1-13@ubu
-ACTION:DISPLAY
-TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
-END:VALARM
-END:VEVENT
 BEGIN:VTIMEZONE
 TZID:/softwarestudio.org/Olson_20011030_5/Pacific/Auckland
 X-LIC-LOCATION:Pacific/Auckland