diff --git a/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result b/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
index ac7acaa0..e7550e19 100644
--- a/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
+++ b/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
@@ -1,7 +1,17 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy
-Content-Length: 36
-Content-Type: text/plain; charset="utf-8"
+Content-Length: 219
+Content-Type: text/xml; charset="utf-8"
 
-You may not create a calendar there.
\ No newline at end of file
+<?xml version="1.0" encoding="utf-8" ?>
+<error xmlns="DAV:">
+ <need-privileges>
+  <resource>
+   <href>/caldav.php/admin/home/</href>
+   <privilege>
+    <bind/>
+   </privilege>
+  </resource>
+ </need-privileges>
+</error>
diff --git a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
index c293c701..aec0fae7 100644
--- a/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
+++ b/testing/tests/regression-suite/824-Spec-PROPFIND-5.result
@@ -13,6 +13,16 @@
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
     <creationdate>YYYY-MM-DDThh:mm:ss+ZZ:ZZ</creationdate>
     <getcontentlanguage/>
+    <supportedlock>
+     <lockentry>
+      <lockscope>
+       <exclusive/>
+      </lockscope>
+      <locktype>
+       <write/>
+      </locktype>
+     </lockentry>
+    </supportedlock>
     <owner>
      <href>/caldav.php/user1/</href>
     </owner>
diff --git a/testing/tests/regression-suite/825-Spec-PROPFIND-6.result b/testing/tests/regression-suite/825-Spec-PROPFIND-6.result
index d15003f7..a09a1c16 100644
--- a/testing/tests/regression-suite/825-Spec-PROPFIND-6.result
+++ b/testing/tests/regression-suite/825-Spec-PROPFIND-6.result
@@ -12,6 +12,16 @@
     <creationdate>YYYY-MM-DDThh:mm:ss+ZZ:ZZ</creationdate>
     <getetag>421abf7e4848d2fecbf64217ed205d4b</getetag>
     <getcontentlanguage/>
+    <supportedlock>
+     <lockentry>
+      <lockscope>
+       <exclusive/>
+      </lockscope>
+      <locktype>
+       <write/>
+      </locktype>
+     </lockentry>
+    </supportedlock>
     <owner>
      <href>/caldav.php/user1/</href>
     </owner>
diff --git a/testing/tests/regression-suite/827-Spec-PROPFIND.result b/testing/tests/regression-suite/827-Spec-PROPFIND.result
index b1830d92..fdd74855 100644
--- a/testing/tests/regression-suite/827-Spec-PROPFIND.result
+++ b/testing/tests/regression-suite/827-Spec-PROPFIND.result
@@ -227,89 +227,6 @@
   <href>/manager1/</href>
   <propstat>
    <prop>
-    <acl>
-     <ace>
-      <principal>
-       <authenticated/>
-      </principal>
-      <grant>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
-      </grant>
-     </ace>
-     <ace>
-      <principal>
-       <href>/assistant1/</href>
-      </principal>
-      <grant>
-       <privilege>
-        <read/>
-       </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <write/>
-       </privilege>
-       <privilege>
-        <write-properties/>
-       </privilege>
-       <privilege>
-        <write-content/>
-       </privilege>
-       <privilege>
-        <bind/>
-       </privilege>
-       <privilege>
-        <unbind/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-      </grant>
-     </ace>
-     <ace>
-      <principal>
-       <href>/teamclient1/</href>
-      </principal>
-      <grant>
-       <privilege>
-        <read/>
-       </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-      </grant>
-     </ace>
-    </acl>
     <creationdate>YYYY-MM-DDThh:mm:ss+ZZ:ZZ</creationdate>
     <displayname>Manager 1</displayname>
     <getcontentlanguage/>
@@ -332,6 +249,12 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <acl/>
+   </prop>
+   <status>HTTP/1.1 403 Forbidden</status>
+  </propstat>
   <propstat>
    <prop>
     <getcontentlength/>
@@ -348,58 +271,6 @@
   <href>/assistant1/</href>
   <propstat>
    <prop>
