diff --git a/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result b/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
new file mode 100644
index 00000000..2da77e1c
--- /dev/null
+++ b/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
@@ -0,0 +1,8 @@
+HTTP/1.1 400 Bad Request
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+Server: Apache/2.2.3 (Debian) DAV/2
+Content-Length: 46
+Connection: close
+Content-Type: text/plain; charset=UTF-8
+
+The calendar path contains illegal characters.
\ No newline at end of file
diff --git a/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.test b/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.test
new file mode 100644
index 00000000..3e9f3430
--- /dev/null
+++ b/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.test
@@ -0,0 +1,5 @@
+#
+# Do an OPTIONS request for an illegal path
+TYPE=OPTIONS
+URL=http://mycaldav/caldav.php/(admin|user1)/
+HEAD
diff --git a/testing/tests/regression-suite/102-Evo-REPORT-1.result b/testing/tests/regression-suite/102-Evo-REPORT-1.result
index 076f7ac4..9f120952 100644
--- a/testing/tests/regression-suite/102-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/102-Evo-REPORT-1.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
-ETag: "2f3549ea9f16d378e166f2945a12cc59"
-Content-Length: 863
+ETag: "999029ee508d00d69a8251bc727d6e52"
+Content-Length: 600
 Content-Type: text/xml;charset=UTF-8
 
 <?xml version="1.0" encoding="UTF-8" ?>
@@ -25,13 +25,4 @@ Content-Type: text/xml;charset=UTF-8
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <response>
-  <href>http://mycaldav/caldav.php/resource2/home/0A5EA1F0F2691A03E917E85F9F255448-0.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"75a75e1c7c4546074aab7645b5323738"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/105-Evo-REPORT-1.result b/testing/tests/regression-suite/105-Evo-REPORT-1.result
index 03bdf71f..031bf2a3 100644
--- a/testing/tests/regression-suite/105-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/105-Evo-REPORT-1.result
@@ -1,8 +1,8 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 Server: Apache/2.2.3 (Debian) DAV/2
-ETag: "253b4eea9667741215d44f5836286543"
-Content-Length: 1104
+ETag: "aec354a7e336855131053ef08ca190b8"
+Content-Length: 841
 Content-Type: text/xml;charset=UTF-8
 
 <?xml version="1.0" encoding="UTF-8" ?>
@@ -25,15 +25,6 @@ Content-Type: text/xml;charset=UTF-8
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <response>
-  <href>http://mycaldav/caldav.php/resource2/home/0A5EA1F0F2691A03E917E85F9F255448-0.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"75a75e1c7c4546074aab7645b5323738"</getetag>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
  <response>
   <href>http://mycaldav/caldav.php/user1/home/20061101T073004Z.ics</href>
   <propstat>
