diff --git a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result
index 209eb19f..07f7e52e 100644
--- a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result
+++ b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.result
@@ -2,38 +2,64 @@ 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
-Content-Length: 687
+Content-Length: 462
 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">
- <response>
-  <href>/caldav.php/user1/home/</href>
-  <responsedescription>Some properties were not able to be changed.</responsedescription>
-  <propstat>
-   <prop>
-    <resourcetype/>
-   </prop>
-   <status>HTTP/1.1 403 Forbidden</status>
-   <responsedescription>Unsupported resourcetype modification.</responsedescription>
-   <error>
-    <cannot-modify-protected-property/>
-   </error>
-  </propstat>
-  <propstat>
-   <prop>
-    <displayname/>
-    <C:schedule-calendar-transp/>
-   </prop>
-   <status>HTTP/1.1 424 Failed Dependency</status>
-  </propstat>
- </response>
+<multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:X="http://xmlns.comical.net/birds">
+ <href>/caldav.php/user1/home/</href>
+ <responsedescription>All requested changes were made.</responsedescription>
+ <propstat>
+  <prop>
+   <resourcetype/>
+   <displayname/>
+   <C:schedule-calendar-transp/>
+   <X:spotted-grebe/>
+   <C:cats/>
+  </prop>
+  <status>HTTP/1.1 200 OK</status>
+ </propstat>
 </multistatus>
 
   changed_last_5m: >1<
-  dav_displayname: >User One's addressbook<
-   is_addressbook: >1<
-      is_calendar: >0<
-    resourcetypes: ><collection xmlns="DAV:"/><addressbook xmlns="urn:ietf:params:xml:ns:carddav"/><
-  schedule_transp: >transparent<
+  dav_displayname: >User 1's Calendaranza<
+   is_addressbook: >0<
+      is_calendar: >1<
+    resourcetypes: ><collection xmlns="DAV:"/><calendar xmlns="urn:ietf:params:xml:ns:caldav"/><
+  schedule_transp: >opaque<
+
+       changed_by: >10<
+    property_name: >http://apple.com/ns/ical/:calendar-color<
+   property_value: >#0252D4FF<
+
+       changed_by: >10<
+    property_name: >http://apple.com/ns/ical/:calendar-order<
+   property_value: >1<
+
+       changed_by: >10<
+    property_name: >urn:ietf:params:xml:ns:caldav:schedule-default-calendar-URL<
+   property_value: >
+ <href xmlns="DAV:">/caldav.php/user1/home/</href>
+<
+
+       changed_by: >10<
+    property_name: >urn:org:davical:outer<
+   property_value: >
+ <middle xmlns="urn:org:davical">
+  <inner xmlns="urn:org:davical">inside</inner>
+  <inner xmlns="urn:org:davical">inside2</inner>
+ </middle>
+<
+
+       changed_by: >10<
+    property_name: >http://xmlns.comical.net/birds:spotted-grebe<
+   property_value: ><
+
+       changed_by: >10<
+    property_name: >urn:ietf:params:xml:ns:caldav:cats<
+   property_value: >
+ <cat breed="persian" xmlns="urn:ietf:params:xml:ns:caldav">Coconut</cat>
+ <cat breed="tabby" xmlns="urn:ietf:params:xml:ns:caldav">Tigger</cat>
+ <cat breed="burmese" xmlns="urn:ietf:params:xml:ns:caldav">Simba</cat>
+<
 
diff --git a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.test b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.test
index 11c6a045..74dd9830 100644
--- a/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.test
+++ b/testing/tests/regression-suite/0846-Spec-PROPPATCH-calendar.test
@@ -1,7 +1,7 @@
 #
 # Check for support of PROPPATCH method
 #
-# Try (and fail) to set the collection to be both an addressbook and a calendar.
+# Try to set some dead properties on the collection
 #
 TYPE=PROPPATCH
 URL=http://regression.host/caldav.php/user1/home/
@@ -11,18 +11,23 @@ HEAD
 
 BEGINDATA
 <?xml version="1.0" encoding="utf-8" ?> 
-<propertyupdate xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav"> 
+<propertyupdate xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:B="urn:example:cats">
   <set> 
     <prop> 
       <resourcetype> 
         <collection/>
         <calendar xmlns="urn:ietf:params:xml:ns:caldav"/>
-        <spotted-grebe xmlns="http://xmlns.comical.net/birds"/>
       </resourcetype> 
       <displayname>User 1's Calendaranza</displayname> 
       <C:schedule-calendar-transp>
        <C:opaque/>
       </C:schedule-calendar-transp>
+      <spotted-grebe xmlns="http://xmlns.comical.net/birds"/>
+      <C:cats>
+        <C:cat breed="persian">Coconut</C:cat>
+        <C:cat breed="tabby">Tigger</C:cat>
+        <C:cat breed="burmese">Simba</C:cat>
+      </C:cats>
     </prop> 
   </set> 
 </propertyupdate>
@@ -34,3 +39,8 @@ SELECT dav_displayname, is_addressbook, is_calendar, resourcetypes,
        schedule_transp
   FROM collection WHERE dav_name = '/user1/home/';
 ENDQUERY
+
+QUERY
+SELECT property_name, property_value, changed_by
+  FROM property WHERE dav_name = '/user1/home/'
+ENDQUERY
diff --git a/testing/tests/regression-suite/0849-Spec-PROPFIND.result b/testing/tests/regression-suite/0849-Spec-PROPFIND.result
new file mode 100644
index 00000000..9e363940
--- /dev/null
+++ b/testing/tests/regression-suite/0849-Spec-PROPFIND.result
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:" xmlns:X="http://xmlns.comical.net/birds" xmlns:C="urn:ietf:params:xml:ns:caldav">
+ <response>
+  <href>/caldav.php/user1/home/</href>
+  <propstat>
+   <prop>
+    <owner>
+     <href>/caldav.php/user1/</href>
+    </owner>
+    <displayname>User 1's Calendaranza</displayname>
+    <X:spotted-grebe/>
+    <C:cats>
+     <C:cat breed="persian">Coconut</C:cat>
+     <C:cat breed="tabby">Tigger</C:cat>
+     <C:cat breed="burmese">Simba</C:cat>
+    </C:cats>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+</multistatus>
diff --git a/testing/tests/regression-suite/0849-Spec-PROPFIND.test b/testing/tests/regression-suite/0849-Spec-PROPFIND.test
new file mode 100644
index 00000000..26064585
--- /dev/null
+++ b/testing/tests/regression-suite/0849-Spec-PROPFIND.test
@@ -0,0 +1,21 @@
+#
+# PROPFIND based on RFC2518 Spec against an iCalendar resource
+#
+TYPE=PROPFIND
+URL=http://regression.host/caldav.php/user1/home/
+HEADER=User-Agent: RFC2518 Spec Tests
+HEADER=Depth: 0
+HEADER=Content-Type: application/xml
+
+
+BEGINDATA
+<?xml version="1.0" encoding="utf-8"?>
+<propfind xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav" xmlns:B="urn:example:cats">
+  <prop> 
+    <owner/> 
+    <displayname/>
+    <spotted-grebe xmlns="http://xmlns.comical.net/birds"/>
+    <C:cats/>
+ </prop>
+</propfind>
+ENDDATA