diff --git a/testing/tests/regression-suite/232-Moz-PROPFIND.result b/testing/tests/regression-suite/232-Moz-PROPFIND.result
new file mode 100644
index 00000000..61354633
--- /dev/null
+++ b/testing/tests/regression-suite/232-Moz-PROPFIND.result
@@ -0,0 +1,22 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
+ETag: "334c8abc0ac73261cdbf963fc7269d76"
+Content-Length: 347
+Content-Type: text/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <propstat>
+   <prop>
+    <resourcetype>
+     <collection/>
+     <C:calendar/>
+    </resourcetype>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+</multistatus>
diff --git a/testing/tests/regression-suite/232-Moz-PROPFIND.test b/testing/tests/regression-suite/232-Moz-PROPFIND.test
new file mode 100644
index 00000000..9c88891d
--- /dev/null
+++ b/testing/tests/regression-suite/232-Moz-PROPFIND.test
@@ -0,0 +1,18 @@
+#
+# Testing with a process similar to Mozilla Sunbird 0.7
+#
+TYPE=PROPFIND
+URL=http://mycaldav/caldav.php/user1/home/
+HEAD
+
+HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7
+HEADER=Content-Type: text/xml; charset=utf-8
+HEADER=Depth: 0
+
+#
+# The first query just gets the resourcetype
+#
+BEGINDATA
+<?xml version="1.0"?>
+<D:propfind xmlns:D="DAV:"><D:prop><D:resourcetype/></D:prop></D:propfind>
+ENDDATA
diff --git a/testing/tests/regression-suite/233-Moz-PUT.result b/testing/tests/regression-suite/233-Moz-PUT.result
new file mode 100644
index 00000000..f96231e5
--- /dev/null
+++ b/testing/tests/regression-suite/233-Moz-PUT.result
@@ -0,0 +1,10 @@
+HTTP/1.1 100 Continue
+
+HTTP/1.1 201 Created
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
+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
diff --git a/testing/tests/regression-suite/233-Moz-PUT.test b/testing/tests/regression-suite/233-Moz-PUT.test
new file mode 100644
index 00000000..4b983a04
--- /dev/null
+++ b/testing/tests/regression-suite/233-Moz-PUT.test
@@ -0,0 +1,69 @@
+#
+# PUT a Mozilla style event into the database
+#
+TYPE=PUT
+URL=http://mycaldav/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics
+HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7
+HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
+HEADER=Accept-Language: en-us,en;q=0.5
+HEADER=Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7
+HEADER=Content-Type: text/calendar; charset=utf-8
+
+HEAD
+
+
+BEGINDATA
+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
+ENDDATA
+
+
+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
+FROM caldav_data JOIN calendar_item USING(dav_name)
+WHERE caldav_data.dav_name =
+'/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics';
+ENDQUERY
+
diff --git a/testing/tests/regression-suite/234-Moz-PUT.result b/testing/tests/regression-suite/234-Moz-PUT.result
new file mode 100644
index 00000000..6f1061c4
--- /dev/null
+++ b/testing/tests/regression-suite/234-Moz-PUT.result
@@ -0,0 +1,8 @@
+HTTP/1.1 201 Created
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
+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
diff --git a/testing/tests/regression-suite/234-Moz-PUT.test b/testing/tests/regression-suite/234-Moz-PUT.test
new file mode 100644
index 00000000..919cfa19
--- /dev/null
+++ b/testing/tests/regression-suite/234-Moz-PUT.test
@@ -0,0 +1,67 @@
+#
+# PUT a Mozilla style event into the database
+#
+TYPE=PUT
+URL=http://mycaldav/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics
+HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7
+HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
+HEADER=Accept-Language: en-us,en;q=0.5
+HEADER=Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7
+HEADER=Content-Type: text/calendar; charset=utf-8
+
+HEAD
+
+
+BEGINDATA
+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
+ENDDATA
+
+
+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
+FROM caldav_data JOIN calendar_item USING(dav_name)
+WHERE caldav_data.dav_name =
+'/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics';
+ENDQUERY
+
diff --git a/testing/tests/regression-suite/235-Moz-REPORT.result b/testing/tests/regression-suite/235-Moz-REPORT.result
new file mode 100644
index 00000000..e0531007
--- /dev/null
+++ b/testing/tests/regression-suite/235-Moz-REPORT.result
@@ -0,0 +1,61 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
+ETag: "c4532eec08793ee4b4f24deb4588f9be"
+Content-Length: 1521
+Content-Type: text/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:">
+ <response>
+  <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"e8060931f30c1798ac58ffbe4ec0bffc"</getetag>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">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
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+</multistatus>
diff --git a/testing/tests/regression-suite/235-Moz-REPORT.test b/testing/tests/regression-suite/235-Moz-REPORT.test
new file mode 100644
index 00000000..5add10f5
--- /dev/null
+++ b/testing/tests/regression-suite/235-Moz-REPORT.test
@@ -0,0 +1,30 @@
+#
+# Check for REPORT calendar-query of VEVENT within time range
+#
+TYPE=REPORT
+URL=http://mycaldav/caldav.php/user1/home/
+HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7
+HEADER=Accept: text/xml
+HEADER=Accept-Language: en-us,en;q=0.5
+HEADER=Accept-Encoding: gzip,deflate
+HEADER=Accept-Charset: utf-8,*;q=0.1
+HEADER=Content-Type: text/xml; charset=utf-8
+HEADER=Depth: 1
+HEAD
+
+BEGINDATA
+<?xml version="1.0" encoding="UTF-8"?>
+<calendar-query xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav">
+  <D:prop>
+    <D:getetag/>
+    <calendar-data/>
+  </D:prop>
+  <filter>
+    <comp-filter name="VCALENDAR">
+      <comp-filter name="VEVENT">
+        <time-range start="20071101T110000Z" end="20080104T110000Z"/>
+      </comp-filter>
+    </comp-filter>
+  </filter>
+</calendar-query>
+ENDDATA
diff --git a/testing/tests/regression-suite/236-Moz-REPORT.result b/testing/tests/regression-suite/236-Moz-REPORT.result
new file mode 100644
index 00000000..7dbe1231
--- /dev/null
+++ b/testing/tests/regression-suite/236-Moz-REPORT.result
@@ -0,0 +1,59 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access
+ETag: "55e79b5b5836290d5b3344ef8a16d10b"
+Content-Length: 1415
+Content-Type: text/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:">
+ <response>
+  <href>/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"8f581a053df6d833254756dfd7553d37"</getetag>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">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
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+</multistatus>
diff --git a/testing/tests/regression-suite/236-Moz-REPORT.test b/testing/tests/regression-suite/236-Moz-REPORT.test
new file mode 100644
index 00000000..5b1a6a8b
--- /dev/null
+++ b/testing/tests/regression-suite/236-Moz-REPORT.test
@@ -0,0 +1,30 @@
+#
+# Check for REPORT calendar-query of VTODO within time range
+#
+TYPE=REPORT
+URL=http://mycaldav/caldav.php/user1/home/
+HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7
+HEADER=Accept: text/xml
+HEADER=Accept-Language: en-us,en;q=0.5
+HEADER=Accept-Encoding: gzip,deflate
+HEADER=Accept-Charset: utf-8,*;q=0.1
+HEADER=Content-Type: text/xml; charset=utf-8
+HEADER=Depth: 1
+HEAD
+
+BEGINDATA
+<?xml version="1.0" encoding="UTF-8"?>
+<calendar-query xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav">
+  <D:prop>
+    <D:getetag/>
+    <calendar-data/>
+  </D:prop>
+  <filter>
+    <comp-filter name="VCALENDAR">
+      <comp-filter name="VTODO">
+        <time-range start="20071101T110000Z" end="20080104T110000Z"/>
+      </comp-filter>
+    </comp-filter>
+  </filter>
+</calendar-query>
+ENDDATA
diff --git a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
index c4513138..4cfe0a50 100644
--- a/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
+++ b/testing/tests/regression-suite/309-Chandler-PROPFIND-4.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access
-ETag: "f678e2f00e4582d963162b293e1e8ecb"
-Content-Length: 3609
+ETag: "307a9592c8e442356bbeb566b87f3de1"
+Content-Length: 4233
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -120,6 +120,28 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics</href>
+  <propstat>
+   <prop>
+    <resourcetype/>
+    <displayname>Release 0.9.3</displayname>
+    <getetag>"8f581a053df6d833254756dfd7553d37"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
+  <propstat>
+   <prop>
+    <resourcetype/>
+    <displayname>Morning Meeting</displayname>
+    <getetag>"e8060931f30c1798ac58ffbe4ec0bffc"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
   <propstat>
