diff --git a/testing/tests/regression-suite/0524-iCal-PROPFIND.result b/testing/tests/regression-suite/0524-iCal-PROPFIND.result
index 7f49a673..d04fc312 100644
--- a/testing/tests/regression-suite/0524-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0524-iCal-PROPFIND.result
@@ -2,7 +2,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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "b7d922855233223a02e6ae2b26b1e384"
+ETag: "12c268350747ee0076940f61be140827"
 Content-Length: 6090
 Content-Type: text/xml; charset="utf-8"
 
@@ -123,7 +123,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/manager1/calendar-proxy-read/</href>
   <propstat>
    <prop>
-    <C:getctag>"ccdfbfa2e7ee6c47d3ea8f134d415b89"</C:getctag>
+    <C:getctag>"9c7765219569248441a5a04569ca6b94"</C:getctag>
     <displayname>/manager1/calendar-proxy-read/</displayname>
     <resourcetype>
      <principal/>
@@ -161,7 +161,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/manager1/calendar-proxy-write/</href>
   <propstat>
    <prop>
-    <C:getctag>"ff25f14bac404c0aae34b5e75618d479"</C:getctag>
+    <C:getctag>"9849062cdad5f238a4ac4a9829bcdbcf"</C:getctag>
     <displayname>/manager1/calendar-proxy-write/</displayname>
     <resourcetype>
      <principal/>
diff --git a/testing/tests/regression-suite/0525-iCal-PROPFIND.result b/testing/tests/regression-suite/0525-iCal-PROPFIND.result
index 103af53e..0ee1e1a3 100644
--- a/testing/tests/regression-suite/0525-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0525-iCal-PROPFIND.result
@@ -2,8 +2,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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "5379cc33938a9b800403f94bdfec0571"
-Content-Length: 1091
+ETag: "6fd0a85fe582ad2af132724a7566be48"
+Content-Length: 1055
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -12,7 +12,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/manager1/calendar-proxy-read/</href>
   <propstat>
    <prop>
-    <C:getctag>"ccdfbfa2e7ee6c47d3ea8f134d415b89"</C:getctag>
+    <C:getctag>"9c7765219569248441a5a04569ca6b94"</C:getctag>
     <displayname>/manager1/calendar-proxy-read/</displayname>
     <resourcetype>
      <principal/>
@@ -20,8 +20,7 @@ Content-Type: text/xml; charset="utf-8"
      <C:calendar-proxy-read/>
     </resourcetype>
     <group-member-set>
-     <href>/caldav.php/user1/</href>
-     <href>/caldav.php/assistant1/</href>
+     <href>/caldav.php/teamclient1/</href>
     </group-member-set>
     <C:calendar-proxy-read-for>
      <href>/caldav.php/user1/</href>
diff --git a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
index c9fcc62e..f34f61ea 100644
--- a/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0532-iCal4-PROPFIND.result
@@ -2,7 +2,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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "fb9405fd210ca3ecbff633bc2d47ebfd"
+ETag: "9edbad4c000fa836698d469920bfbcdd"
 Content-Length: 15604
 Content-Type: text/xml; charset="utf-8"
 
@@ -541,7 +541,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/calendar-proxy-read/</href>
   <propstat>
    <prop>
-    <C:getctag>"abad5538c4aa570cc54b6ff0d36a4565"</C:getctag>
+    <C:getctag>"27f3230cc54eece931a3881045b951ad"</C:getctag>
     <displayname>/user1/calendar-proxy-read/</displayname>
     <resourcetype>
      <principal/>
@@ -613,7 +613,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/calendar-proxy-write/</href>
   <propstat>
    <prop>
-    <C:getctag>"04ba2c2164225fb5abce13f2c523b6c7"</C:getctag>
+    <C:getctag>"1fe22bc6877accf64891e7c9c5428b86"</C:getctag>
     <displayname>/user1/calendar-proxy-write/</displayname>
     <resourcetype>
      <principal/>
diff --git a/testing/tests/regression-suite/0547-iCal4-PROPFIND.result b/testing/tests/regression-suite/0547-iCal4-PROPFIND.result
index 060cbf97..c4098343 100644
--- a/testing/tests/regression-suite/0547-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/0547-iCal4-PROPFIND.result
@@ -2,7 +2,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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "d87847918de54dee06d6412f855dbb1a"
+ETag: "cf27b185d14c825eb7911f229190132c"
 Content-Length: 18035
 Content-Type: text/xml; charset="utf-8"
 
@@ -618,7 +618,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/calendar-proxy-read/</href>
   <propstat>
    <prop>
-    <C:getctag>"abad5538c4aa570cc54b6ff0d36a4565"</C:getctag>
+    <C:getctag>"27f3230cc54eece931a3881045b951ad"</C:getctag>
     <displayname>/user1/calendar-proxy-read/</displayname>
     <resourcetype>
      <principal/>
@@ -701,7 +701,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/calendar-proxy-write/</href>
   <propstat>
    <prop>
-    <C:getctag>"04ba2c2164225fb5abce13f2c523b6c7"</C:getctag>
+    <C:getctag>"1fe22bc6877accf64891e7c9c5428b86"</C:getctag>
     <displayname>/user1/calendar-proxy-write/</displayname>
     <resourcetype>
      <principal/>
