diff --git a/testing/tests/regression-suite/010-Mulberry-PUT-1.result b/testing/tests/regression-suite/010-Mulberry-PUT-1.result
index fa769347..adbd56b9 100644
--- a/testing/tests/regression-suite/010-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/010-Mulberry-PUT-1.result
@@ -5,3 +5,57 @@ ETag: "b000d7defa19ccb7cd21e546b54155ee"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
+   A1 CalDAV DATA: >BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+X-WR-CALNAME:home
+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:VEVENT
+DTSTAMP:20061025T101327Z
+DTSTART;TZID=New Zealand Standard Time:20061025T091500
+DURATION:PT1H
+SUMMARY:A first event
+UID:B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C
+END:VEVENT
+END:VCALENDAR
+<
+      caldav_type: >VEVENT<
+            class: >PUBLIC<
+      description: >NULL<
+            dtend: >2006-10-25 10:15:00+13<
+          dtstamp: >2006-10-25 10:13:27<
+          dtstart: >2006-10-25 09:15:00+13<
+              due: >NULL<
+         location: >NULL<
+      logged_user: >10<
+ percent_complete: >NULL<
+         priority: >NULL<
+            rrule: >NULL<
+           status: >NULL<
+          summary: >A first event<
+           transp: >NULL<
+            tz_id: >New Zealand Standard Time<
+              uid: >B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C<
+              url: >NULL<
+          user_no: >10<
+   ~ Modified Now: >1<
+
diff --git a/testing/tests/regression-suite/010-Mulberry-PUT-1.test b/testing/tests/regression-suite/010-Mulberry-PUT-1.test
index 4efeecde..dfb44760 100644
--- a/testing/tests/regression-suite/010-Mulberry-PUT-1.test
+++ b/testing/tests/regression-suite/010-Mulberry-PUT-1.test
@@ -4,4 +4,50 @@ TYPE=PUT
 URL=http://mycaldav/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
-DATA=F56B49B10FC923D20FE2DC92D6580340-0.ics
\ No newline at end of file
+
+BEGINDATA
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+X-WR-CALNAME:home
+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:VEVENT
+DTSTAMP:20061025T101327Z
+DTSTART;TZID=New Zealand Standard Time:20061025T091500
+DURATION:PT1H
+SUMMARY:A first event
+UID:B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C
+END:VEVENT
+END:VCALENDAR
+ENDDATA
+
+QUERY
+SELECT caldav_data.user_no, caldav_type, logged_user, 
+       uid, dtstamp, dtstart, dtend, due, summary, location,
+       description, priority, class, transp, rrule, url,
+       percent_complete, tz_id, status,
+       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now",
+       caldav_data AS "A1 CalDAV DATA"
+FROM caldav_data JOIN calendar_item USING(dav_name)
+WHERE caldav_data.dav_name ~ '^/user1/home/'
+ENDQUERY
+
diff --git a/testing/tests/regression-suite/011-Mulberry-PUT-1b.result b/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
index 27371c23..4b74f67d 100644
--- a/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
+++ b/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
@@ -1,7 +1,61 @@
 HTTP/1.1 204 No Content
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "b000d7defa19ccb7cd21e546b54155ee"
+ETag: "557e551fae1b5c7f2131bde1ba0ba01e"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
+   A1 CalDAV DATA: >BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+X-WR-CALNAME:home
+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:VEVENT
+DTSTAMP:20061025T101327Z
+DTSTART;TZID=New Zealand Standard Time:20061025T091500
+DURATION:PT1H
+SUMMARY:A first event, modified.
+UID:B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C
+END:VEVENT
+END:VCALENDAR
+<
+      caldav_type: >VEVENT<
+            class: >PUBLIC<
+      description: >NULL<
+            dtend: >2006-10-25 10:15:00+13<
+          dtstamp: >2006-10-25 10:13:27<
+          dtstart: >2006-10-25 09:15:00+13<
+              due: >NULL<
+         location: >NULL<
+      logged_user: >10<
+ percent_complete: >NULL<
+         priority: >NULL<
+            rrule: >NULL<
+           status: >NULL<
+          summary: >A first event, modified.<
+           transp: >NULL<
+            tz_id: >New Zealand Standard Time<
+              uid: >B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C<
+              url: >NULL<
+          user_no: >10<
+   ~ Modified Now: >1<
+
diff --git a/testing/tests/regression-suite/011-Mulberry-PUT-1b.test b/testing/tests/regression-suite/011-Mulberry-PUT-1b.test
index 4efeecde..c80e9cc4 100644
--- a/testing/tests/regression-suite/011-Mulberry-PUT-1b.test
+++ b/testing/tests/regression-suite/011-Mulberry-PUT-1b.test
@@ -3,5 +3,52 @@
 TYPE=PUT
 URL=http://mycaldav/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
+HEADER=If-Match: "b000d7defa19ccb7cd21e546b54155ee"
 HEAD
-DATA=F56B49B10FC923D20FE2DC92D6580340-0.ics
\ No newline at end of file
+
+BEGINDATA
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+X-WR-CALNAME:home
+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:VEVENT
+DTSTAMP:20061025T101327Z
+DTSTART;TZID=New Zealand Standard Time:20061025T091500
+DURATION:PT1H
+SUMMARY:A first event, modified.
+UID:B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C
+END:VEVENT
+END:VCALENDAR
+ENDDATA
+
+QUERY
+SELECT caldav_data.user_no, caldav_type, logged_user, 
+       uid, dtstamp, dtstart, dtend, due, summary, location,
+       description, priority, class, transp, rrule, url,
+       percent_complete, tz_id, status,
+       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now",
+       caldav_data AS "A1 CalDAV DATA"
+FROM caldav_data JOIN calendar_item USING(dav_name)
+WHERE caldav_data.dav_name ~ '^/user1/home/'
+ENDQUERY
+
diff --git a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
index 3e89127c..b4e51c01 100644
--- a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
+++ b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "2644f31d8913a4561b88d0da3833672f"
+ETag: "5747e43a52649b3441d9f8cff66c0e8f"
 Content-Length: 1083
 Content-Type: text/xml; charset="utf-8"
 
@@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength>1425</getcontentlength>
+    <getcontentlength>1436</getcontentlength>
     <resourcetype>
      <collection/>
      <C:calendar/>
@@ -26,7 +26,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics</href>
   <propstat>
    <prop>
-    <getcontentlength>720</getcontentlength>
+    <getcontentlength>731</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
     <resourcetype/>
    </prop>
diff --git a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
index 81fbca8f..ffb18b9b 100644
--- a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
+++ b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
@@ -1,7 +1,7 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "d88a7744c5a9e39f5e2fe68c9d54ea5a"
+ETag: "48a3d4c6e9074f82e775ae6604591d2c"
 Content-Length: 1083
 Content-Type: text/xml; charset="utf-8"
 
@@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength>1467</getcontentlength>
+    <getcontentlength>1478</getcontentlength>
     <resourcetype>
      <collection/>
      <C:calendar/>
@@ -26,7 +26,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics</href>
   <propstat>
    <prop>
-    <getcontentlength>720</getcontentlength>
+    <getcontentlength>731</getcontentlength>
     <getcontenttype>text/calendar</getcontenttype>
     <resourcetype/>
    </prop>