diff --git a/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result b/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
index 35a07746..a36eab0a 100644
--- a/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
+++ b/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
@@ -5,7 +5,7 @@
   <propstat>
    <prop>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-    <getcontentlength>9531</getcontentlength>
+    <getcontentlength>11663</getcontentlength>
     <resourcetype>
      <collection/>
      <C:calendar/>
diff --git a/testing/tests/regression-suite/504-iCal-PROPFIND.result b/testing/tests/regression-suite/504-iCal-PROPFIND.result
index 79aaf950..9da477a3 100644
--- a/testing/tests/regression-suite/504-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/504-iCal-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access
-ETag: "47e34444ff36653135bc516cd861b019"
-Content-Length: 3575
+ETag: "c6c4b54709e3dac67c5c7dd1d8bf30ea"
+Content-Length: 4107
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -130,6 +130,26 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics</href>
+  <propstat>
+   <prop>
+    <resourcetype/>
+    <getetag>"8f581a053df6d833254756dfd7553d37"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
+  <propstat>
+   <prop>
+    <resourcetype/>
+    <getetag>"e8060931f30c1798ac58ffbe4ec0bffc"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
   <propstat>
diff --git a/testing/tests/regression-suite/602-Soho-PROPFIND.result b/testing/tests/regression-suite/602-Soho-PROPFIND.result
index 76a93114..05ed9f72 100644
--- a/testing/tests/regression-suite/602-Soho-PROPFIND.result
+++ b/testing/tests/regression-suite/602-Soho-PROPFIND.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access
-ETag: "a8b240ec9481626730de7fffbc8cc5f8"
-Content-Length: 7461
+ETag: "9cd5b2172bdaa7cc59b004100c6fea86"
+Transfer-Encoding: chunked
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -217,6 +217,34 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics</href>
+  <propstat>
+   <prop>
+    <C:calendar-home-set>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-home-set>
+    <C:calendar-user-address-set>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-user-address-set>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
+  <propstat>
+   <prop>
+    <C:calendar-home-set>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-home-set>
+    <C:calendar-user-address-set>
+     <href>/caldav.php/user1/</href>
+    </C:calendar-user-address-set>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
   <propstat>
