diff --git a/testing/tests/regression-suite/0962-BIND.result b/testing/tests/binding/1000-BIND.result
similarity index 93%
rename from testing/tests/regression-suite/0962-BIND.result
rename to testing/tests/binding/1000-BIND.result
index dcea4d1c..ea207f0a 100644
--- a/testing/tests/regression-suite/0962-BIND.result
+++ b/testing/tests/binding/1000-BIND.result
@@ -7,7 +7,7 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1433<
+          bind_id: >1434<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/user2/<
diff --git a/testing/tests/regression-suite/0962-BIND.test b/testing/tests/binding/1000-BIND.test
similarity index 100%
rename from testing/tests/regression-suite/0962-BIND.test
rename to testing/tests/binding/1000-BIND.test
diff --git a/testing/tests/regression-suite/0963-BIND.result b/testing/tests/binding/1001-BIND.result
similarity index 94%
rename from testing/tests/regression-suite/0963-BIND.result
rename to testing/tests/binding/1001-BIND.result
index ebb90efb..35a5bf24 100644
--- a/testing/tests/regression-suite/0963-BIND.result
+++ b/testing/tests/binding/1001-BIND.result
@@ -9,7 +9,7 @@ Content-Type: text/xml; charset="utf-8"
 <error xmlns="DAV:">
   <DAV::can-overwrite/>A resource already exists at the destination.
 </error>
-          bind_id: >1433<
+          bind_id: >1434<
   bound_source_id: >11<
   dav_displayname: >User 2's Calendar, as uploaded by Admin<
          dav_name: >/user4/user2/<
diff --git a/testing/tests/regression-suite/0963-BIND.test b/testing/tests/binding/1001-BIND.test
similarity index 100%
rename from testing/tests/regression-suite/0963-BIND.test
rename to testing/tests/binding/1001-BIND.test
diff --git a/testing/tests/regression-suite/0964-PROPFIND.result b/testing/tests/binding/1004-PROPFIND-bound.result
similarity index 85%
rename from testing/tests/regression-suite/0964-PROPFIND.result
rename to testing/tests/binding/1004-PROPFIND-bound.result
index 3168e58a..f08dbc2b 100644
--- a/testing/tests/regression-suite/0964-PROPFIND.result
+++ b/testing/tests/binding/1004-PROPFIND-bound.result
@@ -10,8 +10,8 @@
     </resource-id>
     <parent-set>
      <parent>
-      <href>/caldav.php</href>
-      <segment>user4</segment>
+      <href>/</href>
+      <segment>caldav.php</segment>
      </parent>
     </parent-set>
    </prop>
@@ -28,11 +28,11 @@
     </resource-id>
     <parent-set>
      <parent>
-      <href>/caldav.php/user2</href>
-      <segment>home</segment>
+      <href>/caldav.php</href>
+      <segment>user4</segment>
      </parent>
      <parent>
-      <href>/caldav.php/user4</href>
+      <href>/caldav.php</href>
       <segment>user2</segment>
      </parent>
     </parent-set>
@@ -50,8 +50,8 @@
     </resource-id>
     <parent-set>
      <parent>
-      <href>/caldav.php/user4</href>
-      <segment>home</segment>
+      <href>/caldav.php</href>
+      <segment>user4</segment>
      </parent>
     </parent-set>
    </prop>
@@ -65,8 +65,8 @@
     <displayname>/user4/calendar-proxy-read/</displayname>
     <parent-set>
      <parent>
-      <href>/caldav.php/user4</href>
-      <segment>calendar-proxy-read</segment>
+      <href>/caldav.php</href>
+      <segment>user4</segment>
      </parent>
     </parent-set>
    </prop>
@@ -86,8 +86,8 @@
     <displayname>/user4/calendar-proxy-write/</displayname>
     <parent-set>
      <parent>
-      <href>/caldav.php/user4</href>
-      <segment>calendar-proxy-write</segment>
+      <href>/caldav.php</href>
+      <segment>user4</segment>
      </parent>
     </parent-set>
    </prop>