diff --git a/testing/tests/regression-suite/021-Mulberry-DELETE-2.test b/testing/tests/regression-suite/021-Mulberry-DELETE-2.test
index 97885868..523e9d69 100644
--- a/testing/tests/regression-suite/021-Mulberry-DELETE-2.test
+++ b/testing/tests/regression-suite/021-Mulberry-DELETE-2.test
@@ -2,5 +2,5 @@
 # Do a DELETE with a correct etag which will succeed.
 TYPE=DELETE
 URL=http://mycaldav/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics
-HEADER=If-Match: "b000d7defa19ccb7cd21e546b54155ee"
+HEADER=If-Match: "557e551fae1b5c7f2131bde1ba0ba01e"
 HEAD
diff --git a/testing/tests/regression-suite/218-Moz-REPORT.result b/testing/tests/regression-suite/218-Moz-REPORT.result
index 54bef95e..267984cd 100644
--- a/testing/tests/regression-suite/218-Moz-REPORT.result
+++ b/testing/tests/regression-suite/218-Moz-REPORT.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "1265e5969812d13fc4b0f57df30b07d4"
-Content-Length: 2956
+ETag: "382593e900a2698b91f4c54bda9bf080"
+Content-Length: 3461
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -57,14 +57,31 @@ END:VCALENDAR
   <propstat>
    <prop>
     <C:calendar-data>BEGIN:VCALENDAR
-PRODID:-//davical.org//NONSGML AWL Calendar//EN
+PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
 VERSION:2.0
-CALSCALE:GREGORIAN
+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:VEVENT
 SUMMARY:Busy
 CLASS:CONFIDENTIAL
-DTSTART:20061223T160000
-DTEND:20061223T180000
+DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T160000
+DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T180000
 END:VEVENT
 END:VCALENDAR
 </C:calendar-data>
diff --git a/testing/tests/regression-suite/219-Moz-REPORT.result b/testing/tests/regression-suite/219-Moz-REPORT.result
index 54bef95e..267984cd 100644
--- a/testing/tests/regression-suite/219-Moz-REPORT.result
+++ b/testing/tests/regression-suite/219-Moz-REPORT.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "1265e5969812d13fc4b0f57df30b07d4"
-Content-Length: 2956
+ETag: "382593e900a2698b91f4c54bda9bf080"
+Content-Length: 3461
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -57,14 +57,31 @@ END:VCALENDAR
   <propstat>
    <prop>
     <C:calendar-data>BEGIN:VCALENDAR
-PRODID:-//davical.org//NONSGML AWL Calendar//EN
+PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
 VERSION:2.0
-CALSCALE:GREGORIAN
+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:VEVENT
 SUMMARY:Busy
 CLASS:CONFIDENTIAL
-DTSTART:20061223T160000
-DTEND:20061223T180000
+DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T160000
+DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T180000
 END:VEVENT
 END:VCALENDAR
 </C:calendar-data>
diff --git a/testing/tests/regression-suite/233-Moz-PUT.result b/testing/tests/regression-suite/233-Moz-PUT.result
index 8ce402b5..44c57057 100644
--- a/testing/tests/regression-suite/233-Moz-PUT.result
+++ b/testing/tests/regression-suite/233-Moz-PUT.result
@@ -7,4 +7,67 @@ ETag: "e8060931f30c1798ac58ffbe4ec0bffc"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
-10 --- e8060931f30c1798ac58ffbe4ec0bffc --- VEVENT --- 10 --- e70576e9-c1e0-431e-a507-0386fd82f223 --- 2007-12-03 20:26:30 --- 2007-12-11 07:45:00+13 --- 2007-12-11 08:30:00+13 --- NULL --- Morning Meeting --- Suzies Coffee Lounge --- Twice-weekly breakfast meeting --- NULL --- PUBLIC --- NULL --- FREQ=WEEKLY;INTERVAL=1;BYDAY=TU,TH --- NULL --- NULL --- NULL --- NULL
+      CalDAV Data: >BEGIN:VCALENDAR
+PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
+VERSION:2.0
+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:VEVENT
+CREATED:20071203T202630Z
+LAST-MODIFIED:20071203T202834Z
+DTSTAMP:20071203T202630Z
+UID:e70576e9-c1e0-431e-a507-0386fd82f223
+SUMMARY:Morning Meeting
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=TU,TH
+DTSTART;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20071211T074500
+DTEND;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20071211T083000
+X-MOZ-LOCATIONPATH:e70576e9-c1e0-431e-a507-0386fd82f223.ics
+LOCATION:Suzies Coffee Lounge
+DESCRIPTION:Twice-weekly breakfast meeting
+CATEGORIES:Business
+BEGIN:VALARM
+TRIGGER;VALUE=DURATION:-PT10M
+DESCRIPTION:Mozilla Alarm: Morning Meeting
+ACTION:DISPLAY
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+<
+      caldav_type: >VEVENT<
+            class: >PUBLIC<
+         dav_etag: >e8060931f30c1798ac58ffbe4ec0bffc<
+      description: >Twice-weekly breakfast meeting<
+            dtend: >2007-12-11 08:30:00+13<
+          dtstamp: >2007-12-03 20:26:30<
+          dtstart: >2007-12-11 07:45:00+13<
+              due: >NULL<
+         location: >Suzies Coffee Lounge<
+      logged_user: >10<
+ percent_complete: >NULL<
+         priority: >NULL<
+            rrule: >FREQ=WEEKLY;INTERVAL=1;BYDAY=TU,TH<
+           status: >NULL<
+          summary: >Morning Meeting<
+           transp: >NULL<
+            tz_id: >/mozilla.org/20070129_1/Antarctica/McMurdo<
+              uid: >e70576e9-c1e0-431e-a507-0386fd82f223<
+              url: >NULL<
+          user_no: >10<
+   ~ Modified Now: >0<
+
diff --git a/testing/tests/regression-suite/233-Moz-PUT.test b/testing/tests/regression-suite/233-Moz-PUT.test
index 4b983a04..6db8ba6c 100644
--- a/testing/tests/regression-suite/233-Moz-PUT.test
+++ b/testing/tests/regression-suite/233-Moz-PUT.test
@@ -61,7 +61,9 @@ QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
        uid, dtstamp, dtstart, dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
-       percent_complete, tz_id, status
+       percent_complete, tz_id, status,
+       caldav_data AS " CalDAV Data",
+      ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
 FROM caldav_data JOIN calendar_item USING(dav_name)
 WHERE caldav_data.dav_name =
 '/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics';
