diff --git a/testing/tests/regression-suite/522-iCal-PROPFIND.result b/testing/tests/regression-suite/522-iCal-PROPFIND.result
index 020dd930..31612c5f 100644
--- a/testing/tests/regression-suite/522-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/522-iCal-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, bind, calendar-auto-schedule
-ETag: "15c404c52f510728b184026a924e53e7"
-Content-Length: 3930
+ETag: "d1bda7ce2edd243f3af7968f17a97e4c"
+Content-Length: 3932
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user2/</href>
   <propstat>
    <prop>
-    <C:getctag>f3a754d098fc688900631c6293d40fa5</C:getctag>
+    <C:getctag>"f3a754d098fc688900631c6293d40fa5"</C:getctag>
     <displayname>User 2</displayname>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/524-iCal-PROPFIND.result b/testing/tests/regression-suite/524-iCal-PROPFIND.result
index 95c6d173..7ccc295a 100644
--- a/testing/tests/regression-suite/524-iCal-PROPFIND.result
+++ b/testing/tests/regression-suite/524-iCal-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, bind, calendar-auto-schedule
-ETag: "4c09176bb349246638136eaa6c5a40d0"
-Content-Length: 4845
+ETag: "3ff13339128a73ed5d25308b678c3bc5"
+Content-Length: 4847
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/manager1/</href>
   <propstat>
    <prop>
-    <C:getctag>ab4a67c917e242e0989cd278c75a510e</C:getctag>
+    <C:getctag>"ab4a67c917e242e0989cd278c75a510e"</C:getctag>
     <displayname>Manager 1</displayname>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/532-iCal4-PROPFIND.result b/testing/tests/regression-suite/532-iCal4-PROPFIND.result
index d82522bc..2bc1daca 100644
--- a/testing/tests/regression-suite/532-iCal4-PROPFIND.result
+++ b/testing/tests/regression-suite/532-iCal4-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, bind, calendar-auto-schedule
-ETag: "cf8ef9f46b19096c9036fef29ec62622"
-Content-Length: 19066
+ETag: "8f659cb99eb89d1f6b79f1c075598d54"
+Content-Length: 19068
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/user1/</href>
   <propstat>
    <prop>
-    <C:getctag>89514106d00f37cc9ee71689c450d2ef</C:getctag>
+    <C:getctag>"89514106d00f37cc9ee71689c450d2ef"</C:getctag>
     <displayname>User 1</displayname>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/553-iPhone-PROPFIND.result b/testing/tests/regression-suite/553-iPhone-PROPFIND.result
index 37e5d3bd..2687ccfa 100644
--- a/testing/tests/regression-suite/553-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/553-iPhone-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, bind, calendar-auto-schedule
-ETag: "75ce17e7c56b97eb73a7f8b716f47534"
-Content-Length: 15432
+ETag: "e5a193a9e457e0e293583cd99727b4e6"
+Content-Length: 15434
 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"
   <propstat>
    <prop>
     <displayname>User 1</displayname>
-    <C1:getctag>89514106d00f37cc9ee71689c450d2ef</C1:getctag>
+    <C1:getctag>"89514106d00f37cc9ee71689c450d2ef"</C1:getctag>
     <resourcetype>
      <collection/>
      <principal/>
diff --git a/testing/tests/regression-suite/554-iPhone-PROPFIND.result b/testing/tests/regression-suite/554-iPhone-PROPFIND.result
index 37e5d3bd..2687ccfa 100644
--- a/testing/tests/regression-suite/554-iPhone-PROPFIND.result
+++ b/testing/tests/regression-suite/554-iPhone-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, bind, calendar-auto-schedule
-ETag: "75ce17e7c56b97eb73a7f8b716f47534"
-Content-Length: 15432
+ETag: "e5a193a9e457e0e293583cd99727b4e6"
+Content-Length: 15434
 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"
   <propstat>
    <prop>
     <displayname>User 1</displayname>
-    <C1:getctag>89514106d00f37cc9ee71689c450d2ef</C1:getctag>
+    <C1:getctag>"89514106d00f37cc9ee71689c450d2ef"</C1:getctag>
     <resourcetype>
      <collection/>
      <principal/>