diff --git a/testing/tests/regression-suite/0964-PROPFIND.test b/testing/tests/binding/1004-PROPFIND-bound.test
similarity index 100%
rename from testing/tests/regression-suite/0964-PROPFIND.test
rename to testing/tests/binding/1004-PROPFIND-bound.test
diff --git a/testing/tests/regression-suite/0965-PROPFIND.result b/testing/tests/binding/1005-PROPFIND-bound.result
similarity index 55%
rename from testing/tests/regression-suite/0965-PROPFIND.result
rename to testing/tests/binding/1005-PROPFIND-bound.result
index 2743b03a..0235b66e 100644
--- a/testing/tests/regression-suite/0965-PROPFIND.result
+++ b/testing/tests/binding/1005-PROPFIND-bound.result
@@ -53,15 +53,32 @@
     <owner>
      <href>/caldav.php/user2/</href>
     </owner>
+    <current-user-privilege-set>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
-  <propstat>
-   <prop>
-    <current-user-privilege-set/>
-   </prop>
-   <status>HTTP/1.1 403 Forbidden</status>
-  </propstat>
  </response>
  <response>
   <href>/caldav.php/user4/user2/047871e3-6b70-4178-9af8-0ceb50f7b092.ics</href>
@@ -72,15 +89,32 @@
     <owner>
      <href>/caldav.php/user2/</href>
     </owner>
+    <current-user-privilege-set>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
-  <propstat>
-   <prop>
-    <current-user-privilege-set/>
-   </prop>
-   <status>HTTP/1.1 403 Forbidden</status>
-  </propstat>
  </response>
  <response>
   <href>/caldav.php/user4/user2/9429a973-2b13-4b1a-be09-948d75425c45.ics</href>
@@ -91,15 +125,32 @@
     <owner>
      <href>/caldav.php/user2/</href>
     </owner>
+    <current-user-privilege-set>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
-  <propstat>
-   <prop>
-    <current-user-privilege-set/>
-   </prop>
-   <status>HTTP/1.1 403 Forbidden</status>
-  </propstat>
  </response>
  <response>
   <href>/caldav.php/user4/user2/7d729xc0-0895-012d-124e-002421a2359e.ics</href>
@@ -110,15 +161,32 @@
     <owner>
      <href>/caldav.php/user2/</href>
     </owner>
+    <current-user-privilege-set>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
-  <propstat>
-   <prop>
-    <current-user-privilege-set/>
-   </prop>
-   <status>HTTP/1.1 403 Forbidden</status>
-  </propstat>
  </response>
  <response>
   <href>/caldav.php/user4/user2/bd262d20-1cdb-012d-1264-002421a2359e.ics</href>
@@ -129,14 +197,31 @@
     <owner>
      <href>/caldav.php/user2/</href>
     </owner>
+    <current-user-privilege-set>
+     <privilege>
+      <read/>
+     </privilege>
+     <privilege>
+      <read-current-user-privilege-set/>
+     </privilege>
+     <privilege>
+      <write/>
+     </privilege>
+     <privilege>
+      <write-properties/>
+     </privilege>
+     <privilege>
+      <write-content/>
+     </privilege>
+     <privilege>
+      <bind/>
+     </privilege>
+     <privilege>
+      <unbind/>
+     </privilege>
+    </current-user-privilege-set>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
-  <propstat>
-   <prop>
-    <current-user-privilege-set/>
-   </prop>
-   <status>HTTP/1.1 403 Forbidden</status>
-  </propstat>
  </response>
 </multistatus>