diff --git a/testing/tests/regression-suite/234-Moz-PUT.result b/testing/tests/regression-suite/234-Moz-PUT.result
index 2c4bd53d..dc27d488 100644
--- a/testing/tests/regression-suite/234-Moz-PUT.result
+++ b/testing/tests/regression-suite/234-Moz-PUT.result
@@ -5,4 +5,65 @@ ETag: "8f581a053df6d833254756dfd7553d37"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
-10 --- 8f581a053df6d833254756dfd7553d37 --- VTODO --- 10 --- e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08 --- 2007-12-03 20:29:15 --- 2007-12-09 13:30:00+13 --- NULL --- 2007-12-09 13:30:00+13 --- Release 0.9.3 --- NULL --- NULL --- NULL --- PUBLIC --- NULL --- NULL --- NULL --- 95.00 --- NULL --- IN-PROCESS
+      CalDAV Data: >BEGIN:VCALENDAR
+PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
+VERSION:2.0
+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:VTODO
+CREATED:20071203T202915Z
+LAST-MODIFIED:20071203T203021Z
+DTSTAMP:20071203T202915Z
+UID:e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08
+SUMMARY:Release 0.9.3
+STATUS:IN-PROCESS
+DTSTART;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20071209T133000
+DUE;TZID=/mozilla.org/20070129_1/Antarctica/McMurdo:20071209T133000
+PERCENT-COMPLETE:95
+X-MOZ-LOCATIONPATH:e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics
+BEGIN:VALARM
+TRIGGER;VALUE=DURATION:-P2D
+DESCRIPTION:Mozilla Alarm: Release 0.9.3
+ACTION:DISPLAY
+END:VALARM
+END:VTODO
+END:VCALENDAR
+<
+      caldav_type: >VTODO<
+            class: >PUBLIC<
+         dav_etag: >8f581a053df6d833254756dfd7553d37<
+      description: >NULL<
+            dtend: >NULL<
+          dtstamp: >2007-12-03 20:29:15<
+          dtstart: >2007-12-09 13:30:00+13<
+              due: >2007-12-09 13:30:00+13<
+         location: >NULL<
+      logged_user: >10<
+ percent_complete: >95.00<
+         priority: >NULL<
+            rrule: >NULL<
+           status: >IN-PROCESS<
+          summary: >Release 0.9.3<
+           transp: >NULL<
+            tz_id: >/mozilla.org/20070129_1/Antarctica/McMurdo<
+              uid: >e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08<
+              url: >NULL<
+          user_no: >10<
+   ~ Modified Now: >0<
+
diff --git a/testing/tests/regression-suite/234-Moz-PUT.test b/testing/tests/regression-suite/234-Moz-PUT.test
index 919cfa19..be18b048 100644
--- a/testing/tests/regression-suite/234-Moz-PUT.test
+++ b/testing/tests/regression-suite/234-Moz-PUT.test
@@ -59,7 +59,9 @@ QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
        uid, dtstamp, dtstart, dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
-       percent_complete, tz_id, status
+       percent_complete, tz_id, status,
+       caldav_data AS " CalDAV Data",
+      ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
 FROM caldav_data JOIN calendar_item USING(dav_name)
 WHERE caldav_data.dav_name =
 '/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics';
diff --git a/testing/tests/regression-suite/243-Moz-POST-FB.result b/testing/tests/regression-suite/243-Moz-POST-FB.result
index afd4b655..6c14aec6 100644
--- a/testing/tests/regression-suite/243-Moz-POST-FB.result
+++ b/testing/tests/regression-suite/243-Moz-POST-FB.result
@@ -16,8 +16,8 @@ DTSTART:20081020T110000Z
 DTEND:20081105T110000Z
 UID:c5bd82ea-cd89-4f58-8d31-336f47e44f97
 ORGANIZER:mailto:user1@example.net
-ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL:ma 
- ilto:user1@example.net
+ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL: 
+ mailto:user1@example.net
 FREEBUSY;FBTYPE=BUSY:20081021T184500/20081021T193000
 FREEBUSY;FBTYPE=BUSY:20081023T184500/20081023T193000
 FREEBUSY;FBTYPE=BUSY:20081028T184500/20081028T193000
diff --git a/testing/tests/regression-suite/244-Moz-POST-FB.result b/testing/tests/regression-suite/244-Moz-POST-FB.result
index 36b132d4..0090894c 100644
--- a/testing/tests/regression-suite/244-Moz-POST-FB.result
+++ b/testing/tests/regression-suite/244-Moz-POST-FB.result
@@ -16,8 +16,8 @@ DTSTART:20081020T110000Z
 DTEND:20081105T110000Z
 UID:c5bd82ea-cd89-4f58-8d31-336f47e44f97
 ORGANIZER:mailto:user1@example.net
-ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL:ma 
- ilto:user2@example.net
+ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL: 
+ mailto:user2@example.net
 FREEBUSY;FBTYPE=BUSY:20081020T220000/20081020T223000
 FREEBUSY;FBTYPE=BUSY:20081021T220000/20081021T223000
 FREEBUSY;FBTYPE=BUSY:20081022T220000/20081022T223000
diff --git a/testing/tests/regression-suite/305-Chandler-MKCOL-1.result b/testing/tests/regression-suite/305-Chandler-MKCOL-1.result
index 5077bc87..bc379b9d 100644
--- a/testing/tests/regression-suite/305-Chandler-MKCOL-1.result
+++ b/testing/tests/regression-suite/305-Chandler-MKCOL-1.result
@@ -5,4 +5,10 @@ Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
-10 --- /user1/home/ --- /user1/home/.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp/ --- 72205b235fa2a3dfd18535c0793b89b2 --- .ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp --- 0
+  dav_displayname: >.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp<
+         dav_etag: >72205b235fa2a3dfd18535c0793b89b2<
+         dav_name: >/user1/home/.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp/<
+      is_calendar: >0<
+ parent_container: >/user1/home/<
+          user_no: >10<
+
diff --git a/testing/tests/regression-suite/306-Chandler-DELETE-1.result b/testing/tests/regression-suite/306-Chandler-DELETE-1.result
index c637fcfe..11efa00b 100644
--- a/testing/tests/regression-suite/306-Chandler-DELETE-1.result
+++ b/testing/tests/regression-suite/306-Chandler-DELETE-1.result
@@ -4,4 +4,6 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
-Count of matching calendars (should be 0) --- 0
+         ?column?: >Count of matching calendars (should be 0)<
+            count: >0<
+
diff --git a/testing/tests/regression-suite/505-iCal-PUT.result b/testing/tests/regression-suite/505-iCal-PUT.result
index 2eaa78f4..c5faec55 100644
--- a/testing/tests/regression-suite/505-iCal-PUT.result
+++ b/testing/tests/regression-suite/505-iCal-PUT.result
@@ -5,4 +5,70 @@ ETag: "b3e66a461ef178bd4791b2b6509bbb9d"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
-10 --- VEVENT --- 10 --- AAA9318E-37D9-4319-8626-95ECD3D3B243 --- 2007-11-23 09:30:48 --- 2007-11-25 23:00:00+13 --- 2007-11-26 00:00:00+13 --- NULL --- New Event --- NULL --- NULL --- NULL --- PUBLIC --- OPAQUE --- NULL --- NULL --- NULL --- NULL --- NULL
+      CalDAV Data: >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:1
+TRANSP:OPAQUE
+UID:AAA9318E-37D9-4319-8626-95ECD3D3B243
+DTSTART;TZID=Pacific/Auckland:20071125T230000
+DTSTAMP:20071123T093048Z
+SUMMARY:New Event
+CREATED:20071123T093048Z
+DTEND;TZID=Pacific/Auckland:20071126T000000
+BEGIN:VALARM
+X-WR-ALARMUID:2927836F-DF85-4688-901A-9ABE442BFB62
+ACTION:AUDIO
+TRIGGER:-PT15M
+ATTACH;VALUE=URI:Basso
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+<
+      caldav_type: >VEVENT<
+            class: >PUBLIC<
+      description: >NULL<
+            dtend: >2007-11-26 00:00:00+13<
+          dtstamp: >2007-11-23 09:30:48<
+          dtstart: >2007-11-25 23:00:00+13<
+              due: >NULL<
+         location: >NULL<
+      logged_user: >10<
+ percent_complete: >NULL<
+         priority: >NULL<
+            rrule: >NULL<
+           status: >NULL<
+          summary: >New Event<
+           transp: >OPAQUE<
+            tz_id: >Pacific/Auckland<
+              uid: >AAA9318E-37D9-4319-8626-95ECD3D3B243<
+              url: >NULL<
+          user_no: >10<
+   ~ Modified Now: >1<
+
diff --git a/testing/tests/regression-suite/505-iCal-PUT.test b/testing/tests/regression-suite/505-iCal-PUT.test
index 8f7c866e..72d6b36a 100644
--- a/testing/tests/regression-suite/505-iCal-PUT.test
+++ b/testing/tests/regression-suite/505-iCal-PUT.test
@@ -61,7 +61,9 @@ QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
        uid, dtstamp, dtstart, dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
