diff --git a/testing/tests/binding/1036-REPORT-sync-initial-bound.result b/testing/tests/binding/1036-REPORT-sync-initial-bound.result
index cdceddb2..5ed1c571 100644
--- a/testing/tests/binding/1036-REPORT-sync-initial-bound.result
+++ b/testing/tests/binding/1036-REPORT-sync-initial-bound.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: "50cb8400ad214ae2754964db6e1fd312"
+ETag: "d1e724878e4e8478a655c5fae6c1fa3c"
 Content-Length: 2302
 Content-Type: text/xml; charset="utf-8"
 
@@ -89,5 +89,5 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <sync-token>data:,11</sync-token>
+ <sync-token>data:,64</sync-token>
 </multistatus>
diff --git a/testing/tests/binding/Restore-Database.result b/testing/tests/binding/Restore-Database.result
index 458d2c4e..0205b771 100644
--- a/testing/tests/binding/Restore-Database.result
+++ b/testing/tests/binding/Restore-Database.result
@@ -25,7 +25,7 @@
 
  setval 
 --------
-     10
+     59
 (1 row)
 
  setval 
diff --git a/testing/tests/carddav/2010-REPORT-sync-initial.result b/testing/tests/carddav/2010-REPORT-sync-initial.result
index fec1fe8f..7b7136e9 100644
--- a/testing/tests/carddav/2010-REPORT-sync-initial.result
+++ b/testing/tests/carddav/2010-REPORT-sync-initial.result
@@ -38,5 +38,5 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <sync-token>data:,12</sync-token>
+ <sync-token>data:,65</sync-token>
 </multistatus>
diff --git a/testing/tests/carddav/2039-REPORT-sync-changed.result b/testing/tests/carddav/2039-REPORT-sync-changed.result
index 45fd46a3..cfdbf9c5 100644
--- a/testing/tests/carddav/2039-REPORT-sync-changed.result
+++ b/testing/tests/carddav/2039-REPORT-sync-changed.result
@@ -71,5 +71,5 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <sync-token>data:,13</sync-token>
+ <sync-token>data:,66</sync-token>
 </multistatus>
diff --git a/testing/tests/carddav/Restore-Database.result b/testing/tests/carddav/Restore-Database.result
index 944bdb50..817acff0 100644
--- a/testing/tests/carddav/Restore-Database.result
+++ b/testing/tests/carddav/Restore-Database.result
@@ -25,7 +25,7 @@
 
  setval 
 --------
-     11
+     64
 (1 row)
 
  setval 
diff --git a/testing/tests/regression-suite/0099-REPORT-sync-initial.result b/testing/tests/regression-suite/0099-REPORT-sync-initial.result
index fe052ec7..acb9a0f0 100644
--- a/testing/tests/regression-suite/0099-REPORT-sync-initial.result
+++ b/testing/tests/regression-suite/0099-REPORT-sync-initial.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: "428b3b0b0de29ffd0f827a6a9d36ab26"
-Content-Length: 360
+ETag: "3cf5a54d84dd74fc7e272361ff54c1c2"
+Content-Length: 361
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -17,5 +17,5 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <sync-token>data:,1</sync-token>
+ <sync-token>data:,17</sync-token>
 </multistatus>
diff --git a/testing/tests/regression-suite/0548-iCal-PROPFIND.result b/testing/tests/regression-suite/0548-iCal-PROPFIND.result
index cca3c68b..9ef46ca8 100644
--- a/testing/tests/regression-suite/0548-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/0548-iCal-PROPFIND.result
@@ -4,8 +4,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: "efc67f060a8687c760af82549d8e83ae"
-Content-Length: 29703
+ETag: "bfb962d9c38d19e4ac04b8ced69de692"
+Content-Length: 29709
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -240,7 +240,7 @@ Content-Type: text/xml; charset="utf-8"
       </report>
      </supported-report>
     </supported-report-set>
-    <sync-token>data:,1</sync-token>
+    <sync-token>data:,42</sync-token>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -365,7 +365,7 @@ Content-Type: text/xml; charset="utf-8"
       </report>
      </supported-report>
     </supported-report-set>
-    <sync-token>data:,2</sync-token>
+    <sync-token>data:,43</sync-token>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -508,7 +508,7 @@ Content-Type: text/xml; charset="utf-8"
       </report>
      </supported-report>
     </supported-report-set>