diff --git a/testing/tests/regression-suite/200-Moz-OPTIONS-1.result b/testing/tests/regression-suite/200-Moz-OPTIONS-1.result
new file mode 100644
index 00000000..5a1ebc93
--- /dev/null
+++ b/testing/tests/regression-suite/200-Moz-OPTIONS-1.result
@@ -0,0 +1,8 @@
+HTTP/1.1 401 Unauthorized
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+Server: Apache/2.2.3 (Debian) DAV/2
+WWW-Authenticate: Basic realm="Really Simple CalDAV Store"
+Content-Length: 40
+Content-Type: text/html; charset=UTF-8
+
+Please log in for access to this system.
\ No newline at end of file
diff --git a/testing/tests/regression-suite/200-Moz-OPTIONS-1.test b/testing/tests/regression-suite/200-Moz-OPTIONS-1.test
new file mode 100644
index 00000000..636a80ce
--- /dev/null
+++ b/testing/tests/regression-suite/200-Moz-OPTIONS-1.test
@@ -0,0 +1,14 @@
+#
+# Do an initial OPTIONS request (unauthenticated)
+# ... actually, Mozilla Calendar doesn't do this, but no doubt they will.
+TYPE=OPTIONS
+URL=http://mycaldav/caldav.php/user1/home/
+NOAUTH
+
+HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.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-Encoding: gzip,deflate
+HEADER=Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7
+
+HEAD
diff --git a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
new file mode 100644
index 00000000..71204932
--- /dev/null
+++ b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
@@ -0,0 +1,8 @@
+HTTP/1.1 200 OK
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+Server: Apache/2.2.3 (Debian) DAV/2
+Content-length: 0
+Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, REPORT, MKCALENDAR, MKCOL
+DAV: 1, 2, access-control, calendar-access
+Content-Type: text/plain; charset=UTF-8
+
diff --git a/testing/tests/regression-suite/201-Moz-OPTIONS-2.test b/testing/tests/regression-suite/201-Moz-OPTIONS-2.test
new file mode 100644
index 00000000..65bfaadd
--- /dev/null
+++ b/testing/tests/regression-suite/201-Moz-OPTIONS-2.test
@@ -0,0 +1,13 @@
+#
+# Do an initial OPTIONS request (authenticated)
+# ... actually, Mozilla Calendar doesn't do this, but no doubt they will.
+TYPE=OPTIONS
+URL=http://mycaldav/caldav.php/user1/home/
+
+HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.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-Encoding: gzip,deflate
+HEADER=Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7
+
+HEAD
diff --git a/testing/tests/regression-suite/202-Moz-REPORT-1.data b/testing/tests/regression-suite/202-Moz-REPORT-1.data
new file mode 100644
index 00000000..c27d131e
--- /dev/null
+++ b/testing/tests/regression-suite/202-Moz-REPORT-1.data
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<calendar-query xmlns:D="DAV:" xmlns="urn:ietf:params:xml:ns:caldav">
+  <D:prop>
+    <calendar-data/>
+  </D:prop>
+  <filter>
+    <comp-filter name="VCALENDAR">
+      <comp-filter name="VEVENT">
+        <time-range start="20061009T003736Z" end="20061209T003736Z"/>
+      </comp-filter>
+    </comp-filter>
+  </filter>
+</calendar-query>
diff --git a/testing/tests/regression-suite/202-Moz-REPORT-1.result b/testing/tests/regression-suite/202-Moz-REPORT-1.result
new file mode 100644
index 00000000..5a1ebc93
--- /dev/null
+++ b/testing/tests/regression-suite/202-Moz-REPORT-1.result
@@ -0,0 +1,8 @@
+HTTP/1.1 401 Unauthorized
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+Server: Apache/2.2.3 (Debian) DAV/2
+WWW-Authenticate: Basic realm="Really Simple CalDAV Store"
+Content-Length: 40
+Content-Type: text/html; charset=UTF-8
+
+Please log in for access to this system.
\ No newline at end of file
diff --git a/testing/tests/regression-suite/202-Moz-REPORT-1.test b/testing/tests/regression-suite/202-Moz-REPORT-1.test
new file mode 100644
index 00000000..a033aa9a
--- /dev/null
+++ b/testing/tests/regression-suite/202-Moz-REPORT-1.test
@@ -0,0 +1,14 @@
+#
+# Do a REPORT request (unauthenticated)
+TYPE=REPORT
+URL=http://mycaldav/caldav.php/user1/home/
+HEAD
+NOAUTH
+
+HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.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-Encoding: gzip,deflate
+HEADER=Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7
+HEADER=Content-Type: text/xml
+HEADER=Depth: 1
diff --git a/testing/tests/regression-suite/203-Moz-REPORT-2.result b/testing/tests/regression-suite/203-Moz-REPORT-2.result
new file mode 100644
index 00000000..0a2fa3f9
--- /dev/null
+++ b/testing/tests/regression-suite/203-Moz-REPORT-2.result
@@ -0,0 +1,140 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+Server: Apache/2.2.3 (Debian) DAV/2
+ETag: "fd732c9a953ce0156398d02d133c059f"
+Content-Length: 3373
+Content-Type: text/xml;charset=UTF-8
+
+<?xml version="1.0" encoding="UTF-8" ?>
+<multistatus xmlns="DAV:">
+ <response>
+  <href>http://mycaldav/caldav.php/user1/home/20061101T073004Z.ics</href>
+  <propstat>
+   <prop>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//Ximian//NONSGML Evolution Calendar//EN
+VERSION:2.0
+BEGIN:VEVENT
+UID:20061101T073000Z-10468-1000-1-7@ubu
+DTSTAMP:20061101T073000Z
+DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
+ 20061101T100000
+DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
+ 20061101T110000
+SUMMARY:A Meeting
+X-EVOLUTION-CALDAV-HREF:http:
+ //user1@mycaldav/caldav.php/user1/home/20061101T073004Z.ics
+BEGIN:VALARM
+X-EVOLUTION-ALARM-UID:20061101T073000Z-10480-1000-1-5@ubu
+ACTION:DISPLAY
+TRIGGER;VALUE=DURATION;RELATED=START:-PT15M
+DESCRIPTION:A Meeting
+END:VALARM
+END:VEVENT
+BEGIN:VTIMEZONE
+TZID:/softwarestudio.org/Olson_20011030_5/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
+END:VCALENDAR
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>http://mycaldav/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
+  <propstat>
+   <prop>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+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:20061102T090217Z
+DTSTART;TZID=New Zealand Standard Time:20061103T123000
+DURATION:PT1H
+SUMMARY:Lunch with David
+UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
+END:VEVENT
+END:VCALENDAR
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>http://mycaldav/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics</href>
+  <propstat>
+   <prop>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">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
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+</multistatus>
diff --git a/testing/tests/regression-suite/203-Moz-REPORT-2.test b/testing/tests/regression-suite/203-Moz-REPORT-2.test
new file mode 100644
index 00000000..33e257b5
--- /dev/null
+++ b/testing/tests/regression-suite/203-Moz-REPORT-2.test
@@ -0,0 +1,15 @@
+#
+# Do a REPORT request (authenticated)
+TYPE=REPORT
+URL=http://mycaldav/caldav.php/user1/home/
+HEAD
+
+HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.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-Encoding: gzip,deflate
+HEADER=Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7
+HEADER=Content-Type: text/xml
+HEADER=Depth: 1
+
+DATA=202-Moz-REPORT-1
diff --git a/testing/tests/regression-suite/204-Moz-REPORT-3.result b/testing/tests/regression-suite/204-Moz-REPORT-3.result
new file mode 100644
index 00000000..35a55620
--- /dev/null
+++ b/testing/tests/regression-suite/204-Moz-REPORT-3.result
@@ -0,0 +1,52 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+Server: Apache/2.2.3 (Debian) DAV/2
+ETag: "f6d6b5d2136d5389ced4ca2e75c96323"
+Content-Length: 1110
+Content-Type: text/xml;charset=UTF-8
+
+<?xml version="1.0" encoding="UTF-8" ?>
+<multistatus xmlns="DAV:">
+ <response>
+  <href>http://mycaldav/caldav.php/resource2/home/0A5EA1F0F2691A03E917E85F9F255448-0.ics</href>
+  <propstat>
+   <prop>
+    <calendar-data xmlns="urn:ietf:params:xml:ns:caldav">BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+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:20061108T113035Z
+DTSTART;TZID=New Zealand Standard Time:20061030T100000
+DURATION:PT1H
+LAST-MODIFIED:20061108T113044Z
+SEQUENCE:1
+SUMMARY:Booking resource 2
+UID:C8344958F0CC35344E063A04@D76FAF7B10D9E8D2D41F779C
+END:VEVENT
+END:VCALENDAR
+</calendar-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+</multistatus>
diff --git a/testing/tests/regression-suite/204-Moz-REPORT-3.test b/testing/tests/regression-suite/204-Moz-REPORT-3.test
new file mode 100644
index 00000000..2ece44a4
--- /dev/null
+++ b/testing/tests/regression-suite/204-Moz-REPORT-3.test
@@ -0,0 +1,15 @@
+#
+# Do a REPORT request for another user's calendar
+TYPE=REPORT
+URL=http://mycaldav/caldav.php/resource2/home/
+HEAD
+
+HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.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-Encoding: gzip,deflate
+HEADER=Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7
+HEADER=Content-Type: text/xml
+HEADER=Depth: 1
+
+DATA=202-Moz-REPORT-1