diff --git a/testing/tests/regression-suite/902-PUT-collection.result b/testing/tests/regression-suite/902-PUT-collection.result
index de16a742..23eba4ae 100644
--- a/testing/tests/regression-suite/902-PUT-collection.result
+++ b/testing/tests/regression-suite/902-PUT-collection.result
@@ -6,3 +6,28 @@ DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, c
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
+
+      caldav_data: >29<
+
+    calendar_item: >29<
+
+           alarms: >28<
+
+        attendees: >40<
+
+    collection_id: >1398<
+  dav_displayname: >anotherone<
+         dav_etag: >a52157c35d64e6051e54024625d3a94a<
+         dav_name: >/user1/anotherone/<
+default_privilege: >NULL<
+      description: ><
+   is_addressbook: >0<
+      is_calendar: >1<
+ parent_container: >/user1/<
+public_events_onl: >0<
+publicly_readable: >0<
+    resourcetypes: ><DAV::collection/><urn:ietf:params:xml:ns:caldav:calendar/><
+  schedule_transp: >opaque<
+         timezone: >NULL<
+          user_no: >10<
+
diff --git a/testing/tests/regression-suite/902-PUT-collection.test b/testing/tests/regression-suite/902-PUT-collection.test
index d1edab1b..e815bc79 100644
--- a/testing/tests/regression-suite/902-PUT-collection.test
+++ b/testing/tests/regression-suite/902-PUT-collection.test
@@ -4,9 +4,10 @@
 # There is no CalDAV defined behaviour for this.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/entire/
+URL=http://mycaldav/caldav.php/user1/anotherone/
 HEADER=User-Agent: RSCDS Testing/0.7.x
 HEADER=Content-Type: text/calendar; charset=utf-8
+AUTH=admin:nimda
 
 HEAD
 
@@ -721,3 +722,41 @@ END:STANDARD
 END:VTIMEZONE
 END:VCALENDAR
 ENDDATA
+
+QUERY
+SELECT count(*) AS caldav_data FROM caldav_data WHERE dav_name ~ '^/user1/anotherone/'
+ENDQUERY
+
+QUERY
+SELECT count(*) AS calendar_item FROM calendar_item WHERE dav_name ~ '^/user1/anotherone/'
+ENDQUERY
+
+QUERY
+SELECT count(*) AS alarms FROM calendar_alarm JOIN calendar_item USING(dav_id)
+  WHERE dav_name ~ '^/user1/anotherone/'
+ENDQUERY
+
+QUERY
+SELECT count(*) AS attendees FROM calendar_attendee JOIN calendar_item USING(dav_id)
+  WHERE dav_name ~ '^/user1/anotherone/'
+ENDQUERY
+
+QUERY
+SELECT
+     collection_id,
+   dav_displayname,
+          dav_etag,
+          dav_name,
+default_privileges,
+       description,
+    is_addressbook,
+       is_calendar,
+  parent_container,
+public_events_only,
+     resourcetypes,
+   schedule_transp,
+          timezone,
+           user_no,
+ publicly_readable
+ FROM collection WHERE dav_name = '/user1/anotherone/'
+ENDQUERY
diff --git a/testing/tests/regression-suite/903-GET-Collection.result b/testing/tests/regression-suite/903-GET-Collection.result
index 17fa4b86..2078e3ab 100644
--- a/testing/tests/regression-suite/903-GET-Collection.result
+++ b/testing/tests/regression-suite/903-GET-Collection.result
@@ -1,7 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
-Content-Length: 24642
+Content-Length: 24646
 Etag: "a52157c35d64e6051e54024625d3a94a"
 Content-Type: text/calendar; charset="utf-8"
 
@@ -9,7 +9,7 @@ BEGIN:VCALENDAR
 PRODID:-//davical.org//NONSGML AWL Calendar//EN
 VERSION:2.0
 CALSCALE:GREGORIAN
-X-WR-CALNAME:entire
+X-WR-CALNAME:anotherone
 BEGIN:VEVENT
 UID:20061119T201927Z-5105-1000-5103-8@ubu
 DTSTAMP:20061119T201927Z
diff --git a/testing/tests/regression-suite/903-GET-Collection.test b/testing/tests/regression-suite/903-GET-Collection.test
index d647c2b8..58558cc4 100644
--- a/testing/tests/regression-suite/903-GET-Collection.test
+++ b/testing/tests/regression-suite/903-GET-Collection.test
@@ -3,5 +3,5 @@
 # just added with a PUT.
 #
 TYPE=GET