-       percent_complete, tz_id, status
+       percent_complete, tz_id, status,
+       caldav_data AS " CalDAV Data",
+      ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
 FROM caldav_data JOIN calendar_item USING(dav_name)
 WHERE caldav_data.dav_etag =
 'b3e66a461ef178bd4791b2b6509bbb9d';
diff --git a/testing/tests/regression-suite/506-iCal-PUT.result b/testing/tests/regression-suite/506-iCal-PUT.result
index e7d9f6b9..1e8b3015 100644
--- a/testing/tests/regression-suite/506-iCal-PUT.result
+++ b/testing/tests/regression-suite/506-iCal-PUT.result
@@ -5,4 +5,71 @@ ETag: "5f050eca5480bbebbe9428222570913d"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
-10 --- VEVENT --- 10 --- AAA9318E-37D9-4319-8626-95ECD3D3B243 --- 2007-11-23 09:32:23 --- 2007-11-25 13:00:00+13 --- 2007-11-25 19:00:00+13 --- NULL --- BBQ @ ML's --- ML's House --- NULL --- NULL --- PUBLIC --- OPAQUE --- NULL --- NULL --- NULL --- NULL --- NULL
+      CalDAV Data: >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:6
+TRANSP:OPAQUE
+UID:AAA9318E-37D9-4319-8626-95ECD3D3B243
+DTSTART;TZID=Pacific/Auckland:20071125T130000
+DTSTAMP:20071123T093223Z
+SUMMARY:BBQ @ ML's
+CREATED:20071123T093048Z
+DTEND;TZID=Pacific/Auckland:20071125T190000
+LOCATION:ML's House
+BEGIN:VALARM
+X-WR-ALARMUID:2927836F-DF85-4688-901A-9ABE442BFB62
+ACTION:AUDIO
+TRIGGER:-PT15M
+ATTACH;VALUE=URI:Basso
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+<
+      caldav_type: >VEVENT<
+            class: >PUBLIC<
+      description: >NULL<
+            dtend: >2007-11-25 19:00:00+13<
+          dtstamp: >2007-11-23 09:32:23<
+          dtstart: >2007-11-25 13:00:00+13<
+              due: >NULL<
+         location: >ML's House<
+      logged_user: >10<
+ percent_complete: >NULL<
+         priority: >NULL<
+            rrule: >NULL<
+           status: >NULL<
+          summary: >BBQ @ ML's<
+           transp: >OPAQUE<
+            tz_id: >Pacific/Auckland<
+              uid: >AAA9318E-37D9-4319-8626-95ECD3D3B243<
+              url: >NULL<
+          user_no: >10<
+   ~ Modified Now: >1<
+
diff --git a/testing/tests/regression-suite/506-iCal-PUT.test b/testing/tests/regression-suite/506-iCal-PUT.test
index 95971624..29c36211 100644
--- a/testing/tests/regression-suite/506-iCal-PUT.test
+++ b/testing/tests/regression-suite/506-iCal-PUT.test
@@ -63,7 +63,9 @@ QUERY
 SELECT caldav_data.user_no, caldav_type, logged_user, 
        uid, dtstamp, dtstart, dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
-       percent_complete, tz_id, status
+       percent_complete, tz_id, status,
+       caldav_data AS " CalDAV Data",
+      ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
 FROM caldav_data JOIN calendar_item USING(dav_name)
 WHERE caldav_data.dav_etag =
 '5f050eca5480bbebbe9428222570913d';
diff --git a/testing/tests/regression-suite/507-iCal-MKCALENDAR.result b/testing/tests/regression-suite/507-iCal-MKCALENDAR.result
index b4bfaf6c..4f340025 100644
--- a/testing/tests/regression-suite/507-iCal-MKCALENDAR.result
+++ b/testing/tests/regression-suite/507-iCal-MKCALENDAR.result
@@ -5,4 +5,9 @@ Cache-Control: no-cache
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
-10 --- /user1/ --- Untitled --- 1 --- 0
+  dav_displayname: >Untitled<
+      is_calendar: >1<
+ parent_container: >/user1/<
+public_events_onl: >0<
+          user_no: >10<
+
diff --git a/testing/tests/regression-suite/509-iCal-PROPPATCH.result b/testing/tests/regression-suite/509-iCal-PROPPATCH.result
index d5f24b1e..6f280e0a 100644
--- a/testing/tests/regression-suite/509-iCal-PROPPATCH.result
+++ b/testing/tests/regression-suite/509-iCal-PROPPATCH.result
@@ -11,4 +11,6 @@ Content-Type: text/xml; charset="utf-8"
   <responsedescription>All requested changes were made.</responsedescription>
  </response>
 </multistatus>
