diff --git a/testing/tests/binding/1007-PROPFIND-bound.result b/testing/tests/binding/1007-PROPFIND-bound.result
index 5379d6d1..13617095 100644
--- a/testing/tests/binding/1007-PROPFIND-bound.result
+++ b/testing/tests/binding/1007-PROPFIND-bound.result
@@ -24,7 +24,7 @@
   <href>/caldav.php/user4/user2/33169d69-2969-4a96-a3e1-2e312b7614e6.ics</href>
   <propstat>
    <prop>
-    <getcontenttype>text/calendar</getcontenttype>
+    <getcontenttype>text/calendar; component=vevent</getcontenttype>
     <resourcetype/>
     <getetag>"f2c974ff51cb52cde0668544deb36380"</getetag>
    </prop>
@@ -35,7 +35,7 @@
   <href>/caldav.php/user4/user2/047871e3-6b70-4178-9af8-0ceb50f7b092.ics</href>
   <propstat>
    <prop>
-    <getcontenttype>text/calendar</getcontenttype>
+    <getcontenttype>text/calendar; component=vevent</getcontenttype>
     <resourcetype/>
     <getetag>"58cba7e3fafb6080e85619ea77d08c7a"</getetag>
    </prop>
@@ -46,7 +46,7 @@
   <href>/caldav.php/user4/user2/9429a973-2b13-4b1a-be09-948d75425c45.ics</href>
   <propstat>
    <prop>
-    <getcontenttype>text/calendar</getcontenttype>
+    <getcontenttype>text/calendar; component=vevent</getcontenttype>
     <resourcetype/>
     <getetag>"13249ced6c7527191a003f54f7e3cd25"</getetag>
    </prop>
@@ -57,7 +57,7 @@
   <href>/caldav.php/user4/user2/7d729xc0-0895-012d-124e-002421a2359e.ics</href>
   <propstat>
    <prop>
-    <getcontenttype>text/calendar</getcontenttype>
+    <getcontenttype>text/calendar; component=vevent</getcontenttype>
     <resourcetype/>
     <getetag>"848df16c32fc3ce319083ae84c2603a3"</getetag>
    </prop>
@@ -68,7 +68,7 @@
   <href>/caldav.php/user4/user2/bd262d20-1cdb-012d-1264-002421a2359e.ics</href>
   <propstat>
    <prop>
-    <getcontenttype>text/calendar</getcontenttype>
+    <getcontenttype>text/calendar; component=vevent</getcontenttype>
     <resourcetype/>
     <getetag>"671d4ee904be6c16dd1be076619fe7c0"</getetag>
    </prop>
@@ -79,7 +79,7 @@
   <href>/caldav.php/user4/user2/56f0e0e0-f742-012d-680c-002421a2359e.ics</href>
   <propstat>
    <prop>
-    <getcontenttype>text/calendar</getcontenttype>
+    <getcontenttype>text/calendar; component=vevent</getcontenttype>
     <resourcetype/>
     <getetag>"e18c0d539b6dcb56df2d266dd4305008"</getetag>
    </prop>
diff --git a/testing/tests/binding/1008-GET-bound.result b/testing/tests/binding/1008-GET-bound.result
index a2f6b001..6a9776bf 100644
--- a/testing/tests/binding/1008-GET-bound.result
+++ b/testing/tests/binding/1008-GET-bound.result
@@ -4,7 +4,7 @@ DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, bind, addressbook, calendar-auto-schedule, calendar-proxy
 Etag: "f2c974ff51cb52cde0668544deb36380"
 Content-Length: 858
-Content-Type: text/calendar; charset="utf-8"
+Content-Type: text/calendar; component=vevent; charset="utf-8"
 
 BEGIN:VCALENDAR
 PRODID:-//davical.org//NONSGML AWL Calendar//EN
diff --git a/testing/tests/binding/1010-PROPPATCH-bound.result b/testing/tests/binding/1010-PROPPATCH-bound.result
index 10d1bc9b..e7bcb688 100644
--- a/testing/tests/binding/1010-PROPPATCH-bound.result
+++ b/testing/tests/binding/1010-PROPPATCH-bound.result
@@ -2,20 +2,22 @@ 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: 353
+Content-Length: 387
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:" xmlns:X="http://xmlns.dotcal.com/dotcal">
- <href>/caldav.php/user4/user2/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop>
-   <displayname/>
-   <X:icon_uri/>
-  </prop>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user4/user2/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop>
+    <displayname/>
+    <X:icon_uri/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
 
   dav_displayname: >Updated Displayname with PROPPATCH<