diff --git a/testing/tests/regression-suite/0965-PROPFIND.test b/testing/tests/binding/1005-PROPFIND-bound.test
similarity index 100%
rename from testing/tests/regression-suite/0965-PROPFIND.test
rename to testing/tests/binding/1005-PROPFIND-bound.test
diff --git a/testing/tests/regression-suite/0966-REPORT-bound.result b/testing/tests/binding/1006-REPORT-bound.result
similarity index 100%
rename from testing/tests/regression-suite/0966-REPORT-bound.result
rename to testing/tests/binding/1006-REPORT-bound.result
diff --git a/testing/tests/regression-suite/0966-REPORT-bound.test b/testing/tests/binding/1006-REPORT-bound.test
similarity index 100%
rename from testing/tests/regression-suite/0966-REPORT-bound.test
rename to testing/tests/binding/1006-REPORT-bound.test
diff --git a/testing/tests/regression-suite/0967-PROPFIND.result b/testing/tests/binding/1007-PROPFIND-bound.result
similarity index 100%
rename from testing/tests/regression-suite/0967-PROPFIND.result
rename to testing/tests/binding/1007-PROPFIND-bound.result
diff --git a/testing/tests/regression-suite/0967-PROPFIND.test b/testing/tests/binding/1007-PROPFIND-bound.test
similarity index 100%
rename from testing/tests/regression-suite/0967-PROPFIND.test
rename to testing/tests/binding/1007-PROPFIND-bound.test
diff --git a/testing/tests/regression-suite/0968-GET-bound.result b/testing/tests/binding/1008-GET-bound.result
similarity index 100%
rename from testing/tests/regression-suite/0968-GET-bound.result
rename to testing/tests/binding/1008-GET-bound.result
diff --git a/testing/tests/regression-suite/0968-GET-bound.test b/testing/tests/binding/1008-GET-bound.test
similarity index 100%
rename from testing/tests/regression-suite/0968-GET-bound.test
rename to testing/tests/binding/1008-GET-bound.test
diff --git a/testing/tests/regression-suite/0969-REPORT-bound.result b/testing/tests/binding/1009-REPORT-bound.result
similarity index 100%
rename from testing/tests/regression-suite/0969-REPORT-bound.result
rename to testing/tests/binding/1009-REPORT-bound.result
diff --git a/testing/tests/regression-suite/0969-REPORT-bound.test b/testing/tests/binding/1009-REPORT-bound.test
similarity index 100%
rename from testing/tests/regression-suite/0969-REPORT-bound.test
rename to testing/tests/binding/1009-REPORT-bound.test
diff --git a/testing/tests/regression-suite/0970-PROPPATCH-bound.result b/testing/tests/binding/1010-PROPPATCH-bound.result
similarity index 100%
rename from testing/tests/regression-suite/0970-PROPPATCH-bound.result
rename to testing/tests/binding/1010-PROPPATCH-bound.result
diff --git a/testing/tests/regression-suite/0970-PROPPATCH-bound.test b/testing/tests/binding/1010-PROPPATCH-bound.test
similarity index 100%
rename from testing/tests/regression-suite/0970-PROPPATCH-bound.test
rename to testing/tests/binding/1010-PROPPATCH-bound.test
diff --git a/testing/tests/regression-suite/0971-PROPPATCH-bound-fail.result b/testing/tests/binding/1011-PROPPATCH-bound-fail.result
similarity index 100%
rename from testing/tests/regression-suite/0971-PROPPATCH-bound-fail.result
rename to testing/tests/binding/1011-PROPPATCH-bound-fail.result
diff --git a/testing/tests/regression-suite/0971-PROPPATCH-bound-fail.test b/testing/tests/binding/1011-PROPPATCH-bound-fail.test
similarity index 100%
rename from testing/tests/regression-suite/0971-PROPPATCH-bound-fail.test
rename to testing/tests/binding/1011-PROPPATCH-bound-fail.test
diff --git a/testing/tests/binding/1012-BIND.result b/testing/tests/binding/1012-BIND.result
index 96133269..5468897f 100644
--- a/testing/tests/binding/1012-BIND.result
+++ b/testing/tests/binding/1012-BIND.result
@@ -2,29 +2,22 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-Location: /caldav.php/user4/base/user1/
+Location: /caldav.php/user4/user1/
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1433<
+          bind_id: >1434<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
-           length: >8<
  parent_container: >/user4/<