-iCal Calendar --- 1
+  dav_displayname: >iCal Calendar<
+      is_calendar: >1<
+
diff --git a/testing/tests/regression-suite/512-iCal-PUT.result b/testing/tests/regression-suite/512-iCal-PUT.result
index ae6f033f..7fa95125 100644
--- a/testing/tests/regression-suite/512-iCal-PUT.result
+++ b/testing/tests/regression-suite/512-iCal-PUT.result
@@ -5,4 +5,71 @@ ETag: "b7cfb403232dc83f936c15a179901d50"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
-10 --- b7cfb403232dc83f936c15a179901d50 --- VEVENT --- 10 --- 6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA --- 2007-11-24 08:37:09 --- 2007-11-26 22:00:00+13 --- 2007-11-26 23:00:00+13 --- NULL --- New Event --- NULL --- NULL --- NULL --- PUBLIC --- OPAQUE --- NULL --- NULL --- NULL --- NULL --- NULL
+      CalDAV Data: >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:1
+TRANSP:OPAQUE
+UID:6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA
+DTSTART;TZID=Pacific/Auckland:20071126T220000
+DTSTAMP:20071124T083709Z
+SUMMARY:New Event
+CREATED:20071124T083709Z
+DTEND;TZID=Pacific/Auckland:20071126T230000
+BEGIN:VALARM
+X-WR-ALARMUID:F33877C6-563B-4F20-B129-77A5B6C6944E
+ACTION:AUDIO
+TRIGGER:-PT15M
+ATTACH;VALUE=URI:Basso
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+<
+      caldav_type: >VEVENT<
+            class: >PUBLIC<
+         dav_etag: >b7cfb403232dc83f936c15a179901d50<
+      description: >NULL<
+            dtend: >2007-11-26 23:00:00+13<
+          dtstamp: >2007-11-24 08:37:09<
+          dtstart: >2007-11-26 22:00:00+13<
+              due: >NULL<
+         location: >NULL<
+      logged_user: >10<
+ percent_complete: >NULL<
+         priority: >NULL<
+            rrule: >NULL<
+           status: >NULL<
+          summary: >New Event<
+           transp: >OPAQUE<
+            tz_id: >Pacific/Auckland<
+              uid: >6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA<
+              url: >NULL<
+          user_no: >10<
+   ~ Modified Now: >1<
+
diff --git a/testing/tests/regression-suite/512-iCal-PUT.test b/testing/tests/regression-suite/512-iCal-PUT.test
index b1fb8b56..de199c3d 100644
--- a/testing/tests/regression-suite/512-iCal-PUT.test
+++ b/testing/tests/regression-suite/512-iCal-PUT.test
@@ -61,7 +61,9 @@ QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
        uid, dtstamp, dtstart, dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
-       percent_complete, tz_id, status
+       percent_complete, tz_id, status,
+       caldav_data AS " CalDAV Data",
+      ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
 FROM caldav_data JOIN calendar_item USING(dav_name)
 WHERE caldav_data.dav_name =
 '/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics';
diff --git a/testing/tests/regression-suite/513-iCal-PUT.result b/testing/tests/regression-suite/513-iCal-PUT.result
index a9d007ec..ce2c00a0 100644
--- a/testing/tests/regression-suite/513-iCal-PUT.result
+++ b/testing/tests/regression-suite/513-iCal-PUT.result
@@ -5,4 +5,72 @@ ETag: "087d1ea4915719b8a904ca18a9abbbe1"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
-10 --- 087d1ea4915719b8a904ca18a9abbbe1 --- VEVENT --- 10 --- 6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA --- 2007-11-24 08:38:10 --- 2007-11-26 07:00:00+13 --- 2007-11-26 17:00:00+13 --- NULL --- Go to work --- NULL --- NULL --- NULL --- PUBLIC --- OPAQUE --- FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR;WKST=SU --- NULL --- NULL --- NULL --- NULL
+      CalDAV Data: >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:5
+TRANSP:OPAQUE
+UID:6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA
+DTSTART;TZID=Pacific/Auckland:20071126T070000
+DTSTAMP:20071124T083810Z
+SUMMARY:Go to work
+CREATED:20071124T083709Z
+DTEND;TZID=Pacific/Auckland:20071126T170000
+RRULE:FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR;WKST=SU
+BEGIN:VALARM
+X-WR-ALARMUID:F33877C6-563B-4F20-B129-77A5B6C6944E
+ACTION:AUDIO
+TRIGGER:-PT15M
+ATTACH;VALUE=URI:Basso
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+<
+      caldav_type: >VEVENT<
+            class: >PUBLIC<
+         dav_etag: >087d1ea4915719b8a904ca18a9abbbe1<
+      description: >NULL<
+            dtend: >2007-11-26 17:00:00+13<
+          dtstamp: >2007-11-24 08:38:10<
+          dtstart: >2007-11-26 07:00:00+13<
+              due: >NULL<
+         location: >NULL<
+      logged_user: >10<
+ percent_complete: >NULL<
+         priority: >NULL<
+            rrule: >FREQ=WEEKLY;INTERVAL=1;BYDAY=MO,TU,WE,TH,FR;WKST=SU<
+           status: >NULL<
+          summary: >Go to work<
+           transp: >OPAQUE<
+            tz_id: >Pacific/Auckland<
+              uid: >6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA<
+              url: >NULL<
+          user_no: >10<
+   ~ Modified Now: >1<
+
diff --git a/testing/tests/regression-suite/513-iCal-PUT.test b/testing/tests/regression-suite/513-iCal-PUT.test
index 718d6310..b40560c8 100644
--- a/testing/tests/regression-suite/513-iCal-PUT.test
+++ b/testing/tests/regression-suite/513-iCal-PUT.test
@@ -66,7 +66,9 @@ QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
        uid, dtstamp, dtstart, dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
-       percent_complete, tz_id, status
+       percent_complete, tz_id, status,
+       caldav_data AS " CalDAV Data",
+      ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
 FROM caldav_data JOIN calendar_item USING(dav_name)
 WHERE caldav_data.dav_etag =
 '087d1ea4915719b8a904ca18a9abbbe1';
diff --git a/testing/tests/regression-suite/514-iCal-PUT-VTODO.result b/testing/tests/regression-suite/514-iCal-PUT-VTODO.result
index d05f4531..164c368d 100644
--- a/testing/tests/regression-suite/514-iCal-PUT-VTODO.result
+++ b/testing/tests/regression-suite/514-iCal-PUT-VTODO.result
@@ -5,4 +5,60 @@ ETag: "18134bbb51c8e25919c92a0d6265f789"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
-10 --- 18134bbb51c8e25919c92a0d6265f789 --- VTODO --- 10 --- E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74 --- 2007-11-24 22:09:25 --- 2004-01-01 12:00:00+13 --- NULL --- 2010-02-17 00:00:00+13 --- Celebrate a significant birthday --- NULL --- Organise a party --- 5 --- PUBLIC --- NULL --- NULL --- NULL --- NULL --- NULL --- NULL
+      CalDAV Data: >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:19901007T020000
+RRULE:FREQ=YEARLY;UNTIL=20060930T140000Z;BYMONTH=10;BYDAY=1SU
+TZNAME:NZDT
+END:DAYLIGHT
+END:VTIMEZONE
+BEGIN:VTODO
+PRIORITY:5
+SEQUENCE:7
+DESCRIPTION:Organise a party
+UID:E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74
+DTSTART;TZID=Pacific/Auckland:20040101T120000
+DTSTAMP:20071124T220925Z
+SUMMARY:Celebrate a significant birthday
+CREATED:20071124T220749Z
+X-APPLE-SORT-ORDER:2147483647
+DUE;VALUE=DATE:20100217
+END:VTODO
+END:VCALENDAR
+<
+      caldav_type: >VTODO<
+            class: >PUBLIC<
+         dav_etag: >18134bbb51c8e25919c92a0d6265f789<
+      description: >Organise a party<
+            dtend: >NULL<
+          dtstamp: >2007-11-24 22:09:25<
+          dtstart: >2004-01-01 12:00:00+13<
+              due: >2010-02-17 00:00:00+13<
+         location: >NULL<
+      logged_user: >10<
+ percent_complete: >NULL<
+         priority: >5<
+            rrule: >NULL<
+           status: >NULL<
+          summary: >Celebrate a significant birthday<
+           transp: >NULL<
+            tz_id: >Pacific/Auckland<
+              uid: >E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74<
+              url: >NULL<
+          user_no: >10<
+   ~ Modified Now: >1<
+
diff --git a/testing/tests/regression-suite/514-iCal-PUT-VTODO.test b/testing/tests/regression-suite/514-iCal-PUT-VTODO.test
index d6953fd1..1067a9ac 100644
--- a/testing/tests/regression-suite/514-iCal-PUT-VTODO.test
+++ b/testing/tests/regression-suite/514-iCal-PUT-VTODO.test
@@ -50,7 +50,9 @@ QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
        uid, dtstamp, dtstart, dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
