diff --git a/testing/tests/regression-suite/001-Mulberry-1.result b/testing/tests/regression-suite/001-Mulberry-1.result
index cb268b34..259bb5cc 100644
--- a/testing/tests/regression-suite/001-Mulberry-1.result
+++ b/testing/tests/regression-suite/001-Mulberry-1.result
@@ -1,9 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR
+Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR
 DAV: 1, 2, access-control
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/002-Mulberry-1.result b/testing/tests/regression-suite/002-Mulberry-1.result
index 6daa7141..326d9138 100644
--- a/testing/tests/regression-suite/002-Mulberry-1.result
+++ b/testing/tests/regression-suite/002-Mulberry-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "babe83e6862fa165ee05cc53ef149e02"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1790
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/003-Mulberry-1.result b/testing/tests/regression-suite/003-Mulberry-1.result
index 0dde51af..f582a97e 100644
--- a/testing/tests/regression-suite/003-Mulberry-1.result
+++ b/testing/tests/regression-suite/003-Mulberry-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "5050c853fe31c4f40fe0cefb3bb4d9aa"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 365
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/004-Mulberry-1.result b/testing/tests/regression-suite/004-Mulberry-1.result
index dc64a075..f7d64205 100644
--- a/testing/tests/regression-suite/004-Mulberry-1.result
+++ b/testing/tests/regression-suite/004-Mulberry-1.result
@@ -1,7 +1,5 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/005-Mulberry-1.result b/testing/tests/regression-suite/005-Mulberry-1.result
index af4f695a..b9b49f0d 100644
--- a/testing/tests/regression-suite/005-Mulberry-1.result
+++ b/testing/tests/regression-suite/005-Mulberry-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "a2f9456e10ec204df8badf8526eddca8"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 708
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/006-Mulberry-1.result b/testing/tests/regression-suite/006-Mulberry-1.result
index 49428201..968eec04 100644
--- a/testing/tests/regression-suite/006-Mulberry-1.result
+++ b/testing/tests/regression-suite/006-Mulberry-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "f86e4358f5d14ec9e61ee57ae97696d9"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 483
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/007-Mulberry-1.result b/testing/tests/regression-suite/007-Mulberry-1.result
index aa177b50..7208a174 100644
--- a/testing/tests/regression-suite/007-Mulberry-1.result
+++ b/testing/tests/regression-suite/007-Mulberry-1.result
@@ -1,7 +1,5 @@
 HTTP/1.1 412 Precondition Failed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 45
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/010-Mulberry-PUT-1.result b/testing/tests/regression-suite/010-Mulberry-PUT-1.result
index 89d65d35..be62c5f8 100644
--- a/testing/tests/regression-suite/010-Mulberry-PUT-1.result
+++ b/testing/tests/regression-suite/010-Mulberry-PUT-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "b000d7defa19ccb7cd21e546b54155ee"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/011-Mulberry-PUT-1b.result b/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
index 89d65d35..be62c5f8 100644
--- a/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
+++ b/testing/tests/regression-suite/011-Mulberry-PUT-1b.result
@@ -1,8 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "b000d7defa19ccb7cd21e546b54155ee"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/012-Mulberry-PUT-2.result b/testing/tests/regression-suite/012-Mulberry-PUT-2.result
index 51b1b0d5..e2cb9ef6 100644
--- a/testing/tests/regression-suite/012-Mulberry-PUT-2.result
+++ b/testing/tests/regression-suite/012-Mulberry-PUT-2.result
@@ -1,8 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "22158fc45876987b2b00749a3a1684d8"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
index 4fc72c4c..b817c15f 100644
--- a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
+++ b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "145f7e7222b7b8d4f7e194244e825ebe"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1199
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/014-Mulberry-PUT-3.result b/testing/tests/regression-suite/014-Mulberry-PUT-3.result
index 15516d55..06fecffa 100644
--- a/testing/tests/regression-suite/014-Mulberry-PUT-3.result
+++ b/testing/tests/regression-suite/014-Mulberry-PUT-3.result
@@ -1,8 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "2c32a2f8aba853654eb17fe037a4db4d"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
index c8a34cef..c45e48fb 100644
--- a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
+++ b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "9f4924e81f1c237854f11d8d58e85dae"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1199
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result b/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result
index dc64a075..f7d64205 100644
--- a/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result
+++ b/testing/tests/regression-suite/016-Mulberry-MKCALENDAR-3.result
@@ -1,7 +1,5 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result b/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
index 242c4a76..760c5f82 100644
--- a/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
+++ b/testing/tests/regression-suite/017-Mulberry-MKCALENDAR-4.result
@@ -1,7 +1,5 @@
 HTTP/1.1 403 Forbidden
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 36
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/018-Mulberry-PUT-4.result b/testing/tests/regression-suite/018-Mulberry-PUT-4.result
index 2a9250f6..4703eeb4 100644
--- a/testing/tests/regression-suite/018-Mulberry-PUT-4.result
+++ b/testing/tests/regression-suite/018-Mulberry-PUT-4.result
@@ -1,8 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "75a75e1c7c4546074aab7645b5323738"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result b/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
index 6d8926a1..0e01fe29 100644
--- a/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
+++ b/testing/tests/regression-suite/019-Mulberry-OPTIONS-3.result
@@ -1,7 +1,5 @@
 HTTP/1.1 400 Bad Request
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 46
 Connection: close
 Content-Type: text/plain; charset=UTF-8