+ ticket_id_length: >8<
 
-          bind_id: >1434<
+          bind_id: >1435<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
-           length: >8<
  parent_container: >/user4/<
-
-          bind_id: >1439<
-  bound_source_id: >10<
-  dav_displayname: >User 1's Calendaranza<
-         dav_name: >/user4/base/user1/<
-           length: >8<
- parent_container: >/user4/base/<
+ ticket_id_length: >8<
 
diff --git a/testing/tests/binding/1012-BIND.test b/testing/tests/binding/1012-BIND.test
index e68e7a80..c472b256 100644
--- a/testing/tests/binding/1012-BIND.test
+++ b/testing/tests/binding/1012-BIND.test
@@ -3,7 +3,7 @@
 #     also applying a ticket during the bind
 #
 TYPE=BIND
-URL=http://regression.host/caldav.php/user4/base/
+URL=http://regression.host/caldav.php/user4/
 AUTH=user4:user4
 
 # Get the ticket we created earlier in 948...
@@ -29,7 +29,7 @@ ENDDATA
 QUERY
 SELECT bind_id,
        bound_source_id,
-       length(access_ticket_id),
+       length(access_ticket_id) AS ticket_id_length,
        parent_container,
        dav_name,
        dav_displayname
diff --git a/testing/tests/regression-suite/0973-PUT-bound-succeed.result b/testing/tests/binding/1013-PUT-bound-succeed.result
similarity index 100%
rename from testing/tests/regression-suite/0973-PUT-bound-succeed.result
rename to testing/tests/binding/1013-PUT-bound-succeed.result
diff --git a/testing/tests/regression-suite/0973-PUT-bound-succeed.test b/testing/tests/binding/1013-PUT-bound-succeed.test
similarity index 100%
rename from testing/tests/regression-suite/0973-PUT-bound-succeed.test
rename to testing/tests/binding/1013-PUT-bound-succeed.test
diff --git a/testing/tests/regression-suite/0974-PUT-bound-fail.result b/testing/tests/binding/1014-PUT-bound-fail.result
similarity index 100%
rename from testing/tests/regression-suite/0974-PUT-bound-fail.result
rename to testing/tests/binding/1014-PUT-bound-fail.result
diff --git a/testing/tests/regression-suite/0974-PUT-bound-fail.test b/testing/tests/binding/1014-PUT-bound-fail.test
similarity index 100%
rename from testing/tests/regression-suite/0974-PUT-bound-fail.test
rename to testing/tests/binding/1014-PUT-bound-fail.test
diff --git a/testing/tests/binding/1010-MKCOL-base.result b/testing/tests/binding/1020-MKCOL-base.result
similarity index 100%
rename from testing/tests/binding/1010-MKCOL-base.result
rename to testing/tests/binding/1020-MKCOL-base.result
diff --git a/testing/tests/binding/1010-MKCOL-base.test b/testing/tests/binding/1020-MKCOL-base.test
similarity index 100%
rename from testing/tests/binding/1010-MKCOL-base.test
rename to testing/tests/binding/1020-MKCOL-base.test
diff --git a/testing/tests/binding/1011-MKCOL-subcal.result b/testing/tests/binding/1021-MKCOL-subcal.result
similarity index 100%
rename from testing/tests/binding/1011-MKCOL-subcal.result
rename to testing/tests/binding/1021-MKCOL-subcal.result
diff --git a/testing/tests/binding/1011-MKCOL-subcal.test b/testing/tests/binding/1021-MKCOL-subcal.test
similarity index 100%
rename from testing/tests/binding/1011-MKCOL-subcal.test
rename to testing/tests/binding/1021-MKCOL-subcal.test
diff --git a/testing/tests/regression-suite/0972-BIND.result b/testing/tests/binding/1022-BIND.result
similarity index 64%
rename from testing/tests/regression-suite/0972-BIND.result
rename to testing/tests/binding/1022-BIND.result
index 7af4110a..27658b5c 100644
--- a/testing/tests/regression-suite/0972-BIND.result
+++ b/testing/tests/binding/1022-BIND.result
@@ -2,22 +2,29 @@ HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-Location: /caldav.php/user4/user1/
+Location: /caldav.php/user4/base/user1/
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1433<
+          bind_id: >1434<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
+           length: >8<
  parent_container: >/user4/<