-    <acl>
-     <ace>
-      <principal>
-       <authenticated/>
-      </principal>
-      <grant>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-deliver-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-       <privilege>
-        <C:schedule-send/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-invite/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-reply/>
-       </privilege>
-       <privilege>
-        <C:schedule-send-freebusy/>
-       </privilege>
-      </grant>
-     </ace>
-     <ace>
-      <principal>
-       <href>/teamclient1/</href>
-      </principal>
-      <grant>
-       <privilege>
-        <read/>
-       </privilege>
-       <privilege>
-        <C:read-free-busy/>
-       </privilege>
-       <privilege>
-        <C:schedule-query-freebusy/>
-       </privilege>
-      </grant>
-     </ace>
-    </acl>
     <creationdate>YYYY-MM-DDThh:mm:ss+ZZ:ZZ</creationdate>
     <displayname>Assistant 1</displayname>
     <getcontentlanguage/>
@@ -422,6 +293,12 @@
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <acl/>
+   </prop>
+   <status>HTTP/1.1 403 Forbidden</status>
+  </propstat>
   <propstat>
    <prop>
     <getcontentlength/>
diff --git a/testing/tests/regression-suite/833-freebusy.result b/testing/tests/regression-suite/833-freebusy.result
index fabe30a0..dbfbbaf0 100644
--- a/testing/tests/regression-suite/833-freebusy.result
+++ b/testing/tests/regression-suite/833-freebusy.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 14409
+Content-Length: 2670
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
@@ -67,278 +67,5 @@ FREEBUSY:20070302T053000Z/20070302T073000Z
 FREEBUSY:20070402T063000Z/20070402T083000Z
 FREEBUSY:20070502T063000Z/20070502T083000Z
 FREEBUSY:20070602T063000Z/20070602T083000Z