diff --git a/testing/tests/regression-suite/020-Mulberry-DELETE-1.result b/testing/tests/regression-suite/020-Mulberry-DELETE-1.result
index 90da4675..2aebde82 100644
--- a/testing/tests/regression-suite/020-Mulberry-DELETE-1.result
+++ b/testing/tests/regression-suite/020-Mulberry-DELETE-1.result
@@ -1,7 +1,5 @@
 HTTP/1.1 412 Precondition Failed
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 55
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/021-Mulberry-DELETE-2.result b/testing/tests/regression-suite/021-Mulberry-DELETE-2.result
index 7be7f89e..93027f34 100644
--- a/testing/tests/regression-suite/021-Mulberry-DELETE-2.result
+++ b/testing/tests/regression-suite/021-Mulberry-DELETE-2.result
@@ -1,7 +1,5 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/022-Mulberry-PUT-5.result b/testing/tests/regression-suite/022-Mulberry-PUT-5.result
index 0cb88768..dddddb5a 100644
--- a/testing/tests/regression-suite/022-Mulberry-PUT-5.result
+++ b/testing/tests/regression-suite/022-Mulberry-PUT-5.result
@@ -1,8 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "81979ab45975368d619171a4c3e1e5e2"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/023-Mulberry-DELETE-3.result b/testing/tests/regression-suite/023-Mulberry-DELETE-3.result
index 7be7f89e..93027f34 100644
--- a/testing/tests/regression-suite/023-Mulberry-DELETE-3.result
+++ b/testing/tests/regression-suite/023-Mulberry-DELETE-3.result
@@ -1,7 +1,5 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/100-Evo-OPTIONS-1.result b/testing/tests/regression-suite/100-Evo-OPTIONS-1.result
index 5a1ebc93..e1a28acc 100644
--- a/testing/tests/regression-suite/100-Evo-OPTIONS-1.result
+++ b/testing/tests/regression-suite/100-Evo-OPTIONS-1.result
@@ -1,6 +1,5 @@
 HTTP/1.1 401 Unauthorized
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 WWW-Authenticate: Basic realm="Really Simple CalDAV Store"
 Content-Length: 40
 Content-Type: text/html; charset=UTF-8
diff --git a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
index 074b9a9c..7fc69e1f 100644
--- a/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
+++ b/testing/tests/regression-suite/101-Evo-OPTIONS-1.result
@@ -1,9 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR, REPORT
+Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, REPORT
 DAV: 1, 2, access-control, calendar-access
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/102-Evo-REPORT-1.result b/testing/tests/regression-suite/102-Evo-REPORT-1.result
index 0ab7d29f..ec77db16 100644
--- a/testing/tests/regression-suite/102-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/102-Evo-REPORT-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "f9fa1b47eff2ea9f94e6fa54b07198d8"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 341
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/103-Evo-GET-1.result b/testing/tests/regression-suite/103-Evo-GET-1.result
index 8b74e91d..a07e6e25 100644
--- a/testing/tests/regression-suite/103-Evo-GET-1.result
+++ b/testing/tests/regression-suite/103-Evo-GET-1.result
@@ -1,7 +1,5 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 747
 Content-Type: text/calendar; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/104-Evo-PUT-1.result b/testing/tests/regression-suite/104-Evo-PUT-1.result
index 273b1e6d..ed3d9a68 100644
--- a/testing/tests/regression-suite/104-Evo-PUT-1.result
+++ b/testing/tests/regression-suite/104-Evo-PUT-1.result
@@ -2,9 +2,7 @@ HTTP/1.1 100 Continue
 
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "c3658901fd4689d4a1e1d6f08601ef4f"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/105-Evo-REPORT-1.result b/testing/tests/regression-suite/105-Evo-REPORT-1.result
index 129370a6..d14ddbfa 100644
--- a/testing/tests/regression-suite/105-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/105-Evo-REPORT-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "9d3605b5b78ea1f7f2273b3251f23b61"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 582
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/106-Evo-GET-1.result b/testing/tests/regression-suite/106-Evo-GET-1.result
index b511eb79..dba0eb61 100644
--- a/testing/tests/regression-suite/106-Evo-GET-1.result
+++ b/testing/tests/regression-suite/106-Evo-GET-1.result
@@ -1,7 +1,5 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1059
 Content-Type: text/calendar; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/107-Evo-REPORT-1.result b/testing/tests/regression-suite/107-Evo-REPORT-1.result