- ticket_id_length: >8<
 
-          bind_id: >1434<
+          bind_id: >1435<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
+           length: >8<
  parent_container: >/user4/<
- ticket_id_length: >8<
+
+          bind_id: >1439<
+  bound_source_id: >10<
+  dav_displayname: >User 1's Calendaranza<
+         dav_name: >/user4/base/user1/<
+           length: >8<
+ parent_container: >/user4/base/<
 
diff --git a/testing/tests/regression-suite/0972-BIND.test b/testing/tests/binding/1022-BIND.test
similarity index 88%
rename from testing/tests/regression-suite/0972-BIND.test
rename to testing/tests/binding/1022-BIND.test
index c472b256..e68e7a80 100644
--- a/testing/tests/regression-suite/0972-BIND.test
+++ b/testing/tests/binding/1022-BIND.test
@@ -3,7 +3,7 @@
 #     also applying a ticket during the bind
 #
 TYPE=BIND
-URL=http://regression.host/caldav.php/user4/
+URL=http://regression.host/caldav.php/user4/base/
 AUTH=user4:user4
 
 # Get the ticket we created earlier in 948...
@@ -29,7 +29,7 @@ ENDDATA
 QUERY
 SELECT bind_id,
        bound_source_id,
-       length(access_ticket_id) AS ticket_id_length,
+       length(access_ticket_id),
        parent_container,
        dav_name,
        dav_displayname
diff --git a/testing/tests/binding/1013-BIND.result b/testing/tests/binding/1023-BIND.result
similarity index 96%
rename from testing/tests/binding/1013-BIND.result
rename to testing/tests/binding/1023-BIND.result
index 6dd1937c..b2d5e3df 100644
--- a/testing/tests/binding/1013-BIND.result
+++ b/testing/tests/binding/1023-BIND.result
@@ -7,14 +7,14 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1433<
+          bind_id: >1434<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1434<
+          bind_id: >1435<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
diff --git a/testing/tests/binding/1013-BIND.test b/testing/tests/binding/1023-BIND.test
similarity index 100%
rename from testing/tests/binding/1013-BIND.test
rename to testing/tests/binding/1023-BIND.test
diff --git a/testing/tests/binding/1014-BIND.result b/testing/tests/binding/1024-BIND.result
similarity index 97%
rename from testing/tests/binding/1014-BIND.result
rename to testing/tests/binding/1024-BIND.result
index 818d8b88..092132f8 100644
--- a/testing/tests/binding/1014-BIND.result
+++ b/testing/tests/binding/1024-BIND.result
@@ -9,14 +9,14 @@ Content-Type: text/xml; charset="utf-8"
 <error xmlns="DAV:">
   <DAV::can-overwrite/>A resource already exists at the destination.
 </error>
-          bind_id: >1433<
+          bind_id: >1434<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
          dav_name: >/user4/user2/<
            length: >8<
  parent_container: >/user4/<
 
-          bind_id: >1434<
+          bind_id: >1435<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
          dav_name: >/user4/user1/<
diff --git a/testing/tests/binding/1014-BIND.test b/testing/tests/binding/1024-BIND.test
similarity index 100%
rename from testing/tests/binding/1014-BIND.test
rename to testing/tests/binding/1024-BIND.test
diff --git a/testing/tests/binding/1015-PROPFIND.result b/testing/tests/binding/1025-PROPFIND.result
similarity index 86%
rename from testing/tests/binding/1015-PROPFIND.result
rename to testing/tests/binding/1025-PROPFIND.result
index 5c758af2..0cebf093 100644
--- a/testing/tests/binding/1015-PROPFIND.result
+++ b/testing/tests/binding/1025-PROPFIND.result
@@ -10,8 +10,8 @@
     </resource-id>
     <parent-set>
      <parent>