-URL=http://mycaldav/caldav.php/user1/entire/
+URL=http://mycaldav/caldav.php/user1/anotherone/
 HEAD
diff --git a/testing/tests/regression-suite/912-Space-PROPFIND.result b/testing/tests/regression-suite/912-Space-PROPFIND.result
index b571094f..3e4255cf 100644
--- a/testing/tests/regression-suite/912-Space-PROPFIND.result
+++ b/testing/tests/regression-suite/912-Space-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, bind, calendar-auto-schedule
-ETag: "affa07135ed5e3dd94266456e985d53d"
-Content-Length: 3825
+ETag: "bcb966ee1b9c5a114f71aef825b87ae6"
+Content-Length: 3827
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -11,7 +11,7 @@ Content-Type: text/xml; charset="utf-8"
   <href>/caldav.php/User%20Six/</href>
   <propstat>
    <prop>
-    <C:getctag>f077f746d340bc4f1998b35342411363</C:getctag>
+    <C:getctag>"f077f746d340bc4f1998b35342411363"</C:getctag>
     <displayname>User 6</displayname>
     <resourcetype>
      <collection/>
diff --git a/testing/tests/regression-suite/924-MOVE-a.result b/testing/tests/regression-suite/924-MOVE-a.result
new file mode 100644
index 00000000..f989f7ec
--- /dev/null
+++ b/testing/tests/regression-suite/924-MOVE-a.result
@@ -0,0 +1,15 @@
+HTTP/1.1 409 Conflict
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, access-control, calendar-access, calendar-schedule, extended-mkcol, calendar-proxy, bind, calendar-auto-schedule
+Content-Length: 37
+Content-Type: text/plain; charset="utf-8"
+
+Destination collection does not exist
+    cd_collection: >10<
+       cd_user_no: >10<
+    ci_collection: >10<
+       ci_user_no: >10<
+        data_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
+        item_name: >/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
+ mod_in_last_hour: >1<
+
diff --git a/testing/tests/regression-suite/924-MOVE-a.test b/testing/tests/regression-suite/924-MOVE-a.test
new file mode 100644
index 00000000..1b852a38
--- /dev/null
+++ b/testing/tests/regression-suite/924-MOVE-a.test
@@ -0,0 +1,21 @@
+#
+# MOVE an event from one location to another
+#
+TYPE=MOVE
+URL=http://regression.host/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics
+HEADER=User-Agent: RFC4918 Spec Tests
+HEADER=Destination: http://regression.host/caldav.php/user1/nonexistent/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics
+HEAD
+
+QUERY
+SELECT caldav_data.dav_name AS data_name, calendar_item.dav_name AS item_name,
+       (modified > (current_timestamp - '1 hour'::interval)) AS mod_in_last_hour,
+       caldav_data.user_no AS cd_user_no,
+       calendar_item.user_no AS ci_user_no,
+       caldav_data.collection_id AS cd_collection,
+       calendar_item.collection_id AS ci_collection
+FROM caldav_data JOIN calendar_item USING(dav_id)
+WHERE caldav_data.dav_name ~ 'DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics'
+ ORDER BY cd_collection
+ENDQUERY
+
diff --git a/testing/tests/regression-suite/924-MOVE.result b/testing/tests/regression-suite/924-MOVE.result
index edb81d9e..27e78c97 100644
--- a/testing/tests/regression-suite/924-MOVE.result
+++ b/testing/tests/regression-suite/924-MOVE.result
@@ -9,7 +9,7 @@ Content-Type: text/plain; charset="utf-8"
        cd_user_no: >10<
     ci_collection: >1398<
        ci_user_no: >10<
-        data_name: >/user1/entire/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
-        item_name: >/user1/entire/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
+        data_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
+        item_name: >/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics<
  mod_in_last_hour: >1<
 
diff --git a/testing/tests/regression-suite/924-MOVE.test b/testing/tests/regression-suite/924-MOVE.test
index 34a55abe..1496afa9 100644
--- a/testing/tests/regression-suite/924-MOVE.test
+++ b/testing/tests/regression-suite/924-MOVE.test
@@ -4,7 +4,7 @@
 TYPE=MOVE
 URL=http://regression.host/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics
 HEADER=User-Agent: RFC4918 Spec Tests