diff --git a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
index 7c8ff01a..3aae92d9 100644
--- a/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
+++ b/testing/tests/regression-suite/820-Spec-PROPFIND-1.result
@@ -6,7 +6,7 @@
    <prop>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-    <getcontentlength>10512</getcontentlength>
+    <getcontentlength>12644</getcontentlength>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
index 64403a0c..ddf9bea7 100644
--- a/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
+++ b/testing/tests/regression-suite/821-Spec-PROPFIND-2.result
@@ -13,7 +13,7 @@ Content-Type: text/xml; charset="utf-8"
    <prop>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-    <getcontentlength>10512</getcontentlength>
+    <getcontentlength>12644</getcontentlength>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
index 92c56d24..cbe7811e 100644
--- a/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
+++ b/testing/tests/regression-suite/822-Spec-PROPFIND-3.result
@@ -6,7 +6,7 @@
    <prop>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-    <getcontentlength>10512</getcontentlength>
+    <getcontentlength>12644</getcontentlength>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
     <resourcetype>
      <collection/>
@@ -350,6 +350,58 @@
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics</href>
+  <propstat>
+   <prop>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+    <getcontentlength>1013</getcontentlength>
+    <getcontenttype>text/calendar</getcontenttype>
+    <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
+    <resourcetype/>
+    <displayname>Release 0.9.3</displayname>
+    <getetag>"8f581a053df6d833254756dfd7553d37"</getetag>
+    <getcontentlanguage>en_NZ.UTF-8</getcontentlanguage>
+    <supportedlock>
+     <lockentry>
+      <lockscope>
+       <exclusive/>
+      </lockscope>
+      <locktype>
+       <write/>
+      </locktype>
+     </lockentry>
+    </supportedlock>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
+  <propstat>
+   <prop>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+    <getcontentlength>1119</getcontentlength>
+    <getcontenttype>text/calendar</getcontenttype>
+    <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
+    <resourcetype/>
+    <displayname>Morning Meeting</displayname>
+    <getetag>"e8060931f30c1798ac58ffbe4ec0bffc"</getetag>
+    <getcontentlanguage>en_NZ.UTF-8</getcontentlanguage>
+    <supportedlock>
+     <lockentry>
+      <lockscope>
+       <exclusive/>
+      </lockscope>
+      <locktype>
+       <write/>
+      </locktype>
+     </lockentry>
+    </supportedlock>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
   <propstat>
diff --git a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
index 9a033ee7..a623c299 100644
--- a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
+++ b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
@@ -14,7 +14,7 @@
     </C:supported-calendar-component-set>
     <getcontenttype>httpd/unix-directory</getcontenttype>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-    <getcontentlength>10512</getcontentlength>
+    <getcontentlength>12644</getcontentlength>
     <creationdate>Dow, 01 Jan 2000 00:00:00 GMT</creationdate>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/900-Moz-REPORT.result b/testing/tests/regression-suite/900-Moz-REPORT.result
index 3bb0dede..60c82457 100644
--- a/testing/tests/regression-suite/900-Moz-REPORT.result
+++ b/testing/tests/regression-suite/900-Moz-REPORT.result
@@ -1,10 +1,10 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access
-ETag: "add7fd32d70e4f7378b7aff4cf4e32e1"
-Content-Length: 7796
+ETag: "fea25d8795124283031b5cb5ecb29b04"
 Keep-Alive: timeout=15, max=100
 Connection: Keep-Alive
+Transfer-Encoding: chunked
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -258,6 +258,56 @@ STATUS:CONFIRMED
 SUMMARY:Morning Mgmt Mtg
 END:VEVENT
 END:VCALENDAR
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
+  <propstat>
+   <prop>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">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
 </calendar-data>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff --git a/testing/tests/regression-suite/901-GET-Collection.result b/testing/tests/regression-suite/901-GET-Collection.result
index d7d11678..408d4d2e 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, access-control, calendar-access
-Content-Length: 6340
+Content-Length: 7506
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
@@ -160,6 +160,42 @@ RRULE:FREQ=MONTHLY
 STATUS:CONFIRMED
 SUMMARY:Morning Mgmt Mtg
 END:VEVENT
+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
+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
 BEGIN:VEVENT
 CREATED:20061223T051646Z
 LAST-MODIFIED:20061223T051713Z