-    <sync-token>data:,3</sync-token>
+    <sync-token>data:,44</sync-token>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -641,7 +641,7 @@ Content-Type: text/xml; charset="utf-8"
       </report>
      </supported-report>
     </supported-report-set>
-    <sync-token>data:,4</sync-token>
+    <sync-token>data:,39</sync-token>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -774,7 +774,7 @@ Content-Type: text/xml; charset="utf-8"
       </report>
      </supported-report>
     </supported-report-set>
-    <sync-token>data:,5</sync-token>
+    <sync-token>data:,45</sync-token>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -918,7 +918,7 @@ Content-Type: text/xml; charset="utf-8"
       </report>
      </supported-report>
     </supported-report-set>
-    <sync-token>data:,6</sync-token>
+    <sync-token>data:,36</sync-token>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
diff --git a/testing/tests/regression-suite/0598-REPORT-sync-initial.result b/testing/tests/regression-suite/0598-REPORT-sync-initial.result
index dd2c5c0b..9300fa63 100644
--- a/testing/tests/regression-suite/0598-REPORT-sync-initial.result
+++ b/testing/tests/regression-suite/0598-REPORT-sync-initial.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: "57f952b6561fac561ff0a65b7f2b046b"
-Content-Length: 4479
+ETag: "3ca2f604afe66d08212a8194f896e9a5"
+Content-Length: 4480
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -170,5 +170,5 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <sync-token>data:,7</sync-token>
+ <sync-token>data:,46</sync-token>
 </multistatus>
diff --git a/testing/tests/regression-suite/0599-REPORT-sync-changed.result b/testing/tests/regression-suite/0599-REPORT-sync-changed.result
index e03d1d80..71a07ac4 100644
--- a/testing/tests/regression-suite/0599-REPORT-sync-changed.result
+++ b/testing/tests/regression-suite/0599-REPORT-sync-changed.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: "4a1dd3131b34c6a17e3c293c58ba1dc8"
-Content-Length: 4235
+ETag: "ba74f029c7271d3094d45dabd5534418"
+Content-Length: 4624
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -62,6 +62,15 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
  <response>
   <href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
   <propstat>
@@ -152,6 +161,10 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
+ <response>
+  <href>/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics</href>
+  <status>HTTP/1.1 404 Not Found</status>
+ </response>
  <response>
   <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
   <propstat>
@@ -161,5 +174,5 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <sync-token>data:,8</sync-token>
+ <sync-token>data:,47</sync-token>
 </multistatus>
diff --git a/testing/tests/regression-suite/1100-REPORT-sync-changed.result b/testing/tests/regression-suite/1100-REPORT-sync-changed.result
index ff7635fc..916d786f 100644
--- a/testing/tests/regression-suite/1100-REPORT-sync-changed.result
+++ b/testing/tests/regression-suite/1100-REPORT-sync-changed.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: "744d0a9d9f5366255f50110c1922288c"
-Content-Length: 1164
+ETag: "adf396e4066d8251128a3f8ecfcc0481"
+Content-Length: 1165
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -42,5 +42,5 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <sync-token>data:,9</sync-token>
+ <sync-token>data:,58</sync-token>
 </multistatus>
diff --git a/testing/tests/regression-suite/1100-REPORT-sync-changed.test b/testing/tests/regression-suite/1100-REPORT-sync-changed.test
index 8d157fbc..ce873270 100644
--- a/testing/tests/regression-suite/1100-REPORT-sync-changed.test
+++ b/testing/tests/regression-suite/1100-REPORT-sync-changed.test
@@ -15,7 +15,7 @@ BEGINDATA
     <getetag/>
     <getlastmodified/>
   </prop>
-  <sync-token>data:,3</sync-token>
+  <sync-token>data:,47</sync-token>
 </sync-collection>
 ENDDATA
 
diff --git a/testing/tests/regression-suite/1101-REPORT-sync-changed.result b/testing/tests/regression-suite/1101-REPORT-sync-changed.result
index 0c04af17..7203451f 100644
--- a/testing/tests/regression-suite/1101-REPORT-sync-changed.result
+++ b/testing/tests/regression-suite/1101-REPORT-sync-changed.result
@@ -2,11 +2,11 @@ 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: "d5d385bfb2228f4e80f25a9c038eaadc"
-Content-Length: 116
+ETag: "a39452fdb89ce3ae9a822cec0e0efd10"
+Content-Length: 117
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
- <sync-token>data:,9</sync-token>
+ <sync-token>data:,58</sync-token>
 </multistatus>