-      <href>/caldav.php/user4</href>
-      <segment>base</segment>
+      <href>/caldav.php</href>
+      <segment>user4</segment>
      </parent>
     </parent-set>
     <resourcetype>
@@ -31,15 +31,15 @@
     </resource-id>
     <parent-set>
      <parent>
-      <href>/caldav.php/user1</href>
-      <segment>home</segment>
-     </parent>
-     <parent>
-      <href>/caldav.php/user4/base</href>
-      <segment>user1</segment>
+      <href>/caldav.php</href>
+      <segment>user4</segment>
      </parent>
      <parent>
       <href>/caldav.php/user4</href>
+      <segment>base</segment>
+     </parent>
+     <parent>
+      <href>/caldav.php</href>
       <segment>user1</segment>
      </parent>
     </parent-set>
@@ -63,15 +63,15 @@
     </resource-id>
     <parent-set>
      <parent>
-      <href>/caldav.php/user2</href>
-      <segment>home</segment>
-     </parent>
-     <parent>
-      <href>/caldav.php/user4/base</href>
-      <segment>user2</segment>
+      <href>/caldav.php</href>
+      <segment>user4</segment>
      </parent>
      <parent>
       <href>/caldav.php/user4</href>
+      <segment>base</segment>
+     </parent>
+     <parent>
+      <href>/caldav.php</href>
       <segment>user2</segment>
      </parent>
     </parent-set>
@@ -94,8 +94,8 @@
     </resource-id>
     <parent-set>
      <parent>
-      <href>/caldav.php/user4/base</href>
-      <segment>calendar</segment>
+      <href>/caldav.php/user4</href>
+      <segment>base</segment>
      </parent>
     </parent-set>
     <resourcetype>
diff --git a/testing/tests/binding/1015-PROPFIND.test b/testing/tests/binding/1025-PROPFIND.test
similarity index 100%
rename from testing/tests/binding/1015-PROPFIND.test
rename to testing/tests/binding/1025-PROPFIND.test
diff --git a/testing/tests/binding/1016-PUT-bound-succeed.result b/testing/tests/binding/1026-PUT-bound-succeed.result
similarity index 100%
rename from testing/tests/binding/1016-PUT-bound-succeed.result
rename to testing/tests/binding/1026-PUT-bound-succeed.result
diff --git a/testing/tests/binding/1016-PUT-bound-succeed.test b/testing/tests/binding/1026-PUT-bound-succeed.test
similarity index 100%
rename from testing/tests/binding/1016-PUT-bound-succeed.test
rename to testing/tests/binding/1026-PUT-bound-succeed.test
diff --git a/testing/tests/binding/1017-PROPFIND.result b/testing/tests/binding/1027-PROPFIND.result
similarity index 87%
rename from testing/tests/binding/1017-PROPFIND.result
rename to testing/tests/binding/1027-PROPFIND.result
index 0fa57769..6734b9bd 100644
--- a/testing/tests/binding/1017-PROPFIND.result
+++ b/testing/tests/binding/1027-PROPFIND.result
@@ -10,8 +10,8 @@
     </resource-id>
     <parent-set>
      <parent>
-      <href>/caldav.php/user4</href>
-      <segment>base</segment>
+      <href>/caldav.php</href>
+      <segment>user4</segment>
      </parent>
     </parent-set>
     <resourcetype>