index 2b2012d6..3433b8f6 100644
--- a/testing/tests/regression-suite/107-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/107-Evo-REPORT-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "daca68be14cb0969dd84f1410a2764ed"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 560
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/108-Evo-REPORT-1.result b/testing/tests/regression-suite/108-Evo-REPORT-1.result
index 94e344f9..08428c4b 100644
--- a/testing/tests/regression-suite/108-Evo-REPORT-1.result
+++ b/testing/tests/regression-suite/108-Evo-REPORT-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "5940fad8fc254eb229f36f3176385154"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 596
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/200-Moz-OPTIONS-1.result b/testing/tests/regression-suite/200-Moz-OPTIONS-1.result
index 5a1ebc93..e1a28acc 100644
--- a/testing/tests/regression-suite/200-Moz-OPTIONS-1.result
+++ b/testing/tests/regression-suite/200-Moz-OPTIONS-1.result
@@ -1,6 +1,5 @@
 HTTP/1.1 401 Unauthorized
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 WWW-Authenticate: Basic realm="Really Simple CalDAV Store"
 Content-Length: 40
 Content-Type: text/html; charset=UTF-8
diff --git a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
index 074b9a9c..7fc69e1f 100644
--- a/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
+++ b/testing/tests/regression-suite/201-Moz-OPTIONS-2.result
@@ -1,9 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR, REPORT
+Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, REPORT
 DAV: 1, 2, access-control, calendar-access
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/202-Moz-REPORT-1.result b/testing/tests/regression-suite/202-Moz-REPORT-1.result
index 5a1ebc93..e1a28acc 100644
--- a/testing/tests/regression-suite/202-Moz-REPORT-1.result
+++ b/testing/tests/regression-suite/202-Moz-REPORT-1.result
@@ -1,6 +1,5 @@
 HTTP/1.1 401 Unauthorized
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 WWW-Authenticate: Basic realm="Really Simple CalDAV Store"
 Content-Length: 40
 Content-Type: text/html; charset=UTF-8
diff --git a/testing/tests/regression-suite/203-Moz-REPORT-2.result b/testing/tests/regression-suite/203-Moz-REPORT-2.result
index a2c82f76..c5518118 100644
--- a/testing/tests/regression-suite/203-Moz-REPORT-2.result
+++ b/testing/tests/regression-suite/203-Moz-REPORT-2.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "9a2b860b7650f72b1e0760312adac2b4"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 2420
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/204-Moz-REPORT-3.result b/testing/tests/regression-suite/204-Moz-REPORT-3.result
index 61767348..6053928d 100644
--- a/testing/tests/regression-suite/204-Moz-REPORT-3.result
+++ b/testing/tests/regression-suite/204-Moz-REPORT-3.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "e111c4ad26b709f9f5010d8767e66660"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1110
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/205-Moz-PROPFIND-1.result b/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
index c0040580..60424bd3 100644
--- a/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
+++ b/testing/tests/regression-suite/205-Moz-PROPFIND-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "d8ecc54eb92c9d4552b4968f5a4f0edc"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 343
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/206-Moz-PUT-1.result b/testing/tests/regression-suite/206-Moz-PUT-1.result
index aa7e4207..e25f5404 100644
--- a/testing/tests/regression-suite/206-Moz-PUT-1.result
+++ b/testing/tests/regression-suite/206-Moz-PUT-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "a1c6404d61190f9574e2bfd69383f144"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/207-Moz-REPORT-4.result b/testing/tests/regression-suite/207-Moz-REPORT-4.result
index 9c6bcb75..596be63f 100644
--- a/testing/tests/regression-suite/207-Moz-REPORT-4.result
+++ b/testing/tests/regression-suite/207-Moz-REPORT-4.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "3c6079aca32c2bbcff3f4091dcd38168"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1358
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/208-Moz-REPORT-5.result b/testing/tests/regression-suite/208-Moz-REPORT-5.result
index 8e5fa72e..079198a0 100644
--- a/testing/tests/regression-suite/208-Moz-REPORT-5.result
+++ b/testing/tests/regression-suite/208-Moz-REPORT-5.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "bd7f155447f7ae232ebf4093b2c7dbc6"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 68
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/300-Chandler-OPTIONS-1.result b/testing/tests/regression-suite/300-Chandler-OPTIONS-1.result
index 5a1ebc93..e1a28acc 100644
--- a/testing/tests/regression-suite/300-Chandler-OPTIONS-1.result
+++ b/testing/tests/regression-suite/300-Chandler-OPTIONS-1.result
@@ -1,6 +1,5 @@
 HTTP/1.1 401 Unauthorized
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 WWW-Authenticate: Basic realm="Really Simple CalDAV Store"
 Content-Length: 40
 Content-Type: text/html; charset=UTF-8