-       percent_complete, tz_id, status
+       percent_complete, tz_id, status,
+       caldav_data AS " CalDAV Data",
+      ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
 FROM caldav_data JOIN calendar_item USING(dav_name)
 WHERE caldav_data.dav_name =
 '/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74.ics';
diff --git a/testing/tests/regression-suite/515-iCal-PUT-VEVENT.result b/testing/tests/regression-suite/515-iCal-PUT-VEVENT.result
index 82f73a53..f53354cc 100644
--- a/testing/tests/regression-suite/515-iCal-PUT-VEVENT.result
+++ b/testing/tests/regression-suite/515-iCal-PUT-VEVENT.result
@@ -7,4 +7,81 @@ ETag: "c057c3eb789b944e76f4d77fccf36ea1"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
-101 --- c057c3eb789b944e76f4d77fccf36ea1 --- VEVENT --- 10 --- 3C1BF85D-3F28-413F-844F-80EBD33B8EE6 --- 2007-11-24 22:19:00 --- 2007-11-23 12:00:00+13 --- 2007-11-23 14:00:00+13 --- NULL --- Beard Meeting --- NULL --- Lunch will be needed --- NULL --- PUBLIC --- OPAQUE --- FREQ=MONTHLY;INTERVAL=1;BYDAY=4FR --- NULL --- NULL --- NULL --- NULL
+      CalDAV Data: >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:Lunch will be needed
+UID:3C1BF85D-3F28-413F-844F-80EBD33B8EE6
+TRANSP:OPAQUE
+DTSTART;TZID=Pacific/Auckland:20071123T120000
+DTSTAMP:20071124T221900Z
+SUMMARY:Beard Meeting
+CREATED:20071124T221521Z
+DTEND;TZID=Pacific/Auckland:20071123T140000
+RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=4FR
+BEGIN:VALARM
+X-WR-ALARMUID:F5B2B4CF-E7F2-47B3-8243-8CB829E81122
+ACTION:EMAIL
+DESCRIPTION:This is an event reminder
+SUMMARY:Alarm notification
+ATTENDEE:mailto:andrew@mcmillan.net.nz
+TRIGGER:-P8D
+END:VALARM
+BEGIN:VALARM
+X-WR-ALARMUID:3A336F1D-550D-412F-9BDE-EBE8B03E8A53
+ACTION:AUDIO
+TRIGGER:-PT15M
+ATTACH;VALUE=URI:Basso
+END:VALARM
+END:VEVENT
+END:VCALENDAR
+<
+      caldav_type: >VEVENT<
+            class: >PUBLIC<
+         dav_etag: >c057c3eb789b944e76f4d77fccf36ea1<
+      description: >Lunch will be needed<
+            dtend: >2007-11-23 14:00:00+13<
+          dtstamp: >2007-11-24 22:19:00<
+          dtstart: >2007-11-23 12:00:00+13<
+              due: >NULL<
+         location: >NULL<
+      logged_user: >10<
+ percent_complete: >NULL<
+         priority: >NULL<
+            rrule: >FREQ=MONTHLY;INTERVAL=1;BYDAY=4FR<
+           status: >NULL<
+          summary: >Beard Meeting<
+           transp: >OPAQUE<
+            tz_id: >Pacific/Auckland<
+              uid: >3C1BF85D-3F28-413F-844F-80EBD33B8EE6<
+              url: >NULL<
+          user_no: >101<
+   ~ Modified Now: >1<
+
diff --git a/testing/tests/regression-suite/515-iCal-PUT-VEVENT.test b/testing/tests/regression-suite/515-iCal-PUT-VEVENT.test
index fd012383..4c59355a 100644
--- a/testing/tests/regression-suite/515-iCal-PUT-VEVENT.test
+++ b/testing/tests/regression-suite/515-iCal-PUT-VEVENT.test
@@ -71,7 +71,9 @@ QUERY
 SELECT caldav_data.user_no, caldav_data.dav_etag, caldav_type, logged_user, 
        uid, dtstamp, dtstart, dtend, due, summary, location,
        description, priority, class, transp, rrule, url,
-       percent_complete, tz_id, status
+       percent_complete, tz_id, status,
+       caldav_data AS " CalDAV Data",
+      ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now"
 FROM caldav_data JOIN calendar_item USING(dav_name)
 WHERE caldav_data.dav_name =
 '/resource2/home/3C1BF85D-3F28-413F-844F-80EBD33B8EE6.ics';
diff --git a/testing/tests/regression-suite/517-iCal-POST.result b/testing/tests/regression-suite/517-iCal-POST.result
index 3531d65b..79f85b95 100644
--- a/testing/tests/regression-suite/517-iCal-POST.result
+++ b/testing/tests/regression-suite/517-iCal-POST.result
@@ -15,8 +15,8 @@ DTSTAMP:yyyymmddThhmmssZ
 DTSTART:20081022T084500
 DTEND:20081024T113000
 UID:174F9C2A-1223-40C4-9E06-6E91F2EA9491
-ORGANIZER:mailto:user1@example.net
-ATTENDEE;CN=\"User 1\";PARTSTAT=ACCEPTED:mailto:user1@example.net
+ORGANIZER;CN="User 1":mailto:user1@example.net
+ATTENDEE;CN="User 1";PARTSTAT=ACCEPTED:mailto:user1@example.net
 FREEBUSY;FBTYPE=BUSY:20081023T184500/20081023T193000
 FREEBUSY;FBTYPE=BUSY:20081022T180000/20081023T040000
 FREEBUSY;FBTYPE=BUSY:20081023T180000/20081024T040000
@@ -39,7 +39,7 @@ DTSTAMP:yyyymmddThhmmssZ
 DTSTART:20081022T084500
 DTEND:20081024T113000
 UID:174F9C2A-1223-40C4-9E06-6E91F2EA9491
-ORGANIZER:mailto:user1@example.net
+ORGANIZER;CN="User 1":mailto:user1@example.net
 X-WR-ATTENDEE;CN=\"user2\";CUTYPE=INDIVIDUAL;PARTSTAT=NEEDS-ACTION;ROLE= 
  REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@example.net
 FREEBUSY;FBTYPE=BUSY:20081022T220000/20081022T223000
diff --git a/testing/tests/regression-suite/801-Spec-LOCK-1.result b/testing/tests/regression-suite/801-Spec-LOCK-1.result
index bc15913a..6ded8513 100644
--- a/testing/tests/regression-suite/801-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/801-Spec-LOCK-1.result
@@ -25,4 +25,6 @@ Content-Type: text/xml; charset="utf-8"
   </activelock>
  </lockdiscovery>
 </prop>
