diff --git a/testing/tests/regression-suite/003-Mulberry-1.data b/testing/tests/regression-suite/003-Mulberry-1.data
deleted file mode 100644
index 032be966..00000000
--- a/testing/tests/regression-suite/003-Mulberry-1.data
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<D:propfind xmlns:D="DAV:">
-<D:prop>
-<D:getcontentlength/>
-<D:getcontenttype/>
-<D:resourcetype/>
-</D:prop>
-</D:propfind>
diff --git a/testing/tests/regression-suite/003-Mulberry-1.test b/testing/tests/regression-suite/003-Mulberry-1.test
index 67ae486d..627bc96a 100644
--- a/testing/tests/regression-suite/003-Mulberry-1.test
+++ b/testing/tests/regression-suite/003-Mulberry-1.test
@@ -6,3 +6,14 @@ URL=http://mycaldav/caldav.php/user1/
 HEADER=Depth: 1
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
+
+BEGINDATA
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:getcontentlength/>
+<D:getcontenttype/>
+<D:resourcetype/>
+</D:prop>
+</D:propfind>
+ENDDATA
diff --git a/testing/tests/regression-suite/005-Mulberry-1.test b/testing/tests/regression-suite/005-Mulberry-1.test
index 3e223750..3dfec526 100644
--- a/testing/tests/regression-suite/005-Mulberry-1.test
+++ b/testing/tests/regression-suite/005-Mulberry-1.test
@@ -6,5 +6,15 @@ URL=http://mycaldav/caldav.php/user1/
 HEADER=Depth: 1
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
-# We re-use the data from the PROPFIND request before we made the calendar
-DATA=003-Mulberry-1
\ No newline at end of file
+
+
+BEGINDATA
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:getcontentlength/>
+<D:getcontenttype/>
+<D:resourcetype/>
+</D:prop>
+</D:propfind>
+ENDDATA
diff --git a/testing/tests/regression-suite/012-Mulberry-PUT-2.test b/testing/tests/regression-suite/012-Mulberry-PUT-2.test
index 5603b001..0f2b14fd 100644
--- a/testing/tests/regression-suite/012-Mulberry-PUT-2.test
+++ b/testing/tests/regression-suite/012-Mulberry-PUT-2.test
@@ -4,4 +4,37 @@ TYPE=PUT
 URL=http://mycaldav/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
-DATA=3F4CF6227300FD062D9EF3CDFB30D32D-0.ics
+
+BEGINDATA
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:New Zealand Standard Time
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20061102T090217Z
+DTSTART;TZID=New Zealand Standard Time:20061103T123000
+DURATION:PT1H
+SUMMARY:Lunch with David
+UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
+END:VEVENT
+END:VCALENDAR
+ENDDATA
diff --git a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.test b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.test
index 809b3950..e76ffee7 100644
--- a/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.test
+++ b/testing/tests/regression-suite/013-Mulberry-PROPFIND-5.test
@@ -6,5 +6,13 @@ URL=http://mycaldav/caldav.php/user1/home/
 HEADER=Depth: 1
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
-# We re-use the data from the PROPFIND request before we made the calendar
-DATA=003-Mulberry-1
+
+BEGINDATA
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:getcontentlength/>
+<D:getcontenttype/>
+<D:resourcetype/>
+</D:prop>
+</D:propfind>
+ENDDATA
diff --git a/testing/tests/regression-suite/014-Mulberry-PUT-3.test b/testing/tests/regression-suite/014-Mulberry-PUT-3.test
index 62b6f56e..c8b072af 100644
--- a/testing/tests/regression-suite/014-Mulberry-PUT-3.test
+++ b/testing/tests/regression-suite/014-Mulberry-PUT-3.test
@@ -4,4 +4,39 @@ TYPE=PUT
 URL=http://mycaldav/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
-DATA=3F4CF6227300FD062D9EF3CDFB30D32D-0-modified.ics
+
+BEGINDATA
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:New Zealand Standard Time
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20061102T090217Z
+DTSTART;TZID=New Zealand Standard Time:20061102T123000
+DURATION:PT1H
+LAST-MODIFIED:20061104T002921Z
+SEQUENCE:1
+SUMMARY:Lunch with David
+UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
+END:VEVENT
+END:VCALENDAR
+ENDDATA
diff --git a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.test b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.test
index 809b3950..f499697c 100644
--- a/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.test
+++ b/testing/tests/regression-suite/015-Mulberry-PROPFIND-6.test
@@ -6,5 +6,14 @@ URL=http://mycaldav/caldav.php/user1/home/
 HEADER=Depth: 1
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
-# We re-use the data from the PROPFIND request before we made the calendar
-DATA=003-Mulberry-1
+
+BEGINDATA
+<?xml version="1.0" encoding="utf-8" ?>
+<D:propfind xmlns:D="DAV:">
+<D:prop>
+<D:getcontentlength/>
+<D:getcontenttype/>
+<D:resourcetype/>
+</D:prop>
+</D:propfind>
+ENDDATA
diff --git a/testing/tests/regression-suite/018-Mulberry-PUT-4.test b/testing/tests/regression-suite/018-Mulberry-PUT-4.test
index 234884ff..423527f6 100644
--- a/testing/tests/regression-suite/018-Mulberry-PUT-4.test
+++ b/testing/tests/regression-suite/018-Mulberry-PUT-4.test
@@ -4,4 +4,40 @@ TYPE=PUT
 URL=http://mycaldav/caldav.php/resource2/home/0A5EA1F0F2691A03E917E85F9F255448-0.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