diff --git a/testing/tests/regression-suite/301-Chandler-HEAD-1.result b/testing/tests/regression-suite/301-Chandler-HEAD-1.result
index 16e57ff6..a41904b8 100644
--- a/testing/tests/regression-suite/301-Chandler-HEAD-1.result
+++ b/testing/tests/regression-suite/301-Chandler-HEAD-1.result
@@ -1,6 +1,5 @@
 HTTP/1.1 401 Unauthorized
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 WWW-Authenticate: Basic realm="Really Simple CalDAV Store"
 Content-Type: text/html; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result b/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
index 074b9a9c..7fc69e1f 100644
--- a/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
+++ b/testing/tests/regression-suite/302-Chandler-OPTIONS-2.result
@@ -1,9 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR, REPORT
+Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, REPORT
 DAV: 1, 2, access-control, calendar-access
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
index 1b3e8e91..97a64ce8 100644
--- a/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
+++ b/testing/tests/regression-suite/303-Chandler-PROPFIND-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "2fe1affa2720f00af1c4765534fb4334"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 443
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
index be8d9aec..0b027ce1 100644
--- a/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
+++ b/testing/tests/regression-suite/304-Chandler-PROPFIND-2.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "d0133346b5582da2156dcc6d20ed461a"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 558
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/305-Chandler-OPTIONS-3.result b/testing/tests/regression-suite/305-Chandler-OPTIONS-3.result
index 074b9a9c..7fc69e1f 100644
--- a/testing/tests/regression-suite/305-Chandler-OPTIONS-3.result
+++ b/testing/tests/regression-suite/305-Chandler-OPTIONS-3.result
@@ -1,9 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR, REPORT
+Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, REPORT
 DAV: 1, 2, access-control, calendar-access
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/305-Chandler-PROPFIND-3.result b/testing/tests/regression-suite/305-Chandler-PROPFIND-3.result
index 1929f53e..c2b45b2a 100644
--- a/testing/tests/regression-suite/305-Chandler-PROPFIND-3.result
+++ b/testing/tests/regression-suite/305-Chandler-PROPFIND-3.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "5e9b9ac288ac9f551817297c07178c71"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 1498
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/306-Chandler-PUT-1.result b/testing/tests/regression-suite/306-Chandler-PUT-1.result
index b237df96..9f45c1ef 100644
--- a/testing/tests/regression-suite/306-Chandler-PUT-1.result
+++ b/testing/tests/regression-suite/306-Chandler-PUT-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "0d7a68984bf525342d22b8924a57e8e2"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/307-Chandler-PUT-2.result b/testing/tests/regression-suite/307-Chandler-PUT-2.result
index cd68ee94..ef2dc4f2 100644
--- a/testing/tests/regression-suite/307-Chandler-PUT-2.result
+++ b/testing/tests/regression-suite/307-Chandler-PUT-2.result
@@ -1,8 +1,6 @@
 HTTP/1.1 201 Created
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "421abf7e4848d2fecbf64217ed205d4b"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result b/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
index 074b9a9c..7fc69e1f 100644
--- a/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
+++ b/testing/tests/regression-suite/400-Cadaver-OPTIONS-1.result
@@ -1,9 +1,7 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
-Allow: OPTIONS, GET, PUT, DELETE, PROPFIND, PROPPATCH, MKCOL, MKCALENDAR, REPORT
+Allow: OPTIONS, GET, HEAD, PUT, DELETE, PROPFIND, MKCOL, MKCALENDAR, REPORT
 DAV: 1, 2, access-control, calendar-access
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 0
 Content-Type: text/plain; charset=UTF-8
 
diff --git a/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result b/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
index ce42edde..8b4a7446 100644
--- a/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
+++ b/testing/tests/regression-suite/401-Cadaver-PROPFIND-1.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "3100aa09a91541170a59fa9bd268f77d"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 412
 Content-Type: text/xml; charset="utf-8"
 
diff --git a/testing/tests/regression-suite/900-Moz-REPORT.result b/testing/tests/regression-suite/900-Moz-REPORT.result
index 74a1470c..006f52eb 100644
--- a/testing/tests/regression-suite/900-Moz-REPORT.result
+++ b/testing/tests/regression-suite/900-Moz-REPORT.result
@@ -1,8 +1,6 @@
 HTTP/1.1 207 Multi-Status
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Server: Apache/2.2.3 (Debian) DAV/2
 ETag: "33f03d0b3aa9c198b8184fc8aab15acb"
-X-RSCDS-Version: RSCDS/0.5.0; DB/1.1.5
 Content-Length: 2957
 Keep-Alive: timeout=15, max=100
 Connection: Keep-Alive