diff --git a/testing/tests/binding/1017-PROPFIND.test b/testing/tests/binding/1027-PROPFIND.test
similarity index 100%
rename from testing/tests/binding/1017-PROPFIND.test
rename to testing/tests/binding/1027-PROPFIND.test
diff --git a/testing/tests/binding/1018-PROPFIND.result b/testing/tests/binding/1028-PROPFIND.result
similarity index 90%
rename from testing/tests/binding/1018-PROPFIND.result
rename to testing/tests/binding/1028-PROPFIND.result
index 9d140835..58d8ae80 100644
--- a/testing/tests/binding/1018-PROPFIND.result
+++ b/testing/tests/binding/1028-PROPFIND.result
@@ -12,8 +12,8 @@
     </resource-id>
     <parent-set>
      <parent>
-      <href>/caldav.php</href>
-      <segment>user4</segment>
+      <href>/</href>
+      <segment>caldav.php</segment>
      </parent>
     </parent-set>
     <resourcetype>
diff --git a/testing/tests/binding/1018-PROPFIND.test b/testing/tests/binding/1028-PROPFIND.test
similarity index 100%
rename from testing/tests/binding/1018-PROPFIND.test
rename to testing/tests/binding/1028-PROPFIND.test
diff --git a/testing/tests/binding/1019-PUT-subcalendar.result b/testing/tests/binding/1029-PUT-subcalendar.result
similarity index 100%
rename from testing/tests/binding/1019-PUT-subcalendar.result
rename to testing/tests/binding/1029-PUT-subcalendar.result
diff --git a/testing/tests/binding/1019-PUT-subcalendar.test b/testing/tests/binding/1029-PUT-subcalendar.test
similarity index 100%
rename from testing/tests/binding/1019-PUT-subcalendar.test
rename to testing/tests/binding/1029-PUT-subcalendar.test
diff --git a/testing/tests/binding/1020-PUT-whole-subcalendar.result b/testing/tests/binding/1030-PUT-whole-subcalendar.result
similarity index 100%
rename from testing/tests/binding/1020-PUT-whole-subcalendar.result
rename to testing/tests/binding/1030-PUT-whole-subcalendar.result
diff --git a/testing/tests/binding/1020-PUT-whole-subcalendar.test b/testing/tests/binding/1030-PUT-whole-subcalendar.test
similarity index 100%
rename from testing/tests/binding/1020-PUT-whole-subcalendar.test
rename to testing/tests/binding/1030-PUT-whole-subcalendar.test
diff --git a/testing/tests/binding/1021-MKTICKET-admin.result b/testing/tests/binding/1031-MKTICKET-admin.result
similarity index 76%
rename from testing/tests/binding/1021-MKTICKET-admin.result
rename to testing/tests/binding/1031-MKTICKET-admin.result
index dc43ec33..49e10b63 100644
--- a/testing/tests/binding/1021-MKTICKET-admin.result
+++ b/testing/tests/binding/1031-MKTICKET-admin.result
@@ -30,18 +30,7 @@ Content-Type: text/xml; charset="utf-8"
  </T:ticketdiscovery>
 </prop>
 
-     dav_owner_id: >3<
-       privileges: >000000000001001000100001<
-target_collection: >10<
-target_resource_i: >NULL<
-          timeout: >01:00:00<
-
-     dav_owner_id: >4<
-       privileges: >000000000001001011100111<
-target_collection: >11<
-target_resource_i: >NULL<
-          timeout: >NULL<
-
+         dav_name: >/user3/home/<
      dav_owner_id: >1<
        privileges: >000000000001001011100111<
 target_collection: >12<
diff --git a/testing/tests/binding/1021-MKTICKET-admin.test b/testing/tests/binding/1031-MKTICKET-admin.test
similarity index 65%
rename from testing/tests/binding/1021-MKTICKET-admin.test
rename to testing/tests/binding/1031-MKTICKET-admin.test
index 68aeeca8..e54c1483 100644
--- a/testing/tests/binding/1021-MKTICKET-admin.test
+++ b/testing/tests/binding/1031-MKTICKET-admin.test
@@ -18,13 +18,17 @@ BEGINDATA
 ENDDATA
 
 QUERY