-FREEBUSY:20061001T090000Z/20061001T100000Z
-FREEBUSY:20061002T090000Z/20061002T100000Z
-FREEBUSY:20061003T090000Z/20061003T100000Z
-FREEBUSY:20061004T090000Z/20061004T100000Z
-FREEBUSY:20061005T090000Z/20061005T100000Z
-FREEBUSY:20061006T090000Z/20061006T100000Z
-FREEBUSY:20061007T090000Z/20061007T100000Z
-FREEBUSY:20061008T090000Z/20061008T100000Z
-FREEBUSY:20061009T090000Z/20061009T100000Z
-FREEBUSY:20061010T090000Z/20061010T100000Z
-FREEBUSY:20061011T090000Z/20061011T100000Z
-FREEBUSY:20061012T090000Z/20061012T100000Z
-FREEBUSY:20061013T090000Z/20061013T100000Z
-FREEBUSY:20061014T090000Z/20061014T100000Z
-FREEBUSY:20061015T090000Z/20061015T100000Z
-FREEBUSY:20061016T090000Z/20061016T100000Z
-FREEBUSY:20061017T090000Z/20061017T100000Z
-FREEBUSY:20061018T090000Z/20061018T100000Z
-FREEBUSY:20061019T090000Z/20061019T100000Z
-FREEBUSY:20061020T090000Z/20061020T100000Z
-FREEBUSY:20061021T090000Z/20061021T100000Z
-FREEBUSY:20061022T090000Z/20061022T100000Z
-FREEBUSY:20061023T090000Z/20061023T100000Z
-FREEBUSY:20061024T090000Z/20061024T100000Z
-FREEBUSY:20061025T090000Z/20061025T100000Z
-FREEBUSY:20061026T090000Z/20061026T100000Z
-FREEBUSY:20061027T090000Z/20061027T100000Z
-FREEBUSY:20061028T090000Z/20061028T100000Z
-FREEBUSY:20061029T090000Z/20061029T100000Z
-FREEBUSY:20061030T090000Z/20061030T100000Z
-FREEBUSY:20061031T090000Z/20061031T100000Z
-FREEBUSY:20061101T090000Z/20061101T100000Z
-FREEBUSY:20061102T090000Z/20061102T100000Z
-FREEBUSY:20061103T090000Z/20061103T100000Z
-FREEBUSY:20061104T090000Z/20061104T100000Z
-FREEBUSY:20061105T090000Z/20061105T100000Z
-FREEBUSY:20061106T090000Z/20061106T100000Z
-FREEBUSY:20061107T090000Z/20061107T100000Z
-FREEBUSY:20061108T090000Z/20061108T100000Z
-FREEBUSY:20061109T090000Z/20061109T100000Z
-FREEBUSY:20061110T090000Z/20061110T100000Z
-FREEBUSY:20061111T090000Z/20061111T100000Z
-FREEBUSY:20061112T090000Z/20061112T100000Z
-FREEBUSY:20061113T090000Z/20061113T100000Z
-FREEBUSY:20061114T090000Z/20061114T100000Z
-FREEBUSY:20061115T090000Z/20061115T100000Z
-FREEBUSY:20061116T090000Z/20061116T100000Z
-FREEBUSY:20061117T090000Z/20061117T100000Z
-FREEBUSY:20061118T090000Z/20061118T100000Z
-FREEBUSY:20061119T090000Z/20061119T100000Z
-FREEBUSY:20061120T090000Z/20061120T100000Z
-FREEBUSY:20061121T090000Z/20061121T100000Z
-FREEBUSY:20061122T090000Z/20061122T100000Z
-FREEBUSY:20061123T090000Z/20061123T100000Z
-FREEBUSY:20061124T090000Z/20061124T100000Z
-FREEBUSY:20061125T090000Z/20061125T100000Z
-FREEBUSY:20061126T090000Z/20061126T100000Z
-FREEBUSY:20061127T090000Z/20061127T100000Z
-FREEBUSY:20061128T090000Z/20061128T100000Z
-FREEBUSY:20061129T090000Z/20061129T100000Z
-FREEBUSY:20061130T090000Z/20061130T100000Z
-FREEBUSY:20061201T090000Z/20061201T100000Z
-FREEBUSY:20061202T090000Z/20061202T100000Z
-FREEBUSY:20061203T090000Z/20061203T100000Z
-FREEBUSY:20061204T090000Z/20061204T100000Z
-FREEBUSY:20061205T090000Z/20061205T100000Z
-FREEBUSY:20061206T090000Z/20061206T100000Z
-FREEBUSY:20061207T090000Z/20061207T100000Z
-FREEBUSY:20061208T090000Z/20061208T100000Z
-FREEBUSY:20061209T090000Z/20061209T100000Z
-FREEBUSY:20061210T090000Z/20061210T100000Z
-FREEBUSY:20061211T090000Z/20061211T100000Z
-FREEBUSY:20061212T090000Z/20061212T100000Z
-FREEBUSY:20061213T090000Z/20061213T100000Z
-FREEBUSY:20061214T090000Z/20061214T100000Z
-FREEBUSY:20061215T090000Z/20061215T100000Z
-FREEBUSY:20061216T090000Z/20061216T100000Z
-FREEBUSY:20061217T090000Z/20061217T100000Z
-FREEBUSY:20061218T090000Z/20061218T100000Z
-FREEBUSY:20061219T090000Z/20061219T100000Z
-FREEBUSY:20061220T090000Z/20061220T100000Z
-FREEBUSY:20061221T090000Z/20061221T100000Z
-FREEBUSY:20061222T090000Z/20061222T100000Z
-FREEBUSY:20061223T090000Z/20061223T100000Z
-FREEBUSY:20061224T090000Z/20061224T100000Z
-FREEBUSY:20061225T090000Z/20061225T100000Z
-FREEBUSY:20061226T090000Z/20061226T100000Z
-FREEBUSY:20061227T090000Z/20061227T100000Z
-FREEBUSY:20061228T090000Z/20061228T100000Z
-FREEBUSY:20061229T090000Z/20061229T100000Z
-FREEBUSY:20061230T090000Z/20061230T100000Z
-FREEBUSY:20061231T090000Z/20061231T100000Z
-FREEBUSY:20070101T090000Z/20070101T100000Z
-FREEBUSY:20070102T090000Z/20070102T100000Z
-FREEBUSY:20070103T090000Z/20070103T100000Z
-FREEBUSY:20070104T090000Z/20070104T100000Z
-FREEBUSY:20070105T090000Z/20070105T100000Z
-FREEBUSY:20070106T090000Z/20070106T100000Z
-FREEBUSY:20070107T090000Z/20070107T100000Z
-FREEBUSY:20070108T090000Z/20070108T100000Z
-FREEBUSY:20070109T090000Z/20070109T100000Z
-FREEBUSY:20070110T090000Z/20070110T100000Z
-FREEBUSY:20070111T090000Z/20070111T100000Z
-FREEBUSY:20070112T090000Z/20070112T100000Z
-FREEBUSY:20070113T090000Z/20070113T100000Z
-FREEBUSY:20070114T090000Z/20070114T100000Z
-FREEBUSY:20070115T090000Z/20070115T100000Z
-FREEBUSY:20070116T090000Z/20070116T100000Z
-FREEBUSY:20070117T090000Z/20070117T100000Z
-FREEBUSY:20070118T090000Z/20070118T100000Z
-FREEBUSY:20070119T090000Z/20070119T100000Z
-FREEBUSY:20070120T090000Z/20070120T100000Z
-FREEBUSY:20070121T090000Z/20070121T100000Z
-FREEBUSY:20070122T090000Z/20070122T100000Z
-FREEBUSY:20070123T090000Z/20070123T100000Z
-FREEBUSY:20070124T090000Z/20070124T100000Z
-FREEBUSY:20070125T090000Z/20070125T100000Z
-FREEBUSY:20070126T090000Z/20070126T100000Z
-FREEBUSY:20070127T090000Z/20070127T100000Z
-FREEBUSY:20070128T090000Z/20070128T100000Z
-FREEBUSY:20070129T090000Z/20070129T100000Z
-FREEBUSY:20070130T090000Z/20070130T100000Z
-FREEBUSY:20070131T090000Z/20070131T100000Z
-FREEBUSY:20070201T090000Z/20070201T100000Z
-FREEBUSY:20070202T090000Z/20070202T100000Z
-FREEBUSY:20070203T090000Z/20070203T100000Z
-FREEBUSY:20070204T090000Z/20070204T100000Z
-FREEBUSY:20070205T090000Z/20070205T100000Z
-FREEBUSY:20070206T090000Z/20070206T100000Z
-FREEBUSY:20070207T090000Z/20070207T100000Z
-FREEBUSY:20070208T090000Z/20070208T100000Z
-FREEBUSY:20070209T090000Z/20070209T100000Z
-FREEBUSY:20070210T090000Z/20070210T100000Z
-FREEBUSY:20070211T090000Z/20070211T100000Z
-FREEBUSY:20070212T090000Z/20070212T100000Z
-FREEBUSY:20070213T090000Z/20070213T100000Z
-FREEBUSY:20070214T090000Z/20070214T100000Z
-FREEBUSY:20070215T090000Z/20070215T100000Z
-FREEBUSY:20070216T090000Z/20070216T100000Z
-FREEBUSY:20070217T090000Z/20070217T100000Z
-FREEBUSY:20070218T090000Z/20070218T100000Z
-FREEBUSY:20070219T090000Z/20070219T100000Z
-FREEBUSY:20070220T090000Z/20070220T100000Z
-FREEBUSY:20070221T090000Z/20070221T100000Z
-FREEBUSY:20070222T090000Z/20070222T100000Z
-FREEBUSY:20070223T090000Z/20070223T100000Z
-FREEBUSY:20070224T090000Z/20070224T100000Z
-FREEBUSY:20070225T090000Z/20070225T100000Z
-FREEBUSY:20070226T090000Z/20070226T100000Z
-FREEBUSY:20070227T090000Z/20070227T100000Z
-FREEBUSY:20070228T090000Z/20070228T100000Z
-FREEBUSY:20070301T090000Z/20070301T100000Z
-FREEBUSY:20070302T090000Z/20070302T100000Z
-FREEBUSY:20070303T090000Z/20070303T100000Z
-FREEBUSY:20070304T090000Z/20070304T100000Z
-FREEBUSY:20070305T090000Z/20070305T100000Z
-FREEBUSY:20070306T090000Z/20070306T100000Z
-FREEBUSY:20070307T090000Z/20070307T100000Z
-FREEBUSY:20070308T090000Z/20070308T100000Z
-FREEBUSY:20070309T090000Z/20070309T100000Z
-FREEBUSY:20070310T090000Z/20070310T100000Z
-FREEBUSY:20070311T090000Z/20070311T100000Z
-FREEBUSY:20070312T090000Z/20070312T100000Z
-FREEBUSY:20070313T090000Z/20070313T100000Z
-FREEBUSY:20070314T090000Z/20070314T100000Z
-FREEBUSY:20070315T090000Z/20070315T100000Z
-FREEBUSY:20070316T090000Z/20070316T100000Z
-FREEBUSY:20070317T090000Z/20070317T100000Z
-FREEBUSY:20070318T100000Z/20070318T110000Z
-FREEBUSY:20070319T100000Z/20070319T110000Z
-FREEBUSY:20070320T100000Z/20070320T110000Z
-FREEBUSY:20070321T100000Z/20070321T110000Z
-FREEBUSY:20070322T100000Z/20070322T110000Z
-FREEBUSY:20070323T100000Z/20070323T110000Z
-FREEBUSY:20070324T100000Z/20070324T110000Z
-FREEBUSY:20070325T100000Z/20070325T110000Z
-FREEBUSY:20070326T100000Z/20070326T110000Z
-FREEBUSY:20070327T100000Z/20070327T110000Z
-FREEBUSY:20070328T100000Z/20070328T110000Z
-FREEBUSY:20070329T100000Z/20070329T110000Z
-FREEBUSY:20070330T100000Z/20070330T110000Z
-FREEBUSY:20070331T100000Z/20070331T110000Z
-FREEBUSY:20070401T100000Z/20070401T110000Z
-FREEBUSY:20070402T100000Z/20070402T110000Z
-FREEBUSY:20070403T100000Z/20070403T110000Z
-FREEBUSY:20070404T100000Z/20070404T110000Z
-FREEBUSY:20070405T100000Z/20070405T110000Z
-FREEBUSY:20070406T100000Z/20070406T110000Z
-FREEBUSY:20070407T100000Z/20070407T110000Z
-FREEBUSY:20070408T100000Z/20070408T110000Z
-FREEBUSY:20070409T100000Z/20070409T110000Z
-FREEBUSY:20070410T100000Z/20070410T110000Z
-FREEBUSY:20070411T100000Z/20070411T110000Z
-FREEBUSY:20070412T100000Z/20070412T110000Z
-FREEBUSY:20070413T100000Z/20070413T110000Z
-FREEBUSY:20070414T100000Z/20070414T110000Z
-FREEBUSY:20070415T100000Z/20070415T110000Z
-FREEBUSY:20070416T100000Z/20070416T110000Z
-FREEBUSY:20070417T100000Z/20070417T110000Z
-FREEBUSY:20070418T100000Z/20070418T110000Z
-FREEBUSY:20070419T100000Z/20070419T110000Z
-FREEBUSY:20070420T100000Z/20070420T110000Z
-FREEBUSY:20070421T100000Z/20070421T110000Z
-FREEBUSY:20070422T100000Z/20070422T110000Z
-FREEBUSY:20070423T100000Z/20070423T110000Z
-FREEBUSY:20070424T100000Z/20070424T110000Z
-FREEBUSY:20070425T100000Z/20070425T110000Z
-FREEBUSY:20070426T100000Z/20070426T110000Z
-FREEBUSY:20070427T100000Z/20070427T110000Z
-FREEBUSY:20070428T100000Z/20070428T110000Z
-FREEBUSY:20070429T100000Z/20070429T110000Z
-FREEBUSY:20070430T100000Z/20070430T110000Z
-FREEBUSY:20070501T100000Z/20070501T110000Z
-FREEBUSY:20070502T100000Z/20070502T110000Z
-FREEBUSY:20070503T100000Z/20070503T110000Z
-FREEBUSY:20070504T100000Z/20070504T110000Z
-FREEBUSY:20070505T100000Z/20070505T110000Z
-FREEBUSY:20070506T100000Z/20070506T110000Z
-FREEBUSY:20070507T100000Z/20070507T110000Z
-FREEBUSY:20070508T100000Z/20070508T110000Z
-FREEBUSY:20070509T100000Z/20070509T110000Z
-FREEBUSY:20070510T100000Z/20070510T110000Z
-FREEBUSY:20070511T100000Z/20070511T110000Z
-FREEBUSY:20070512T100000Z/20070512T110000Z
-FREEBUSY:20070513T100000Z/20070513T110000Z
-FREEBUSY:20070514T100000Z/20070514T110000Z
-FREEBUSY:20070515T100000Z/20070515T110000Z
-FREEBUSY:20070516T100000Z/20070516T110000Z
-FREEBUSY:20070517T100000Z/20070517T110000Z
-FREEBUSY:20070518T100000Z/20070518T110000Z
-FREEBUSY:20070519T100000Z/20070519T110000Z
-FREEBUSY:20070520T100000Z/20070520T110000Z
-FREEBUSY:20070521T100000Z/20070521T110000Z
-FREEBUSY:20070522T100000Z/20070522T110000Z
-FREEBUSY:20070523T100000Z/20070523T110000Z
-FREEBUSY:20070524T100000Z/20070524T110000Z
-FREEBUSY:20070525T100000Z/20070525T110000Z
-FREEBUSY:20070526T100000Z/20070526T110000Z
-FREEBUSY:20070527T100000Z/20070527T110000Z
-FREEBUSY:20070528T100000Z/20070528T110000Z
-FREEBUSY:20070529T100000Z/20070529T110000Z
-FREEBUSY:20070530T100000Z/20070530T110000Z
-FREEBUSY:20070531T100000Z/20070531T110000Z
-FREEBUSY:20070601T100000Z/20070601T110000Z
-FREEBUSY:20070602T100000Z/20070602T110000Z
-FREEBUSY:20070603T100000Z/20070603T110000Z
-FREEBUSY:20070604T100000Z/20070604T110000Z
-FREEBUSY:20070605T100000Z/20070605T110000Z
-FREEBUSY:20070606T100000Z/20070606T110000Z
-FREEBUSY:20070607T100000Z/20070607T110000Z
-FREEBUSY:20070608T100000Z/20070608T110000Z
-FREEBUSY:20070609T100000Z/20070609T110000Z
-FREEBUSY:20070610T100000Z/20070610T110000Z
-FREEBUSY:20070611T100000Z/20070611T110000Z
-FREEBUSY:20070612T100000Z/20070612T110000Z
-FREEBUSY:20070613T100000Z/20070613T110000Z
-FREEBUSY:20070614T100000Z/20070614T110000Z
-FREEBUSY:20070615T100000Z/20070615T110000Z
-FREEBUSY:20070616T100000Z/20070616T110000Z
-FREEBUSY:20070617T100000Z/20070617T110000Z
-FREEBUSY:20070618T100000Z/20070618T110000Z
-FREEBUSY:20070619T100000Z/20070619T110000Z
-FREEBUSY:20070620T100000Z/20070620T110000Z
-FREEBUSY:20070621T100000Z/20070621T110000Z
-FREEBUSY:20070622T100000Z/20070622T110000Z
-FREEBUSY:20070623T100000Z/20070623T110000Z
-FREEBUSY:20070624T100000Z/20070624T110000Z
-FREEBUSY:20070625T100000Z/20070625T110000Z
-FREEBUSY:20070626T100000Z/20070626T110000Z
-FREEBUSY:20070627T100000Z/20070627T110000Z
-FREEBUSY:20070628T100000Z/20070628T110000Z
-FREEBUSY:20070629T100000Z/20070629T110000Z
-FREEBUSY:20070630T100000Z/20070630T110000Z
 END:VFREEBUSY
 END:VCALENDAR