diff --git a/testing/tests/regression-suite/0548-iCal-PROPFIND.result b/testing/tests/regression-suite/0548-iCal-PROPFIND.result
index 9f3df692..55b118df 100644
--- a/testing/tests/regression-suite/0548-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0548-iCal-PROPFIND.result
@@ -4,7 +4,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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "e6d929727ad5e85f7db37f1e7c091f6a"
+ETag: "d34169c5948ac4f074110acfe1f4aa10"
 Content-Length: 28701
 Content-Type: text/xml; charset="utf-8"
 
@@ -988,7 +988,7 @@ Content-Type: text/xml; charset="utf-8"
      </privilege>
     </current-user-privilege-set>
     <displayname>/user1/calendar-proxy-read/</displayname>
-    <C:getctag>"abad5538c4aa570cc54b6ff0d36a4565"</C:getctag>
+    <C:getctag>"27f3230cc54eece931a3881045b951ad"</C:getctag>
     <owner>
      <href>/caldav.php/user1/</href>
     </owner>
@@ -1133,7 +1133,7 @@ Content-Type: text/xml; charset="utf-8"
      </privilege>
     </current-user-privilege-set>
     <displayname>/user1/calendar-proxy-write/</displayname>
-    <C:getctag>"04ba2c2164225fb5abce13f2c523b6c7"</C:getctag>
+    <C:getctag>"1fe22bc6877accf64891e7c9c5428b86"</C:getctag>
     <owner>
      <href>/caldav.php/user1/</href>
     </owner>
diff --git a/testing/tests/regression-suite/0549-iCal-REPORT.result b/testing/tests/regression-suite/0549-iCal-REPORT.result
index 1839a202..0ac77140 100644
--- a/testing/tests/regression-suite/0549-iCal-REPORT.result
+++ b/testing/tests/regression-suite/0549-iCal-REPORT.result
@@ -2,44 +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
-ETag: "ef355f1b27cdb05f1465aeb58f9d1baa"
-Content-Length: 1120
+ETag: "9a5fbd4ac1577d7f67bee71b330fcbc0"
+Content-Length: 273
 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">
+<multistatus xmlns="DAV:">
  <response>
   <href>/caldav.php/resource1/calendar-proxy-read/</href>
   <propstat>
    <prop>
-    <group-member-set>
-     <response>
-      <href>/caldav.php/user1/</href>
-      <propstat>
-       <prop>
-        <displayname>User 1</displayname>
-        <C:calendar-user-address-set>
-         <href>mailto:user1@example.net</href>
-         <href>/caldav.php/user1/</href>
-        </C:calendar-user-address-set>
-       </prop>
-       <status>HTTP/1.1 200 OK</status>
-      </propstat>
-     </response>
-     <response>
-      <href>/caldav.php/assistant1/</href>
-      <propstat>
-       <prop>
-        <displayname>Assistant 1</displayname>
-        <C:calendar-user-address-set>
-         <href>mailto:assistant1@example.net</href>
-         <href>/caldav.php/assistant1/</href>
-        </C:calendar-user-address-set>
-       </prop>
-       <status>HTTP/1.1 200 OK</status>
-      </propstat>
-     </response>
-    </group-member-set>
+    <group-member-set/>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/0553-iPhone-PROPFIND.result b/testing/tests/regression-suite/0553-iPhone-PROPFIND.result
index 9e7d152c..ed181cd2 100644
--- a/testing/tests/regression-suite/0553-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/0553-iPhone-PROPFIND.result
@@ -2,7 +2,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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "9f39c7aaec936d59b52abd670cd6039e"
+ETag: "8d87a0a254909c00c61fc0b8dbf06061"
 Content-Length: 12634
 Content-Type: text/xml; charset="utf-8"
 
@@ -465,7 +465,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <displayname>/user1/calendar-proxy-read/</displayname>
-    <C:getctag>"abad5538c4aa570cc54b6ff0d36a4565"</C:getctag>
+    <C:getctag>"27f3230cc54eece931a3881045b951ad"</C:getctag>
     <resourcetype>
      <principal/>
      <collection/>
@@ -526,7 +526,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <displayname>/user1/calendar-proxy-write/</displayname>
-    <C:getctag>"04ba2c2164225fb5abce13f2c523b6c7"</C:getctag>
+    <C:getctag>"1fe22bc6877accf64891e7c9c5428b86"</C:getctag>
     <resourcetype>
      <principal/>
      <collection/>
diff --git a/testing/tests/regression-suite/0554-iPhone-PROPFIND.result b/testing/tests/regression-suite/0554-iPhone-PROPFIND.result
index 9e7d152c..ed181cd2 100644
--- a/testing/tests/regression-suite/0554-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/0554-iPhone-PROPFIND.result
@@ -2,7 +2,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
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
-ETag: "9f39c7aaec936d59b52abd670cd6039e"
+ETag: "8d87a0a254909c00c61fc0b8dbf06061"
 Content-Length: 12634
 Content-Type: text/xml; charset="utf-8"
 
@@ -465,7 +465,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <displayname>/user1/calendar-proxy-read/</displayname>
-    <C:getctag>"abad5538c4aa570cc54b6ff0d36a4565"</C:getctag>
+    <C:getctag>"27f3230cc54eece931a3881045b951ad"</C:getctag>
     <resourcetype>
      <principal/>
      <collection/>
@@ -526,7 +526,7 @@ Content-Type: text/xml; charset="utf-8"
   <propstat>
    <prop>
     <displayname>/user1/calendar-proxy-write/</displayname>
-    <C:getctag>"04ba2c2164225fb5abce13f2c523b6c7"</C:getctag>
+    <C:getctag>"1fe22bc6877accf64891e7c9c5428b86"</C:getctag>
     <resourcetype>
      <principal/>
      <collection/>