-DATA=0A5EA1F0F2691A03E917E85F9F255448-0.ics
+
+
+BEGINDATA
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:New Zealand Standard Time
+X-LIC-LOCATION:Pacific/Auckland
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20061108T113035Z
+DTSTART;TZID=New Zealand Standard Time:20061030T100000
+DURATION:PT1H
+LAST-MODIFIED:20061108T113044Z
+SEQUENCE:1
+SUMMARY:Booking resource 2
+UID:C8344958F0CC35344E063A04@D76FAF7B10D9E8D2D41F779C
+END:VEVENT
+END:VCALENDAR
+ENDDATA
diff --git a/testing/tests/regression-suite/022-Mulberry-PUT-5.test b/testing/tests/regression-suite/022-Mulberry-PUT-5.test
index bec2c0ed..a9904f5b 100644
--- a/testing/tests/regression-suite/022-Mulberry-PUT-5.test
+++ b/testing/tests/regression-suite/022-Mulberry-PUT-5.test
@@ -5,4 +5,36 @@ TYPE=PUT
 URL=http://mycaldav/caldav.php/resource2/home/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
-DATA=27D2201A83F0CD2EA9ECEBB588F796A7-0.ics
+
+BEGINDATA
+BEGIN:VCALENDAR
+CALSCALE:GREGORIAN
+PRODID:-//mulberrymail.com//Mulberry v4.0//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+LAST-MODIFIED:20040110T032845Z
+TZID:New Zealand Standard Time
+BEGIN:DAYLIGHT
+DTSTART:20000404T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
+TZNAME:NZDT
+TZOFFSETFROM:+1200
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+DTSTART:20001026T020000
+RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
+TZNAME:NZST
+TZOFFSETFROM:+1300
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+DTSTAMP:20061121T233700Z
+DTSTART;TZID=New Zealand Standard Time:20061031T100000
+DURATION:PT3H
+SUMMARY:Resource 2 to be deleted
+UID:5C50D66788218BF2180E0C7C@D76FAF7B10D9E8D2D41F779C
+END:VEVENT
+END:VCALENDAR
+ENDDATA
diff --git a/testing/tests/regression-suite/0A5EA1F0F2691A03E917E85F9F255448-0.ics.data b/testing/tests/regression-suite/0A5EA1F0F2691A03E917E85F9F255448-0.ics.data
deleted file mode 100644
index 7e424e6d..00000000
--- a/testing/tests/regression-suite/0A5EA1F0F2691A03E917E85F9F255448-0.ics.data
+++ /dev/null
@@ -1,33 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//mulberrymail.com//Mulberry v4.0//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:New Zealand Standard Time
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20061108T113035Z
-DTSTART;TZID=New Zealand Standard Time:20061030T100000
-DURATION:PT1H
-LAST-MODIFIED:20061108T113044Z
-SEQUENCE:1
-SUMMARY:Booking resource 2
-UID:C8344958F0CC35344E063A04@D76FAF7B10D9E8D2D41F779C
-END:VEVENT
-END:VCALENDAR
diff --git a/testing/tests/regression-suite/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics.data b/testing/tests/regression-suite/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics.data
deleted file mode 100644
index 107da3af..00000000
--- a/testing/tests/regression-suite/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics.data
+++ /dev/null
@@ -1,30 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//mulberrymail.com//Mulberry v4.0//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:New Zealand Standard Time
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20061121T233700Z
-DTSTART;TZID=New Zealand Standard Time:20061031T100000
-DURATION:PT3H
-SUMMARY:Resource 2 to be deleted
-UID:5C50D66788218BF2180E0C7C@D76FAF7B10D9E8D2D41F779C
-END:VEVENT
-END:VCALENDAR
diff --git a/testing/tests/regression-suite/3F4CF6227300FD062D9EF3CDFB30D32D-0-modified.ics.data b/testing/tests/regression-suite/3F4CF6227300FD062D9EF3CDFB30D32D-0-modified.ics.data
deleted file mode 100644
index 701a4d86..00000000
--- a/testing/tests/regression-suite/3F4CF6227300FD062D9EF3CDFB30D32D-0-modified.ics.data
+++ /dev/null
@@ -1,33 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//mulberrymail.com//Mulberry v4.0//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:New Zealand Standard Time
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20061102T090217Z
-DTSTART;TZID=New Zealand Standard Time:20061102T123000
-DURATION:PT1H
-LAST-MODIFIED:20061104T002921Z
-SEQUENCE:1
-SUMMARY:Lunch with David
-UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
-END:VEVENT
-END:VCALENDAR
diff --git a/testing/tests/regression-suite/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics.data b/testing/tests/regression-suite/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics.data
deleted file mode 100644
index 08176921..00000000
--- a/testing/tests/regression-suite/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics.data
+++ /dev/null
@@ -1,31 +0,0 @@
-BEGIN:VCALENDAR
-CALSCALE:GREGORIAN
-PRODID:-//mulberrymail.com//Mulberry v4.0//EN
-VERSION:2.0
-BEGIN:VTIMEZONE
-LAST-MODIFIED:20040110T032845Z
-TZID:New Zealand Standard Time
-X-LIC-LOCATION:Pacific/Auckland
-BEGIN:DAYLIGHT
-DTSTART:20000404T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=4
-TZNAME:NZDT
-TZOFFSETFROM:+1200
-TZOFFSETTO:+1300
-END:DAYLIGHT
-BEGIN:STANDARD
-DTSTART:20001026T020000
-RRULE:FREQ=YEARLY;BYDAY=1SU;BYMONTH=10
-TZNAME:NZST
-TZOFFSETFROM:+1300
-TZOFFSETTO:+1200
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-DTSTAMP:20061102T090217Z
-DTSTART;TZID=New Zealand Standard Time:20061103T123000
-DURATION:PT1H
-SUMMARY:Lunch with David
-UID:5A55230C8866CA8D3D325F3A@CA1CBED546AAE36FF3BC722E
-END:VEVENT
-END:VCALENDAR