-Refreshed (should be 1) --- 1
+         ?column?: >Refreshed (should be 1)<
+  refresh_success: >1<
+
diff --git a/testing/tests/regression-suite/804-Mulberry-PUT-1.result b/testing/tests/regression-suite/804-Mulberry-PUT-1.result
index fa769347..036a02c7 100644
--- a/testing/tests/regression-suite/804-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/804-Mulberry-PUT-1.result
@@ -1,7 +1,61 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-ETag: "b000d7defa19ccb7cd21e546b54155ee"
+ETag: "a8f2331f539bfb5ce52c464482196f85"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
+   A1 CalDAV DATA: >BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+X-WR-CALNAME:home
+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:VEVENT
+DTSTAMP:20061025T101327Z
+DTSTART;TZID=New Zealand Standard Time:20061025T091500
+DURATION:PT1H
+SUMMARY:Check PUT works when we supply the correct lock token.
+UID:B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C
+END:VEVENT
+END:VCALENDAR
+<
+      caldav_type: >VEVENT<
+            class: >PUBLIC<
+      description: >NULL<
+            dtend: >2006-10-25 10:15:00+13<
+          dtstamp: >2006-10-25 10:13:27<
+          dtstart: >2006-10-25 09:15:00+13<
+              due: >NULL<
+         location: >NULL<
+      logged_user: >10<
+ percent_complete: >NULL<
+         priority: >NULL<
+            rrule: >NULL<
+           status: >NULL<
+          summary: >Check PUT works when we supply the correct lock token.<
+           transp: >NULL<
+            tz_id: >New Zealand Standard Time<
+              uid: >B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C<
+              url: >NULL<
+          user_no: >10<
+   ~ Modified Now: >1<
+
diff --git a/testing/tests/regression-suite/804-Mulberry-PUT-1.test b/testing/tests/regression-suite/804-Mulberry-PUT-1.test
index 4273bbc9..1c14a599 100644
--- a/testing/tests/regression-suite/804-Mulberry-PUT-1.test
+++ b/testing/tests/regression-suite/804-Mulberry-PUT-1.test
@@ -14,5 +14,51 @@ ENDSQL
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEADER=Lock-Token: <opaquelocktoken:##locktoken##>
 HEAD
-DATA=F56B49B10FC923D20FE2DC92D6580340-0.ics
+
+BEGINDATA
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+X-WR-CALNAME:home
+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:VEVENT
+DTSTAMP:20061025T101327Z
+DTSTART;TZID=New Zealand Standard Time:20061025T091500
+DURATION:PT1H
+SUMMARY:Check PUT works when we supply the correct lock token.
+UID:B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C
+END:VEVENT
+END:VCALENDAR
+ENDDATA
+
+QUERY
+SELECT caldav_data.user_no, caldav_type, logged_user, 
+       uid, dtstamp, dtstart, dtend, due, summary, location,
+       description, priority, class, transp, rrule, url,
+       percent_complete, tz_id, status,
+       ((current_timestamp AT TIME ZONE 'GMT' - last_modified) < '2 seconds'::interval) AS "~ Modified Now",
+       caldav_data AS "A1 CalDAV DATA"
+FROM caldav_data JOIN calendar_item USING(dav_name)
+WHERE caldav_data.dav_name ~ '^/user1/home/i1278618276.ics'
+ENDQUERY
+
 
diff --git a/testing/tests/regression-suite/811-Spec-LOCK-1.result b/testing/tests/regression-suite/811-Spec-LOCK-1.result
index bc15913a..6ded8513 100644
--- a/testing/tests/regression-suite/811-Spec-LOCK-1.result
+++ b/testing/tests/regression-suite/811-Spec-LOCK-1.result
@@ -25,4 +25,6 @@ Content-Type: text/xml; charset="utf-8"
   </activelock>
  </lockdiscovery>
 </prop>
-Refreshed (should be 1) --- 1
+         ?column?: >Refreshed (should be 1)<
+  refresh_success: >1<
+
diff --git a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
index f1e0912b..ede0c69a 100644
--- a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
+++ b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
@@ -5,7 +5,7 @@
   <propstat>
    <prop>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength>12644</getcontentlength>
+    <getcontentlength>14202</getcontentlength>
     <resourcetype>
      <collection/>
      <C:calendar/>
@@ -14,7 +14,7 @@
     <displayname>home</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"0cb8666f1cb6aaac5fb737b1491dd6a7"</getetag>
+    <getetag>"8600dc4a1b264a09a5f741d710497cba"</getetag>
     <acl>
      <ace>
       <principal>
diff --git a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
index d717bbfd..3e096274 100644
--- a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
+++ b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
@@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength>12644</getcontentlength>
+    <getcontentlength>14202</getcontentlength>
     <resourcetype>
      <collection/>
      <C:calendar/>
@@ -21,7 +21,7 @@ Content-Type: text/xml; charset="utf-8"
     <displayname>home</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"0cb8666f1cb6aaac5fb737b1491dd6a7"</getetag>
+    <getetag>"8600dc4a1b264a09a5f741d710497cba"</getetag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
diff --git a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
index d4ad394c..1dc01092 100644
--- a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
+++ b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
@@ -5,7 +5,7 @@
   <propstat>
    <prop>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength>12644</getcontentlength>
+    <getcontentlength>14202</getcontentlength>
     <resourcetype>
      <collection/>
      <C:calendar/>
@@ -14,7 +14,7 @@
     <displayname>home</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"0cb8666f1cb6aaac5fb737b1491dd6a7"</getetag>
+    <getetag>"8600dc4a1b264a09a5f741d710497cba"</getetag>
     <getcontentlanguage/>
     <supportedlock>
      <lockentry>
@@ -564,4 +564,74 @@
    <status>HTTP/1.1 404 Not Found</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics</href>
+  <propstat>
+   <prop>
+    <getcontentlength>772</getcontentlength>
+    <getcontenttype>text/calendar</getcontenttype>
+    <displayname>Party all day!</displayname>
+    <resourcetype/>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+    <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
+    <getetag>"165746adbab8bc0c8336a63cc5332ff2"</getetag>
+    <getcontentlanguage/>
+    <supportedlock>
+     <lockentry>
+      <lockscope>
+       <exclusive/>
+      </lockscope>
+      <locktype>
+       <write/>
+      </locktype>
+     </lockentry>
+    </supportedlock>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics</href>
+  <propstat>
+   <prop>
+    <getcontentlength>786</getcontentlength>
+    <getcontenttype>text/calendar</getcontenttype>
+    <displayname>Woohoo!  Time to Par-tay!</displayname>
+    <resourcetype/>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+    <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
+    <getetag>"8600dc4a1b264a09a5f741d710497cba"</getetag>
+    <getcontentlanguage/>
+    <supportedlock>
+     <lockentry>
+      <lockscope>
+       <exclusive/>
+      </lockscope>
+      <locktype>
+       <write/>
+      </locktype>
+     </lockentry>
+    </supportedlock>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+  <propstat>
+   <prop>
+    <lockdiscovery/>
+    <source/>
+    <checked-in/>
+    <checked-out/>
+   </prop>
+   <status>HTTP/1.1 404 Not Found</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
index 00ade156..c92bf829 100644
--- a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
+++ b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
@@ -5,7 +5,7 @@
   <propstat>
    <prop>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <getcontentlength>12644</getcontentlength>