diff --git a/testing/tests/regression-suite/835-freebusy.result b/testing/tests/regression-suite/835-freebusy.result
index ab724dc7..ebf398f0 100644
--- a/testing/tests/regression-suite/835-freebusy.result
+++ b/testing/tests/regression-suite/835-freebusy.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 1395
+Content-Length: 191
 Content-Type: text/calendar
 
 BEGIN:VCALENDAR
@@ -10,33 +10,5 @@ BEGIN:VFREEBUSY
 DTSTAMP:yyyymmddThhmmssZ
 DTSTART:20060930T120000Z
 DURATION:P4WT12H
-FREEBUSY:20061001T090000Z/20061001T100000Z
-FREEBUSY:20061002T090000Z/20061002T100000Z
-FREEBUSY:20061003T090000Z/20061003T100000Z
-FREEBUSY:20061004T090000Z/20061004T100000Z
-FREEBUSY:20061005T090000Z/20061005T100000Z
-FREEBUSY:20061006T090000Z/20061006T100000Z
-FREEBUSY:20061007T090000Z/20061007T100000Z
-FREEBUSY:20061008T090000Z/20061008T100000Z
-FREEBUSY:20061009T090000Z/20061009T100000Z
-FREEBUSY:20061010T090000Z/20061010T100000Z
-FREEBUSY:20061011T090000Z/20061011T100000Z
-FREEBUSY:20061012T090000Z/20061012T100000Z
-FREEBUSY:20061013T090000Z/20061013T100000Z
-FREEBUSY:20061014T090000Z/20061014T100000Z
-FREEBUSY:20061015T090000Z/20061015T100000Z
-FREEBUSY:20061016T090000Z/20061016T100000Z
-FREEBUSY:20061017T090000Z/20061017T100000Z
-FREEBUSY:20061018T090000Z/20061018T100000Z
-FREEBUSY:20061019T090000Z/20061019T100000Z
-FREEBUSY:20061020T090000Z/20061020T100000Z
-FREEBUSY:20061021T090000Z/20061021T100000Z
-FREEBUSY:20061022T090000Z/20061022T100000Z
-FREEBUSY:20061023T090000Z/20061023T100000Z
-FREEBUSY:20061024T090000Z/20061024T100000Z
-FREEBUSY:20061025T090000Z/20061025T100000Z
-FREEBUSY:20061026T090000Z/20061026T100000Z
-FREEBUSY:20061027T090000Z/20061027T100000Z
-FREEBUSY:20061028T090000Z/20061028T100000Z
 END:VFREEBUSY
 END:VCALENDAR
