diff --git a/testing/tests/regression-suite/0509-iCal-PROPPATCH.result b/testing/tests/regression-suite/0509-iCal-PROPPATCH.result
index 5bcc3a69..19e98c58 100644
--- a/testing/tests/regression-suite/0509-iCal-PROPPATCH.result
+++ b/testing/tests/regression-suite/0509-iCal-PROPPATCH.result
@@ -2,19 +2,21 @@ 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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 326
+Content-Length: 359
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
- <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop>
-   <displayname/>
-  </prop>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop>
+    <displayname/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
 
   dav_displayname: >iCal Calendar<
diff --git a/testing/tests/regression-suite/0533-iCal4-PROPPATCH.result b/testing/tests/regression-suite/0533-iCal4-PROPPATCH.result
index 9d66073a..8c402b70 100644
--- a/testing/tests/regression-suite/0533-iCal4-PROPPATCH.result
+++ b/testing/tests/regression-suite/0533-iCal4-PROPPATCH.result
@@ -2,17 +2,19 @@ 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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 335
+Content-Length: 368
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:" xmlns:A="http://apple.com/ns/ical/">
- <href>/caldav.php/user1/home/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop>
-   <A:calendar-color/>
-  </prop>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop>
+    <A:calendar-color/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/0534-iCal4-PROPPATCH.result b/testing/tests/regression-suite/0534-iCal4-PROPPATCH.result
index 0bfeece6..7fc75786 100644
--- a/testing/tests/regression-suite/0534-iCal4-PROPPATCH.result
+++ b/testing/tests/regression-suite/0534-iCal4-PROPPATCH.result
@@ -2,17 +2,19 @@ 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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 335
+Content-Length: 368
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:" xmlns:A="http://apple.com/ns/ical/">
- <href>/caldav.php/user1/home/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop>
-   <A:calendar-order/>
-  </prop>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop>
+    <A:calendar-order/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/0535-iCal4-PROPPATCH.result b/testing/tests/regression-suite/0535-iCal4-PROPPATCH.result
index 2b88405e..ae30a24b 100644
--- a/testing/tests/regression-suite/0535-iCal4-PROPPATCH.result
+++ b/testing/tests/regression-suite/0535-iCal4-PROPPATCH.result
@@ -2,15 +2,17 @@ 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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 267
+Content-Length: 298
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
- <href>/caldav.php/user1/home/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop/>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop/>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/0606-Soho-PROPPATCH.result b/testing/tests/regression-suite/0606-Soho-PROPPATCH.result
index 7d04328e..d43daa70 100644
--- a/testing/tests/regression-suite/0606-Soho-PROPPATCH.result
+++ b/testing/tests/regression-suite/0606-Soho-PROPPATCH.result
@@ -3,20 +3,22 @@ Date: Dow, 01 Jan 2000 00:00:00 GMT
 Content-Location: /caldav.php/user1/SOHO%20collection/
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 424
+Content-Length: 459
 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" xmlns:X="com.apple.ical:">
- <href>/caldav.php/user1/SOHO%20collection/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop>
-   <displayname/>
-   <C:calendar-description/>
-   <X:calendarcolor/>
-  </prop>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user1/SOHO%20collection/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop>
+    <displayname/>
+    <C:calendar-description/>
+    <X:calendarcolor/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
 
diff --git a/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result b/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result
index b4eeb1fe..fdaa5eae 100644
--- a/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result
+++ b/testing/tests/regression-suite/0841-Spec-PROPPATCH-2.result
@@ -2,22 +2,24 @@ 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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 448
+Content-Length: 484
 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" xmlns:D="urn:mcmillan:bogus:xml:ns:davical">
- <href>/caldav.php/user1/home/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop>
-   <resourcetype/>
-   <displayname/>
-   <C:schedule-calendar-transp/>
-   <D:arbitrary/>
-  </prop>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop>
+    <resourcetype/>
+    <displayname/>
+    <C:schedule-calendar-transp/>
+    <D:arbitrary/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
 
   changed_last_5m: >1<
diff --git a/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result b/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result
index b9b17217..24e006c5 100644
--- a/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result
+++ b/testing/tests/regression-suite/0844-Spec-PROPPATCH-addressbook.result
@@ -2,20 +2,22 @@ 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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 313
+Content-Length: 347
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
- <href>/caldav.php/user1/home/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop>
-   <resourcetype/>
-   <displayname/>
-  </prop>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop>
+    <resourcetype/>
+    <displayname/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
 
   changed_last_5m: >1<
diff --git a/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.result b/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.result
index 2c9fb899..62bc567d 100644
--- a/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.result
+++ b/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.result
@@ -2,21 +2,23 @@ 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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 374
+Content-Length: 409
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:" xmlns:D="http://dotcal.com/principal-properties">
- <href>/caldav.php/user1/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop>
-   <D:country/>
-   <D:countrycode/>
-   <displayname/>
-  </prop>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user1/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop>
+    <D:country/>
+    <D:countrycode/>
+    <displayname/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
 
       displayname: >User Number One PROPPATCH'd in<
diff --git a/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.result b/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.result
index a7f9cf5a..106e9e74 100644
--- a/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.result
+++ b/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.result
@@ -2,21 +2,23 @@ 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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 374
+Content-Length: 409
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:" xmlns:D="http://dotcal.com/principal-properties">
- <href>/caldav.php/user1/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop>
-   <displayname/>
-   <D:country/>
-   <D:countrycode/>
-  </prop>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user1/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop>
+    <displayname/>
+    <D:country/>
+    <D:countrycode/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
 
       displayname: >User 1<
diff --git a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result
index 07f7e52e..d451ba8e 100644
--- a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result
+++ b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result
@@ -2,23 +2,25 @@ 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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 462
+Content-Length: 499
 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" xmlns:X="http://xmlns.comical.net/birds">
- <href>/caldav.php/user1/home/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop>
-   <resourcetype/>
-   <displayname/>
-   <C:schedule-calendar-transp/>
-   <X:spotted-grebe/>
-   <C:cats/>
-  </prop>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop>
+    <resourcetype/>
+    <displayname/>
+    <C:schedule-calendar-transp/>
+    <X:spotted-grebe/>
+    <C:cats/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
 
   changed_last_5m: >1<
diff --git a/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.result b/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.result
index 208413b8..b0272a3c 100644
--- a/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.result
+++ b/testing/tests/regression-suite/0848-Spec-PROPPATCH-calendar.result
@@ -2,21 +2,23 @@ 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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-Content-Length: 386
+Content-Length: 421
 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">
- <href>/caldav.php/user1/home/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop>
-   <resourcetype/>
-   <displayname/>
-   <C:schedule-calendar-transp/>
-  </prop>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop>
+    <resourcetype/>
+    <displayname/>
+    <C:schedule-calendar-transp/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
 
   changed_last_5m: >1<