diff --git a/testing/tests/regression-suite/1101-REPORT-sync-changed.test b/testing/tests/regression-suite/1101-REPORT-sync-changed.test
index 2191be9f..ab97f738 100644
--- a/testing/tests/regression-suite/1101-REPORT-sync-changed.test
+++ b/testing/tests/regression-suite/1101-REPORT-sync-changed.test
@@ -17,7 +17,7 @@ BEGINDATA
     <getetag/>
     <getlastmodified/>
   </prop>
-  <sync-token>data:,9</sync-token>
+  <sync-token>data:,58</sync-token>
 </sync-collection>
 ENDDATA
 
diff --git a/testing/tests/regression-suite/1102-REPORT-sync-changed.result b/testing/tests/regression-suite/1102-REPORT-sync-changed.result
index 0c04af17..7203451f 100644
--- a/testing/tests/regression-suite/1102-REPORT-sync-changed.result
+++ b/testing/tests/regression-suite/1102-REPORT-sync-changed.result
@@ -2,11 +2,11 @@ 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: "d5d385bfb2228f4e80f25a9c038eaadc"
-Content-Length: 116
+ETag: "a39452fdb89ce3ae9a822cec0e0efd10"
+Content-Length: 117
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
- <sync-token>data:,9</sync-token>
+ <sync-token>data:,58</sync-token>
 </multistatus>
diff --git a/testing/tests/regression-suite/1102-REPORT-sync-changed.test b/testing/tests/regression-suite/1102-REPORT-sync-changed.test
index 2191be9f..ab97f738 100644
--- a/testing/tests/regression-suite/1102-REPORT-sync-changed.test
+++ b/testing/tests/regression-suite/1102-REPORT-sync-changed.test
@@ -17,7 +17,7 @@ BEGINDATA
     <getetag/>
     <getlastmodified/>
   </prop>
-  <sync-token>data:,9</sync-token>
+  <sync-token>data:,58</sync-token>
 </sync-collection>
 ENDDATA
 
diff --git a/testing/tests/regression-suite/1103-REPORT-sync-changed.result b/testing/tests/regression-suite/1103-REPORT-sync-changed.result
index f71773d5..a81ef69b 100644
--- a/testing/tests/regression-suite/1103-REPORT-sync-changed.result
+++ b/testing/tests/regression-suite/1103-REPORT-sync-changed.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: "1b04205588aa0a39b89c5f000dc8c23e"
+ETag: "9a90914dea200103fb2d8ed56e1468c2"
 Content-Length: 6649
 Content-Type: text/xml; charset="utf-8"
 
@@ -218,5 +218,5 @@ Content-Type: text/xml; charset="utf-8"
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <sync-token>data:,10</sync-token>
+ <sync-token>data:,59</sync-token>
 </multistatus>
diff --git a/testing/tests/regression-suite/1103-REPORT-sync-changed.test b/testing/tests/regression-suite/1103-REPORT-sync-changed.test
index a8454721..c05d3871 100644
--- a/testing/tests/regression-suite/1103-REPORT-sync-changed.test
+++ b/testing/tests/regression-suite/1103-REPORT-sync-changed.test
@@ -17,7 +17,7 @@ BEGINDATA
     <getetag/>
     <getlastmodified/>
   </prop>
-  <sync-token>data:,10</sync-token>
+  <sync-token>data:,59</sync-token>
 </sync-collection>
 ENDDATA
 
diff --git a/testing/tests/scheduling/Restore-Database.result b/testing/tests/scheduling/Restore-Database.result
index 193683b4..43c27fe7 100644
--- a/testing/tests/scheduling/Restore-Database.result
+++ b/testing/tests/scheduling/Restore-Database.result
@@ -25,7 +25,7 @@
 
  setval 
 --------
-     13
+     66
 (1 row)
 
  setval 
diff --git a/testing/tests/timezone/Restore-Database.result b/testing/tests/timezone/Restore-Database.result
index c056f4ad..01de020c 100644
--- a/testing/tests/timezone/Restore-Database.result
+++ b/testing/tests/timezone/Restore-Database.result
@@ -25,7 +25,7 @@
 
  setval 
 --------
-     13
+     79
 (1 row)
 
  setval