diff --git a/testing/tests/binding/1033-PROPPATCH-admin-bound.result b/testing/tests/binding/1033-PROPPATCH-admin-bound.result
index 1520c5f8..5ffab934 100644
--- a/testing/tests/binding/1033-PROPPATCH-admin-bound.result
+++ b/testing/tests/binding/1033-PROPPATCH-admin-bound.result
@@ -2,20 +2,22 @@ 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: 358
+Content-Length: 392
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:" xmlns:X="http://xmlns.dotcal.com/dotcal">
- <href>/caldav.php/user4/base/user3/</href>
- <responsedescription>All requested changes were made.</responsedescription>
- <propstat>
-  <prop>
-   <displayname/>
-   <X:icon_uri/>
-  </prop>
-  <status>HTTP/1.1 200 OK</status>
- </propstat>
+ <response>
+  <href>/caldav.php/user4/base/user3/</href>
+  <responsedescription>All requested changes were made.</responsedescription>
+  <propstat>
+   <prop>
+    <displayname/>
+    <X:icon_uri/>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
 </multistatus>
 
   dav_displayname: >Updated user4-base-user3 displayname with PROPPATCH<
diff --git a/testing/tests/binding/1034-DELETE-admin-bind.result b/testing/tests/binding/1034-DELETE-admin-bind.result
index f9ad3151..3dc98ff7 100644
--- a/testing/tests/binding/1034-DELETE-admin-bind.result
+++ b/testing/tests/binding/1034-DELETE-admin-bind.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 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: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/carddav/2014-PUT-vcard.result b/testing/tests/carddav/2014-PUT-vcard.result
index 9479b2d9..2482c70f 100644
--- a/testing/tests/carddav/2014-PUT-vcard.result
+++ b/testing/tests/carddav/2014-PUT-vcard.result
@@ -4,7 +4,6 @@ HTTP/1.1 204 No Content
 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: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result
index 031827b0..743fc248 100644
--- a/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3023-PUT-iCal-with-attendees.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 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: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result
index cf0f12a5..acaecba6 100644
--- a/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3024-PUT-iCal-with-attendees.result
@@ -7,7 +7,6 @@ HTTP/1.1 204 No Content
 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: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/scheduling/3025-DELETE-invite.result b/testing/tests/scheduling/3025-DELETE-invite.result
index 2cbe70f6..9bf712b5 100644
--- a/testing/tests/scheduling/3025-DELETE-invite.result
+++ b/testing/tests/scheduling/3025-DELETE-invite.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 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: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result
index 49d0f8a8..b49dbf54 100644
--- a/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 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: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/scheduling/3028-DELETE-reply.result b/testing/tests/scheduling/3028-DELETE-reply.result
index 586e683c..a84513f4 100644
--- a/testing/tests/scheduling/3028-DELETE-reply.result
+++ b/testing/tests/scheduling/3028-DELETE-reply.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 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: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/scheduling/3029-DELETE-reply.result b/testing/tests/scheduling/3029-DELETE-reply.result
index 2cbe70f6..9bf712b5 100644
--- a/testing/tests/scheduling/3029-DELETE-reply.result
+++ b/testing/tests/scheduling/3029-DELETE-reply.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 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: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/scheduling/3030-DELETE-attendee-event.result b/testing/tests/scheduling/3030-DELETE-attendee-event.result
index 0589855f..420b52dd 100644
--- a/testing/tests/scheduling/3030-DELETE-attendee-event.result
+++ b/testing/tests/scheduling/3030-DELETE-attendee-event.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 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: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/scheduling/3031-DELETE-reply.result b/testing/tests/scheduling/3031-DELETE-reply.result
index 8f69c346..095b538e 100644
--- a/testing/tests/scheduling/3031-DELETE-reply.result
+++ b/testing/tests/scheduling/3031-DELETE-reply.result
@@ -2,7 +2,6 @@ HTTP/1.1 204 No Content
 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: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result
index c1c00f1d..d1827a5c 100644
--- a/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result
+++ b/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result
@@ -4,7 +4,6 @@ HTTP/1.1 204 No Content
 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: 0
 Content-Type: text/plain; charset="utf-8"
 
 
diff --git a/testing/tests/scheduling/3033-DELETE-organizer-event.result b/testing/tests/scheduling/3033-DELETE-organizer-event.result
index ecdd5ef4..303231a4 100644
--- a/testing/tests/scheduling/3033-DELETE-organizer-event.result
+++ b/testing/tests/scheduling/3033-DELETE-organizer-event.result
@@ -5,7 +5,6 @@ HTTP/1.1 204 No Content
 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: 0
 Content-Type: text/plain; charset="utf-8"