-HEADER=Destination: http://regression.host/caldav.php/user1/entire/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics
+HEADER=Destination: http://regression.host/caldav.php/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics
 HEAD
 
 QUERY
diff --git a/testing/tests/regression-suite/925-MOVE.test b/testing/tests/regression-suite/925-MOVE.test
index da99d330..da6e47ac 100644
--- a/testing/tests/regression-suite/925-MOVE.test
+++ b/testing/tests/regression-suite/925-MOVE.test
@@ -2,7 +2,7 @@
 # MOVE an event from one location to another
 #
 TYPE=MOVE
-URL=http://regression.host/caldav.php/user1/entire/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics
+URL=http://regression.host/caldav.php/user1/anotherone/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics
 HEADER=User-Agent: RFC4918 Spec Tests
 HEADER=Destination: /caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics
 HEAD
diff --git a/testing/tests/regression-suite/928-MOVE.result b/testing/tests/regression-suite/928-MOVE.result
index af6389a8..e7aa0867 100644
--- a/testing/tests/regression-suite/928-MOVE.result
+++ b/testing/tests/regression-suite/928-MOVE.result
@@ -5,7 +5,7 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-         dav_etag: >3cd2d347bfe806857ef14bce9eafd599<
+         dav_etag: >d28a7507a92f6f6b368c87a65808155e<
          dav_name: >/user1/movedcalendar/<
  mod_in_last_hour: >1<
           user_no: >10<
diff --git a/testing/tests/regression-suite/928-MOVE.test b/testing/tests/regression-suite/928-MOVE.test
index 1a54224a..bb117d50 100644
--- a/testing/tests/regression-suite/928-MOVE.test
+++ b/testing/tests/regression-suite/928-MOVE.test
@@ -2,7 +2,7 @@
 # MOVE an event from one location to another
 #
 TYPE=MOVE
-URL=http://regression.host/caldav.php/user1/entire/
+URL=http://regression.host/caldav.php/user1/anotherone/
 HEADER=User-Agent: RFC4918 Spec Tests
 HEADER=Destination: /caldav.php/user1/movedcalendar/
 HEAD
@@ -13,6 +13,6 @@ SELECT dav_name,
        (modified > (current_timestamp - '1 hour'::interval)) AS mod_in_last_hour,
        dav_etag
 FROM collection
-WHERE collection.dav_name ~ '(entire|movedcalendar)';
+WHERE collection.dav_name ~ '(anotherone|movedcalendar)';
 ENDQUERY
 
diff --git a/testing/tests/regression-suite/929-MOVE.result b/testing/tests/regression-suite/929-MOVE.result
index 0d594168..ad3e2f36 100644
--- a/testing/tests/regression-suite/929-MOVE.result
+++ b/testing/tests/regression-suite/929-MOVE.result
@@ -5,8 +5,8 @@ Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
-         dav_etag: >3cd2d347bfe806857ef14bce9eafd599<
-         dav_name: >/user1/entire/<
+         dav_etag: >d28a7507a92f6f6b368c87a65808155e<
+         dav_name: >/user1/anotherone/<
  mod_in_last_hour: >1<
           user_no: >10<
 
diff --git a/testing/tests/regression-suite/929-MOVE.test b/testing/tests/regression-suite/929-MOVE.test
index 5fe860bd..dfda95de 100644
--- a/testing/tests/regression-suite/929-MOVE.test
+++ b/testing/tests/regression-suite/929-MOVE.test
@@ -4,7 +4,7 @@
 TYPE=MOVE
 URL=http://regression.host/caldav.php/user1/movedcalendar/
 HEADER=User-Agent: RFC4918 Spec Tests
-HEADER=Destination: /caldav.php/user1/entire/
+HEADER=Destination: /caldav.php/user1/anotherone/
 HEAD
 
 QUERY
@@ -13,6 +13,6 @@ SELECT dav_name,
        (modified > (current_timestamp - '1 hour'::interval)) AS mod_in_last_hour,
        dav_etag
 FROM collection
-WHERE collection.dav_name ~ '(entire|movedcalendar)';
+WHERE collection.dav_name ~ '(anotherone|movedcalendar)';
 ENDQUERY