diff --git a/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result b/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result
index d3daf9f8..6362278a 100644
--- a/testing/tests/regression-suite/873-GroupDAV-PROPFIND.result
+++ b/testing/tests/regression-suite/873-GroupDAV-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, calendar-schedule, extended-mkcol, calendar-proxy
-ETag: "5b97fca3ed961205ea674eb0658d44e3"
-Content-Length: 8808
+ETag: "31ce8bd9c40357ae067a52cf8c75cadc"
+Content-Length: 8564
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -143,21 +143,16 @@ Content-Type: text/xml; charset="utf-8"
      <principal/>
     </resourcetype>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <current-user-privilege-set>
-     <privilege>
-      <read/>
-     </privilege>
-     <privilege>
-      <C:read-free-busy/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-    </current-user-privilege-set>
     <C2:getctag>ab4a67c917e242e0989cd278c75a510e</C2:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <current-user-privilege-set/>
+   </prop>
+   <status>HTTP/1.1 403 Forbidden</status>
+  </propstat>
   <propstat>
    <prop>
     <getetag/>
@@ -181,21 +176,16 @@ Content-Type: text/xml; charset="utf-8"
      <principal/>
     </resourcetype>
     <getcontenttype>httpd/unix-directory</getcontenttype>
-    <current-user-privilege-set>
-     <privilege>
-      <read/>
-     </privilege>
-     <privilege>
-      <C:read-free-busy/>
-     </privilege>
-     <privilege>
-      <C:schedule-query-freebusy/>
-     </privilege>
-    </current-user-privilege-set>
     <C2:getctag>4d470212545b8dd76f702fe2444accad</C2:getctag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
+  <propstat>
+   <prop>
+    <current-user-privilege-set/>
+   </prop>
+   <status>HTTP/1.1 403 Forbidden</status>
+  </propstat>
   <propstat>
    <prop>
     <getetag/>