-SELECT dav_owner_id,
-       date_trunc( 'minute', ('55 seconds' + expires - current_timestamp)::interval(0)) AS timeout,
-       privileges,
+SELECT access_ticket.dav_owner_id,
+       date_trunc( 'minute', ('55 seconds' + access_ticket.expires - current_timestamp)::interval(0)) AS timeout,
+       access_ticket.privileges,
        target_collection_id,
-       target_resource_id
+       target_resource_id,
+       collection.dav_name
   FROM access_ticket
+       INNER JOIN collection ON (collection_id = target_collection_id)
+ WHERE collection.dav_name = '/user3/home/'
 ENDQUERY
+# WHERE target_collection = 11
 
 REPLACE=!ETag: "\S+"!ETag: "Some good etag"!
 REPLACE=!<T:id>\S{8}</T:id>!<T:id>Good Ticket ID</T:id>!
diff --git a/testing/tests/binding/1022-BIND-admin.result b/testing/tests/binding/1032-BIND-admin.result
similarity index 98%
rename from testing/tests/binding/1022-BIND-admin.result
rename to testing/tests/binding/1032-BIND-admin.result
index a8fe9c57..972db535 100644
--- a/testing/tests/binding/1022-BIND-admin.result
+++ b/testing/tests/binding/1032-BIND-admin.result
@@ -7,7 +7,7 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-          bind_id: >1433<
+          bind_id: >1434<
        bind_owner: >6<
   bound_source_id: >11<
   dav_displayname: >Updated Displayname with PROPPATCH<
@@ -19,7 +19,7 @@ target_collection: >11<
 target_resource_i: >NULL<
      ticket_owner: >4<
 
-          bind_id: >1434<
+          bind_id: >1435<
        bind_owner: >6<
   bound_source_id: >10<
   dav_displayname: >User 1's Calendaranza<
diff --git a/testing/tests/binding/1022-BIND-admin.test b/testing/tests/binding/1032-BIND-admin.test
similarity index 100%
rename from testing/tests/binding/1022-BIND-admin.test
rename to testing/tests/binding/1032-BIND-admin.test
diff --git a/testing/tests/binding/1023-PROPPATCH-admin-bound.result b/testing/tests/binding/1033-PROPPATCH-admin-bound.result
similarity index 100%
rename from testing/tests/binding/1023-PROPPATCH-admin-bound.result
rename to testing/tests/binding/1033-PROPPATCH-admin-bound.result
diff --git a/testing/tests/binding/1023-PROPPATCH-admin-bound.test b/testing/tests/binding/1033-PROPPATCH-admin-bound.test
similarity index 100%
rename from testing/tests/binding/1023-PROPPATCH-admin-bound.test
rename to testing/tests/binding/1033-PROPPATCH-admin-bound.test
diff --git a/testing/tests/binding/1024-DELETE-admin-bind.result b/testing/tests/binding/1034-DELETE-admin-bind.result
similarity index 100%
rename from testing/tests/binding/1024-DELETE-admin-bind.result
rename to testing/tests/binding/1034-DELETE-admin-bind.result
diff --git a/testing/tests/binding/1024-DELETE-admin-bind.test b/testing/tests/binding/1034-DELETE-admin-bind.test
similarity index 100%
rename from testing/tests/binding/1024-DELETE-admin-bind.test
rename to testing/tests/binding/1034-DELETE-admin-bind.test
diff --git a/testing/tests/binding/1025-GET-mashup.result b/testing/tests/binding/1035-GET-mashup.result
similarity index 100%
rename from testing/tests/binding/1025-GET-mashup.result
rename to testing/tests/binding/1035-GET-mashup.result
diff --git a/testing/tests/binding/1025-GET-mashup.test b/testing/tests/binding/1035-GET-mashup.test
similarity index 100%
rename from testing/tests/binding/1025-GET-mashup.test
rename to testing/tests/binding/1035-GET-mashup.test