+    <getcontentlength>14202</getcontentlength>
     <resourcetype>
      <collection/>
      <C:calendar/>
@@ -14,7 +14,7 @@
     <displayname>home</displayname>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
-    <getetag>"0cb8666f1cb6aaac5fb737b1491dd6a7"</getetag>
+    <getetag>"8600dc4a1b264a09a5f741d710497cba"</getetag>
     <getcontentlanguage/>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result
index 74b5e021..30ceaa83 100644
--- a/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result
+++ b/testing/tests/regression-suite/840-Spec-PROPPATCH-1.result
@@ -11,8 +11,31 @@ Content-Type: text/xml; charset="utf-8"
   <responsedescription>All requested changes were made.</responsedescription>
  </response>
 </multistatus>
-User One's Not Calendar --- 0 --- 1
-/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/ --- http://apple.com/ns/ical/:calendar-color --- #391B71A0 --- 10 --- 1
-/user1/home/ --- urn:mcmillan:bogus:xml:ns:rscds:arbitrary --- A completely bogus property which should be saved. --- 10 --- 1
-/user1/SOHO+collection/ --- com.apple.ical::calendarcolor --- #FF8000FF --- 10 --- 1
-/user1/SOHO+collection/ --- urn:ietf:params:xml:ns:caldav:calendar-description --- Calendar description --- 10 --- 1
+changed_last_60se: >1<
+  dav_displayname: >User One's Not Calendar<
+      is_calendar: >0<
+
+       changed_by: >10<
+changed_last_30se: >1<
+         dav_name: >/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/<
+    property_name: >http://apple.com/ns/ical/:calendar-color<
+   property_value: >#391B71A0<
+
+       changed_by: >10<
+changed_last_30se: >1<
+         dav_name: >/user1/home/<
+    property_name: >urn:mcmillan:bogus:xml:ns:rscds:arbitrary<
+   property_value: >A completely bogus property which should be saved.<
+
+       changed_by: >10<
+changed_last_30se: >1<
+         dav_name: >/user1/SOHO+collection/<
+    property_name: >com.apple.ical::calendarcolor<
+   property_value: >#FF8000FF<
+
+       changed_by: >10<
+changed_last_30se: >1<
+         dav_name: >/user1/SOHO+collection/<
+    property_name: >urn:ietf:params:xml:ns:caldav:calendar-description<
+   property_value: >Calendar description<
+
diff --git a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result
index 686cb541..1203a3cf 100644
--- a/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result
+++ b/testing/tests/regression-suite/841-Spec-PROPPATCH-2.result
@@ -11,4 +11,7 @@ Content-Type: text/xml; charset="utf-8"
   <responsedescription>All requested changes were made.</responsedescription>
  </response>
 </multistatus>
-User One's Calendar --- 1 --- 1
+changed_last_60se: >1<
+  dav_displayname: >User One's Calendar<
+      is_calendar: >1<
+
diff --git a/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result b/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result
index 4c733151..b046903c 100644
--- a/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result
+++ b/testing/tests/regression-suite/842-Spec-PROPPATCH-3.result
@@ -18,4 +18,7 @@ Content-Type: text/xml; charset="utf-8"
   <responsedescription>Some properties were not able to be changed.</responsedescription>
  </response>
 </multistatus>
-User One's Calendar --- 1 --- 1
+changed_last_60se: >1<
+  dav_displayname: >User One's Calendar<
+      is_calendar: >1<
+
diff --git a/testing/tests/regression-suite/880-Freebusy-POST.result b/testing/tests/regression-suite/880-Freebusy-POST.result
index 28d492ce..f9587366 100644
--- a/testing/tests/regression-suite/880-Freebusy-POST.result
+++ b/testing/tests/regression-suite/880-Freebusy-POST.result
@@ -16,8 +16,8 @@ DTSTART:20081021T110000Z
 DTEND:20081106T110000Z
 UID:1e680b0e-ee15-4d63-844f-3e48aa92791f
 ORGANIZER:mailto:user1@example.net
-ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL:ma 
- ilto:user1@example.net
+ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL: 
+ mailto:user1@example.net
 FREEBUSY;FBTYPE=BUSY:20081021T184500/20081021T193000
 FREEBUSY;FBTYPE=BUSY:20081023T184500/20081023T193000
 FREEBUSY;FBTYPE=BUSY:20081028T184500/20081028T193000
@@ -56,8 +56,8 @@ DTSTART:20081021T110000Z
 DTEND:20081106T110000Z
 UID:1e680b0e-ee15-4d63-844f-3e48aa92791f
 ORGANIZER:mailto:user1@example.net
-ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL:ma 
- ilto:user2@example.net
+ATTENDEE;PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;CUTYPE=INDIVIDUAL: 
+ mailto:user2@example.net
 FREEBUSY;FBTYPE=BUSY:20081021T220000/20081021T223000
 FREEBUSY;FBTYPE=BUSY:20081022T220000/20081022T223000
 FREEBUSY;FBTYPE=BUSY:20081023T220000/20081023T223000
diff --git a/testing/tests/regression-suite/901-GET-Collection.result b/testing/tests/regression-suite/901-GET-Collection.result
index 233eddfa..f278c430 100644
--- a/testing/tests/regression-suite/901-GET-Collection.result
+++ b/testing/tests/regression-suite/901-GET-Collection.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
-Content-Length: 9101
+Content-Length: 9709
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
@@ -209,6 +209,24 @@ TRIGGER:-PT15M
 ATTACH;VALUE=URI:Basso
 END:VALARM
 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:VEVENT
+DESCRIPTION:Have a microparty. All the best parties are monthly!
+UID:MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74
+DTSTAMP:20081024T220925Z
+SUMMARY:Woohoo!  Time to Par-tay!
+CREATED:20081024T220749Z
+DTSTART;TZID=Pacific/Auckland:20081121T160000
+RRULE:FREQ=MONTHLY;INTERVAL=1;BYDAY=3FR
+END:VEVENT
 BEGIN:VTIMEZONE
 TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
 X-LIC-LOCATION:Antarctica/McMurdo
diff --git a/testing/tests/regression-suite/F56B49B10FC923D20FE2DC92D6580340-0.ics.data b/testing/tests/regression-suite/F56B49B10FC923D20FE2DC92D6580340-0.ics.data
deleted file mode 100644
index 9a458727..00000000
--- a/testing/tests/regression-suite/F56B49B10FC923D20FE2DC92D6580340-0.ics.data
+++ /dev/null
@@ -1,32 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//mulberrymail.com//Mulberry v4.0//EN
-VERSION:2.0
-X-WR-CALNAME:home
-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:VEVENT
-DTSTAMP:20061025T101327Z
-DTSTART;TZID=New Zealand Standard Time:20061025T091500
-DURATION:PT1H
-SUMMARY:A first event
-UID:B18CBB57295D01D7661A6DD4@D76FAF7B10D9E8D2D41F779C
-END:VEVENT
-END:VCALENDAR